Changeset 3679 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2010-11-29T08:24:10+01:00 (13 years ago)

Author:

bastiK

Message:

see #5559 - ExtendedDialog.showDialog() blocks when called in main thread, so move gui stuff to edt. This problem is highly system dependent (i could never reproduce it myself, but seems to be quite common)

File:

• trunk/src/org/openstreetmap/josm/io/FileImporter.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/io/FileImporter.java

@@ -36 +36 @@
     /**
      * Needs to be implemented if isBatchImporter() returns false.
-     * @throws IllegalDataException
      */
     public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
@@ -44 +43 @@
     /**
      * Needs to be implemented if isBatchImporter() returns true.
-     * @throws IllegalDataException
      */
     public void importData(List<File> files, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
@@ -52 +50 @@
     /**
      * Wrapper to give meaningful output if things go wrong.
+     * @return true if data import was successful
      */
-    public void importDataHandleExceptions(File f, ProgressMonitor progressMonitor) {
+    public boolean importDataHandleExceptions(File f, ProgressMonitor progressMonitor) {
         try {
             System.out.println("Open file: " + f.getAbsolutePath() + " (" + f.length() + " bytes)");
             importData(f, progressMonitor);
+            return true;
         } catch (Exception e) {
             e.printStackTrace();
@@ -65 +65 @@
                     JOptionPane.ERROR_MESSAGE, null
             );
+            return false;
         }
     }
-    public void importDataHandleExceptions(List<File> files, ProgressMonitor progressMonitor) {
+    public boolean importDataHandleExceptions(List<File> files, ProgressMonitor progressMonitor) {
         try {
             System.out.println("Open "+files.size()+" files");
             importData(files, progressMonitor);
+            return true;
         } catch (Exception e) {
             e.printStackTrace();
@@ -79 +81 @@
                     JOptionPane.ERROR_MESSAGE, null
             );
+            return false;
         }
     }