stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7184945: [macosx] NPE in AquaComboBoxUI since jdk7u6b17, jdk8b47

Browse Source 
Reviewed-by: malenkov, alexsch
This commit is contained in:
Sergey Bylokhov 2013-03-01 21:50:00 +04:00
parent b6a841d5a3
commit 916da4ac2c
1 changed files with 17 additions and 7 deletions

24
jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -34,7 +34,6 @@ import javax.swing.border.Border;
import javax.swing.event.*;
import javax.swing.plaf.*;
import javax.swing.plaf.basic.*;
import com.apple.laf.ClientPropertyApplicator;
import com.apple.laf.ClientPropertyApplicator.Property;
import apple.laf.JRSUIConstants.Size;
@ -142,35 +141,46 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable {
return new AquaComboBoxEditor();
}
class AquaComboBoxEditor extends BasicComboBoxEditor implements UIResource, DocumentListener {
protected AquaComboBoxEditor() {
final class AquaComboBoxEditor extends BasicComboBoxEditor
implements UIResource, DocumentListener {
AquaComboBoxEditor() {
super();
editor = new AquaCustomComboTextField();
editor.addFocusListener(this);
editor.getDocument().addDocumentListener(this);
}
@Override
public void focusGained(final FocusEvent e) {
arrowButton.repaint();
if (arrowButton != null) {
arrowButton.repaint();
}
}
@Override
public void focusLost(final FocusEvent e) {
arrowButton.repaint();
if (arrowButton != null) {
arrowButton.repaint();
}
}
@Override
public void changedUpdate(final DocumentEvent e) {
editorTextChanged();
}
@Override
public void insertUpdate(final DocumentEvent e) {
editorTextChanged();
}
@Override
public void removeUpdate(final DocumentEvent e) {
editorTextChanged();
}
protected void editorTextChanged() {
private void editorTextChanged() {
if (!popup.isVisible()) return;
final Object text = editor.getText();