Auto stash before merge of "swingjs" and "origin/swingjs"

nikeshyad · nikeshyad · commit 6b734632f398 · 2017-06-16T17:11:11.000-05:00
Fixing global replacement of "new Boolean" with "Boolean.from" in transpiler
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java
@@ -321,6 +321,7 @@ public static void updateJ2SMap(String prjFolder) {
 
 	public static void outputJavaScript(ASTScriptVisitor visitor, DependencyASTVisitor dvisitor, CompilationUnit fRoot, String folderPath, Properties props) {
 		String js = dvisitor.getDependencyScript(visitor.getBuffer());
+		//js = js + "\n//SwingJS test " + System.currentTimeMillis() + "\n";
 		String lineBreak = props.getProperty("j2s.compiler.linebreak");
 		String whiteSpace = props.getProperty("j2s.compiler.whitespace");
 		String utf8Header = props.getProperty("j2s.compiler.utf8bom");
@@ -357,6 +358,18 @@ public static void outputJavaScript(ASTScriptVisitor visitor, DependencyASTVisit
 				.replaceAll("finalVars", "v\\$")
 				.replaceAll("\\.callbacks", "\\.b\\$")
 				.replaceAll("\\.\\$finals", "\\.f\\$");
+		
+		//SwingJS 6/15/2017- Trying to replace new Boolean with Boolean.from because 
+		//new Boolean("false") returns true.
+		//Require implementation of Boolean.from in runtime
+		//javascript considers any string to be true while java only considers the string "true"
+		//to be true
+		//js = js.replaceAll("new\\ Boolean\\ ", "Boolean\\.from");
+		js = js.replaceAll("new Boolean ", "Boolean.from");
+		js = js + "\n\\\\Created Boolean.from js" + System.currentTimeMillis() + "\n"; 
+			
+		
+		
 		String abbr = props.getProperty("j2s.compiler.abbreviation");
 		if (abbr != null) {
 			if (abbr.equals("true")) {
