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

Timestamp:

2009-10-03T13:57:27+02:00 (15 years ago)

Author:

Gubaer

Message:

Make sure the changeset comment field has focus and is selected when the upload dialog is launched

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• io/UploadDialog.java (modified) (5 diffs)
• widgets/AutoCompleteComboBox.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -46 +46 @@
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
+import javax.swing.text.JTextComponent;
 
 import org.openstreetmap.josm.Main;
@@ -203 +204 @@
         getContentPane().add(buildActionPanel(), BorderLayout.SOUTH);
 
-        addWindowListener(new WindowClosingAdapter());
+        addWindowListener(new WindowEventHandler());
     }
 
@@ -398 +399 @@
                     )
             ).apply(this);
-            startUserInput();
         } else if (!visible && isShowing()){
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
@@ -566 +566 @@
      *
      */
-    class WindowClosingAdapter extends WindowAdapter {
+    class WindowEventHandler extends WindowAdapter {
         @Override
         public void windowClosing(WindowEvent e) {
             setCanceled(true);
+        }
+
+        @Override
+        public void windowActivated(WindowEvent e) {
+            startUserInput();
         }
     }
@@ -748 +753 @@
          */
         public void startUserInput() {
-            cmt.getEditor().selectAll();
-            cmt.requestFocus();
+            List<String> history = cmt.getHistory();
+            if (history != null && !history.isEmpty()) {
+                cmt.setText(history.get(0));
+            }
+            cmt.requestFocusInWindow();
+            cmt.getEditor().getEditorComponent().requestFocusInWindow();
         }
 

trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.widgets;
 
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 import java.util.Collection;
 
@@ -93 +95 @@
 
     public AutoCompleteComboBox() {
-        JTextComponent editor = (JTextComponent) this.getEditor().getEditorComponent();
+        final JTextComponent editor = (JTextComponent) this.getEditor().getEditorComponent();
         editor.setDocument(new AutoCompleteComboBoxDocument(this));
+        editor.addFocusListener(
+                new FocusListener() {
+                    public void focusLost(FocusEvent e) {
+                    }
+                    public void focusGained(FocusEvent e) {
+                        editor.selectAll();
+                    }
+                }
+        );
     }