Changeset 5459 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2012-08-20T01:11:45+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #2961 - Improve usability of WMS Layer Saving/Loading

• Replaced the unconventional method of creating a blank layer, then loading a .wms file to a standard File->Open approach
• Fixed memory leaks with some actions registered as listeners but never destroyed
• Layer interface modified to allow a generic approach of layer saving in SaveActionBase rather than the previous one restricted to OSM and GPX data
• FileImporters and FileExporters can now be enabled/disabled at runtime, for example when the active layer changes

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (5 diffs)

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

@@ -106 +106 @@
      * the layer listeners
      */
-    private static final CopyOnWriteArrayList<MapView.LayerChangeListener> layerChangeListeners = new CopyOnWriteArrayList<MapView.LayerChangeListener>();
+    private static final CopyOnWriteArrayList<LayerChangeListener> layerChangeListeners = new CopyOnWriteArrayList<LayerChangeListener>();
     private static final CopyOnWriteArrayList<EditLayerChangeListener> editLayerChangeListeners = new CopyOnWriteArrayList<EditLayerChangeListener>();
 
@@ -114 +114 @@
      * @param listener the listener. Ignored if null or already registered.
      */
-    public static void removeLayerChangeListener(MapView.LayerChangeListener listener) {
+    public static void removeLayerChangeListener(LayerChangeListener listener) {
         layerChangeListeners.remove(listener);
     }
@@ -127 +127 @@
      * @param listener the listener. Ignored if null or already registered.
      */
-    public static void addLayerChangeListener(MapView.LayerChangeListener listener) {
+    public static void addLayerChangeListener(LayerChangeListener listener) {
         if (listener != null) {
             layerChangeListeners.addIfAbsent(listener);
@@ -222 +222 @@
     public MapView(final JPanel contentPane) {
         Main.pref.addPreferenceChangeListener(this);
-
-        //        new MoveAction(MoveAction.Direction.UP);
-        //        new MoveAction(MoveAction.Direction.DOWN);
-        //        new MoveAction(MoveAction.Direction.LEFT);
-        //        new MoveAction(MoveAction.Direction.RIGHT);
 
         addComponentListener(new ComponentAdapter(){
@@ -265 +260 @@
             }
         });
-
-        // Add Multipolygon cache to layer listeners
-        addLayerChangeListener(MultipolygonCache.getInstance());
     }