adding awt, javax, sun, etc.

BobHanson · BobHanson · commit eed23e0fe33d · 2017-09-02T01:27:51.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
@@ -28,11 +28,13 @@
 package java.awt;
 
 import java.awt.peer.ComponentPeer;
+
 import javax.swing.JComponent;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
-import sun.awt.ConstrainableGraphics;
+
+import swingjs.JSAppletThread;
 import swingjs.JSAppletViewer;
 import swingjs.JSFrameViewer;
 import swingjs.JSGraphics2D;
@@ -59,8 +61,7 @@ public abstract class JSComponent extends Component {
 
 	public boolean isRootPane, isContentPane;
 	public HTML5Canvas canvas;
-	public JSAppletViewer appletViewer = JSToolkit.getAppletViewer();    
-
+	public JSAppletViewer appletViewer = ((JSAppletThread) Thread.currentThread()).appletViewer;
 	private  JSFrameViewer frameViewer;
 
   public JSComponent() {
diff --git a/sources/net.sf.j2s.java.core/src/java/beans/PropertyChangeSupport.java b/sources/net.sf.j2s.java.core/src/java/beans/PropertyChangeSupport.java
@@ -27,6 +27,8 @@
  */
 package java.beans;
 
+import javajs.J2SRequireImport;
+
 /**
  * This is a utility class that can be used by beans that support bound
  * properties.  You can use an instance of this class as a member field
@@ -36,6 +38,7 @@
  * (and restore) any listeners that are themselves serializable.  Any
  * non-serializable listeners will be skipped during serialization.
  */
+@J2SRequireImport(PropertyChangeListener.class)
 public class PropertyChangeSupport {
     private PropertyChangeListenerMap map = new PropertyChangeListenerMap();
 
@@ -472,7 +475,8 @@ public boolean hasListeners(String propertyName) {
      * that works with {@link PropertyChangeListener PropertyChangeListener} objects.
      */
     private static final class PropertyChangeListenerMap extends ChangeListenerMap<PropertyChangeListener> {
-        private static final PropertyChangeListener[] EMPTY = {};
+
+    	private static final PropertyChangeListener[] EMPTY = {};
 
         /**
          * Creates an array of {@link PropertyChangeListener PropertyChangeListener} objects.
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/JSThread.java b/sources/net.sf.j2s.java.core/src/javajs/util/JSThread.java
@@ -59,7 +59,7 @@ public synchronized void start() {
 		/**
 		 * @j2sNative
 		 * 
-		 *            swingjs.JSToolkit.dispatch(this, 1, 0);
+		 *            swingjs.JSToolkit.dispatch$O$I$I(this, 1, 0);
 		 * 
 		 */
 		{
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java b/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java
@@ -1,17 +1,5 @@
 package swingjs;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLStreamHandlerFactory;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import javax.swing.WindowConstants;
-
-import javajs.util.JSThread;
-import javajs.util.Lst;
-import javajs.util.PT;
 import java.applet.Applet;
 import java.applet.AppletContext;
 import java.applet.AppletStub;
@@ -24,17 +12,28 @@
 import java.awt.Insets;
 import java.awt.Toolkit;
 import java.awt.Window;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLStreamHandlerFactory;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Hashtable;
 import java.util.Locale;
+
 import javax.swing.JApplet;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
+import javax.swing.WindowConstants;
+
+import javajs.util.JSThread;
+import javajs.util.Lst;
+import javajs.util.PT;
 import sun.applet.AppletEvent;
 import sun.applet.AppletEventMulticaster;
 import sun.applet.AppletListener;
 import sun.awt.AppContext;
 import swingjs.api.Interface;
 import swingjs.api.js.HTML5Applet;
-import swingjs.api.js.JSInterface;
 import swingjs.plaf.Resizer;
 
 /**
@@ -66,8 +65,7 @@
  * 
  */
 @SuppressWarnings("rawtypes")
-public class JSAppletViewer extends JSFrameViewer implements AppletStub, AppletContext,
-		JSInterface {
+public class JSAppletViewer extends JSFrameViewer implements AppletStub, AppletContext {
 
 	/*
 	 * the JavaScript testApplet._applet object
@@ -262,7 +260,7 @@ public void start() {
 			myThread.start();
 		else
 			showStatus("already started");
-		japplet.repaint();
+		//japplet.repaint();
 	}
 
 	synchronized public void addAppletListener(AppletListener l) {
@@ -392,6 +390,7 @@ public Enumeration<Applet> getApplets() {
 
 	@Override
 	public void showDocument(URL url) {
+		// note that JavaScript will overwrite this one because names will not be qualified here
 		JSToolkit.showWebPage(url, null);
 	}
 
@@ -421,7 +420,7 @@ private void showAppletException(Throwable t) {
 		/**
 		 * @j2sNative
 		 * 
-		 *            this.showAppletStatus$S("error " + (t.getMessage ?
+		 *            this.showAppletStatus("error " + (t.getMessage ?
 		 *            t.getMessage() : t)); t.printStackTrace &&
 		 *            t.printStackTrace();
 		 */

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public synchronized void start() {`
`59`	`59`	`/**`
`60`	`60`	`* @j2sNative`
`61`	`61`	`*`
`62`		`- * swingjs.JSToolkit.dispatch(this, 1, 0);`
	`62`	`+ * swingjs.JSToolkit.dispatch$O$I$I(this, 1, 0);`
`63`	`63`	`*`
`64`	`64`	`*/`
`65`	`65`	`{`