Changeset 5459 in josm for trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.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/layer/ImageryLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

@@ -72 +72 @@
     protected OffsetServerThread offsetServerThread;
 
+    private final ImageryAdjustAction adjustAction = new ImageryAdjustAction(this);
+    private final AbstractAction useServerOffsetAction = new AbstractAction(tr("(use server offset)")) {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            enableOffsetServer(true);
+        }
+    };
+
     protected OffsetServerThread createoffsetServerThread() {
         return new OffsetServerThread(new OsmosnimkiOffsetServer(
@@ -179 +187 @@
         }
     }
-
-    ImageryAdjustAction adjustAction = new ImageryAdjustAction(this);
-    AbstractAction useServerOffsetAction = new AbstractAction(tr("(use server offset)")) {
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            enableOffsetServer(true);
-        }
-    };
 
     public void enableOffsetServer(boolean enable) {
@@ -311 +311 @@
         }
     }
+
+    /* (non-Javadoc)
+     * @see org.openstreetmap.josm.gui.layer.Layer#destroy()
+     */
+    @Override
+    public void destroy() {
+        adjustAction.destroy();
+    }
 }