#179668: more JDK 6 cleanup.
authorJesse Glick <jglick@netbeans.org>
Wed, 20 Jan 2010 19:18:58 -0500
changeset 29173b22ffc3a73d
parent 2916 f2bafad24371
child 2918 68918ef177f3
child 2981 7e227f264b5f
#179668: more JDK 6 cleanup.
visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ComboBoxAutoCompletion.java
     1.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ComboBoxAutoCompletion.java	Wed Jan 20 17:59:42 2010 -0500
     1.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ComboBoxAutoCompletion.java	Wed Jan 20 19:18:58 2010 -0500
     1.3 @@ -79,7 +79,6 @@
     1.4      // flag to indicate if setSelectedItem has been called
     1.5      // subsequent calls to remove/insertString should be ignored
     1.6      private boolean selecting=false;
     1.7 -    private boolean hidePopupOnFocusLoss;
     1.8      private boolean hitBackspace=false;
     1.9      private boolean hitBackspaceOnSelection;
    1.10      private boolean listContainsSelectedItem;
    1.11 @@ -131,16 +130,12 @@
    1.12                  }
    1.13              }
    1.14          });
    1.15 -        // Bug 5100422 on Java 1.5: Editable JComboBox won't hide popup when tabbing out
    1.16 -        hidePopupOnFocusLoss=System.getProperty("java.version").startsWith("1.5");
    1.17          // Highlight whole text when gaining focus
    1.18          editor.addFocusListener(new FocusAdapter() {
    1.19              public void focusGained(FocusEvent e) {
    1.20                  highlightCompletedText(0);
    1.21              }
    1.22              public void focusLost(FocusEvent e) {
    1.23 -                // Workaround for Bug 5100422 - Hide Popup on focus loss
    1.24 -                if (hidePopupOnFocusLoss) comboBox.setPopupVisible(false);
    1.25              }
    1.26          });
    1.27          // Handle initially selected object