java2script · BobHanson · Aug 27, 2018 · Aug 20, 2018 · Aug 20, 2018 · Aug 20, 2018
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.jar b/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1,5 @@
-20180819230621 
+<<<<<<< Upstream, based on branch 'yadav1' of https://github.com/BobHanson/java2script.git
+20180827111114 
+=======
+20180827113308 
+>>>>>>> 7e507a2 refactoring mouse events and tooltip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp
@@ -1 +1,5 @@
-20180819230621 
+<<<<<<< Upstream, based on branch 'yadav1' of https://github.com/BobHanson/java2script.git
+20180827111114 
+=======
+20180827113308 
+>>>>>>> 7e507a2 refactoring mouse events and tooltip
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
@@ -132,6 +132,8 @@
 import org.eclipse.jdt.core.dom.WhileStatement;
 import org.eclipse.jdt.core.dom.WildcardType;
 
+// BH 8/20/2018 -- fix for return (short)++;
+
 // BH 8/19/2018 -- refactored to simplify $finals$
 // BH 8/12/2018 -- refactored to simplify naming issues
 // BH 8/6/2018  -- additional Java 8 fixes; enum $valueOf$S to valueOf$S
@@ -2795,8 +2797,6 @@ private boolean fixAssignArray(ArrayAccess leftArray, int ptArray, int ptArray2,
 				buffer.setLength(ptArray);
 				String name = left.substring(0, ptIndex1);
 				if (name.indexOf("(") >= 0) {
-					// test/Test_Static: getByteArray()[p++] += (byte) ++p;
-					// ($j$=C$.getByteArray())[$k$=p++]=($j$[$k$]+((++p|0))|0);
 					buffer.append("($j$=" + name + ")");
 					name = "$j$";
 					trailingBuffer.addType("j");
@@ -3513,7 +3513,7 @@ private void addPrePostFix(Expression left, ASTNode parent, IVariableBinding var
 		boolean isChar = (type == 'c');
 		if (isChar)
 			type = 'p';
-		boolean isStatement = (parent instanceof Statement);
+		boolean isStatement = (parent instanceof Statement && !(parent instanceof ReturnStatement));
 		boolean addAnonymousWrapper = (!isChar || !isPrefix && !isStatement);
 		String key = "$" + type + (isChar ? "$" : "$[0]");
 		if (addAnonymousWrapper) {
@@ -3555,8 +3555,9 @@ private void addPrePostFix(Expression left, ASTNode parent, IVariableBinding var
 				// ($b$[0]=++b,b=$b$[0]);
 				buffer.append(key);
 			} else {
-				// i = ($b$[0]=b,b=(++$b$[0],$b$[0]),--$b$[0],$b$[0]);
-				// ($b$[0]=b,b=(++$b$[0],$b$[0]));
+				// postfix
+				// statement:         ($b$[0]=b,b=(++$b$[0]                  ,$b$[0]))
+				// not statement: i = ($b$[0]=b,b=(++$b$[0] ,$b$[0]),--$b$[0],$b$[0]);
 				buffer.append("(");
 				buffer.append(op);
 				buffer.append(key);

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/AWTKeyStroke.java b/sources/net.sf.j2s.java.core/src/java/awt/AWTKeyStroke.java
@@ -840,7 +840,7 @@ public VKCollection() {
 		 * for (var k in C$)
 		 *   if (k.indexOf("VK_") == 0) {
 		 *     try {
-		 *     	this.put$S$I(k, Integer.valueOf$I(C$[k]));
+		 *     	this.put$S$Integer(k, Integer.valueOf$I(C$[k]));
 		 *     } catch (e) {}
 		 *   }
 		 */