BobHanson · BobHanson · Dec 19, 2017 · Aug 4, 2017 · Aug 4, 2017 · Aug 5, 2017
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
+tests/net.sf.j2s.test.junit/bin/*
 */*/bin
 sources/net.sf.j2s.lib/j2slib
+dist/*
diff --git a/README.md b/README.md
@@ -0,0 +1,23 @@
+# Quick Build Directions
+
+```
+cd workspace (where workspace is your Eclipse Neon Workspace)
+git clone https://github.com/BobHanson/java2script.git
+git checkout swingjs
+```
+
+Then, open Eclipse, open Navigator, and hit Refresh. java2script will show up as a blank generic trunk without a name (i.e. 'trunk[]')
+
+![Eclipse Refresh](https://68.media.tumblr.com/47add4de1bc35f07f0e709fd6634289d/tumblr_or8mhqHsje1s5a4bko3_1280.png)
+
+![Eclipse trunk](https://68.media.tumblr.com/866cc531b6b9d1c3dca8071732a66a26/tumblr_or8mihapDW1s5a4bko1_540.png)
+
+Or, do the equivalent tasks on Eclipse's graphical git tool.
+
+Go to net.sf.j2s.core directory, Clean Project, then export as a Deployable plug-ins and fragments.
+
+![Eclipse Deployable](https://68.media.tumblr.com/c5714cadb166c7a887fbd00110e19afc/tumblr_or8mhqHsje1s5a4bko1_1280.png)
+
+![Eclipse Optionsj](https://68.media.tumblr.com/0a7d77765983c11ca59b4739307359ee/tumblr_or8mhqHsje1s5a4bko2_1280.png)
+
+Core is the only thing that was affected. Hence, everything else can be built the same exact way it was built before (assuming you were using the HEAD of the master branch of j2s).
diff --git a/demos/org.java2script.demo.gtalk/.j2s b/demos/org.java2script.demo.gtalk/.j2s
@@ -1,6 +1,6 @@
 #Java2Script Configuration
 #Sun Mar 18 22:29:00 CST 2007
-j2s.resources.list=../../plugins/net.sf.j2s.lib_1.0.0/j2slib/java.runtime.j2x,../../plugins/net.sf.j2s.lib_1.0.0/j2slib/swt.j2x,bin/org/java2script/demo/gtalk/GTalkRunnable.js,bin/org/java2script/demo/gtalk/AddFriendDialog.js,bin/org/java2script/demo/gtalk/AddFriendRunnable.js,bin/org/java2script/demo/gtalk/ChatDialog.js,bin/org/java2script/demo/gtalk/CloseChattingRunnable.js,bin/org/java2script/demo/gtalk/GoogleTalk.js,bin/org/java2script/demo/gtalk/JabberPool.js,bin/org/java2script/demo/gtalk/LoginRunnable.js,bin/org/java2script/demo/gtalk/LogoutRunnable.js,bin/org/java2script/demo/gtalk/ReceivingRunnable.js,bin/org/java2script/demo/gtalk/SendingRunnable.js,bin/org/java2script/demo/gtalk/UpdatingRunnable.js
+j2s.resources.list=../../plugins/net.sf.j2s.lib_3.1.1/j2slib/java.runtime.j2x,../../plugins/net.sf.j2s.lib_3.1.1/j2slib/swt.j2x,bin/org/java2script/demo/gtalk/GTalkRunnable.js,bin/org/java2script/demo/gtalk/AddFriendDialog.js,bin/org/java2script/demo/gtalk/AddFriendRunnable.js,bin/org/java2script/demo/gtalk/ChatDialog.js,bin/org/java2script/demo/gtalk/CloseChattingRunnable.js,bin/org/java2script/demo/gtalk/GoogleTalk.js,bin/org/java2script/demo/gtalk/JabberPool.js,bin/org/java2script/demo/gtalk/LoginRunnable.js,bin/org/java2script/demo/gtalk/LogoutRunnable.js,bin/org/java2script/demo/gtalk/ReceivingRunnable.js,bin/org/java2script/demo/gtalk/SendingRunnable.js,bin/org/java2script/demo/gtalk/UpdatingRunnable.js
 j2s.abandoned.resources.list=
 j2s.output.path=bin
 j2s.compiler.status=enable
diff --git a/demos/org.java2script.demo.gtalk/org.java2script.demo.gtalk.GoogleTalk.html b/demos/org.java2script.demo.gtalk/org.java2script.demo.gtalk.GoogleTalk.html
@@ -29,12 +29,12 @@
 <body>
 <!-- A Link An Application (ALAA) -->
 <div class="powered">Powered by <a href="http://j2s.sourceforge.net/">Java2Script</a></div>
-<a class="alaa" href="javascript:if(a='org.java2script.demo.gtalk.GoogleTalk@bin/',window['ClazzLoader']!=null)$w$(a);else{var d=document,t='onreadystatechange',x=d.createElement('SCRIPT'),f=function(){var s=this.readyState;if(s==null||s=='loaded'||s=='complete'){$w$(a);}};x.src='http://archive.java2script.org/1.0.0-m5/j2slib.z.js';(typeof x[t]=='undefined')?x.onload=f:x[t]=f;d.getElementsByTagName('HEAD')[0].appendChild(x);void(0);}">org.java2script.demo.gtalk.GoogleTalk</a>
+<a class="alaa" href="javascript:if(a='org.java2script.demo.gtalk.GoogleTalk@bin/',window['ClazzLoader']!=null)$w$(a);else{var d=document,t='onreadystatechange',x=d.createElement('SCRIPT'),f=function(){var s=this.readyState;if(s==null||s=='loaded'||s=='complete'){$w$(a);}};x.src='http://archive.java2script.org/3.1.1-m5/j2slib.z.js';(typeof x[t]=='undefined')?x.onload=f:x[t]=f;d.getElementsByTagName('HEAD')[0].appendChild(x);void(0);}">org.java2script.demo.gtalk.GoogleTalk</a>
 
 <script type="text/javascript">
 window["j2s.lib"] = {
 	base : "http://archive.java2script.org/",
-	alias : "1.0.0-m5",
+	alias : "3.1.1-m5",
 	version : "20070315",
 	/*forward : true,*/
 	mode : "dailybuild",

diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/META-INF/MANIFEST.MF b/dist/plugins/net.sf.j2s.ajax_3.1.1/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Java2Script AJAX Support
+Bundle-SymbolicName: net.sf.j2s.ajax; singleton:=true
+Bundle-Version: 3.1.1
+Bundle-Activator: net.sf.j2s.ajax.AjaxPlugin
+Bundle-Vendor: j2s.sourceforge.net
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.swt,
+ org.eclipse.jdt.core,
+ org.eclipse.core.resources,
+ org.eclipse.core.variables,
+ org.eclipse.jface
+Export-Package: net.sf.j2s.ajax
+Eclipse-LazyStart: true
+Bundle-ClassPath: ajaxlib.jar
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxcore.jar b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxcore.jar
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxcoresrc.zip b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxcoresrc.zip
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxlib.jar b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxlib.jar
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxlibsrc.zip b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxlibsrc.zip
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxpipe.jar b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxpipe.jar
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxpipesrc.zip b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxpipesrc.zip
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxrpc.jar b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxrpc.jar
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxrpcsrc.zip b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxrpcsrc.zip
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxstore.jar b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxstore.jar
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxstoresrc.zip b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxstoresrc.zip
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxswt.jar b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxswt.jar
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxswtsrc.zip b/dist/plugins/net.sf.j2s.ajax_3.1.1/ajaxswtsrc.zip
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/j2stag.jar b/dist/plugins/net.sf.j2s.ajax_3.1.1/j2stag.jar
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/j2stagsrc.zip b/dist/plugins/net.sf.j2s.ajax_3.1.1/j2stagsrc.zip
diff --git a/dist/plugins/net.sf.j2s.ajax_3.1.1/plugin.xml b/dist/plugins/net.sf.j2s.ajax_3.1.1/plugin.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+   <extension
+         point="org.eclipse.jdt.core.classpathVariableInitializer">
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_CORE"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_SWT"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_RPC"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_PIPE"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_STORE"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="J2S_ANNOTATION"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_CORE_SRC"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_SWT_SRC"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_RPC_SRC"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_PIPE_SRC"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_STORE_SRC"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="J2S_ANNOTATION_SRC"/>
+   </extension>
+
+</plugin>
diff --git a/dist/plugins/net.sf.j2s.core_3.1.1.jar b/dist/plugins/net.sf.j2s.core_3.1.1.jar
diff --git a/dist/plugins/net.sf.j2s.lib_3.1.1/META-INF/MANIFEST.MF b/dist/plugins/net.sf.j2s.lib_3.1.1/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Java2Script Library
+Bundle-SymbolicName: net.sf.j2s.lib; singleton:=true
+Bundle-Version: 3.1.1
+Bundle-Activator: net.sf.j2s.lib.LibPlugin
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime,
+ net.sf.j2s.ui
+Eclipse-AutoStart: true
+Bundle-Vendor: j2s.sourceforge.net
+Bundle-ClassPath: library.jar
diff --git a/dist/plugins/net.sf.j2s.lib_3.1.1/library.jar b/dist/plugins/net.sf.j2s.lib_3.1.1/library.jar
diff --git a/dist/plugins/net.sf.j2s.lib_3.1.1/librarysrc.zip b/dist/plugins/net.sf.j2s.lib_3.1.1/librarysrc.zip
diff --git a/dist/plugins/net.sf.j2s.lib_3.1.1/plugin.xml b/dist/plugins/net.sf.j2s.lib_3.1.1/plugin.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+   <extension
+         id="net.sf.j2s.innerjsresources"
+         name="Inner JS Resources"
+         point="net.sf.j2s.ui.externalResourceProvider">
+      <externalResourceProvider
+            class="net.sf.j2s.lib.providers.JavaRuntimeJSProvider"
+            id="net.sf.j2s.lib.providers.javaRuntimeJS"/>
+      <!--
+      <externalResourceProvider
+            class="net.sf.j2s.lib.providers.JavaSWTJSProvider"
+            id="net.sf.j2s.lib.providers.javaSWTJS"/>
+       -->
+   </extension>
+
+</plugin>
diff --git a/dist/plugins/net.sf.j2s.lib_3.1.1/src/net/sf/j2s/lib/LibPlugin.java b/dist/plugins/net.sf.j2s.lib_3.1.1/src/net/sf/j2s/lib/LibPlugin.java
@@ -0,0 +1,43 @@
+package net.sf.j2s.lib;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class LibPlugin extends Plugin {
+
+	//The shared instance.
+	private static LibPlugin plugin;
+
+	/**
+	 * The constructor.
+	 */
+	public LibPlugin() {
+		plugin = this;
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static LibPlugin getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/dist/plugins/net.sf.j2s.lib_3.1.1/src/net/sf/j2s/lib/build/Bundle2StringUtil.java b/dist/plugins/net.sf.j2s.lib_3.1.1/src/net/sf/j2s/lib/build/Bundle2StringUtil.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2007 java2script.org and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Zhou Renjian - initial API and implementation
+ *******************************************************************************/
+
+package net.sf.j2s.lib.build;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * @author zhou renjian
+ * 
+ * 2006-5-3
+ */
+public class Bundle2StringUtil {
+
+	/**
+	 * @param args
+	 * @throws FileNotFoundException
+	 */
+	public static void main(String[] args) throws FileNotFoundException {
+		String bundleName = null;
+		String basePath = "bin/";
+		if (args.length != 0) {
+			basePath = args[0];
+			bundleName = args[1];
+		} else {
+			bundleName = "net.sf.j2s.java.core.messages";
+		}
+		String bundlePath = bundleName.replaceAll("\\.", "/") + ".properties";
+		String content = RegExCompress.readFileAll(new FileInputStream(
+				new File(basePath, bundlePath)));
+		String contentStr = content
+				.replaceAll("\\s*#.*[\\r\\n]+", "")
+				.replaceAll("\\\\", "\\\\\\\\").replaceAll(
+				"\\t", "\\\\t").replaceAll("\\r", "\\\\r").replaceAll("\\n",
+				"\\\\n").replaceAll("\\'", "\\\\'")
+				.replaceAll("\\\"", "\\\\\"");
+		String jsStr = "java.util.ResourceBundle.registerBundle(\""
+				+ bundleName + "\", \"" + contentStr + "\");";
+		System.out.println(jsStr);
+		if (args.length != 0) {
+			try {
+				bundlePath = bundleName.replaceAll("\\.", "/") + ".js";
+				FileOutputStream fos = new FileOutputStream(new File(basePath,
+						bundlePath));
+				fos.write(jsStr.getBytes());
+				fos.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+}
diff --git a/dist/plugins/net.sf.j2s.lib_3.1.1/src/net/sf/j2s/lib/build/J2SConcat.java b/dist/plugins/net.sf.j2s.lib_3.1.1/src/net/sf/j2s/lib/build/J2SConcat.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2007 java2script.org and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Zhou Renjian - initial API and implementation
+ *******************************************************************************/
+
+package net.sf.j2s.lib.build;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * @author zhou renjian
+ *
+ * 2006-7-29
+ */
+public class J2SConcat {
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		boolean completelyCompressing = true;
+		int indexDelta = 1;
+		if (args.length > 0 && ("true".equals(args[0]) || "false".equals(args[0]))) {
+			completelyCompressing = "true".equals(args[0]);
+			indexDelta++;
+		}
+		File dest = new File(args[indexDelta - 1]);
+		StringBuffer buf = new StringBuffer();
+		String j2sKeySig = "/* http://j2s.sf.net/ */";
+		buf.append(j2sKeySig);
+		System.out.println("To " + dest.getAbsolutePath());
+		boolean isAllFileEarlier = dest.exists();
+		if (isAllFileEarlier) {
+			for (int i = 0; i < args.length - 1 - indexDelta; i++) {
+				File src = new File(args[indexDelta], args[i + 1 + indexDelta]);
+				if (!src.exists()) {
+					System.err.println("Source file " + src.getAbsolutePath() + " does not exist!");
+					return ;
+				}
+//				System.out.println("Checking " + args[i + 1 + indexDelta] + " ...");
+				if (src.lastModified() > dest.lastModified()) {
+					isAllFileEarlier = false;
+					break;
+				}
+			}
+			if (isAllFileEarlier) {
+				System.out.println("Already updated.");
+				return;
+			}
+		}
+		for (int i = 0; i < args.length - 1 - indexDelta; i++) {
+			File src = new File(args[indexDelta], args[i + 1 + indexDelta]);
+			try {
+				String s = RegExCompress.readFileAll(new FileInputStream(src));
+				if (s.startsWith(j2sKeySig)) {
+					s = s.substring(j2sKeySig.length());
+				}
+				if (s.startsWith("Clazz.load") || s.startsWith("$_L")) {
+					int idx1 = s.indexOf("{") + 1;
+					if (idx1 != -1) {
+						int idx2 = s.lastIndexOf("}");
+						if (idx2 != -1) {
+							s = s.substring(idx1, idx2);
+						}
+					}
+				}
+				/*
+				if (completelyCompressing) {
+					buf.append(RegExCompress.regexCompress(s));
+				} else {
+					buf.append(RegExCompress.regexCompress2(s));
+				}
+				*/
+				buf.append(s);
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+				return;
+			}
+		}
+		try {
+			FileOutputStream fos = new FileOutputStream(dest);
+			fos.write(new byte[] {(byte) 0xef, (byte) 0xbb, (byte) 0xbf}); // UTF-8 header!
+			if (completelyCompressing) {
+				fos.write(RegExCompress.regexCompress(buf.toString()).getBytes("UTF-8"));
+			} else {
+				fos.write(RegExCompress.regexCompress2(buf.toString()).getBytes("UTF-8"));
+			}
+			fos.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+	}
+}