Changeset 11300 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-11-23T23:39:47+01:00 (7 years ago)

Author:

simon04

Message:

Jump to Position: focus first input, select text in textfield on focus

File:

• trunk/src/org/openstreetmap/josm/actions/JumpToAction.java (modified) (3 diffs)

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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -112 +114 @@
         url.getDocument().addDocumentListener(new OsmURLListener());
 
+        SelectAllOnFocusGainedDecorator.decorate(lat);
+        SelectAllOnFocusGainedDecorator.decorate(lon);
+        SelectAllOnFocusGainedDecorator.decorate(zm);
+        SelectAllOnFocusGainedDecorator.decorate(url);
+
         JPanel p = new JPanel(new GridBagLayout());
         panel.add(p, BorderLayout.NORTH);
@@ -127 +134 @@
         p.add(url, GBC.eol().fill(GBC.HORIZONTAL));
 
-        Object[] buttons = {tr("Jump there"), tr("Cancel")};
+        String[] buttons = {tr("Jump there"), tr("Cancel")};
         LatLon ll = null;
         double zoomLvl = 100;
         while (ll == null) {
-            int option = JOptionPane.showOptionDialog(
-                            Main.parent,
-                            panel,
-                            tr("Jump to Position"),
-                            JOptionPane.OK_CANCEL_OPTION,
-                            JOptionPane.PLAIN_MESSAGE,
-                            null,
-                            buttons,
-                            buttons[0]);
-
-            if (option != JOptionPane.OK_OPTION) return;
+            final int option = new ExtendedDialog(Main.parent, tr("Jump to Position"), buttons) {{
+                setContent(panel);
+                setCancelButton(2);
+            }}.showDialog().getValue();
+
+            if (option != 1) return;
             try {
                 zoomLvl = Double.parseDouble(zm.getText());