Deferred editor for JCOmboBox

hansonr · hansonr · commit 62706dd36724 · 2019-07-13T21:11:50.000+01:00
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JComboBox.java b/sources/net.sf.j2s.java.core/src/javax/swing/JComboBox.java
@@ -50,6 +50,8 @@
 import javax.swing.event.PopupMenuListener;
 import javax.swing.plaf.ComboBoxUI;
 
+import swingjs.plaf.JSComboBoxUI;
+
 //
 
 /**
@@ -186,6 +188,13 @@ public class JComboBox extends JComponent
 
     // Flag to ensure the we don't get multiple ActionEvents on item selection.
     private boolean selectingItem = false;
+    
+	/**
+	 * SwingJS tweak: Lazy creation of editor, so we need to know if the editor has
+	 * been explicitly set null using setEditor(null) or not.
+	 * 
+	 */
+	private boolean 秘isEditorCleared;
 
     /**
      * Creates a <code>JComboBox</code> that takes its items from an
@@ -496,7 +505,7 @@ public ListCellRenderer getRenderer() {
      */
     public void setEditor(ComboBoxEditor anEditor) {
         ComboBoxEditor oldEditor = editor;
-
+        秘isEditorCleared = (editor == null);
         if ( editor != null ) {
             editor.removeActionListener(this);
         }
@@ -514,6 +523,8 @@ public void setEditor(ComboBoxEditor anEditor) {
      * @return the <code>ComboBoxEditor</code> that displays the selected item
      */
     public ComboBoxEditor getEditor() {
+    	if (editor == null && !this.秘isEditorCleared)
+    		setEditor(((JSComboBoxUI) ui).createEditor());
         return editor;
     }
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComboBoxUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComboBoxUI.java
@@ -187,10 +187,11 @@ public void installUI(JComponent c) {
 			comboBox.setRenderer(createRenderer());
 		}
 
-		if (comboBox.getEditor() == null || comboBox.getEditor() instanceof UIResource) {
-			comboBox.setEditor(createEditor());
-		}
-
+// deferred -- no reason to do this now.
+//		if (comboBox.getEditor() == null || comboBox.getEditor() instanceof UIResource) {
+//			comboBox.setEditor(createEditor());
+//		}
+//
 		installListeners();
 		installComponents();
 
@@ -225,7 +226,7 @@ public void uninstallUI(JComponent c) {
 			comboBox.setRenderer(null);
 		}
 
-		ComboBoxEditor comboBoxEditor = comboBox.getEditor();
+		ComboBoxEditor comboBoxEditor = /** @j2sNative this.comboBox.editor && */comboBox.getEditor();
 		if (comboBoxEditor instanceof UIResource) {
 			if (comboBoxEditor.getEditorComponent().hasFocus()) {
 				// Leave focus in JComboBox.
@@ -634,7 +635,7 @@ protected ListCellRenderer createRenderer() {
 	 * @return a <code>ComboBoxEditor</code> used for the combo box
 	 * @see javax.swing.JComboBox#setEditor
 	 */
-	protected ComboBoxEditor createEditor() {
+	public ComboBoxEditor createEditor() {
 		return new BasicComboBoxEditor.UIResource();
 	}
 
