TODO check swingjs for @j2sNative

BobHanson · BobHanson · commit 54dff99d3933 · 2017-09-01T01:39:15.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Container.java b/sources/net.sf.j2s.java.core/src/java/awt/Container.java
@@ -1143,11 +1143,6 @@ void checkGD(String stringID) {
      * 
      */
     public void remove(int index) {
-    	removeInt(index);
-    }
-
-	public void removeInt(int index) {
-  	// SwingJS SAEM
 		synchronized (getTreeLock()) {
 			if (index < 0 || index >= children.size()) {
 				throw new ArrayIndexOutOfBoundsException(index);
@@ -1207,18 +1202,6 @@ public void removeInt(int index) {
      * @see #remove(int)
      */
     public void remove(Component comp) {
-    	//SwingJS SAEM
-    	/**
-    	 * @j2sNative
-    	 * 
-    	 * if (typeof comp == "number")
-    	 *   return removeInt(comp);
-    	 */
-    	removeChild(comp);
-    }
-
-	public void removeChild(Component comp) {
-  	//SwingJS SAEM
 		synchronized (getTreeLock()) {
 			if (comp.parent == this) {
 				int index = children.indexOf(comp);
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/EventDispatchThread.java b/sources/net.sf.j2s.java.core/src/java/awt/EventDispatchThread.java
@@ -104,7 +104,7 @@ public void run() {
 		/**
 		 * @j2sNative
 		 * 
-		 *            f = function() {r.run();me.run1(mode)};
+		 *            f = function() {r.run();me.run1$I(mode)};
 		 * 
 		 */
 		{
@@ -295,7 +295,7 @@ protected void dispatchAndReturn(Runnable r, int mode) {
 		/**
 		 * @j2sNative
 		 * 
-		 *            f = function() {r.run();me.run1(mode)
+		 *            f = function() {r.run();me.run1$I(mode)
 		 *            };
 		 * 
 		 */
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/DefaultRowSorter.java b/sources/net.sf.j2s.java.core/src/javax/swing/DefaultRowSorter.java
@@ -985,10 +985,11 @@ private int compare(int model1, int model2) {
                     result = 1;
                 } else {
                 		Comparator c = sortComparators[counter];
+                		// BH ??????? BH
                 		/**
                 		 *  @j2sNative
                 		 *  
-                		 *  result = (c != null ? c.compare(v1, v2) : typeof c == "object" ? 
+                		 *  result = (c != null ? c.compare$O$O(v1, v2) : typeof c == "object" ? 
                 		 *    ((v1 = v1.toString()) < (v2 = v2.toString) ? -1 : v1 == v2 ? 0 : 1)
                 		 *    : (v1 < v2 ? -1 : v1 == v2 ? 0 : 1));   
                 		 */
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JApplet.java b/sources/net.sf.j2s.java.core/src/javax/swing/JApplet.java
@@ -376,9 +376,9 @@ protected Component addImpl(Component comp, Object constraints, int index) {
     @Override
 		public void remove(Component comp) {
         if (comp == rootPane) {
-            removeChild(comp);
+            super.remove(comp);
         } else {
-            getContentPane().removeChild(comp);
+            getContentPane().remove(comp);
         }
     }
 
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JDialog.java b/sources/net.sf.j2s.java.core/src/javax/swing/JDialog.java
@@ -926,9 +926,9 @@ protected Component addImpl(Component comp, Object constraints, int index) {
     @Override
 		public void remove(Component comp) {
         if (comp == rootPane) {
-            removeChild(comp);
+            super.remove(comp);
         } else {
-            getContentPane().removeChild(comp);
+            getContentPane().remove(comp);
         }
     }
 
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JFrame.java b/sources/net.sf.j2s.java.core/src/javax/swing/JFrame.java
@@ -591,9 +591,9 @@ protected Component addImpl(Component comp, Object constraints, int index) {
 	@Override
 	public void remove(Component comp) {
 		if (comp == rootPane) {
-			removeChild(comp);
+			super.remove(comp);
 		} else {
-			getContentPane().removeChild(comp);
+			getContentPane().remove(comp);
 		}
 	}
 
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
@@ -308,7 +308,7 @@ protected Component addImpl(Component child, Object constraints, int index) {
     @Override
 		public void remove(Component child) {
         child.removeComponentListener(viewListener);
-        removeChild(child);
+        super.remove(child);
     }
 
 
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JWindow.java b/sources/net.sf.j2s.java.core/src/javax/swing/JWindow.java
@@ -436,9 +436,9 @@ protected Component addImpl(Component comp, Object constraints, int index) {
 	@Override
 	public void remove(Component comp) {
 		if (comp == rootPane) {
-			removeChild(comp);
+			super.remove(comp);
 		} else {
-			getContentPane().removeChild(comp);
+			getContentPane().remove(comp);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public void run() {`
`104`	`104`	`/**`
`105`	`105`	`* @j2sNative`
`106`	`106`	`*`
`107`		`- * f = function() {r.run();me.run1(mode)};`
	`107`	`+ * f = function() {r.run();me.run1$I(mode)};`
`108`	`108`	`*`
`109`	`109`	`*/`
`110`	`110`	`{`
`@@ -295,7 +295,7 @@ protected void dispatchAndReturn(Runnable r, int mode) {`
`295`	`295`	`/**`
`296`	`296`	`* @j2sNative`
`297`	`297`	`*`
`298`		`- * f = function() {r.run();me.run1(mode)`
	`298`	`+ * f = function() {r.run();me.run1$I(mode)`
`299`	`299`	`* };`
`300`	`300`	`*`
`301`	`301`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -376,9 +376,9 @@ protected Component addImpl(Component comp, Object constraints, int index) {`
`376`	`376`	`@Override`
`377`	`377`	`public void remove(Component comp) {`
`378`	`378`	`if (comp == rootPane) {`
`379`		`- removeChild(comp);`
	`379`	`+ super.remove(comp);`
`380`	`380`	`} else {`
`381`		`- getContentPane().removeChild(comp);`
	`381`	`+ getContentPane().remove(comp);`
`382`	`382`	`}`
`383`	`383`	`}`
`384`	`384`
Original file line number	Diff line number	Diff line change
`@@ -926,9 +926,9 @@ protected Component addImpl(Component comp, Object constraints, int index) {`
`926`	`926`	`@Override`
`927`	`927`	`public void remove(Component comp) {`
`928`	`928`	`if (comp == rootPane) {`
`929`		`- removeChild(comp);`
	`929`	`+ super.remove(comp);`
`930`	`930`	`} else {`
`931`		`- getContentPane().removeChild(comp);`
	`931`	`+ getContentPane().remove(comp);`
`932`	`932`	`}`
`933`	`933`	`}`
`934`	`934`
Original file line number	Diff line number	Diff line change
`@@ -591,9 +591,9 @@ protected Component addImpl(Component comp, Object constraints, int index) {`
`591`	`591`	`@Override`
`592`	`592`	`public void remove(Component comp) {`
`593`	`593`	`if (comp == rootPane) {`
`594`		`- removeChild(comp);`
	`594`	`+ super.remove(comp);`
`595`	`595`	`} else {`
`596`		`- getContentPane().removeChild(comp);`
	`596`	`+ getContentPane().remove(comp);`
`597`	`597`	`}`
`598`	`598`	`}`
`599`	`599`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ protected Component addImpl(Component child, Object constraints, int index) {`
`308`	`308`	`@Override`
`309`	`309`	`public void remove(Component child) {`
`310`	`310`	`child.removeComponentListener(viewListener);`
`311`		`- removeChild(child);`
	`311`	`+ super.remove(child);`
`312`	`312`	`}`
`313`	`313`
`314`	`314`
Original file line number	Diff line number	Diff line change
`@@ -436,9 +436,9 @@ protected Component addImpl(Component comp, Object constraints, int index) {`
`436`	`436`	`@Override`
`437`	`437`	`public void remove(Component comp) {`
`438`	`438`	`if (comp == rootPane) {`
`439`		`- removeChild(comp);`
	`439`	`+ super.remove(comp);`
`440`	`440`	`} else {`
`441`		`- getContentPane().removeChild(comp);`
	`441`	`+ getContentPane().remove(comp);`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`