java2script · BobHanson · Aug 17, 2019 · Aug 16, 2019 · Aug 17, 2019 · Aug 17, 2019
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/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20190814182015 
+20190817161814 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190814182015 
+20190817161814 
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/JSDialog.java b/sources/net.sf.j2s.java.core/src/java/awt/JSDialog.java
@@ -690,10 +690,9 @@ protected String constructComponentName() {
 		public void addNotify() {
         synchronized (getTreeLock()) {
           getOrCreatePeer();
-            if (parent != null) {
-                parent.addNotify();
-            }
-            super.addNotify();
+  		if (parent != null && parent.getPeer() == null)
+			parent.addNotify();
+           super.addNotify();
         }
     }
 

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
@@ -115,7 +115,7 @@ private static class JSClass {
 		public String __CLASS_NAME__;
 	}
 	private JSClass $clazz$; //  BH SwingJS
-	private String[] $methodList$; // BH SwingJS for proxy interfaces
+	public String[] $methodList$; // BH see j2sClazz.js Clazz.getClass, from interface parameters
 
 //	private static native void registerNatives();
 //
@@ -139,6 +139,7 @@ private Class() {
 	 *
 	 * @return a string representation of this class object.
 	 */
+	@Override
 	public String toString() {
 		return (isInterface() ? "interface " : (isPrimitive() ? "" : "class ")) + getName();
 	}
@@ -769,7 +770,7 @@ ClassLoader getClassLoader0() {
 	 *             Specification, 3rd edition
 	 * @since 1.5
 	 */
-	@SuppressWarnings("unchecked")
+	@Override
 	public TypeVariable<Class<T>>[] getTypeParameters() {
 //		if (getGenericSignature() != null)
 //			return (TypeVariable<Class<T>>[]) getGenericInfo().getTypeParameters();
@@ -1811,7 +1812,7 @@ private void addField(Field[] fields, String m, int modifiers) {
 	 *
 	 * @param name
 	 *            the name of the method
-	 * @param parameterTypes
+	 * @param paramTypes
 	 *            the list of parameters
 	 * @return the {@code Method} object that matches the specified {@code name}
 	 *         and {@code parameterTypes}
@@ -1852,7 +1853,7 @@ public Method getMethod(String name, Class<?>... paramTypes) throws NoSuchMethod
 		Method m = new Method(this, name, paramTypes, null, null, 0);
 		if (!isInterface()) {
 			Object o = null;
-			String qname = name + argumentTypesToString(paramTypes);
+			String qname = m.getSignature();
 			/**
 			 * @j2sNative
 			 * 
@@ -1925,15 +1926,11 @@ public Method getMethod(String name, Class<?>... paramTypes) throws NoSuchMethod
 	 *
 	 * @since JDK1.1
 	 */
-	@SuppressWarnings("unchecked")
 	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());
-		Class<?>[] x = parameterTypes;
-		if (parameterTypes == null)
-			parameterTypes = new Class<?>[0];
 		return new Constructor(this, parameterTypes, new Class<?>[0], Member.PUBLIC);
 //	return getConstructor0(parameterTypes, Member.PUBLIC);
 	}
@@ -3218,6 +3215,8 @@ public static String argumentTypesToString(Class<?>[] parameterTypes) {
 //	 */
 //	private static final ObjectStreamField[] serialPersistentFields = new ObjectStreamField[0];
 
+	public static final Class<?>[] NO_PARAMETERS = new Class<?>[0];
+
 //	/**
 //	 * Returns the assertion status that would be assigned to this class if it
 //	 * were to be initialized at the time this method is invoked. If this class
@@ -3295,7 +3294,7 @@ public boolean isEnum() {
 //	private static ReflectionFactory reflectionFactory;
 //
 	// To be able to query system properties as soon as they're available
-	private static boolean initted = false;
+//	private static boolean initted = false;
 
 //	private static void checkInitted() {
 //		if (initted)
@@ -3558,8 +3557,9 @@ public boolean equals(Object o) {
 	/**
 	 * A SwingJS method for Constructor and Method
 	 * 
-	 * @param parameterTypes
+	 * @param types
 	 * @param args
+	 * @param isProxy
 	 * @return
 	 */
 	public static Object[] getArgumentArray(Class<?>[] types, Object[] args, boolean isProxy) {

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
@@ -46,7 +46,10 @@ public Constructor(Class<T> declaringClass, Class<?>[] parameterTypes, Class<?>[
 		// NO!! wrong: all of the SwingJS primitive classes run without parameterization
 		//if (";Integer;Long;Short;Byte;Float;Double;".indexOf(";" + declaringClass.getName() + ";") >= 0)
 			//parameterTypes = null;
-		this.parameterTypes = parameterTypes;
+		// Special case - constructors with parameters have c$$, not just c$. For whatever reason!
+		// This signals NOT to add "$" if there are no parameters.
+		if (parameterTypes == null)
+			parameterTypes = Class.NO_PARAMETERS;
 		this.signature = "c$" + Class.argumentTypesToString(parameterTypes);
  		constr = /** @j2sNative this.Class_.$clazz$[this.signature] || */ null;
 	}

diff --git a/sources/net.sf.j2s.java.core/src/java/lang/reflect/Method.java b/sources/net.sf.j2s.java.core/src/java/lang/reflect/Method.java
@@ -46,11 +46,14 @@ public Method(Class<?> declaringClass, String name, Class<?>[] parameterTypes, C
 			Class<?>[] checkedExceptions, int modifiers) {
 		this.Class_ = declaringClass;
 		this.name = name;
-		this.parameterTypes = parameterTypes;
+		this.parameterTypes = (parameterTypes == null ? Class.NO_PARAMETERS : parameterTypes);
 		this.returnType = returnType;
 		this.exceptionTypes = checkedExceptions;
 		this.modifiers = modifiers;
-		this.signature = name + Class.argumentTypesToString(parameterTypes);
+		// modifier PUBLIC means this is from Class.java getMethods
+		if (parameterTypes != null && parameterTypes.length == 0)
+			parameterTypes = null;
+		this.signature = (declaringClass.$methodList$ == null ? name + Class.argumentTypesToString(parameterTypes) : name);
 	}
 
 	/**

diff --git a/sources/net.sf.j2s.java.core/src/javax/xml/stream/Location.java b/sources/net.sf.j2s.java.core/src/javax/xml/stream/Location.java
@@ -0,0 +1,77 @@
+/*
+ * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+/*
+ * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+ */
+
+package javax.xml.stream;
+
+/**
+ * Provides information on the location of an event.
+ *
+ * All the information provided by a Location is optional.  For example
+ * an application may only report line numbers.
+ *
+ * @version 1.0
+ * @author Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
+ * @since 1.6
+ */
+public interface Location {
+  /**
+   * Return the line number where the current event ends,
+   * returns -1 if none is available.
+   * @return the current line number
+   */
+  int getLineNumber();
+
+  /**
+   * Return the column number where the current event ends,
+   * returns -1 if none is available.
+   * @return the current column number
+   */
+  int getColumnNumber();
+
+  /**
+   * Return the byte or character offset into the input source this location
+   * is pointing to. If the input source is a file or a byte stream then
+   * this is the byte offset into that stream, but if the input source is
+   * a character media then the offset is the character offset.
+   * Returns -1 if there is no offset available.
+   * @return the current offset
+   */
+  int getCharacterOffset();
+
+  /**
+   * Returns the public ID of the XML
+   * @return the public ID, or null if not available
+   */
+  public String getPublicId();
+
+  /**
+   * Returns the system ID of the XML
+   * @return the system ID, or null if not available
+   */
+  public String getSystemId();
+}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSGraphicsConfiguration.java b/sources/net.sf.j2s.java.core/src/swingjs/JSGraphicsConfiguration.java
@@ -56,9 +56,9 @@ protected BufferedImage newBufferedImage(ColorModel cm, WritableRaster wr,
 			boolean alphaPremultiplied, Hashtable<?, ?> properties) {
 		return (BufferedImage) Interface.getInstanceWithParams(
 				"java.awt.image.BufferedImage", new Class<?>[] { ColorModel.class,
-						WritableRaster.class, Boolean.class, Hashtable.class },
+						WritableRaster.class, boolean.class, Hashtable.class },
 				new Object[] { cm, wr,
-						alphaPremultiplied ? Boolean.TRUE : Boolean.FALSE, properties });
+						alphaPremultiplied, properties });
 	}
 
 	@Override

diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java b/sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java
@@ -467,7 +467,7 @@ public static void checkConsume(InputEvent e) {
 
 
 	public static JComponent getJ2SEventTarget(MouseEvent e) {
-		return /** @j2sNative e.bdata.source || */null;
+		return /** @j2sNative e.bdata && e.bdata.source || */null;
 	}
 
 	private static boolean isPopupTrigger(int id, int mods, boolean isWin) {
@@ -495,8 +495,8 @@ private static boolean isPopupTrigger(int id, int mods, boolean isWin) {
 
 	private boolean keyAction(int id, Object jqevent, long time) {
 		JComponent c = 	/** @j2sNative 
-		jqevent.target["data-shadowkeycomponent"] || jqevent.target["data-keycomponent"]
-				 */null;
+		jqevent.target["data-shadowkeycomponent"] || jqevent.target["data-keycomponent"] ||
+				 */null; 
 		return JSKeyEvent.dispatchKeyEvent(c, id, jqevent, time);
 	}
 

diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
@@ -964,12 +964,13 @@ public static void consumeEvent(Object e) {
 		// SwingJS stop any further processing at all within the browser
 		Object jqevent = null;
 		if (e instanceof InputEvent) {
-			jqevent = /** @j2sNative e.bdata.jqevent || */null; 
+			jqevent = /** @j2sNative e.bdata && e.bdata.jqevent || */null; 
 		} else {
 			jqevent = e;
 		}
 		if (jqevent == null)
 			return;
+
 		/**
 		 * @j2sNative 
 		 * 		jqevent.stopPropagation();

diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java
@@ -1103,6 +1103,18 @@ protected void bindJSKeyEvents(DOMNode node, boolean addFocus) {
 		}
 	}
 
+
+
+	/**
+	 * Signal to swingjs2 to ignore the event, as it has been handled already.
+	 * 
+	 * @param jqevent
+	 */
+	void setIgnoreEvent(Object jqevent) {
+		/**
+		 * @j2sNative jqevent.originalEvent.xhandled = true;
+		 */
+	}
 	/**
 	 * Allows mouse and keyboard handling via an overridden method
 	 * 

diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSEditorPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSEditorPaneUI.java
@@ -949,6 +949,7 @@ public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 			 * 			jQueryEvent.preventDefault(); 
 			 * 			jQueryEvent.stopPropagation();
 			 */
+			setIgnoreEvent(jQueryEvent);
 			return HANDLED;
 		}
 	}

diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextUI.java
@@ -3542,4 +3542,5 @@ public void setCaretFromJS() {
 		setJavaMarkAndDot(pt);
 	}
 
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/TextListener.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/TextListener.java
@@ -160,6 +160,7 @@ void handleJSTextEvent(JSTextUI ui, int eventType, Object jqevent) {
 		lastKeyEvent = eventType;
 		if (setCaret)
 			ui.setJavaMarkAndDot(markDot);
+		ui.setIgnoreEvent(jqevent);
 	}
 
 	@SuppressWarnings("unused")

diff --git a/sources/net.sf.j2s.java.core/src/test/TApp2.java b/sources/net.sf.j2s.java.core/src/test/TApp2.java
@@ -29,6 +29,8 @@
 import java.awt.event.AdjustmentListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.WindowAdapter;
@@ -120,6 +122,25 @@ public void focusLost(FocusEvent e) {
 		ta.setBounds(200, 70, 200, 200);
 		ta.setFont(new Font(Font.DIALOG, Font.BOLD, 20));
 		ta.appendText("A text\nwith some\nlines and\n no content.");
+		ta.addKeyListener(new KeyListener() {
+
+			@Override
+			public void keyTyped(KeyEvent e) {
+				System.out.println("keyTyped");
+			}
+
+			@Override
+			public void keyPressed(KeyEvent e) {
+				System.out.println("keypressed");
+			}
+
+			@Override
+			public void keyReleased(KeyEvent e) {
+				System.out.println("keyReleased");
+
+			}
+
+		});
 		ta.addFocusListener(new FocusListener() {
 
 			@Override

diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Class.java b/sources/net.sf.j2s.java.core/src/test/Test_Class.java
@@ -63,11 +63,11 @@ public void propertyChange(PropertyChangeEvent event) {
 
 			@Override
 			public void mouseClicked(MouseEvent e) {
-				System.out.println("!!!");
+				System.out.println("mouseClicked1");
 				Test_Class.this.showt(); 
 				showt();				
 				assert(Test_Class.this == me);
-				System.out.println("!!!");
+				System.out.println("mouseClicked2");
 			}
 
 			@Override
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3542,4 +3542,5 @@ public void setCaretFromJS() {
		setJavaMarkAndDot(pt);
		}


		}