Changeset 16563 in josm for trunk

Timestamp:

2020-06-07T18:45:04+02:00 (4 years ago)

Author:

simon04

Message:

fix #19357 - MapPaintStylesUpdateListener: fix typo

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (2 diffs)
• dialogs/MapPaintDialog.java (modified) (3 diffs)
• mappaint/MapPaintMenu.java (modified) (3 diffs)
• mappaint/MapPaintStyles.java (modified) (10 diffs)
• mappaint/loader/MapPaintStyleLoader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -67 +67 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintStylesUpdateListener;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.audio.AudioPlayer;
@@ -95 +95 @@
 
     static {
-        MapPaintStyles.addMapPaintSylesUpdateListener(new MapPaintSylesUpdateListener() {
+        MapPaintStyles.addMapPaintStylesUpdateListener(new MapPaintStylesUpdateListener() {
             @Override
             public void mapPaintStylesUpdated() {

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -60 +60 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintStylesUpdateListener;
 import org.openstreetmap.josm.gui.mappaint.StyleSettingGroupGui;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
@@ -180 +180 @@
     @Override
     public void showNotify() {
-        MapPaintStyles.addMapPaintSylesUpdateListener(model);
+        MapPaintStyles.addMapPaintStylesUpdateListener(model);
         model.mapPaintStylesUpdated();
         MainApplication.getMenu().wireFrameToggleAction.addButtonModel(cbWireframe.getModel());
@@ -188 +188 @@
     public void hideNotify() {
         MainApplication.getMenu().wireFrameToggleAction.removeButtonModel(cbWireframe.getModel());
-        MapPaintStyles.removeMapPaintSylesUpdateListener(model);
-    }
-
-    protected class StylesModel extends AbstractTableModel implements MapPaintSylesUpdateListener {
+        MapPaintStyles.removeMapPaintStylesUpdateListener(model);
+    }
+
+    protected class StylesModel extends AbstractTableModel implements MapPaintStylesUpdateListener {
 
         private final Class<?>[] columnClasses = {Boolean.class, StyleSource.class};

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

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintStylesUpdateListener;
 import org.openstreetmap.josm.gui.util.StayOpenCheckBoxMenuItem;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -25 +25 @@
  * @since 5086
  */
-public class MapPaintMenu extends JMenu implements MapPaintSylesUpdateListener {
+public class MapPaintMenu extends JMenu implements MapPaintStylesUpdateListener {
 
     private static class MapPaintAction extends JosmAction {
@@ -88 +88 @@
         super(tr("Map Paint Styles"));
         setIcon(ImageProvider.get("dialogs", "mapstyle", ImageProvider.ImageSizes.MENU));
-        MapPaintStyles.addMapPaintSylesUpdateListener(this);
+        MapPaintStyles.addMapPaintStylesUpdateListener(this);
         putClientProperty("help", ht("/Dialog/MapPaint"));
     }

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

@@ -37 +37 @@
  * the ElemStyles singleton.
  *
- * On change, {@link MapPaintSylesUpdateListener#mapPaintStylesUpdated()} is fired
+ * On change, {@link MapPaintStylesUpdateListener#mapPaintStylesUpdated()} is fired
  * for all listeners.
  */
@@ -46 +46 @@
             "misc/deprecated.png");
 
-    private static final ListenerList<MapPaintSylesUpdateListener> listeners = ListenerList.createUnchecked();
+    private static final ListenerList<MapPaintStylesUpdateListener> listeners = ListenerList.createUnchecked();
 
     private static final class MapPaintStylesPreferenceListener implements PreferenceChangedListener {
@@ -67 +67 @@
 
     static {
-        listeners.addListener(new MapPaintSylesUpdateListener() {
+        listeners.addListener(new MapPaintStylesUpdateListener() {
             @Override
             public void mapPaintStylesUpdated() {
@@ -316 +316 @@
             }
         }
-        fireMapPaintSylesUpdated();
+        fireMapPaintStylesUpdated();
     }
 
@@ -373 +373 @@
         styles.setStyleSources(data);
         MapPaintPrefHelper.INSTANCE.put(data);
-        fireMapPaintSylesUpdated();
+        fireMapPaintStylesUpdated();
     }
 
@@ -413 +413 @@
             fireMapPaintStyleEntryUpdated(sel[0]);
         } else {
-            fireMapPaintSylesUpdated();
+            fireMapPaintStylesUpdated();
         }
     }
@@ -444 +444 @@
     private static void refreshStyles() {
         MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
-        fireMapPaintSylesUpdated();
+        fireMapPaintStylesUpdated();
     }
 
     /***********************************
-     * MapPaintSylesUpdateListener &amp; related code
+     * MapPaintStylesUpdateListener &amp; related code
      *  (get informed when the list of MapPaint StyleSources changes)
      */
-    public interface MapPaintSylesUpdateListener {
+    public interface MapPaintStylesUpdateListener {
         /**
          * Called on any style source changes that are not handled by {@link #mapPaintStyleEntryUpdated(int)}
@@ -468 +468 @@
      * @param listener The listener
      */
-    public static void addMapPaintSylesUpdateListener(MapPaintSylesUpdateListener listener) {
+    public static void addMapPaintStylesUpdateListener(MapPaintStylesUpdateListener listener) {
         listeners.addListener(listener);
     }
@@ -476 +476 @@
      * @param listener The listener
      */
-    public static void removeMapPaintSylesUpdateListener(MapPaintSylesUpdateListener listener) {
+    public static void removeMapPaintStylesUpdateListener(MapPaintStylesUpdateListener listener) {
         listeners.removeListener(listener);
     }
@@ -483 +483 @@
      * Notifies all listeners that there was any update to the map paint styles
      */
-    public static void fireMapPaintSylesUpdated() {
-        listeners.fireEvent(MapPaintSylesUpdateListener::mapPaintStylesUpdated);
+    public static void fireMapPaintStylesUpdated() {
+        listeners.fireEvent(MapPaintStylesUpdateListener::mapPaintStylesUpdated);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/loader/MapPaintStyleLoader.java

@@ -41 +41 @@
     @Override
     protected void finish() {
-        MapPaintStyles.fireMapPaintSylesUpdated();
+        MapPaintStyles.fireMapPaintStylesUpdated();
     }