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

Timestamp:

2011-02-05T10:40:39+01:00 (13 years ago)

Author:

bastiK

Message:

Extended mappaint style dialog. No longer required to restart JOSM for changes in mappaint preferences.

Location:

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

Files:

• ElemStyles.java (modified) (2 diffs)
• MapPaintStyles.java (modified) (7 diffs)
• NodeElemStyle.java (modified) (1 diff)
• mapcss/MapCSSStyleSource.java (modified) (1 diff)
• xml/XmlStyleSource.java (modified) (1 diff)

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

@@ -35 +35 @@
     }
 
-    public void add(StyleSource style) {
-        styleSources.add(style);
-    }
-
-    public Collection<StyleSource> getStyleSources() {
-        return Collections.<StyleSource>unmodifiableCollection(styleSources);
+    public List<StyleSource> getStyleSources() {
+        return Collections.<StyleSource>unmodifiableList(styleSources);
     }
 
@@ -241 +237 @@
         this.drawMultipolygon = drawMultipolygon;
     }
+
+    /**
+     * remove all style sources; only accessed from MapPaintStyles
+     */
+    void clear() {
+        styleSources.clear();
+    }
+
+    /**
+     * add a style source; only accessed from MapPaintStyles
+     */
+    void add(StyleSource style) {
+        styleSources.add(style);
+    }
+
+    /**
+     * set the style sources; only accessed from MapPaintStyles
+     */
+    void setStyleSources(Collection<StyleSource> sources) {
+        styleSources.clear();
+        styleSources.addAll(sources);
+    }
+
 }

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.ImageIcon;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -23 +27 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
+/**
+ * This class manages the ElemStyles instance. The object you get with
+ * getStyles() is read only, any manipulation happens via one of
+ * the wrapper methods here. (readFromPreferences, moveStyles, ...)
+ *
+ * On change, mapPaintSylesUpdated() is fired for all listeners.
+ */
 public class MapPaintStyles {
 
@@ -71 +82 @@
     }
 
-    @SuppressWarnings("null")
     public static void readFromPreferences() {
+        styles.clear();
         iconDirs = Main.pref.getCollection("mappaint.icon.sources", Collections.<String>emptySet());
         if(Main.pref.getBoolean("mappaint.icon.enable-defaults", true))
@@ -83 +94 @@
         }
 
-        Collection<? extends SourceEntry> sourceEntries = (new MapPaintPrefMigration()).get();
+        Collection<? extends SourceEntry> sourceEntries = MapPaintPrefMigration.INSTANCE.get();
 
         for (SourceEntry entry : sourceEntries) {
@@ -120 +131 @@
             s.loadStyleSource();
         }
+        fireMapPaintSylesUpdated();
+    }
+
+    /**
+     * 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<StyleSource>();
+        List<StyleSource> data = styles.getStyleSources();
+        for (int i : sel) {
+            toReload.add(data.get(i));
+        }
+        Main.worker.submit(new MapPaintStyleLoader(toReload));
     }
 
@@ -138 +164 @@
         @Override
         protected void finish() {
+            SwingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    fireMapPaintSylesUpdated();
+                    styles.clearCached();
+                    Main.map.mapView.preferenceChanged(null);
+                    Main.map.mapView.repaint();
+                }
+            });
         }
 
@@ -154 +189 @@
     }
 
+    /**
+     * Move position of entries in the current list of StyleSources
+     * @param sele The indices of styles to be moved.
+     * @param delta The number of lines it should move. positive int moves
+     *      down and negative moves up.
+     */
+    public static void moveStyles(int[] sel, int delta) {
+        if (!canMoveStyles(sel, delta))
+            return;
+        int[] selSorted = Arrays.copyOf(sel, sel.length);
+        Arrays.sort(selSorted);
+        List<StyleSource> data = new ArrayList<StyleSource>(styles.getStyleSources());
+        for (int row: selSorted) {
+            StyleSource t1 = data.get(row);
+            StyleSource t2 = data.get(row + delta);
+            data.set(row, t2);
+            data.set(row + delta, t1);
+        }
+        styles.setStyleSources(data);
+        MapPaintPrefMigration.INSTANCE.put(data);
+        fireMapPaintSylesUpdated();
+        styles.clearCached();
+        Main.map.mapView.repaint();
+    }
+
+    public static boolean canMoveStyles(int[] sel, int i) {
+        if (sel.length == 0)
+            return false;
+        int[] selSorted = Arrays.copyOf(sel, sel.length);
+        Arrays.sort(selSorted);
+
+        if (i < 0) { // Up
+            return selSorted[0] >= -i;
+        } else
+        if (i > 0) { // Down
+            return selSorted[selSorted.length-1] <= styles.getStyleSources().size() - 1 - i;
+        } else
+            return true;
+    }
+
+    public static void toggleStyleActive(int... sel) {
+        List<StyleSource> data = styles.getStyleSources();
+        for (int p : sel) {
+            StyleSource s = data.get(p);
+            s.active = !s.active;
+        }
+        MapPaintPrefMigration.INSTANCE.put(data);
+        if (sel.length == 1) {
+            fireMapPaintStyleEntryUpdated(sel[0]);
+        } else {
+            fireMapPaintSylesUpdated();
+        }
+        styles.clearCached();
+        Main.map.mapView.repaint();
+    }
+
+    /***********************************
+     * MapPaintSylesUpdateListener & related code
+     *  (get informed when the list of MapPaint StyleSources changes)
+     */
+
+    public interface MapPaintSylesUpdateListener {
+        public void mapPaintStylesUpdated();
+        public void mapPaintStyleEntryUpdated(int idx);
+    }
+
+    protected static final CopyOnWriteArrayList<MapPaintSylesUpdateListener> listeners
+            = new CopyOnWriteArrayList<MapPaintSylesUpdateListener>();
+
+    public static void addMapPaintSylesUpdateListener(MapPaintSylesUpdateListener listener) {
+        if (listener != null) {
+            listeners.addIfAbsent(listener);
+        }
+    }
+
+    public static void removeMapPaintSylesUpdateListener(MapPaintSylesUpdateListener listener) {
+        listeners.remove(listener);
+    }
+
+    public static void fireMapPaintSylesUpdated() {
+        for (MapPaintSylesUpdateListener l : listeners) {
+            l.mapPaintStylesUpdated();
+        }
+    }
+
+    public static void fireMapPaintStyleEntryUpdated(int idx) {
+        for (MapPaintSylesUpdateListener l : listeners) {
+            l.mapPaintStyleEntryUpdated(idx);
+        }
+    }
 }

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

@@ -97 +97 @@
                 }
             }
-        } else if (primitive instanceof Relation) {
+        } else if (primitive instanceof Relation && icon != null) {
             painter.drawRestriction((Relation) primitive, this);
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -41 +41 @@
     public void loadStyleSource() {
         rules.clear();
+        hasError = false;
         try {
             MirroredInputStream in = new MirroredInputStream(url);

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -50 +50 @@
 
     protected void init() {
+        hasError = false;
         icons.clear();
         lines.clear();