Merge with /trunk for *.j2x support over cross project references

jossonsmith · jossonsmith · commit 8dc971eaef90 · 2006-08-12T09:30:32.000Z
diff --git a/src/net/sf/j2s/ui/classpath/CompositeResources.java b/src/net/sf/j2s/ui/classpath/CompositeResources.java
@@ -1,6 +1,7 @@
 package net.sf.j2s.ui.classpath;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -257,6 +258,25 @@ public String toJ2XString() {
 		if (resources == null) {
 			this.load();
 		}
+		if (this instanceof ProjectResources) {
+			ProjectResources pr = (ProjectResources) this;
+			File binFolder = new File(pr.getAbsoluteFolder(), this.binRelativePath);
+			File[] files = binFolder.listFiles(new FileFilter() {
+				public boolean accept(File pathname) {
+					if (pathname.isFile() && pathname.getName().endsWith(".j2x")) {
+						return true;
+					}
+					return false;
+				}
+			});
+			if (files != null && files.length != 0) {
+				for (int i = 0; i < files.length; i++) {
+					buf.append(files[i].getAbsolutePath());
+					buf.append(',');
+				}
+				return buf.toString();
+			}
+		}
 		for (Iterator iter = resources.iterator(); iter.hasNext();) {
 			Resource res = (Resource) iter.next();
 			if (!J2SCyclicProjectUtils.visit(res)) {
@@ -290,6 +310,33 @@ public String existedClassesString() {
 		if (resources == null) {
 			this.load();
 		}
+		if (this instanceof ProjectResources) {
+			ProjectResources pr = (ProjectResources) this;
+			File binFolder = new File(pr.getAbsoluteFolder(), this.binRelativePath);
+			File[] files = binFolder.listFiles(new FileFilter() {
+				public boolean accept(File pathname) {
+					if (pathname.isFile() && pathname.getName().endsWith(".j2x")) {
+						return true;
+					}
+					return false;
+				}
+			});
+			if (files != null && files.length != 0) { // should always one *.j2x file
+				Properties prop = new Properties();
+				try {
+					prop.load(new FileInputStream(files[0]));
+				} catch (FileNotFoundException e) {
+					e.printStackTrace();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+				String pkg = prop.getProperty("package.prefix");
+				File pkgFile = new File(files[0].getParentFile(), pkg.replace('.', '/') + "/package.js");
+				if (pkgFile.exists()) {
+					return buf.toString();
+				}
+			}
+		}
 		buf.append('[');
 		try {
 			buf.append(new File(getAbsoluteFolder(), binRelativePath).getCanonicalPath());
diff --git a/src/net/sf/j2s/ui/classpath/IRuntimeClasspathEntry.java b/src/net/sf/j2s/ui/classpath/IRuntimeClasspathEntry.java
@@ -12,7 +12,6 @@
 
 
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
diff --git a/src/net/sf/j2s/ui/classpath/ProjectResources.java b/src/net/sf/j2s/ui/classpath/ProjectResources.java
@@ -1,7 +1,6 @@
 package net.sf.j2s.ui.classpath;
 
 import java.io.File;
-import java.util.Iterator;
 
 
 public class ProjectResources extends CompositeResources {
diff --git a/src/net/sf/j2s/ui/classpath/Resource.java b/src/net/sf/j2s/ui/classpath/Resource.java
@@ -11,7 +11,6 @@
 import org.eclipse.jdt.core.IJavaModel;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
 
 public class Resource implements IRuntimeClasspathEntry {
 	private Resource parent;
diff --git a/src/net/sf/j2s/ui/launching/J2SLaunchingUtil.java b/src/net/sf/j2s/ui/launching/J2SLaunchingUtil.java
@@ -623,18 +623,12 @@ private static String generateHTML(ILaunchConfiguration configuration,
 			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");
 
-
 		J2SCyclicProjectUtils.emptyTracks();
 		buf.append(generateClasspathIgnoredClasses(configuration, mainType, workingDir));
 
diff --git a/src/net/sf/j2s/ui/launching/J2SUnitLaunchingUtil.java b/src/net/sf/j2s/ui/launching/J2SUnitLaunchingUtil.java
@@ -627,7 +627,7 @@ private static String generateHTML(ILaunchConfiguration configuration,
 			buf.append("\", true);\r\n");
 		}
 		buf.append(j2xStr);
-
+		
 		buf.append("ClazzLoader.setPrimaryFolder (\"");
 		buf.append(relativePath);
 		buf.append("\");\r\n");
@@ -638,8 +638,6 @@ 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);
 		buf.append("ClazzLoader.loadClass (\"junit.textui.TestRunner\", function () {\r\n");
 		buf.append("ClazzLoader.loadClass (\"" + mainType + "\", function () {\r\n");
