Changeset 12634 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2017-08-24T15:54:00+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.worker, replace it by gui.MainApplication.worker + code refactoring to make sure only editor packages use it

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• MapPaintStyles.java (modified) (2 diffs)
• StyleSetting.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -349 +350 @@
             toReload.add(data.get(i));
         }
-        Main.worker.submit(new MapPaintStyleLoader(toReload));
+        MainApplication.worker.submit(new MapPaintStyleLoader(toReload));
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java

@@ -11 +11 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -70 +71 @@
                 public void actionPerformed(ActionEvent e) {
                     setValue(item.isSelected());
-                    Main.worker.submit(new MapPaintStyles.MapPaintStyleLoader(Arrays.asList(parentStyle)));
+                    MainApplication.worker.submit(new MapPaintStyles.MapPaintStyleLoader(Arrays.asList(parentStyle)));
                 }
             };