Changeset 5459 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.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/actions/mapmode/DrawAction.java (modified) (8 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions.mapmode;
 
-import java.awt.*;
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -8 +7 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.awt.AWTEvent;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Graphics2D;
+import java.awt.KeyboardFocusManager;
+import java.awt.Point;
+import java.awt.Stroke;
+import java.awt.Toolkit;
 import java.awt.event.AWTEventListener;
 import java.awt.event.ActionEvent;
@@ -29 +38 @@
 import java.util.TreeSet;
 
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JFrame;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
 
 import org.openstreetmap.josm.Main;
@@ -91 +107 @@
     private EastNorth currentMouseEastNorth;
 
-    private SnapHelper snapHelper = new SnapHelper();
+    private final SnapHelper snapHelper = new SnapHelper();
 
     private Shortcut backspaceShortcut;
-    private Shortcut snappingShortcut;
-
-    private JCheckBoxMenuItem snapCheckboxMenuItem;
+    private final Shortcut snappingShortcut;
+
+    private final SnapChangeAction snapChangeAction;
+    private final JCheckBoxMenuItem snapCheckboxMenuItem;
     private boolean useRepeatedShortcut;
 
@@ -106 +123 @@
         snappingShortcut = Shortcut.registerShortcut("mapmode:drawanglesnapping",
             tr("Mode: Draw Angle snapping"), KeyEvent.VK_TAB, Shortcut.DIRECT);
-        addMenuItem();
+        snapChangeAction = new SnapChangeAction();
+        snapCheckboxMenuItem = addMenuItem();
         snapHelper.setMenuCheckBox(snapCheckboxMenuItem);
         cursorJoinNode = ImageProvider.getCursor("crosshair", "joinnode");
@@ -112 +130 @@
     }
 
-    private void addMenuItem() {
+    private JCheckBoxMenuItem addMenuItem() {
         int n=Main.main.menu.editMenu.getItemCount();
         for (int i=n-1;i>0;i--) {
@@ -120 +138 @@
             }
         }
-        snapCheckboxMenuItem = MainMenu.addWithCheckbox(Main.main.menu.editMenu, new SnapChangeAction(),  MainMenu.WINDOW_MENU_GROUP.VOLATILE);
+        return MainMenu.addWithCheckbox(Main.main.menu.editMenu, snapChangeAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
     }
 
@@ -1207 +1225 @@
     public void destroy() {
         super.destroy();
+        snapChangeAction.destroy();
     }