Merge branch 3.3's modifications to revision 918

zhourenjian · zhourenjian · commit ede86f400d40 · 2008-12-02T16:56:15.000Z
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Java2Script Development Tools UI
 Bundle-SymbolicName: net.sf.j2s.ui; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0
 Bundle-Activator: net.sf.j2s.ui.Java2ScriptUIPlugin
 Bundle-Vendor: j2s.sourceforge.net
 Bundle-Localization: plugin
diff --git a/src/net/sf/j2s/ui/launching/J2SLaunchingUtil.java b/src/net/sf/j2s/ui/launching/J2SLaunchingUtil.java
@@ -138,7 +138,7 @@ public static void launchingJ2SUnit(ILaunchConfiguration configuration, String m
 			
 			if (addonCompatiable) {
 				generateFirefoxAddonPreJavaScript(buf, j2sLibPath, gj2sLibPath,
-						grelativePath, mainType, workingDir, configuration);
+						grelativePath, isJUnit, mainType, workingDir, configuration);
 				
 				buf.append("\t\tClazzLoader.loadClass (\"junit.textui.TestRunner\", function () {\r\n");
 				buf.append("\t\t\tClazzLoader.loadClass (\"" + mainType + "\", function () {\r\n");
@@ -293,7 +293,7 @@ public static void launchingJ2SApp(ILaunchConfiguration configuration, String mo
 			
 			if (addonCompatiable) {
 				generateFirefoxAddonPreJavaScript(buf, j2sLibPath, gj2sLibPath,
-						grelativePath, mainType, workingDir, configuration);
+						grelativePath, isJUnit, mainType, workingDir, configuration);
 				
 				buf.append("\t\tClazzLoader.loadClass (\"" + mainType + "\", function () {\r\n");
 				String mainTypeName = new ASTTypeVisitor().assureQualifiedName(mainType);
@@ -405,14 +405,14 @@ private static void generateFirefoxAddonPostJavaScript(StringBuffer buf,
 
 	private static void generateFirefoxAddonPreJavaScript(StringBuffer buf,
 			String j2sLibPath, String gj2sLibPath, String grelativePath,
-			String mainType, File workingDir, ILaunchConfiguration configuration)
+			boolean isJUnit, String mainType, File workingDir, ILaunchConfiguration configuration)
 			throws CoreException {
 		buf.append("window[\"j2s.lib\"] = {\r\n");
 		File j2slibFolder = new File(workingDir.getAbsolutePath(), j2sLibPath);
 		File j2sRelease = new File(j2slibFolder, ".release");
 		Properties release = new Properties();
 		String alias = "1.0.0";
-		String version = "20071001";
+		String version = "20081203";
 		release.put("alias", alias);
 		release.put("version", version);
 		if (j2sRelease.exists()) {
@@ -449,10 +449,15 @@ private static void generateFirefoxAddonPreJavaScript(StringBuffer buf,
 		buf.append("\t/*forward : true,*/\r\n");
 		buf.append("\tmode : \"dailybuild\",\r\n");
 		buf.append("\tonload : function () {\r\n");
-		String j2xStr = J2SLaunchingUtil.generateClasspathJ2X(configuration, "j2slibPath", workingDir);
+		String j2xStr = J2SLaunchingUtil.generateClasspathJ2X(configuration, "j2sBase", workingDir);
 		if (j2xStr != null && j2xStr.length() != 0) {
-			buf.append("\t\tvar o = window[\"j2s.lib\"];\r\n");
-			buf.append("\t\tvar j2slibPath = o.base + (o.alias ? o.alias : o.version) + \"/\";\r\n");
+			buf.append("\t\tvar j2sBase = window[\"j2s.lib\"].j2sBase;\r\n");
+			if (j2xStr.indexOf("\"java\"") == -1) {
+				buf.append("\t\tClazzLoader.packageClasspath (\"java\", j2sBase, true);\r\n");
+			}
+			if (isJUnit && j2xStr.indexOf("\"junit\"") == -1) {
+				buf.append("\t\tClazzLoader.packageClasspath (\"junit\", j2sBase, true);\r\n");
+			}
 			buf.append("\t\t");
 			buf.append(j2xStr.replaceAll("\r\n", "\r\n\t\t").trim());
 			buf.append("\r\n");
@@ -750,6 +755,7 @@ static String generateClasspathJ2X(
 				String propStr = "j2s.output.path=" + relativePath + "\r\nj2s.resources.list=" + classpath;
 				fModel.load(new ByteArrayInputStream(propStr.getBytes()));
 			}
+			J2SCyclicProjectUtils.emptyTracks();
 			buf.append(fModel.toJ2XString());
 		}
 		
diff --git a/src/net/sf/j2s/ui/variables/SWTVariableInitializer.java b/src/net/sf/j2s/ui/variables/SWTVariableInitializer.java
@@ -57,7 +57,7 @@ public void initialize(String variable) {
 			File[] swtJars = file.listFiles(new FileFilter() {
 				public boolean accept(File pathname) {
 					String name = pathname.getName().toLowerCase();
-					if (name.startsWith("org.eclipse.swt.") && name.endsWith(".jar")) {
+					if (name.startsWith("org.eclipse.swt.") && name.endsWith(".jar") && name.indexOf("source") == -1) {
 						return true;
 					}
 					return false;

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public void initialize(String variable) {`
`57`	`57`	`File[] swtJars = file.listFiles(new FileFilter() {`
`58`	`58`	`public boolean accept(File pathname) {`
`59`	`59`	`String name = pathname.getName().toLowerCase();`
`60`		`- if (name.startsWith("org.eclipse.swt.") && name.endsWith(".jar")) {`
	`60`	`+ if (name.startsWith("org.eclipse.swt.") && name.endsWith(".jar") && name.indexOf("source") == -1) {`
`61`	`61`	`return true;`
`62`	`62`	`}`
`63`	`63`	`return false;`