java2script
diff --git a/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java‎
Lines changed: 8 additions & 10 deletions b/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java‎
Lines changed: 8 additions & 10 deletions
diff --git a/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
118 Bytes b/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
118 Bytes
diff --git a/‎sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java‎
Lines changed: 4 additions & 2 deletions b/‎sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.js‎
Lines changed: 0 additions & 26 deletions b/‎sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.js‎
Lines changed: 0 additions & 26 deletions
@@ -18,21 +18,15 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.dom.AST;
 import org.eclipse.jdt.core.dom.ASTParser;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
-import org.eclipse.jdt.internal.core.builder.SourceFile;
 
 import net.sf.j2s.core.CorePlugin;
 import net.sf.j2s.core.astvisitors.Java2ScriptVisitor;
-//import net.sf.j2s.core.builder.SourceFile;
-//import net.sf.j2s.core.builder.SourceFileProxy;
-//import net.sf.j2s.core.hotspot.InnerHotspotServer;
 
 /**
  * The main (and currently only operational) Java2Script compiler.
@@ -42,7 +36,11 @@
  */
 @SuppressWarnings("restriction")
 public class Java2ScriptCompiler {
-
+	/**
+	 * The name of the J2S options file, aka as the "Dot-j2s" file.
+	 */
+	public static final String J2S_OPTIONS_FILE_NAME = ".j2s";
+	
 	// BH: added "true".equals(getProperty(props,
 	// "j2s.compiler.allow.compression")) to ensure compression only occurs when
 	// desired
@@ -83,8 +81,8 @@ public class Java2ScriptCompiler {
 
 	public static boolean isActive(IProject project) {
 		try {
-			return new File(project.getProject().getLocation().toOSString(), ".J2S").exists();
-		} catch (Exception e) {
+			return new File(project.getProject().getLocation().toOSString(), J2S_OPTIONS_FILE_NAME).exists();
+		} catch (@SuppressWarnings("unused") Exception e) {
 			return false;
 		}
 	}
@@ -141,7 +139,7 @@ public boolean initializeProject(IProject project, boolean isCompilationParticip
 		projectFolder = project.getLocation().toOSString();
 		props = new Properties();
 		try {
-			File j2sFile = new File(projectFolder, ".j2s");
+			File j2sFile = new File(projectFolder, J2S_OPTIONS_FILE_NAME);
 			props.load(new FileInputStream(j2sFile));
 			String status = getProperty("j2s.compiler.status");
 			if (!"enable".equals(status) && !"enabled".equals(status)) {
 
@@ -169,7 +169,7 @@ public static String getJavaResource(String resourceName, boolean isJavaPath,
 				+ (ok ? "" + sdata.length() : sdata) + "]");
 		return (!ok ? null : !doProcess ? sdata
 				: path.endsWith(".css") ? JSUtil.processCSS(sdata, path) : path
-						.endsWith(".js") ? JSUtil.processJS(sdata) : sdata);
+						.endsWith(".js") ? JSUtil.processJS(sdata, resourceName) : sdata);
 	}
 
 	static void cacheFileData(String path, Object data) {		
@@ -231,11 +231,13 @@ static String processCSS(String css, String path) {
 	return css;
 	}
 
-	static String processJS(String js) {
+	static String processJS(String js, String resourceName) {
 	try {
 		/**
 		 * @j2sNative
 		 * 
+		 * 
+		 * if (js.indexOf(";//# sourceURL=") < 0) js += ";//# sourceURL=" + thisApplet._j2sPath + "/" + resourceName;
 		 * eval(js);
 		 * 
 		 */
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public static String getJavaResource(String resourceName, boolean isJavaPath,`
`169`	`169`	`+ (ok ? "" + sdata.length() : sdata) + "]");`
`170`	`170`	`return (!ok ? null : !doProcess ? sdata`
`171`	`171`	`: path.endsWith(".css") ? JSUtil.processCSS(sdata, path) : path`
`172`		`- .endsWith(".js") ? JSUtil.processJS(sdata) : sdata);`
	`172`	`+ .endsWith(".js") ? JSUtil.processJS(sdata, resourceName) : sdata);`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`static void cacheFileData(String path, Object data) {`
`@@ -231,11 +231,13 @@ static String processCSS(String css, String path) {`
`231`	`231`	`return css;`
`232`	`232`	`}`
`233`	`233`
`234`		`- static String processJS(String js) {`
	`234`	`+ static String processJS(String js, String resourceName) {`
`235`	`235`	`try {`
`236`	`236`	`/**`
`237`	`237`	`* @j2sNative`
`238`	`238`	`*`
	`239`	`+ *`
	`240`	`+ * if (js.indexOf(";//# sourceURL=") < 0) js += ";//# sourceURL=" + thisApplet._j2sPath + "/" + resourceName;`
`239`	`241`	`* eval(js);`
`240`	`242`	`*`
`241`	`243`	`*/`