Changeset 9572 in josm for trunk/src/org

Timestamp:

2016-01-23T02:10:43+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12417 - mapmodes did not listen to preferences change (patch by kolesar)

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• DrawAction.java (modified) (2 diffs)
• ExtrudeAction.java (modified) (2 diffs)
• ImproveWayAccuracyAction.java (modified) (1 diff)
• MapMode.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -141 +141 @@
         readPreferences();
         snapHelper.init();
+        readPreferences();
     }
 
@@ -239 +240 @@
     }
 
-    private void readPreferences() {
+    @Override
+    protected void readPreferences() {
         rubberLineColor = Main.pref.getColor(marktr("helper line"), null);
         if (rubberLineColor == null) rubberLineColor = PaintColors.SELECTED.get();

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -295 +295 @@
         Main.map.mapView.addMouseListener(this);
         Main.map.mapView.addMouseMotionListener(this);
-        readPreferences();
         ignoreNextKeyRelease = true;
         Main.map.keyDetector.addKeyListener(this);
@@ -301 +300 @@
     }
 
-    private void readPreferences() {
+    @Override
+    protected void readPreferences() {
         initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay", 200);
         initialMoveThreshold = Main.pref.getInteger("extrude.initial-move-threshold", 1);

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -142 +142 @@
     }
 
-    private void readPreferences() {
+    @Override
+    protected void readPreferences() {
         guideColor = Main.pref.getColor(marktr("improve way accuracy helper line"), null);
         if (guideColor == null) guideColor = PaintColors.HIGHLIGHT.get();

trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -15 +15 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 
 /**
@@ -22 +24 @@
  * MapModes should register/deregister all necessary listeners on the map's view control.
  */
-public abstract class MapMode extends JosmAction implements MouseListener, MouseMotionListener {
+public abstract class MapMode extends JosmAction implements MouseListener, MouseMotionListener, PreferenceChangedListener {
     protected final Cursor cursor;
     protected boolean ctrl;
@@ -63 +65 @@
     public void enterMode() {
         putValue("active", Boolean.TRUE);
+        Main.pref.addPreferenceChangeListener(this);
+        readPreferences();
         Main.map.mapView.setNewCursor(cursor, this);
         updateStatusLine();
@@ -72 +76 @@
     public void exitMode() {
         putValue("active", Boolean.FALSE);
+        Main.pref.removePreferenceChangeListener(this);
         Main.map.mapView.resetCursor(this);
     }
@@ -83 +88 @@
         return "";
     }
+
+    protected void readPreferences() {}
 
     /**
@@ -160 +167 @@
         // Do nothing
     }
+
+    @Override
+    public void preferenceChanged(PreferenceChangeEvent e) {
+        readPreferences();
+    }
 }