Fixed bug for those projects with default source or binary folder

zhourenjian · zhourenjian · commit 034ff6efed3b · 2007-03-10T13:40:55.000Z
diff --git a/sources/net.sf.j2s.ui/src/net/sf/j2s/ui/launching/J2SConsoleOptionsTab.java b/sources/net.sf.j2s.ui/src/net/sf/j2s/ui/launching/J2SConsoleOptionsTab.java
@@ -69,7 +69,7 @@ public J2SConsoleOptionsTab() {
 
 	public void createControl(Composite parent) {
 		Font font = parent.getFont();
-		Composite comp = new Composite(parent, parent.getStyle());
+		Composite comp = new Composite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout(1, true);
 		comp.setLayout(layout);
 		comp.setFont(font);
@@ -294,7 +294,7 @@ private String getCurrentBinPath(ILaunchConfiguration configuration) {
 			}
 			String path = javaProject.getOutputLocation().toString();
 			int idx = path.indexOf('/', 2);
-			String relativePath = "";
+			String relativePath = "./";
 			if (idx != -1) {
 				relativePath = path.substring(idx + 1); 
 			}
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
@@ -283,6 +283,9 @@ public boolean accept(File pathname) {
 					String gj2sLibPath = j2slibPath;
 					if (isUseGlobalURL) {
 						gj2sLibPath = configuration.getAttribute(IJ2SLauchingConfiguration.GLOBAL_J2SLIB_URL, j2slibPath);
+						if (gj2sLibPath.length() == 0) {
+							gj2sLibPath = "./";
+						}
 						if (!gj2sLibPath.endsWith("/")) {
 							gj2sLibPath += "/";
 						}
@@ -415,6 +418,9 @@ private static String generateClasspathExistedClasses (
 							String glastLocation = lastLocation;
 							if (isUseGlobalURL) {
 								glastLocation = configuration.getAttribute(IJ2SLauchingConfiguration.GLOBAL_BINARY_URL, lastLocation);
+								if (glastLocation.length() == 0) {
+									glastLocation = "./";
+								}
 								if (!glastLocation.endsWith("/")) {
 									glastLocation += "/";
 								}
@@ -455,6 +461,9 @@ private static String generateClasspathExistedClasses (
 				String glastLocation = lastLocation;
 				if (isUseGlobalURL) {
 					glastLocation = configuration.getAttribute(IJ2SLauchingConfiguration.GLOBAL_BINARY_URL, lastLocation);
+					if (glastLocation.length() == 0) {
+						glastLocation = "./";
+					}
 					if (!glastLocation.endsWith("/")) {
 						glastLocation += "/";
 					}
@@ -643,6 +652,9 @@ private static String generateHTML(ILaunchConfiguration configuration,
 		String gj2sLibPath = j2sLibPath;
 		if (isUseGlobalURL) {
 			gj2sLibPath = configuration.getAttribute(IJ2SLauchingConfiguration.GLOBAL_J2SLIB_URL, j2sLibPath);
+			if (gj2sLibPath.length() == 0) {
+				gj2sLibPath = "./";
+			}
 			if (!gj2sLibPath.endsWith("/")) {
 				gj2sLibPath += "/";
 			}
@@ -705,6 +717,9 @@ private static String generateHTML(ILaunchConfiguration configuration,
 		String grelativePath = relativePath;
 		if (isUseGlobalURL) {
 			grelativePath = configuration.getAttribute(IJ2SLauchingConfiguration.GLOBAL_BINARY_URL, relativePath);
+			if (grelativePath.length() == 0) {
+				grelativePath = "./";
+			}
 			if (!grelativePath.endsWith("/")) {
 				grelativePath += "/";
 			}
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
@@ -284,6 +284,9 @@ public boolean accept(File pathname) {
 					String gj2sLibPath = j2slibPath;
 					if (isUseGlobalURL) {
 						gj2sLibPath = configuration.getAttribute(IJ2SLauchingConfiguration.GLOBAL_J2SLIB_URL, j2slibPath);
+						if (gj2sLibPath.length() == 0) {
+							gj2sLibPath = "./";
+						}
 						if (!gj2sLibPath.endsWith("/")) {
 							gj2sLibPath += "/";
 						}
@@ -416,6 +419,9 @@ private static String generateClasspathExistedClasses (
 							String glastLocation = lastLocation;
 							if (isUseGlobalURL) {
 								glastLocation = configuration.getAttribute(IJ2SLauchingConfiguration.GLOBAL_BINARY_URL, lastLocation);
+								if (glastLocation.length() == 0) {
+									glastLocation = "./";
+								}
 								if (!glastLocation.endsWith("/")) {
 									glastLocation += "/";
 								}
@@ -456,6 +462,9 @@ private static String generateClasspathExistedClasses (
 				String glastLocation = lastLocation;
 				if (isUseGlobalURL) {
 					glastLocation = configuration.getAttribute(IJ2SLauchingConfiguration.GLOBAL_BINARY_URL, lastLocation);
+					if (glastLocation.length() == 0) {
+						glastLocation = "./";
+					}
 					if (!glastLocation.endsWith("/")) {
 						glastLocation += "/";
 					}
@@ -644,6 +653,9 @@ private static String generateHTML(ILaunchConfiguration configuration,
 		String gj2sLibPath = j2sLibPath;
 		if (isUseGlobalURL) {
 			gj2sLibPath = configuration.getAttribute(IJ2SLauchingConfiguration.GLOBAL_J2SLIB_URL, j2sLibPath);
+			if (gj2sLibPath.length() == 0) {
+				gj2sLibPath = "./";
+			}
 			if (!gj2sLibPath.endsWith("/")) {
 				gj2sLibPath += "/";
 			}
@@ -706,6 +718,9 @@ private static String generateHTML(ILaunchConfiguration configuration,
 		String grelativePath = relativePath;
 		if (isUseGlobalURL) {
 			grelativePath = configuration.getAttribute(IJ2SLauchingConfiguration.GLOBAL_BINARY_URL, relativePath);
+			if (grelativePath.length() == 0) {
+				grelativePath = "./";
+			}
 			if (!grelativePath.endsWith("/")) {
 				grelativePath += "/";
 			}
