Changeset 12651 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

Timestamp:

2017-08-25T23:56:58+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - code refactoring to avoid dependence on GUI packages from MapPaintStyles

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (7 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.File;
@@ -24 +22 @@
 import org.openstreetmap.josm.data.preferences.sources.MapPaintPrefHelper;
 import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.styleelement.MapImage;
 import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -340 +333 @@
 
     /**
-     * reload styles
-     * preferences are the same, but the file source may have changed
-     * @param sel the indices of styles to reload
-     */
-    public static void reloadStyles(final int... sel) {
-        List<StyleSource> toReload = new ArrayList<>();
-        List<StyleSource> data = styles.getStyleSources();
-        for (int i : sel) {
-            toReload.add(data.get(i));
-        }
-        MainApplication.worker.submit(new MapPaintStyleLoader(toReload));
-    }
-
-    /**
-     * This class loads the map paint styles
-     */
-    public static class MapPaintStyleLoader extends PleaseWaitRunnable {
-        private boolean canceled;
-        private final Collection<StyleSource> sources;
-
-        /**
-         * Create a new {@link MapPaintStyleLoader}
-         * @param sources The styles to load
-         */
-        public MapPaintStyleLoader(Collection<StyleSource> sources) {
-            super(tr("Reloading style sources"));
-            this.sources = sources;
-        }
-
-        @Override
-        protected void cancel() {
-            canceled = true;
-        }
-
-        @Override
-        protected void finish() {
-            fireMapPaintSylesUpdated();
-            afterStyleUpdate();
-        }
-
-        @Override
-        protected void realRun() {
-            ProgressMonitor monitor = getProgressMonitor();
-            monitor.setTicksCount(sources.size());
-            for (StyleSource s : sources) {
-                if (canceled)
-                    return;
-                monitor.subTask(tr("loading style ''{0}''...", s.getDisplayString()));
-                s.loadStyleSource();
-                monitor.worked(1);
-            }
-        }
-    }
-
-    /**
      * Move position of entries in the current list of StyleSources
      * @param sel The indices of styles to be moved.
@@ -415 +353 @@
         MapPaintPrefHelper.INSTANCE.put(data);
         fireMapPaintSylesUpdated();
-        afterStyleUpdate();
-    }
-
-    /**
-     * Manually trigger for now. TODO: Move this to a listener
-     */
-    private static void afterStyleUpdate() {
-        SwingUtilities.invokeLater(() -> {
-            styles.clearCached();
-
-            // Trigger a repaint of all data layers
-            MainApplication.getLayerManager().getLayers()
-                .stream()
-                .filter(layer -> layer instanceof OsmDataLayer)
-                .forEach(Layer::invalidate);
-        });
     }
 
@@ -469 +391 @@
             fireMapPaintSylesUpdated();
         }
-        afterStyleUpdate();
     }
 
@@ -500 +421 @@
         MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
         fireMapPaintSylesUpdated();
-        afterStyleUpdate();
     }
 
@@ -522 +442 @@
     private static final ListenerList<MapPaintSylesUpdateListener> listeners = ListenerList.createUnchecked();
 
+    static {
+        listeners.addListener(new MapPaintSylesUpdateListener() {
+            @Override
+            public void mapPaintStylesUpdated() {
+                SwingUtilities.invokeLater(styles::clearCached);
+            }
+
+            @Override
+            public void mapPaintStyleEntryUpdated(int index) {
+                mapPaintStylesUpdated();
+            }
+        });
+    }
+
     /**
      * Add a listener that listens to global style changes.