Java2ScriptCompiler j2s.config.altfileproperty

hansonr · hansonr · commit 059547a60257 · 2020-12-22T13:03:49.000-06:00
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 @@
-20201222082136 
+20201222130056 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.10/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.10/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.10/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.10/timestamp
@@ -1 +1 @@
-20201222082136 
+20201222130056 
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
@@ -365,8 +365,8 @@ boolean initializeProject(IJavaProject project, boolean isCompilationParticipant
 	}
 
 	/**
-	 * Iteratively look for a .j2s file to use for configuration information.
-	 * Up to five iterations are allowed.
+	 * Iteratively look for a .j2s file to use for configuration information. Up to
+	 * five iterations are allowed.
 	 * 
 	 * @param j2sFile
 	 * @param level
@@ -381,10 +381,14 @@ private void initializeUsing(File j2sFile, int level) {
 			newProps.load(os);
 			os.close();
 			String j2sAltFileProperty = newProps.getProperty(J2S_OPTIONS_ALTFILEPROPERTY);
-			String j2sAltFileName = (j2sAltFileProperty == null ? null : System.getProperty(j2sAltFileProperty));
-			if (j2sAltFileName != null && j2sAltFileName.length() > 0) {
-				initializeUsing(new File(projectFolder, j2sAltFileName), level);
-				return;
+			if (j2sAltFileProperty != null) {
+				System.out.println(J2S_OPTIONS_ALTFILEPROPERTY + " = " + j2sAltFileProperty);
+				String j2sAltFileName = System.getProperty(j2sAltFileProperty);
+				System.out.println("J2S System.getProperty(\"" + j2sAltFileProperty + "\") = " + j2sAltFileName);
+				if (j2sAltFileName != null && j2sAltFileName.length() > 0) {
+					initializeUsing(new File(projectFolder, j2sAltFileName), level);
+					return;
+				}
 			}
 			props = newProps;
 		} catch (Exception e) {
diff --git a/sources/net.sf.j2s.java.core/.j2s b/sources/net.sf.j2s.java.core/.j2s
@@ -1,3 +1,4 @@
+#j2s.config.altfileproperty=j2s.alt.file
 j2s.compiler.status=enable
 
 # read.annotations to false to not record annotations
diff --git a/sources/net.sf.j2s.java.core/.j2s1 b/sources/net.sf.j2s.java.core/.j2s1
@@ -0,0 +1,24 @@
+j2s.compiler.status=enable
+
+# read.annotations to false to not record annotations
+j2s.compiler.read.annotations=true
+
+# customizable list for what annotations to skip
+j2s.compiler.ignored.annotations=CallerSensitive;ConstructorProperties;Deprecated;Override;SaveVarargs;SuppressWarnings;
+
+#j2s.compiler.nonqualified.packages=org.w3c.dom
+
+#output file name for logging methods declared - delete the file to regenerate a listing 
+#j2s.log.methods.declared=methodsDeclared.csv
+
+#output file name for logging methods called - delete the file to regenerate a listing
+#j2s.log.methods.called=methodsCalled.csv
+
+#if set, every instance of methods called will be logged
+#otherwise, only the first call to a method will be logged 
+#output will be comma-separated: called method,caller class 
+#j2s.log.all.calls=true
+
+#a semicolon-separated list of package-level file paths to be excluded
+#j2s.excluded.paths=test;testng
+

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#j2s.config.altfileproperty=j2s.alt.file`
`1`	`2`	`j2s.compiler.status=enable`
`2`	`3`
`3`	`4`	`# read.annotations to false to not record annotations`