Changeset 4718 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2011-12-27T12:56:27+01:00 (12 years ago)

Author:

jttt

Message:

Add posibility to run please wait runnable tasks in background

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (15 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -22 +22 @@
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.regex.Matcher;
@@ -41 +39 @@
 import javax.swing.JTextArea;
 import javax.swing.KeyStroke;
+import javax.swing.RepaintManager;
 import javax.swing.UIManager;
 
+import org.jdesktop.swinghelper.debug.CheckThreadViolationRepaintManager;
 import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -76 +76 @@
 import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitorExecutor;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.plugins.PluginHandler;
@@ -116 +118 @@
      * and sequential.
      */
-    public final static ExecutorService worker = Executors.newSingleThreadExecutor();
+    public final static ExecutorService worker = new ProgressMonitorExecutor();
     /**
      * Global application preferences
@@ -143 +145 @@
 
     public UndoRedoHandler undoRedo = new UndoRedoHandler();
+
+    public static PleaseWaitProgressMonitor currentProgressMonitor;
 
     /**
@@ -208 +212 @@
 
         PluginHandler.notifyMapFrameChanged(old, map);
+        if (map == null && currentProgressMonitor != null) {
+            currentProgressMonitor.showForegroundDialog();
+        }
     }
 
@@ -238 +245 @@
         isOpenjdk = System.getProperty("java.vm.name").toUpperCase().indexOf("OPENJDK") != -1;
 
-        if (initListener != null)
+        if (initListener != null) {
             initListener.updateStatus(tr("Executing platform startup hook"));
+        }
         platform.startupHook();
 
@@ -245 +253 @@
         // capabilities are already known to the editor instance. However
         // if it goes wrong that's not critical at this stage.
-        if (initListener != null)
+        if (initListener != null) {
             initListener.updateStatus(tr("Initializing OSM API"));
+        }
         try {
             OsmApi.getOsmApi().initialize(null, true);
@@ -253 +262 @@
         }
 
-        if (initListener != null)
+        if (initListener != null) {
             initListener.updateStatus(tr("Building main menu"));
+        }
         contentPanePrivate.add(panel, BorderLayout.CENTER);
         panel.add(gettingStarted, BorderLayout.CENTER);
@@ -267 +277 @@
                 KeyEvent.VK_F1, Shortcut.GROUP_DIRECT));
 
-        if (initListener != null)
+        if (initListener != null) {
             initListener.updateStatus(tr("Initializing presets"));
+        }
         TaggingPresetPreference.initialize();
 
-        if (initListener != null)
+        if (initListener != null) {
             initListener.updateStatus(tr("Initializing map styles"));
+        }
         MapPaintPreference.initialize();
 
-        if (initListener != null)
+        if (initListener != null) {
             initListener.updateStatus(tr("Loading imagery preferences"));
+        }
         ImageryPreference.initialize();
 
-        if (initListener != null)
+        if (initListener != null) {
             initListener.updateStatus(tr("Initializing validator"));
+        }
         validator = new OsmValidator();
         MapView.addLayerChangeListener(validator);
@@ -293 +307 @@
         FeatureAdapter.registerTranslationAdapter(I18n.getTranslationAdapter());
 
-        if (initListener != null)
+        if (initListener != null) {
             initListener.updateStatus(tr("Updating user interface"));
+        }
 
         toolbar.refreshToolbarControl();
@@ -527 +542 @@
                                 tr("Warning"),
                                 JOptionPane.WARNING_MESSAGE
-                        );
+                                );
                     }
                     if (f!=null) {
@@ -560 +575 @@
                             tr("Warning"),
                             JOptionPane.WARNING_MESSAGE
-                    );
+                            );
                 }
             }
@@ -647 +662 @@
                     tr("Warning"),
                     JOptionPane.WARNING_MESSAGE
-            );
+                    );
         } else {
             downloadFromParamBounds(rawGps, b);
@@ -664 +679 @@
                     new LatLon(Double.parseDouble(st.nextToken()),Double.parseDouble(st.nextToken())),
                     new LatLon(Double.parseDouble(st.nextToken()),Double.parseDouble(st.nextToken()))
-            );
+                    );
             downloadFromParamBounds(rawGps, b);
         }