AWT adds automated List wrapping with JScrollPane

hansonr · hansonr · commit e706634ff4b1 · 2019-03-16T11:11:07.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java b/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java
@@ -27,7 +27,6 @@
  */
 package java.awt;
 
-import java.applet.JSApplet;
 import java.awt.event.KeyListener;
 import java.awt.peer.ComponentPeer;
 import java.beans.PropertyChangeListener;
@@ -67,6 +66,32 @@
  */
 public abstract class JSComponent extends Component {
 
+	/**
+	 * A marker for the SwingJS version of JViewPort to indicate that it 
+	 * can add an A2SWrappedComponent, not pass it back for wrapping.
+	 * 
+	 * @author hansonr
+	 *
+	 */
+	public interface A2SComponentWrapper {
+
+		public void isWrapper$();
+	}
+
+	/**
+	 * For JViewPort. 
+	 * 
+	 * Implementations of java.awt.List require a JScrollPane/JViewPort
+	 * wrapper.  
+	 * 
+	 * @author hansonr
+	 *
+	 */
+	public interface A2SWrappedComponent {
+
+	   public Component getWrap$();
+
+	}
 	/**
 	 * overridden in Applet
 	 * 
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JViewport.java b/sources/net.sf.j2s.java.core/src/javax/swing/JViewport.java
@@ -114,9 +114,14 @@
  * @author Philip Milne
  * @see JScrollPane
  */
-public class JViewport extends JComponent
+public class JViewport extends JComponent implements JSComponent.A2SComponentWrapper
 {
-    /** Property used to indicate window blitting should not be done.
+
+	// BH for SwingJS
+	public void isWrapper$() {};
+	
+
+	/** Property used to indicate window blitting should not be done.
      */
     static final Object EnableWindowBlit = "EnableWindowBlit";
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Dialog.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Dialog.java
@@ -136,4 +136,5 @@ public A2SListener getA2SListener() {
 		return listener;
 	}
 
+	
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/List.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/List.java
@@ -2,6 +2,7 @@
 
 import java.awt.AWTEvent;
 import java.awt.AWTEventMulticaster;
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.ItemSelectable;
 import java.awt.event.ActionEvent;
@@ -13,12 +14,11 @@
 
 import javax.swing.DefaultListModel;
 import javax.swing.JList;
+import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
 import javax.swing.border.LineBorder;
-
-import com.sun.prism.paint.Color;
-
-public class List extends JList implements ItemSelectable  {
+import java.awt.JSComponent;
+public class List extends JList implements ItemSelectable, JSComponent.A2SWrappedComponent  {
 
 	public void isAWT() {} // for SwingJS isAWT$
 	
@@ -34,6 +34,10 @@ public void isAWT() {} // for SwingJS isAWT$
 
     final static int    DEFAULT_VISIBLE_ROWS = 4;
 
+	@Override
+	public Component getWrap$() {
+		return new JScrollPane(this);
+	}
         
 	public List(int rows, boolean multipleMode) {
 		this();
@@ -493,12 +497,12 @@ public Dimension getPreferredSize(int rows) {
      */
     @Deprecated
     public Dimension preferredSize(int rows) {
-        synchronized (getTreeLock()) {
+//        synchronized (getTreeLock()) {
             ListPeer peer = (ListPeer)this.peer;
-            return (peer != null) ?
-                       peer.getPreferredSize(rows) :
-                       super.preferredSize();
-        }
+            if (peer != null)
+            	return peer.getPreferredSize(rows);
+            return preferredSize();
+//        }
     }
 
     /**
@@ -511,18 +515,21 @@ public Dimension getPreferredSize() {
         return preferredSize();
     }
 
-    /**
-     * @deprecated As of JDK version 1.1,
-     * replaced by <code>getPreferredSize()</code>.
-     */
-    @Deprecated
-    public Dimension preferredSize() {
-     //   synchronized (getTreeLock()) {
-    	int rows = awtmodel.getSize();
-            return (rows > 0) ?
-                       preferredSize(rows) :
-                       super.preferredSize();
-        }
+	/**
+	 * @deprecated As of JDK version 1.1, replaced by
+	 *             <code>getPreferredSize()</code>.
+	 */
+	@Deprecated
+	public Dimension preferredSize() {
+		// synchronized (getTreeLock()) {
+		int rows = awtmodel.getSize();
+		if (rows > 0) {
+			ListPeer peer = (ListPeer) this.peer;
+			if (peer != null)
+				return peer.getPreferredSize(rows);
+		}
+		return super.preferredSize();
+	}
    // }
 
     /**
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSListUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSListUI.java
@@ -118,16 +118,10 @@ public class JSListUI extends JSLightweightUI //true, but unnecessary implements
 
 	String itemHTML = null;
 
-	private JScrollPane scrollPane;
-
 	@Override
 	public DOMNode updateDOMNode() {
 		list = (JList) jc;
 		if (domNode == null) {
-
-			
-			/**@j2sNative xxL = this.jc; */
-			
 			
 			focusNode = enableNode = newDOMObject("div", id);
 			// maybe DOMNode.setAttrInt(domNode, "tabIndex", 1);
@@ -143,12 +137,6 @@ public DOMNode updateDOMNode() {
 			fillDOM();
 		}
 		
-		if (isAWT && scrollPane == null && list.getParent() != null) {
-			JComponent parent = (JComponent) list.getParent();
-			scrollPane = new JScrollPane();
-			scrollPane.getViewport().setView(list);
-			parent.add(scrollPane);
-		}
 		return updateDOMNodeCUI();
 	}
 
@@ -2245,7 +2233,7 @@ private void changeSelection(JList list, int type, int index, int direction) {
 					type = CHANGE_SELECTION;
 				}
 
-				// IMPORTANT - This needs to happen before the index is changed.
+				// importANT - This needs to happen before the index is changed.
 				// This is because JFileChooser, which uses JList, also scrolls
 				// the selected item into view. If that happens first, then
 				// this method becomes a no-op.

Original file line number	Diff line number	Diff line change
`@@ -136,4 +136,5 @@ public A2SListener getA2SListener() {`
`136`	`136`	`return listener;`
`137`	`137`	`}`
`138`	`138`
	`139`	`+`
`139`	`140`	`}`