Changeset 2231 in josm
- Timestamp:
- 2009-10-03T13:57:27+02:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
r2218 r2231 46 46 import javax.swing.event.ListDataEvent; 47 47 import javax.swing.event.ListDataListener; 48 import javax.swing.text.JTextComponent; 48 49 49 50 import org.openstreetmap.josm.Main; … … 203 204 getContentPane().add(buildActionPanel(), BorderLayout.SOUTH); 204 205 205 addWindowListener(new Window ClosingAdapter());206 addWindowListener(new WindowEventHandler()); 206 207 } 207 208 … … 398 399 ) 399 400 ).apply(this); 400 startUserInput();401 401 } else if (!visible && isShowing()){ 402 402 new WindowGeometry(this).remember(getClass().getName() + ".geometry"); … … 566 566 * 567 567 */ 568 class Window ClosingAdapter extends WindowAdapter {568 class WindowEventHandler extends WindowAdapter { 569 569 @Override 570 570 public void windowClosing(WindowEvent e) { 571 571 setCanceled(true); 572 } 573 574 @Override 575 public void windowActivated(WindowEvent e) { 576 startUserInput(); 572 577 } 573 578 } … … 748 753 */ 749 754 public void startUserInput() { 750 cmt.getEditor().selectAll(); 751 cmt.requestFocus(); 755 List<String> history = cmt.getHistory(); 756 if (history != null && !history.isEmpty()) { 757 cmt.setText(history.get(0)); 758 } 759 cmt.requestFocusInWindow(); 760 cmt.getEditor().getEditorComponent().requestFocusInWindow(); 752 761 } 753 762 -
trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java
r2218 r2231 2 2 package org.openstreetmap.josm.gui.widgets; 3 3 4 import java.awt.event.FocusEvent; 5 import java.awt.event.FocusListener; 4 6 import java.util.Collection; 5 7 … … 93 95 94 96 public AutoCompleteComboBox() { 95 JTextComponent editor = (JTextComponent) this.getEditor().getEditorComponent(); 97 final JTextComponent editor = (JTextComponent) this.getEditor().getEditorComponent(); 96 98 editor.setDocument(new AutoCompleteComboBoxDocument(this)); 99 editor.addFocusListener( 100 new FocusListener() { 101 public void focusLost(FocusEvent e) { 102 } 103 public void focusGained(FocusEvent e) { 104 editor.selectAll(); 105 } 106 } 107 ); 97 108 } 98 109
Note:
See TracChangeset
for help on using the changeset viewer.