Support ealier projects with no libraries.

jossonsmith · jossonsmith · commit 04c2c571fc4d · 2006-08-12T05:13:41.000Z
diff --git a/sources/net.sf.j2s.ui/src/net/sf/j2s/ui/launching/J2SLaunchingUtil.java b/sources/net.sf.j2s.ui/src/net/sf/j2s/ui/launching/J2SLaunchingUtil.java
@@ -612,7 +612,18 @@ private static String generateHTML(ILaunchConfiguration configuration,
 		*/
 
 		J2SCyclicProjectUtils.emptyTracks();
-		buf.append(generateClasspathJ2X(configuration, mainType, workingDir));
+		String j2xStr = generateClasspathJ2X(configuration, mainType, workingDir);
+		if (j2xStr.indexOf("\"java\"") == -1) {
+			buf.append("ClazzLoader.packageClasspath (\"java\", \"");
+			buf.append(j2sLibPath);
+			buf.append("\", true);\r\n");
+		}
+		if (j2xStr.indexOf("\"junit\"") == -1) {
+			buf.append("ClazzLoader.packageClasspath (\"junit\", \"");
+			buf.append(j2sLibPath);
+			buf.append("\", true);\r\n");
+		}
+		buf.append(j2xStr);
 		
 		buf.append("ClazzLoader.setPrimaryFolder (\"");
 		buf.append(relativePath);
diff --git a/sources/net.sf.j2s.ui/src/net/sf/j2s/ui/launching/J2SUnitLaunchingUtil.java b/sources/net.sf.j2s.ui/src/net/sf/j2s/ui/launching/J2SUnitLaunchingUtil.java
@@ -572,9 +572,6 @@ private static String generateHTML(ILaunchConfiguration configuration,
 		J2SCyclicProjectUtils.emptyTracks();
 		buf.append(generateClasspathHTML(configuration, mainType, workingDir));
 
-		J2SCyclicProjectUtils.emptyTracks();
-		buf.append(generateClasspathHTML(configuration, mainType, workingDir));
-
 		buf.append(configuration.getAttribute(
 				IJ2SLauchingConfiguration.TAIL_HEADER_HTML, ""));
 		buf.append("</head>\r\n");
@@ -611,10 +608,21 @@ private static String generateHTML(ILaunchConfiguration configuration,
 		buf.append(j2sLibPath);
 		buf.append("\");\r\n");
 		*/
-		buf.append("ClazzLoader.packageClasspath ([\"java\", \"junit\", \"swt\"], \"");
-		buf.append(j2sLibPath);
-		buf.append("\", true);\r\n");
-		
+
+		J2SCyclicProjectUtils.emptyTracks();
+		String j2xStr = generateClasspathJ2X(configuration, mainType, workingDir);
+		if (j2xStr.indexOf("\"java\"") == -1) {
+			buf.append("ClazzLoader.packageClasspath (\"java\", \"");
+			buf.append(j2sLibPath);
+			buf.append("\", true);\r\n");
+		}
+		if (j2xStr.indexOf("\"junit\"") == -1) {
+			buf.append("ClazzLoader.packageClasspath (\"junit\", \"");
+			buf.append(j2sLibPath);
+			buf.append("\", true);\r\n");
+		}
+		buf.append(j2xStr);
+
 		buf.append("ClazzLoader.setPrimaryFolder (\"");
 		buf.append(relativePath);
 		buf.append("\");\r\n");
@@ -625,7 +633,7 @@ private static String generateHTML(ILaunchConfiguration configuration,
 		J2SCyclicProjectUtils.emptyTracks();
 		buf.append(generateClasspathExistedClasses(configuration, mainType, workingDir));
 
-		String args = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String) null);
+		//String args = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String) null);
 		
 		//String args = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String) null);
 		buf.append("ClazzLoader.loadClass (\"junit.textui.TestRunner\", function () {\r\n");
