Changeset 12967 in josm

Timestamp:

2017-10-09T21:05:03+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15273 - fix initialization of MapPaintStyles (NPE)

File:

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

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

@@ -46 +46 @@
             "misc/deprecated.png");
 
+    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();
+            }
+        });
+    }
+
     private static ElemStyles styles = new ElemStyles();
 
@@ -441 +457 @@
     }
 
-    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.