Changeset 12634 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/imagery

Timestamp:

2017-08-24T15:54:00+02:00 (8 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/preferences/imagery

Files:

• CacheContentsPanel.java (modified) (2 diffs)
• ImageryPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java

@@ -27 +27 @@
 import org.apache.commons.jcs.engine.stats.behavior.IStatElement;
 import org.apache.commons.jcs.engine.stats.behavior.IStats;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
@@ -51 +51 @@
     public CacheContentsPanel() {
         super(new GridBagLayout());
-        Main.worker.submit(() -> {
+        MainApplication.worker.submit(() -> {
             addToPanel(TMSLayer.getCache(), "TMS");
             addToPanel(WMSLayer.getCache(), "WMS");

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -61 +61 @@
 import org.openstreetmap.josm.data.imagery.Shape;
 import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
@@ -657 +658 @@
             @Override
             public void actionPerformed(ActionEvent evt) {
-                layerInfo.loadDefaults(true, false, false);
+                layerInfo.loadDefaults(true, MainApplication.worker, false);
                 defaultModel.fireTableDataChanged();
                 defaultTable.getSelectionModel().clearSelection();