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

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/actions/OpenFileAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -76 +76 @@
     static public class OpenFileTask extends PleaseWaitRunnable {
         private List<File> files;
+        private List<File> successfullyOpenedFiles = new ArrayList<File>();
         private FileFilter fileFilter;
         private boolean cancelled;
 
-        public OpenFileTask(List<File> files, FileFilter fileFilter) {
-            super(tr("Opening files"), false /* don't ignore exception */);
+        public OpenFileTask(List<File> files, FileFilter fileFilter, String title) {
+            super(title, false /* don't ignore exception */);
             this.files = new ArrayList<File>(files);
             this.fileFilter = fileFilter;
         }
+
+        public OpenFileTask(List<File> files, FileFilter fileFilter) {
+            this(files, fileFilter, tr("Opening files"));
+        }
+
         @Override
         protected void cancel() {
@@ -240 +246 @@
                 getProgressMonitor().setCustomText(msg);
                 getProgressMonitor().indeterminateSubTask(msg);
-                importer.importDataHandleExceptions(files, getProgressMonitor().createSubTaskMonitor(files.size(), false));
+                if (importer.importDataHandleExceptions(files, getProgressMonitor().createSubTaskMonitor(files.size(), false))) {
+                    successfullyOpenedFiles.addAll(files);
+                }
             } else {
                 for (File f : files) {
                     if (cancelled) return;
                     getProgressMonitor().indeterminateSubTask(tr("Opening file ''{0}'' ...", f.getAbsolutePath()));
-                    importer.importDataHandleExceptions(f, getProgressMonitor().createSubTaskMonitor(1, false));
-                }
-            }
+                    if (importer.importDataHandleExceptions(f, getProgressMonitor().createSubTaskMonitor(1, false))) {
+                        successfullyOpenedFiles.add(f);
+                    }
+                }
+            }
+        }
+
+        public List<File> getSuccessfullyOpenedFiles() {
+            return successfullyOpenedFiles;
         }
     }