Fixing bug#2797451 j2s incorrectly sets up namespace of cross-referenced project

zhourenjian · zhourenjian · commit 3da25b75efca · 2009-05-27T16:54:44.000Z
http://sourceforge.net/tracker/?func=detail&aid=2797451&group_id=155436&atid=795800
diff --git a/src/net/sf/j2s/ui/property/FileUtil.java b/src/net/sf/j2s/ui/property/FileUtil.java
@@ -42,7 +42,7 @@ public static String toRelativePath(String absPath, String basePath) {
 			int lastIndex = index;
 			while (index != -1) {
 				String partURL = absURL.substring(0, index);
-				if (!baseURL.startsWith(partURL)) {
+				if (!baseURL.startsWith(partURL + "/") && !baseURL.equals(partURL)) {
 					break;
 				}
 				lastIndex = index;
@@ -69,4 +69,10 @@ public static String toRelativePath(String absPath, String basePath) {
 			return null;
 		}
 	}
+	
+//	public static void main(String[] args) {
+//		String relativeStr = toRelativePath("D:/eclipse-3.3/eclipse/workspace/org.eclipse.draw2d/bin", "D:/eclipse-3.3/eclipse/workspace/org.eclipse.draw2d.examples");
+//		String relativeStr = toRelativePath("D:/eclipse-3.3/eclipse/workspace/org.eclipse.draw2d.examples/bin", "D:/eclipse-3.3/eclipse/workspace/org.eclipse.draw2d.examples/");
+//		System.out.println(relativeStr);
+//	}
 }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static String toRelativePath(String absPath, String basePath) {`
`42`	`42`	`int lastIndex = index;`
`43`	`43`	`while (index != -1) {`
`44`	`44`	`String partURL = absURL.substring(0, index);`
`45`		`- if (!baseURL.startsWith(partURL)) {`
	`45`	`+ if (!baseURL.startsWith(partURL + "/") && !baseURL.equals(partURL)) {`
`46`	`46`	`break;`
`47`	`47`	`}`
`48`	`48`	`lastIndex = index;`
`@@ -69,4 +69,10 @@ public static String toRelativePath(String absPath, String basePath) {`
`69`	`69`	`return null;`
`70`	`70`	`}`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+// public static void main(String[] args) {`
	`74`	`+// String relativeStr = toRelativePath("D:/eclipse-3.3/eclipse/workspace/org.eclipse.draw2d/bin", "D:/eclipse-3.3/eclipse/workspace/org.eclipse.draw2d.examples");`
	`75`	`+// String relativeStr = toRelativePath("D:/eclipse-3.3/eclipse/workspace/org.eclipse.draw2d.examples/bin", "D:/eclipse-3.3/eclipse/workspace/org.eclipse.draw2d.examples/");`
	`76`	`+// System.out.println(relativeStr);`
	`77`	`+// }`
`72`	`78`	`}`