Fixed bug#1563609. Merge from trunk

jossonsmith · jossonsmith · commit 26bb58c06ce8 · 2006-09-23T03:36:15.000Z
diff --git a/src/net/sf/j2s/ui/launching/J2SLaunchingUtil.java b/src/net/sf/j2s/ui/launching/J2SLaunchingUtil.java
@@ -288,14 +288,20 @@ private static String generateClasspathExistedClasses (
 		String path = javaProject.getOutputLocation().toString();
 		int idx = path.indexOf('/', 2);
 		String relativePath = null;
+		File srcFolder = null;
 		if (idx != -1) {
-			relativePath = path.substring(idx + 1); 
+			relativePath = path.substring(idx + 1);
+			srcFolder = new File(workingDir, relativePath);
+		} else {
+			relativePath = "";
+			srcFolder = workingDir;
 		}
 
 		buf.append('[');
 		try {
-			buf.append(new File(workingDir, relativePath).getCanonicalPath());
+			buf.append(srcFolder.getCanonicalPath());
 		} catch (IOException e) {
+			// should never run into these lines!
 			e.printStackTrace();
 			buf.append(relativePath);
 		}
@@ -394,9 +400,9 @@ private static String generateClasspathExistedClasses (
 				int idx2 = clazzName.lastIndexOf(".");
 				if (idx2 != -1) {
 					clazzName = clazzName.substring(0, idx2);
+					set.add(clazzName);
+					existedPackages = true;
 				}
-				set.add(clazzName);
-				existedPackages = true;
 			}
 		}
 		if (existedPackages) {
diff --git a/src/net/sf/j2s/ui/launching/J2SUnitLaunchingUtil.java b/src/net/sf/j2s/ui/launching/J2SUnitLaunchingUtil.java
@@ -289,14 +289,20 @@ private static String generateClasspathExistedClasses (
 		String path = javaProject.getOutputLocation().toString();
 		int idx = path.indexOf('/', 2);
 		String relativePath = null;
+		File srcFolder = null;
 		if (idx != -1) {
-			relativePath = path.substring(idx + 1); 
+			relativePath = path.substring(idx + 1);
+			srcFolder = new File(workingDir, relativePath);
+		} else {
+			relativePath = "";
+			srcFolder = workingDir;
 		}
 
 		buf.append('[');
 		try {
-			buf.append(new File(workingDir, relativePath).getCanonicalPath());
+			buf.append(srcFolder.getCanonicalPath());
 		} catch (IOException e) {
+			// should never run into these lines!
 			e.printStackTrace();
 			buf.append(relativePath);
 		}
@@ -395,9 +401,9 @@ private static String generateClasspathExistedClasses (
 				int idx2 = clazzName.lastIndexOf(".");
 				if (idx2 != -1) {
 					clazzName = clazzName.substring(0, idx2);
+					set.add(clazzName);
+					existedPackages = true;
 				}
-				set.add(clazzName);
-				existedPackages = true;
 			}
 		}
 		if (existedPackages) {
diff --git a/src/net/sf/j2s/ui/property/J2SConfigPage.java b/src/net/sf/j2s/ui/property/J2SConfigPage.java
@@ -422,9 +422,9 @@ protected void updateButtonGroup() {
 			return ;
 		}
 		if (isSelectionInOneCategory()) {
-			if (!isAbandonsSelected()) {
+			//if (!isAbandonsSelected()) {
 				buttonRemove.setEnabled(true);
-			}
+			//}
 			if (!isLastElementSelected()) {
 				buttonDown.setEnabled(true);
 			}
@@ -443,9 +443,9 @@ protected void updateButtonGroup() {
 				}
 			}
 		} else if (!isSelectionContainsCategory() && getSelection().length > 0) {
-			if (!isAbandonsSelected()) {
+			//if (!isAbandonsSelected()) {
 				buttonRemove.setEnabled(true);
-			}
+			//}
 		}
 		if (getSelection().length == 1) {
 			if (isResourceCategorySelected()) {

Original file line number	Diff line number	Diff line change
`@@ -422,9 +422,9 @@ protected void updateButtonGroup() {`
`422`	`422`	`return ;`
`423`	`423`	`}`
`424`	`424`	`if (isSelectionInOneCategory()) {`
`425`		`- if (!isAbandonsSelected()) {`
	`425`	`+ //if (!isAbandonsSelected()) {`
`426`	`426`	`buttonRemove.setEnabled(true);`
`427`		`- }`
	`427`	`+ //}`
`428`	`428`	`if (!isLastElementSelected()) {`
`429`	`429`	`buttonDown.setEnabled(true);`
`430`	`430`	`}`
`@@ -443,9 +443,9 @@ protected void updateButtonGroup() {`
`443`	`443`	`}`
`444`	`444`	`}`
`445`	`445`	`} else if (!isSelectionContainsCategory() && getSelection().length > 0) {`
`446`		`- if (!isAbandonsSelected()) {`
	`446`	`+ //if (!isAbandonsSelected()) {`
`447`	`447`	`buttonRemove.setEnabled(true);`
`448`		`- }`
	`448`	`+ //}`
`449`	`449`	`}`
`450`	`450`	`if (getSelection().length == 1) {`
`451`	`451`	`if (isResourceCategorySelected()) {`