BobHanson · BobHanson · Jun 3, 2020 · May 5, 2020 · May 5, 2020 · May 5, 2020
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 @@
-20200501154159 
+20200602150211 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/net.sf.j2s.core-j11.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/net.sf.j2s.core-j11.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/timestamp
@@ -1 +1 @@
-20200416125313 
+20200602150211 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20200501154159 
+20200601144428 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java
@@ -19,7 +19,6 @@
 import java.util.Properties;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.dom.AST;

diff --git a/sources/net.sf.j2s.java.core/build-zipoonly.xml b/sources/net.sf.j2s.java.core/build-zipoonly.xml
@@ -0,0 +1,12 @@
+<project name="JSmol" default="zip" basedir=".">
+
+   <target name="zip" id="zip">
+
+   	<echo>creating dist/SwingJS-site.zip </echo>
+   	<zip destfile="dist/SwingJS-site.zip" basedir="site" >
+   		<exclude name="swingjs/j2s/test/**"/>
+   		<exclude name="*.html"/>
+   	</zip>
+
+  </target>
+</project>
diff --git a/sources/net.sf.j2s.java.core/dev/derivative_out_java.txt b/sources/net.sf.j2s.java.core/dev/derivative_out_java.txt
@@ -0,0 +1,28 @@
+1.8.0_191 amd64
+Direct: ...........-8069730.430666992........373
+Direct: ...........-8069730.430666992........269
+Direct: ...........-8069730.430666992........267
+Unwrapped: ........-8069730.430666992................ 248
+Unwrapped: ........-8069730.430666992................ 432
+Unwrapped: ........-8069730.430666992................ 430
+Wrapped: ..........-8069730.430666992........................263
+Wrapped: ..........-8069730.430666992........................248
+Wrapped: ..........-8069730.430666992........................247
+Direct: ...........-8069730.430666992........271
+Unwrapped: ........-8069730.430666992................ 430
+Wrapped: ..........-8069730.430666992........................244
+Direct: ...........-8069730.430666992........271
+Unwrapped: ........-8069730.430666992................ 429
+Wrapped: ..........-8069730.430666992........................241
+Direct: ...........-8069730.430666992........270
+Unwrapped: ........-8069730.430666992................ 426
+Wrapped: ..........-8069730.430666992........................248
+Wrapped: ..........-8069730.430666992........................245
+Wrapped: ..........-8069730.430666992........................242
+Wrapped: ..........-8069730.430666992........................244
+Unwrapped: ........-8069730.430666992................ 429
+Unwrapped: ........-8069730.430666992................ 422
+Unwrapped: ........-8069730.430666992................ 423
+Direct: ...........-8069730.430666992........264
+Direct: ...........-8069730.430666992........265
+Direct: ...........-8069730.430666992........269
diff --git a/sources/net.sf.j2s.java.core/dev/derivative_out_swingjs_Chrome.txt b/sources/net.sf.j2s.java.core/dev/derivative_out_swingjs_Chrome.txt
@@ -0,0 +1,28 @@
+1.8 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.129 Safari/537.36
+Direct: ...........-8069730.43066709........188
+Direct: ...........-8069730.43066709........187
+Direct: ...........-8069730.43066709........183
+Unwrapped: ........-8069730.43066709................ 189
+Unwrapped: ........-8069730.43066709................ 186
+Unwrapped: ........-8069730.43066709................ 183
+Wrapped: ..........-8069730.43066709........................189
+Wrapped: ..........-8069730.43066709........................188
+Wrapped: ..........-8069730.43066709........................189
+Direct: ...........-8069730.43066709........185
+Unwrapped: ........-8069730.43066709................ 186
+Wrapped: ..........-8069730.43066709........................189
+Direct: ...........-8069730.43066709........185
+Unwrapped: ........-8069730.43066709................ 183
+Wrapped: ..........-8069730.43066709........................187
+Direct: ...........-8069730.43066709........185
+Unwrapped: ........-8069730.43066709................ 184
+Wrapped: ..........-8069730.43066709........................186
+Wrapped: ..........-8069730.43066709........................189
+Wrapped: ..........-8069730.43066709........................190
+Wrapped: ..........-8069730.43066709........................190
+Unwrapped: ........-8069730.43066709................ 196
+Unwrapped: ........-8069730.43066709................ 223
+Unwrapped: ........-8069730.43066709................ 185
+Direct: ...........-8069730.43066709........186
+Direct: ...........-8069730.43066709........184
+Direct: ...........-8069730.43066709........182
diff --git a/sources/net.sf.j2s.java.core/dev/derivative_out_swingjs_Firefox.txt b/sources/net.sf.j2s.java.core/dev/derivative_out_swingjs_Firefox.txt
@@ -0,0 +1,53 @@
+j2sApplet exec testApplet start applet null
+transpiler was unknown now 3.2.9-v1 for java.lang.Class
+swingjs.api.Interface creating instance of javajs.util.AjaxURLStreamHandlerFactory
+JSApp get parameter: language = null
+swingjs.JSUtil initialized;debug=false
+JSApp get parameter: name = testApplet
+JSApp get parameter: syncId = 022516724642611
+JSApp initialized
+JSAppletViewer initializing2
+JSToolkit initialized
+JSGraphicsConfiguration initialized
+swingjs.api.Interface creating instance of swingjs.JSGraphicsEnvironment
+JSGraphicsEnvironment initialized
+swingjs.api.Interface creating instance of swingjs.JSScreenDevice
+JSScreenDevice initialized
+JSAppletViewer thread run1 mode=0 status=0
+JSAppletViewer thread run1 mode=1 status=1
+JSAppletViewer runloader
+JSApp get parameter: main = test.Derivative
+swingjs.api.Interface creating instance of swingjs.JSDummyApplet
+swingjs.api.Interface creating instance of swingjs.plaf.HTML5LookAndFeel
+testApplet loaded
+JSAppletViewer thread run1 mode=1 status=76
+testApplet running test.Derivative
+Running main(args) in class test.Derivative
+1.8 Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:75.0) Gecko/20100101 Firefox/75.0
+Direct: ...........-8069730.430666382........131
+Direct: ...........-8069730.430666382........128
+Direct: ...........-8069730.430666382........123
+Unwrapped: ........-8069730.430666382................ 128
+Unwrapped: ........-8069730.430666382................ 127
+Unwrapped: ........-8069730.430666382................ 124
+Wrapped: ..........-8069730.430666382........................132
+Wrapped: ..........-8069730.430666382........................134
+Wrapped: ..........-8069730.430666382........................130
+Direct: ...........-8069730.430666382........121
+Unwrapped: ........-8069730.430666382................ 125
+Wrapped: ..........-8069730.430666382........................130
+Direct: ...........-8069730.430666382........120
+Unwrapped: ........-8069730.430666382................ 125
+Wrapped: ..........-8069730.430666382........................129
+Direct: ...........-8069730.430666382........120
+Unwrapped: ........-8069730.430666382................ 124
+Wrapped: ..........-8069730.430666382........................132
+Wrapped: ..........-8069730.430666382........................131
+Wrapped: ..........-8069730.430666382........................130
+Wrapped: ..........-8069730.430666382........................130
+Unwrapped: ........-8069730.430666382................ 122
+Unwrapped: ........-8069730.430666382................ 124
+Unwrapped: ........-8069730.430666382................ 124
+Direct: ...........-8069730.430666382........121
+Direct: ...........-8069730.430666382........122
+Direct: ...........-8069730.430666382........121
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/com/sun/imageio/plugins/common/ImageUtil.java b/sources/net.sf.j2s.java.core/src/com/sun/imageio/plugins/common/ImageUtil.java
@@ -25,7 +25,6 @@
 
 package com.sun.imageio.plugins.common;
 
-import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Transparency;
 import java.awt.color.ColorSpace;
@@ -46,12 +45,10 @@
 import java.awt.image.SampleModel;
 import java.awt.image.SinglePixelPackedSampleModel;
 import java.awt.image.WritableRaster;
-import java.util.Arrays;
 
 //import javax.imageio.ImageTypeSpecifier;
 
 import javax.imageio.IIOException;
-import javax.imageio.IIOImage;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.ImageWriter;
 import javax.imageio.spi.ImageWriterSpi;
@@ -1127,7 +1124,7 @@ public static final void canEncodeImage(ImageWriter writer,
     public static final boolean imageIsContiguous(RenderedImage image) {
         SampleModel sm;
         if(image instanceof BufferedImage) {
-            WritableRaster ras = ((BufferedImage)image).秘getRaster();
+            WritableRaster ras = ((BufferedImage)image).getRaster();
             sm = ras.getSampleModel();
         } else {
             sm = image.getSampleModel();

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/AWTKeyStroke.java b/sources/net.sf.j2s.java.core/src/java/awt/AWTKeyStroke.java
@@ -823,7 +823,7 @@ public VKCollection() {
 		 */
 		for (int i = 0; i < list.length; i++)
 		{  
-			put((String) list[i][0], Integer.valueOf((String) list[i][1]));
+			put((String) list[i][0], Integer.valueOf(/** @j2sNative list[i][1] ||*/0));
 		}	
 
 	}

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/image/AffineTransformOp.java b/sources/net.sf.j2s.java.core/src/java/awt/image/AffineTransformOp.java
@@ -302,7 +302,7 @@ public final BufferedImage filter(BufferedImage src, BufferedImage dst) {
             Graphics2D g = origDst.createGraphics();
             try {
                 g.setComposite(AlphaComposite.Src);
-                ((JSGraphics2D)(Object) g).drawImageFromRaster(dst, 0, 0, null);
+                ((JSGraphics2D)(Object) g).drawImageFromPixelsOrRaster(dst, 0, 0, null);
             } finally {
                 g.dispose();
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -823,7 +823,7 @@ public VKCollection() { @@
     		 */
     		for (int i = 0; i < list.length; i++)
     		{
-    			put((String) list[i][0], Integer.valueOf((String) list[i][1]));
+    			put((String) list[i][0], Integer.valueOf(/** @j2sNative list[i][1] ||*/0));
     		}
     	}
@@ Expand Down @@