Commit3da25b7

zhourenjian

committed

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

1 parent7f6a018 commit3da25b7Copy full SHA for 3da25b7

File tree

-1

lines changed

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static String toRelativePath(String absPath, String basePath) {`
`42`	`42`	`intlastIndex =index;`
`43`	`43`	`while (index != -1) {`
`44`	`44`	`StringpartURL =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`	`returnnull;`
`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`	`}`

Comments

(0)