Changeset 2531 in josm

Timestamp:

Nov 28, 2009 2:40:35 PM (3 years ago)

Author:

Gubaer

Message:

fixed in #2730: "Add Node..." dialog: wrong focus after showing up

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 
+import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -32 +35 @@
                         Shortcut.SHIFT_DEFAULT), true);
         putValue("help", ht("/Action/AddNode"));
+    }
+
+    private String normalizeUserInputForLatLonValue(String value) {
+        if (value == null) return null;
+        value = value.trim();
+        return value.replaceAll("\u00B0", ""); // the degree symbol
     }
 
@@ -58 +67 @@
         while(nnew == null) {
             JOptionPane pane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
-            pane.createDialog(Main.parent, tr("Add Node...")).setVisible(true);
+            JDialog dialog = pane.createDialog(Main.parent, tr("Add Node..."));
+            dialog.addWindowListener(new WindowAdapter() {
+                @Override
+                public void windowGainedFocus(WindowEvent e) {
+                    lat.selectAll();
+                    lat.requestFocusInWindow();
+                }
+            }
+            );
+            dialog.setVisible(true);
+
             if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue()))
                 return;
             try {
-                LatLon ll = new LatLon(Double.parseDouble(lat.getText()), Double.parseDouble(lon.getText()));
+                LatLon ll = new LatLon(
+                        Double.parseDouble(
+                                normalizeUserInputForLatLonValue(lat.getText())
+                        ),
+                        Double.parseDouble(
+                                normalizeUserInputForLatLonValue(lon.getText())
+                        )
+                );
                 if (!ll.isOutSideWorld()) {
                     nnew = new Node(ll);
                 }
-            } catch (Exception ex) { }
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                JOptionPane.showMessageDialog(
+                        Main.parent,
+                        tr("Could not create a node with the entered latitude/longitude."),
+                        tr("Illegal lat/lon value"),
+                        JOptionPane.ERROR_MESSAGE
+                );
+            }
         }
 
@@ -79 +113 @@
         setEnabled(getEditLayer() != null);
     }
-
 }