Changeset 4314 in josm for trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

Timestamp:

13.08.2011 11:00:41 (10 months ago)

Author:

bastiK

Message:

add east/north input to 'add node' and 'move node' actions

File:

• trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -21 +22 @@
 public final class AddNodeAction extends JosmAction {
     // remember input from last time
-    private String text;
+    private String textLatLon, textEastNorth;
 
     public AddNodeAction() {
-        super(tr("Add Node..."), "addnode", tr("Add a node by entering latitude and longitude."),
+        super(tr("Add Node..."), "addnode", tr("Add a node by entering latitude / longitude or easting / northing."),
                 Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node...")), KeyEvent.VK_D, Shortcut.GROUP_EDIT,
                         Shortcut.SHIFT_DEFAULT), true);
@@ -36 +37 @@
         LatLonDialog dialog = new LatLonDialog(Main.parent, tr("Add Node..."), ht("/Action/AddNode"));
 
-        if (text != null) {
-            dialog.setText(text);
+        if (textLatLon != null) {
+            dialog.setLatLonText(textLatLon);
+        }
+        if (textEastNorth != null) {
+            dialog.setEastNorthText(textEastNorth);
         }
 
-        dialog.setVisible(true);
-        if (dialog.isCanceled())
+        dialog.showDialog();
+        
+        if (dialog.getValue() != 1)
             return;
 
@@ -48 +53 @@
             return;
 
-        text = dialog.getText();
+        textLatLon = dialog.getLatLonText();
+        textEastNorth = dialog.getEastNorthText();
 
         Node nnew = new Node(coordinates);