fixes for DND, JColorChooser, JSFileBytes, J2SInterface, j2sApplet,

BobHanson · BobHanson · commit 2fa9c9140693 · 2018-06-27T18:05:46.000+01:00
j2sClazz
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/datatransfer/DataFlavor.java b/sources/net.sf.j2s.java.core/src/java/awt/datatransfer/DataFlavor.java
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
@@ -646,15 +646,46 @@ public String getName() {
 	private transient String name;
 
 	private String getName0() {
-		/**
-		 * @j2sNative return this.$clazz$.__CLASS_NAME$__ || this.$clazz$.__CLASS_NAME__;
+		String code = "";
 
+		/**
+		 * @j2sNative
+		 * 
+		 * 			code = this.$clazz$.__CLASS_NAME$__ ||
+		 *            this.$clazz$.__CLASS_NAME__; 
+		 *            
+		 *            if (code) return code;
+		 * 
+		 *            code = this.$clazz$.__PARAMCODE;
+		 * 
 		 */
-		{
+
+		switch (code) {
+		case "S":
+			code = "String";
+			break;
+		case "I":
+			code = "Integer";
+			break;
+		case "H":
+			code = "Short";
+			break;
+		case "B":
+			code = "Byte";
+			break;
+		case "L":
+			code = "Long";
+			break;
+		case "C":
+			code = "Character";
+			break;
+		default:
 			return null;
 		}
-	}
+		return "java.lang." + code;
 
+	}
+	
 	/**
 	 * Returns the class loader for the class. Some implementations may use null
 	 * to represent the bootstrap class loader. This method will return null in
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JColorChooser.java b/sources/net.sf.j2s.java.core/src/javax/swing/JColorChooser.java
@@ -59,7 +59,8 @@
  * 
  * SwingJS note:
  * 
- * This class in JavaScript will run a modal dialog that will initially return
+ * This class in JavaScript will run a modal dialog that will initially
+ *  return
  * an instance of JColorChooser.ASYNCHRONOUS_COLOR, testable as ret instanceof
  * javax.swing.UIResource if the parent component implements
  * PropertyChangeListener, or null if not. The final result of color selection
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
@@ -43,6 +43,9 @@
 
 import javax.swing.plaf.UIResource;
 
+import swingjs.JSUtil;
+import swingjs.plaf.JSComponentUI;
+
 // BH: Added rootPane.addNotify(); // builds a peer for the root pane
 
 /**
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
@@ -42,6 +42,9 @@
 import java.awt.event.WindowEvent;
 //
 
+import swingjs.JSUtil;
+import swingjs.plaf.JSComponentUI;
+
 //BH: Added rootPane.addNotify(); // builds a peer for the root pane
 
 /**
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
@@ -39,6 +39,9 @@
 import java.awt.Window;
 import java.awt.event.WindowListener;
 
+import swingjs.JSUtil;
+import swingjs.plaf.JSComponentUI;
+
 
 // 
 
@@ -264,11 +267,11 @@ public JWindow(Window owner, GraphicsConfiguration gc) {
 	protected void windowInit() {
 		setLocale(JComponent.getDefaultLocale());
 		setRootPane(createRootPane());
-    rootPane.setFrameViewer(setFrameViewer(null));
+		rootPane.setFrameViewer(setFrameViewer(null));
 		setRootPaneCheckingEnabled(true);
 		uiClassID = "WindowUI";
 		updateUI();
-    addNotify(); // BH added; applet will not do this automatically
+		addNotify(); // BH added; applet will not do this automatically
 		rootPane.addNotify(); // builds a peer for the root pane
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSFileBytes.java b/sources/net.sf.j2s.java.core/src/swingjs/JSFileBytes.java
@@ -4,15 +4,15 @@
 
 public class JSFileBytes extends File {
 	
-	private byte[] bytes;
+	private byte[] _bytes;
 
 	public JSFileBytes(String name, byte[] data) {
 		super(name);
-		bytes = data;		
+		_bytes = data;		
 	}
 	
 	public byte[] getData() {
-		return bytes;
+		return _bytes;
 	}
  
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/js/J2SInterface.java b/sources/net.sf.j2s.java.core/src/swingjs/api/js/J2SInterface.java
@@ -31,6 +31,8 @@ void _readyCallback(String appId, String fullId, boolean isReady,
 	Object _getFileData(String fileName, Object fSuccess, boolean doProcess, boolean isBinary);
 
 	void _setDraggable(DOMNode tagNode, Object targetNodeOrFDown);
+	
+	void _setDragDropTarget(Object domNode);
 
 	int _setWindowZIndex(DOMNode domNode, int pos);
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.js
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSWindowUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSWindowUI.java
@@ -82,6 +82,7 @@ public DOMNode updateDOMNode() {
 	protected void setWindowClass(DOMNode windowNode) {
 		DOMNode.setZ(windowNode, z);
 		$(windowNode).addClass("swingjs-window");
+		JSUtil.J2S._setDragDropTarget(windowNode);
 	}
 
 	@Override
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -1,5 +1,6 @@
 // j2sCore.js (based on JmolCore.js)
 
+// BH 6/27/2018 12:45:44 PM adds DND for frames
 // BH 6/20/2018 11:26:09 PM fix for menu bar not closable
 // BH 3/16/2018 5:25:09 AM fixes for dragging on phones
 // BH 2/20/2018 12:08:08 AM adds J2S._getKeyModifiers
@@ -1649,15 +1650,17 @@ J2S.Cache.get = function(filename) {
 J2S.Cache.put = function(filename, data) {
   J2S.Cache.fileCache[filename] = data;
 }
-  // dnd 
-	J2S.Cache.setDragDrop = function(me) {
-		J2S.$appEvent(me, "appletdiv", "dragover", function(e) {
+  // dnd  _setDragDrop for swingjs.api.J2S called from swingjs.JSFrameViewer
+	J2S._setDragDropTarget = J2S.Cache.setDragDrop = function(me, div) {
+    // me can be just a div id
+    div || (div = null); 
+		J2S.$appEvent(me, div, "dragover", function(e) {
 			e = e.originalEvent;
 			e.stopPropagation();
 			e.preventDefault();
 			e.dataTransfer.dropEffect = 'copy';
 		});
-		J2S.$appEvent(me, "appletdiv", "drop", function(e) {
+		J2S.$appEvent(me, div, "drop", function(e) {
 			var oe = e.originalEvent;
 			oe.stopPropagation();
 			oe.preventDefault();
@@ -1670,7 +1673,8 @@ J2S.Cache.put = function(filename, data) {
 			var file = oe.dataTransfer.files[0];
 			if (file == null) {
 				// FF and Chrome will drop an image here
-				// but it will be only a URL, not an actual file. 
+				// but it will be only a URL, not an actual file.
+        // this bit is designed just for Jmol 
 				try {
 				  file = "" + oe.dataTransfer.getData("text");
 				  if (file.indexOf("file:/") == 0 || file.indexOf("http:/") == 0 || file.indexOf("https:/") == 0) {
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -7,6 +7,7 @@
 
 // Google closure compiler cannot handle Clazz.new or Clazz.super
 
+// BH 6/27/2018 3:11:50 PM fix for class String not indicating its name 
 // BH 6/25/2018 3:06:30 PM adds String.concat$S
 // BH 6/25/2018 12:10:25 PM Character.toTitleCase, isTitleCase as ...UpperCase
 // BH 6/25/2018 10:23:24 AM really fixing new int[] {'a'} using .$c() see Test_Byte.java
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -10654,6 +10654,7 @@ return jQuery;
 })(jQuery,document,"click mousemove mouseup touchmove touchend", "outjsmol");
 // j2sCore.js (based on JmolCore.js)
 
+// BH 6/27/2018 12:45:44 PM adds DND for frames
 // BH 6/20/2018 11:26:09 PM fix for menu bar not closable
 // BH 3/16/2018 5:25:09 AM fixes for dragging on phones
 // BH 2/20/2018 12:08:08 AM adds J2S._getKeyModifiers
@@ -12303,15 +12304,17 @@ J2S.Cache.get = function(filename) {
 J2S.Cache.put = function(filename, data) {
   J2S.Cache.fileCache[filename] = data;
 }
-  // dnd 
-	J2S.Cache.setDragDrop = function(me) {
-		J2S.$appEvent(me, "appletdiv", "dragover", function(e) {
+  // dnd  _setDragDrop for swingjs.api.J2S called from swingjs.JSFrameViewer
+	J2S._setDragDropTarget = J2S.Cache.setDragDrop = function(me, div) {
+    // me can be just a div id
+    div || (div = null); 
+		J2S.$appEvent(me, div, "dragover", function(e) {
 			e = e.originalEvent;
 			e.stopPropagation();
 			e.preventDefault();
 			e.dataTransfer.dropEffect = 'copy';
 		});
-		J2S.$appEvent(me, "appletdiv", "drop", function(e) {
+		J2S.$appEvent(me, div, "drop", function(e) {
 			var oe = e.originalEvent;
 			oe.stopPropagation();
 			oe.preventDefault();
@@ -12324,7 +12327,8 @@ J2S.Cache.put = function(filename, data) {
 			var file = oe.dataTransfer.files[0];
 			if (file == null) {
 				// FF and Chrome will drop an image here
-				// but it will be only a URL, not an actual file. 
+				// but it will be only a URL, not an actual file.
+        // this bit is designed just for Jmol 
 				try {
 				  file = "" + oe.dataTransfer.getData("text");
 				  if (file.indexOf("file:/") == 0 || file.indexOf("http:/") == 0 || file.indexOf("https:/") == 0) {
@@ -13094,6 +13098,7 @@ J2S._getResourcePath = function(path, isJavaPath) {
 
 // Google closure compiler cannot handle Clazz.new or Clazz.super
 
+// BH 6/27/2018 3:11:50 PM fix for class String not indicating its name 
 // BH 6/25/2018 3:06:30 PM adds String.concat$S
 // BH 6/25/2018 12:10:25 PM Character.toTitleCase, isTitleCase as ...UpperCase
 // BH 6/25/2018 10:23:24 AM really fixing new int[] {'a'} using .$c() see Test_Byte.java

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@`
`59`	`59`	`*`
`60`	`60`	`* SwingJS note:`
`61`	`61`	`*`
`62`		`- * This class in JavaScript will run a modal dialog that will initially return`
	`62`	`+ * This class in JavaScript will run a modal dialog that will initially`
	`63`	`+ * return`
`63`	`64`	`* an instance of JColorChooser.ASYNCHRONOUS_COLOR, testable as ret instanceof`
`64`	`65`	`* javax.swing.UIResource if the parent component implements`
`65`	`66`	`* PropertyChangeListener, or null if not. The final result of color selection`
Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@`
`4`	`4`
`5`	`5`	`public class JSFileBytes extends File {`
`6`	`6`
`7`		`- private byte[] bytes;`
	`7`	`+ private byte[] _bytes;`
`8`	`8`
`9`	`9`	`public JSFileBytes(String name, byte[] data) {`
`10`	`10`	`super(name);`
`11`		`- bytes = data;`
	`11`	`+ _bytes = data;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public byte[] getData() {`
`15`		`- return bytes;`
	`15`	`+ return _bytes;`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`}`