Bug 536335 - [9] Quick Fix to fix project setup always adds to classpath
Change-Id: I7e2abde6139bf6bf88f219dfb7c416582392c2ae
Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/DefaultClasspathFixProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/DefaultClasspathFixProcessor.java
index b7f1116..14c794e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/DefaultClasspathFixProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/DefaultClasspathFixProcessor.java
@@ -206,10 +206,12 @@
}
Change cuChange= null;
String moduleName= null;
+ boolean isModule= false;
if (typesWithModule.contains(curr)) {
moduleName= typeNameMatchToModuleName.get(curr);
if (moduleName != null && currentModuleDescription != null) {
ICompilationUnit currentCU= currentModuleDescription.getCompilationUnit();
+ isModule= true;
String[] args= { moduleName };
final String changeName= Messages.format(CorrectionMessages.UnresolvedElementsSubProcessor_add_requires_module_info, args);
final String changeDescription= Messages.format(CorrectionMessages.UnresolvedElementsSubProcessor_add_requires_module_description, args);
@@ -224,7 +226,7 @@
int entryKind= entry.getEntryKind();
if ((entry.isExported() || entryKind == IClasspathEntry.CPE_SOURCE) && addedClaspaths.add(other)) {
IClasspathEntry newEntry= null;
- if (cuChange != null) {
+ if (isModule) {
IClasspathAttribute[] extraAttributes= new IClasspathAttribute[] {
JavaCore.newClasspathAttribute(IClasspathAttribute.MODULE, "true") //$NON-NLS-1$
};
