Index: javax/swing/JComboBox.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JComboBox.java,v retrieving revision 1.22 diff -u -r1.22 JComboBox.java --- javax/swing/JComboBox.java 18 Oct 2005 16:43:16 -0000 1.22 +++ javax/swing/JComboBox.java 19 Oct 2005 15:19:01 -0000 @@ -46,8 +46,6 @@ import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.IOException; -import java.io.ObjectOutputStream; import java.util.Vector; import javax.accessibility.Accessible; @@ -213,10 +211,6 @@ this(new DefaultComboBoxModel()); } - private void writeObject(ObjectOutputStream stream) throws IOException - { - } - /** * This method returns true JComboBox is editable and false otherwise * @@ -1028,6 +1022,19 @@ */ public void processKeyEvent(KeyEvent e) { + if (e.getKeyCode() == KeyEvent.VK_TAB) + setPopupVisible(false); + else if (keySelectionManager != null) + { + int i = keySelectionManager.selectionForKey(e.getKeyChar(), + getModel()); + if (i >= 0) + setSelectedIndex(i); + else + super.processKeyEvent(e); + } + else + super.processKeyEvent(e); } /** @@ -1037,6 +1044,7 @@ */ public void setKeySelectionManager(KeySelectionManager aManager) { + keySelectionManager = aManager; } /** @@ -1201,6 +1209,7 @@ protected AccessibleJComboBox() { + // Nothing to do here. } public int getAccessibleChildrenCount() @@ -1260,18 +1269,22 @@ public void addAccessibleSelection(int value0) { + // TODO: Implement this properly. } public void removeAccessibleSelection(int value0) { + // TODO: Implement this properly. } public void clearAccessibleSelection() { + // TODO: Implement this properly. } public void selectAllAccessibleSelection() { + // TODO: Implement this properly. } } }