Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 2979) +++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 2980) @@ -12,5 +12,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; +import java.util.LinkedList; import java.util.List; @@ -20,5 +22,7 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.HelpAwareOptionPane; import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.io.AllFormatsImporter; import org.openstreetmap.josm.io.FileImporter; @@ -89,4 +93,57 @@ } + protected void alertFilesNotMatchingWithImporter(Collection files, FileImporter importer) { + StringBuffer msg = new StringBuffer(); + msg.append(""); + msg.append( + trn( + "Cannot open {0} file with the file importer ''{1}''. Skipping the following files:", + "Cannot open {0} files with the file importer ''{1}''. Skipping the following files:", + files.size(), + files.size(), + importer.filter.getDescription() + ) + ).append("
"); + msg.append(""); + + HelpAwareOptionPane.showOptionDialog( + Main.parent, + msg.toString(), + tr("Warning"), + JOptionPane.WARNING_MESSAGE, + HelpUtil.ht("/Action/OpenFile#ImporterCantImportFiles") + ); + } + + protected void alertFilesWithUnknownImporter(Collection files) { + StringBuffer msg = new StringBuffer(); + msg.append(""); + msg.append( + trn( + "Cannot open {0} file because no suitable file importer is available. Skipping the following files:", + "Cannot open {0} files because no suitable file importer is available. Skipping the following files:", + files.size(), + files.size() + ) + ).append("
"); + msg.append(""); + + HelpAwareOptionPane.showOptionDialog( + Main.parent, + msg.toString(), + tr("Warning"), + JOptionPane.WARNING_MESSAGE, + HelpUtil.ht("/Action/OpenFile#MissingImporterForFiles") + ); + } + @Override protected void realRun() throws SAXException, IOException, OsmTransferException { @@ -111,41 +168,51 @@ getProgressMonitor().setTicksCount(files.size()); - if (chosenImporter != null) { // The importer was expicitely chosen, so use it. - //System.err.println("Importer: " +chosenImporter.getClass().getName()); + if (chosenImporter != null) { + // The importer was expicitely chosen, so use it. + List filesNotMatchingWithImporter = new LinkedList(); + List filesMatchingWithImporter = new LinkedList(); for (File f : files) { if (!chosenImporter.acceptFile(f)) { if (f.isDirectory()) { - JOptionPane.showMessageDialog( - Main.parent, - tr("Cannot open directory.
Please select a file!"), - tr("Open file"), - JOptionPane.INFORMATION_MESSAGE - ); - return; - } else - throw new IllegalStateException(); + JOptionPane.showMessageDialog(Main.parent, tr( + "Cannot open directory ''{0}''.
Please select a file.", f + .getAbsolutePath()), tr("Open file"), JOptionPane.ERROR_MESSAGE); + } else { + filesNotMatchingWithImporter.add(f); + } + } else { + filesMatchingWithImporter.add(f); } } - importData(chosenImporter, files); - } - else { // find apropriate importer + + if (!filesNotMatchingWithImporter.isEmpty()) { + alertFilesNotMatchingWithImporter(filesNotMatchingWithImporter, chosenImporter); + } + if (!filesNotMatchingWithImporter.isEmpty()) { + importData(chosenImporter, filesMatchingWithImporter); + } + } else { + // find appropriate importer MultiMap map = new MultiMap(); - FILES: - for (File f: files) { - for (FileImporter importer : ExtensionFileFilter.importers) { - if (importer.acceptFile(f)) { - map.put(importer, f); - continue FILES; - } + List filesWithKnownImporter = new LinkedList(); + List filesWithUnknownImporter = new LinkedList(); + FILES: for (File f : files) { + for (FileImporter importer : ExtensionFileFilter.importers) { + if (importer.acceptFile(f)) { + map.put(importer, f); + filesWithKnownImporter.add(f); + continue FILES; } - throw new RuntimeException(); // no importer found } + filesWithUnknownImporter.add(f); + } + if (!filesWithUnknownImporter.isEmpty()) { + alertFilesWithUnknownImporter(filesWithUnknownImporter); + } List ims = new ArrayList(map.keySet()); Collections.sort(ims); Collections.reverse(ims); for (FileImporter importer : ims) { - //System.err.println("Using "+importer.getClass().getName()); List files = new ArrayList(map.get(importer)); - //System.err.println("for files: "+files); importData(importer, files); } @@ -162,4 +229,5 @@ msg = trn("Opening {0} file...", "Opening {0} files...", files.size(), files.size()); } + getProgressMonitor().setCustomText(msg); getProgressMonitor().indeterminateSubTask(msg); importer.importDataHandleExceptions(files, getProgressMonitor().createSubTaskMonitor(files.size(), false)); Index: trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 2979) +++ trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 2980) @@ -13,4 +13,5 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener; import org.openstreetmap.josm.io.OsmTransferException; +import org.openstreetmap.josm.tools.BugReportExceptionHandler; import org.openstreetmap.josm.tools.CheckParameterUtil; import org.xml.sax.SAXException; @@ -103,5 +104,9 @@ SwingUtilities.invokeLater(new Runnable() { public void run() { - ExceptionDialogUtil.explainException(e); + if (e instanceof RuntimeException) { + BugReportExceptionHandler.handleException(e); + } else { + ExceptionDialogUtil.explainException(e); + } } });