jprdonnelly/tcommon-studio-se
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TESB-21810:Module tab shows the incorrect list of installed jar files (#1622)

Browse Source 
when using cConfig components
This commit is contained in:
SunChaoqun
2018-04-10 17:27:04 +08:00
committed by nrousseau
parent f5486df15c
commit ce2c9ef375
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/ModulesNeededProvider.java
View File

@@ -277,13 +277,17 @@ public class ModulesNeededProvider {
getModulesNeeded().removeAll(moduleForCurrentJobList);
getAllManagedModules().removeAll(moduleForCurrentJobList);
Set<String> neededLibraries = process.getNeededLibraries(TalendProcessOptionConstants.MODULES_DEFAULT);
Set<ModuleNeeded> neededLibraries = process.getNeededModules(TalendProcessOptionConstants.MODULES_DEFAULT);
if (neededLibraries != null) {
for (String neededLibrary : neededLibraries) {
for (ModuleNeeded neededLibrary : neededLibraries) {
boolean alreadyInImports = false;
for (ModuleNeeded module : getModulesNeeded()) {
if (module.getModuleName().equals(neededLibrary)) {
alreadyInImports = true;
if (module.getModuleName().equals(neededLibrary.getModuleName())) {
if (StringUtils.equals(module.getMavenUri(), neededLibrary.getMavenUri())) {
alreadyInImports = true;
break;
}
}
}
if (alreadyInImports) {
@@ -291,8 +295,15 @@ public class ModulesNeededProvider {
}
// Step 2: re-add specific modules
ModuleNeeded toAdd = new ModuleNeeded("Job " + process.getName(), neededLibrary, //$NON-NLS-1$
"Required for the job " + process.getName() + ".", true); //$NON-NLS-1$ //$NON-NLS-2$
ModuleNeeded toAdd = null;
if (neededLibrary.getMavenUri() != null) {
toAdd = new ModuleNeeded("Job " + process.getName(), "Required for the job " + process.getName() + ".", true,
neededLibrary.getMavenUri());
} else {
toAdd = new ModuleNeeded("Job " + process.getName(), neededLibrary.getModuleName(), //$NON-NLS-1$
"Required for the job " + process.getName() + ".", true); //$NON-NLS-1$ //$NON-NLS-2$
}
getModulesNeeded().add(toAdd);
getAllManagedModules().add(toAdd);