last update prior to shifting to master for integrated Jmol/SwingJS

BobHanson · BobHanson · commit 4b4613ea0a55 · 2023-11-09T09:04:05.000-06:00
plugin
diff --git a/sources/net.sf.j2s.core/build.properties b/sources/net.sf.j2s.core/build.properties
@@ -6,5 +6,5 @@ bin.includes = META-INF/,\
                schema/
 src.includes = META-INF/,\
                plugin.xml
-javacSource = 1.3
-javacTarget = 1.2
+javacSource = 1.7
+javacTarget = 1.7
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java
@@ -17,6 +17,7 @@ public class CorePlugin extends Plugin {
 	 * The constructor.
 	 */
 	public CorePlugin() {
+		System.out.println("J2S legacy core plugin created");
 		plugin = this;
 	}
 
@@ -25,6 +26,7 @@ public CorePlugin() {
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
+		System.out.println("J2S legacy core plugin started");
 		if (!InnerHotspotServer.isServerStarted()) {
 			InnerHotspotServer.getSingletonServer().startServer();
 		}
@@ -36,6 +38,7 @@ public void start(BundleContext context) throws Exception {
 	public void stop(BundleContext context) throws Exception {
 		super.stop(context);
 		plugin = null;
+		System.out.println("J2S legacy core plugin stopped");
 		if (InnerHotspotServer.isServerStarted()) {
 			InnerHotspotServer.getSingletonServer().stopServer();
 		}
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
@@ -72,6 +72,7 @@ public void run() {
 			 */
 			return ;
 		}
+		System.out.println("J2S loading file " + file);
 		Properties props = new Properties();
 		try {
 			props.load(new FileInputStream(file));
@@ -117,6 +118,9 @@ public void run() {
 			if (sourceUnit instanceof SourceFile) {
 				SourceFile unitSource = (SourceFile) sourceUnit;
 				String fileName = new String(unitSource.getFileName());
+				
+				System.out.println("J2S processing file " + fileName);
+
 				int idx = fileName.lastIndexOf('/');
 				String className = fileName.substring(idx + 1, fileName.lastIndexOf('.'));
 				StringBuffer path = new StringBuffer();
@@ -423,6 +427,7 @@ public static void outputJavaScript(ASTScriptVisitor visitor, DependencyASTVisit
 		File jsFile = new File(folderPath, elementName + ".js"); //$NON-NLS-1$
 		try {
 			FileOutputStream fos = new FileOutputStream(jsFile);
+			System.out.println("J2S creating " + jsFile);
 			if (addUTF8Header) {
 				fos.write(new byte[] {(byte) 0xef, (byte) 0xbb, (byte) 0xbf}); // UTF-8 header!
 			}
