Commit26bb58c

jossonsmith

committed

Fixed bug#1563609. Merge from trunk

1 parent862f1a8 commit26bb58cCopy full SHA for 26bb58c

File tree

+24

-12

lines changed

+24

-12

lines changed

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -288,14 +288,20 @@ private static String generateClasspathExistedClasses (`
`288`	`288`	`Stringpath =javaProject.getOutputLocation().toString();`
`289`	`289`	`intidx =path.indexOf('/',2);`
`290`	`290`	`StringrelativePath =null;`
	`291`	`+FilesrcFolder =null;`
`291`	`292`	`if (idx != -1) {`
`292`		`-relativePath =path.substring(idx +1);`
	`293`	`+relativePath =path.substring(idx +1);`
	`294`	`+srcFolder =newFile(workingDir,relativePath);`
	`295`	`+}else {`
	`296`	`+relativePath ="";`
	`297`	`+srcFolder =workingDir;`
`293`	`298`	`}`
`294`	`299`
`295`	`300`	`buf.append('[');`
`296`	`301`	`try {`
`297`		`-buf.append(newFile(workingDir,relativePath).getCanonicalPath());`
	`302`	`+buf.append(srcFolder.getCanonicalPath());`
`298`	`303`	`}catch (IOExceptione) {`
	`304`	`+// should never run into these lines!`
`299`	`305`	`e.printStackTrace();`
`300`	`306`	`buf.append(relativePath);`
`301`	`307`	`}`
`@@ -394,9 +400,9 @@ private static String generateClasspathExistedClasses (`
`394`	`400`	`intidx2 =clazzName.lastIndexOf(".");`
`395`	`401`	`if (idx2 != -1) {`
`396`	`402`	`clazzName =clazzName.substring(0,idx2);`
	`403`	`+set.add(clazzName);`
	`404`	`+existedPackages =true;`
`397`	`405`	`}`
`398`		`-set.add(clazzName);`
`399`		`-existedPackages =true;`
`400`	`406`	`}`
`401`	`407`	`}`
`402`	`408`	`if (existedPackages) {`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -289,14 +289,20 @@ private static String generateClasspathExistedClasses (`
`289`	`289`	`Stringpath =javaProject.getOutputLocation().toString();`
`290`	`290`	`intidx =path.indexOf('/',2);`
`291`	`291`	`StringrelativePath =null;`
	`292`	`+FilesrcFolder =null;`
`292`	`293`	`if (idx != -1) {`
`293`		`-relativePath =path.substring(idx +1);`
	`294`	`+relativePath =path.substring(idx +1);`
	`295`	`+srcFolder =newFile(workingDir,relativePath);`
	`296`	`+}else {`
	`297`	`+relativePath ="";`
	`298`	`+srcFolder =workingDir;`
`294`	`299`	`}`
`295`	`300`
`296`	`301`	`buf.append('[');`
`297`	`302`	`try {`
`298`		`-buf.append(newFile(workingDir,relativePath).getCanonicalPath());`
	`303`	`+buf.append(srcFolder.getCanonicalPath());`
`299`	`304`	`}catch (IOExceptione) {`
	`305`	`+// should never run into these lines!`
`300`	`306`	`e.printStackTrace();`
`301`	`307`	`buf.append(relativePath);`
`302`	`308`	`}`
`@@ -395,9 +401,9 @@ private static String generateClasspathExistedClasses (`
`395`	`401`	`intidx2 =clazzName.lastIndexOf(".");`
`396`	`402`	`if (idx2 != -1) {`
`397`	`403`	`clazzName =clazzName.substring(0,idx2);`
	`404`	`+set.add(clazzName);`
	`405`	`+existedPackages =true;`
`398`	`406`	`}`
`399`		`-set.add(clazzName);`
`400`		`-existedPackages =true;`
`401`	`407`	`}`
`402`	`408`	`}`
`403`	`409`	`if (existedPackages) {`

Lines changed: 4 additions & 4 deletions

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`	`}elseif (!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()) {`

Comments

(0)