Thread: [Gridarta-commit] SF.net SVN: gridarta:[7809] trunk (Page 49)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7809
          http://gridarta.svn.sourceforge.net/gridarta/?rev=7809&view=rev
Author:   akirschbaum
Date:     2010-05-16 16:19:17 +0000 (Sun, 16 May 2010)

Log Message:
-----------
Improve UI of go location dialog.

Modified Paths:
--------------
    trunk/atrinik/ChangeLog
    trunk/crossfire/ChangeLog
    trunk/daimonin/ChangeLog
    trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/gui/utils/TextComponentUtils.java

Modified: trunk/atrinik/ChangeLog
===================================================================

--- trunk/atrinik/ChangeLog	2010-05-16 15:49:08 UTC (rev 7808)
+++ trunk/atrinik/ChangeLog	2010-05-16 16:19:17 UTC (rev 7809)
@@ -1,5 +1,8 @@
 2010-05-16  Andreas Kirschbaum
 
+	* Improve UI of go location dialog: to go to coordinates (12,4)
+	press CTRL-L, enter 12, press ENTER, enter 4, press ENTER.
+
 	* Fix display issues when filtering the map view on mobs within
 	spawn points.
 

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2010-05-16 15:49:08 UTC (rev 7808)
+++ trunk/crossfire/ChangeLog	2010-05-16 16:19:17 UTC (rev 7809)
@@ -1,6 +1,9 @@
 2010-05-16  Andreas Kirschbaum
 
-	Implement #2385942 (Alert message on exit from unique maps): add
+	* Improve UI of go location dialog: to go to coordinates (12,4)
+	press CTRL-L, enter 12, press ENTER, enter 4, press ENTER.
+
+	* Implement #2385942 (Alert message on exit from unique maps): add
 	new map validator "Exit path is not absolute" that checks for
 	exits within 'unique' maps that reference non-absolute map paths.
 

Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog	2010-05-16 15:49:08 UTC (rev 7808)
+++ trunk/daimonin/ChangeLog	2010-05-16 16:19:17 UTC (rev 7809)
@@ -1,5 +1,8 @@
 2010-05-16  Andreas Kirschbaum
 
+	* Improve UI of go location dialog: to go to coordinates (12,4)
+	press CTRL-L, enter 12, press ENTER, enter 4, press ENTER.
+
 	* Fix display issues when filtering the map view on mobs within
 	spawn points.
 

Modified: trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java	2010-05-16 15:49:08 UTC (rev 7808)
+++ trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java	2010-05-16 16:19:17 UTC (rev 7809)
@@ -29,17 +29,19 @@
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
-import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JTextField;
 import javax.swing.WindowConstants;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EtchedBorder;
 import javax.swing.border.TitledBorder;
+import javax.swing.text.JTextComponent;
 import net.sf.gridarta.gui.map.AbstractPerMapDialogManager;
 import net.sf.gridarta.gui.map.mapview.MapView;
 import net.sf.gridarta.gui.utils.GUIConstants;
+import net.sf.gridarta.gui.utils.TextComponentUtils;
 import net.sf.gridarta.model.archetype.Archetype;
 import net.sf.gridarta.model.gameobject.GameObject;
 import net.sf.gridarta.model.map.maparchobject.MapArchObject;
@@ -81,13 +83,13 @@
      * The text input field for the x coordinate.
      */
     @NotNull
-    private final JFormattedTextField xCoordinateField = new JFormattedTextField();
+    private final JTextField xCoordinateField = new JTextField();
 
     /**
      * The text input field for the y coordinate.
      */
     @NotNull
-    private final JFormattedTextField yCoordinateField = new JFormattedTextField();
+    private final JTextField yCoordinateField = new JTextField();
 
     /**
      * The {@link JButton} for ok.
@@ -122,6 +124,10 @@
         this.mapView = mapView;
         setMessage(createPanel());
 
+        TextComponentUtils.setAutoSelectOnFocus(xCoordinateField);
+        TextComponentUtils.setAutoSelectOnFocus(yCoordinateField);
+        TextComponentUtils.setActionNextFocus(xCoordinateField, yCoordinateField);
+
         dialog = createDialog(mapView.getComponent(), ACTION_BUILDER.getString("goLocation.title"));
         dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
         dialog.getRootPane().setDefaultButton(okButton);
@@ -157,12 +163,12 @@
         final Point point = mapView.getMapViewBasic().getMapCursor().getLocation();
 
         coordinatesPanel.add(new JLabel(ACTION_BUILDER.getString("goLocationX")), gbcLabel);
-        xCoordinateField.setValue(point == null ? 0 : point.x);
+        xCoordinateField.setText(point == null ? "0" : Integer.toString(point.x));
         xCoordinateField.setColumns(3);
         coordinatesPanel.add(xCoordinateField, gbcField);
 
         coordinatesPanel.add(new JLabel(ACTION_BUILDER.getString("goLocationY")), gbcLabel);
-        yCoordinateField.setValue(point == null ? 0 : point.y);
+        yCoordinateField.setText(point == null ? "0" : Integer.toString(point.y));
         yCoordinateField.setColumns(3);
         coordinatesPanel.add(yCoordinateField, gbcField);
 
@@ -224,10 +230,10 @@
      * @return the coordinate value
      * @throws IllegalArgumentException if the coordinate value is invalid
      */
-    private int parseCoordinate(@NotNull final JFormattedTextField textField, final int range) {
+    private int parseCoordinate(@NotNull final JTextComponent textField, final int range) {
         final int result;
         try {
-            result = (Integer) textField.getValue();
+            result = Integer.parseInt(textField.getText());
         } catch (final NumberFormatException e) {
             ACTION_BUILDER.showMessageDialog(this, "goLocationCoordinateNotANumber");
             textField.requestFocus();

Added: trunk/src/app/net/sf/gridarta/gui/utils/TextComponentUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/TextComponentUtils.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/utils/TextComponentUtils.java	2010-05-16 16:19:17 UTC (rev 7809)
@@ -0,0 +1,82 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.utils;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import javax.swing.JTextField;
+import javax.swing.text.JTextComponent;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Utility class for {@link JTextComponent} related functions.
+ * @author Andreas Kirschbaum
+ */
+public class TextComponentUtils {
+
+    /**
+     * Private constructor to prevent instantiation.
+     */
+    private TextComponentUtils() {
+    }
+
+    /**
+     * Selects all text of a {@link JTextComponent} when the component gains the
+     * focus.
+     * @param textComponent the text component
+     */
+    public static void setAutoSelectOnFocus(@NotNull final JTextComponent textComponent) {
+        final FocusListener focusListener = new FocusListener() {
+
+            @Override
+            public void focusGained(@NotNull final FocusEvent e) {
+                textComponent.selectAll();
+            }
+
+            @Override
+            public void focusLost(@NotNull final FocusEvent e) {
+                // ignore
+            }
+
+        };
+        textComponent.addFocusListener(focusListener);
+    }
+
+    /**
+     * Transfers the focus to another component when ENTER is pressed.
+     * @param textField the text field to track
+     * @param nextComponent the component to transfer the focus to
+     */
+    public static void setActionNextFocus(@NotNull final JTextField textField, @NotNull final Component nextComponent) {
+        final ActionListener actionListener = new ActionListener() {
+
+            @Override
+            public void actionPerformed(@NotNull final ActionEvent e) {
+                nextComponent.requestFocusInWindow();
+            }
+
+        };
+        textField.addActionListener(actionListener);
+    }
+
+} // class TextComponentUtils


Property changes on: trunk/src/app/net/sf/gridarta/gui/utils/TextComponentUtils.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Gridarta-commit] SF.net SVN: gridarta:[7809] trunk (Page 49)

gridarta-commit