java2script · BobHanson · Mar 21, 2021 · Jan 15, 2021 · Feb 1, 2021 · Feb 1, 2021
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core-j11.jar b/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core-j11.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20210115055921 
+20210321064238 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1-j11/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1-j11/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1-j11/net.sf.j2s.core-j11.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1-j11/net.sf.j2s.core-j11.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1-j11/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1-j11/timestamp
@@ -1 +1 @@
-20210115055845 
+20210208070817 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
@@ -1 +1 @@
-20210115055921 
+20210321064238 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/Component.java b/sources/net.sf.j2s.java.core/src/java/awt/Component.java
@@ -2148,7 +2148,8 @@ private void reshapeNativePeer(int x, int y, int width, int height, int op) {
 //			nativeY += c.y;
 //		}
 //		peer.setBounds(nativeX, nativeY, width, height, op);
-		peer.setBounds(0, 0, width, height, op);
+		if (peer != null)
+			peer.setBounds(0, 0, width, height, op);
 	}
 
 	@SuppressWarnings("deprecation")
@@ -2411,8 +2412,7 @@ protected Dimension prefSizeComp() {
 		if (dim == null || !(isPreferredSizeSet() || isValid())) {
 			// synchronized (getTreeLock()) {
 			dim = (width != 0 || height != 0 ? null 
-					: isDisplayable() ? //
-						// peer != null) ?
+					: isDisplayable() && peer != null ? //
 						peer.getPreferredSize() :
 					getMinimumSize());
 			prefSize = dim;

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/event/ActionEvent.java b/sources/net.sf.j2s.java.core/src/java/awt/event/ActionEvent.java
@@ -203,6 +203,7 @@ public ActionEvent(Object source, int id, String command, long when,
         this.actionCommand = command;
         this.when = when;
         this.modifiers = modifiers;
+        this.bdata = new byte[0];// for e.bdata.doPropagate
     }
 
     /**

diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Class.java b/sources/net.sf.j2s.java.core/src/java/lang/Class.java
@@ -1771,7 +1771,7 @@ public Method[] getMethods() throws SecurityException {
 	 * @since JDK1.1
 	 */
 	public Constructor<?>[] getConstructors() throws SecurityException {
-		return null;// TODO
+		return /*copyMethods*/(privateGetConstructors());
 //		// be very careful not to change the stack depth of this
 //		// checkMemberAccess call for security reasons
 //		// see java.lang.SecurityManager.checkMemberAccess
@@ -2043,12 +2043,7 @@ public Method getMethod(String name, Class<?>... paramTypes) throws NoSuchMethod
 	 * @since JDK1.1
 	 */
 	public Constructor<T> getConstructor(Class<?>... parameterTypes) throws NoSuchMethodException, SecurityException {
-		// be very careful not to change the stack depth of this
-		// checkMemberAccess call for security reasons
-		// see java.lang.SecurityManager.checkMemberAccess
-//		checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader());
 		return new Constructor(this, parameterTypes, new Class<?>[0], Member.PUBLIC);
-//	return getConstructor0(parameterTypes, Member.PUBLIC);
 	}
 
 	/**
@@ -3111,6 +3106,7 @@ private Method[] privateGetPublicMethods(boolean isAll) {
 
 	    return ms;
 
+
 //		checkInitted();
 //		Method[] res = null;
 //		if (useCaches) {
@@ -3172,6 +3168,54 @@ private Method[] privateGetPublicMethods(boolean isAll) {
 //		return res;
 	}
 
+
+	public Constructor[] $constructors$;
+
+
+	// Returns an array of "root" methods. These Method objects must NOT
+	// be propagated to the outside world, but must instead be copied
+	// via ReflectionFactory.copyMethod.
+	private Constructor[] privateGetConstructors() {
+		Constructor[] ms;
+		if ($constructors$ != null) {
+			// interface hack
+			ms = new Constructor[$constructors$.length];
+			for (int i = ms.length; --i >= 0;) {
+				ms[i] = new Constructor(this, $constructors$[i].getParameterTypes(), null, java.lang.reflect.Modifier.PUBLIC);
+			}
+			return ms;
+		}
+
+		ms = new Constructor[0];
+		String attr = null;
+		Object o = null;
+		/**
+		 * @j2sNative
+		 * 
+		 * 
+		 * 			var p = this.$clazz$;
+		 * 
+		 *            for (attr in p) { o = p[attr]; if (
+		 *            typeof o == "function" 
+		 *            && o.exName && o.exName.startsWith("c$")
+		 *            && !o.__CLASS_NAME__ 
+		 *            && (o.exClazz == this.$clazz$)
+		 *            ) { 
+		 */
+
+		Constructor m = new Constructor(this, UNKNOWN_PARAMETERS, null, Modifier.PUBLIC);
+		m._setJSMethod(o, Modifier.PUBLIC);
+
+		/**
+		 * @j2sNative
+		 * 
+		 * 			ms.push(m);
+		 * }}
+		 */
+
+	    return ms;
+	}
+
 //	//
 //	// Helpers for fetchers of one field, method, or constructor
 //	//

diff --git a/sources/net.sf.j2s.java.core/src/java/lang/reflect/Constructor.java b/sources/net.sf.j2s.java.core/src/java/lang/reflect/Constructor.java
@@ -19,6 +19,7 @@
 import java.util.Map;
 
 import sun.reflect.annotation.AnnotationParser;
+import swingjs.api.js.JSFunction;
 
 /**
  * This class must be implemented by the VM vendor. This class models a
@@ -53,12 +54,20 @@ public Constructor(Class<T> declaringClass, Class<?>[] paramTypes, Class<?>[] ch
 			//parameterTypes = null;
 		// Special case - constructors with parameters have c$$, not just c$. For whatever reason!
 		// This signals NOT to add "$" if there are no parameters.
-		if (paramTypes == null)
-			paramTypes = Class.NO_PARAMETERS;
-		this.signature = "c$" + Class.argumentTypesToString(paramTypes);
+		if (paramTypes != null && paramTypes.length == 0)
+			paramTypes = null;
+		this.signature = (paramTypes == Class.UNKNOWN_PARAMETERS 
+				|| paramTypes  == null || declaringClass.$constructors$ != null 
+				? "c$" : "c$" + Class.argumentTypesToString(paramTypes));
  		constr = /** @j2sNative this.Class_.$clazz$[this.signature] || */ null;
 	}
 
+	public void _setJSMethod(Object o, int modifiers) {
+		constr = o;
+		signature = /** @j2sNative	o && o.exName || */ null;
+		this.modifiers |= modifiers;
+	}
+
 	/**
 	 * Return a new instance of the declaring class, initialized by dynamically
 	 * invoking the modelled constructor. This reproduces the effect of
@@ -298,7 +307,8 @@ public String getName() {
 	 * @return the parameter types
 	 */
 	public Class<?>[] getParameterTypes() {
-		return parameterTypes;
+		return (parameterTypes == Class.UNKNOWN_PARAMETERS ?
+			parameterTypes = AnnotationParser.JSAnnotationObject.guessMethodParameterTypes(signature) : parameterTypes);
 	}
 
 	/**