Fixed icon behavior.

This commit is contained in:
Oliver Spohngellert 2016-06-29 14:25:25 -04:00
parent b64bc6d69e
commit ed36fbb5fe

View File

@ -548,14 +548,36 @@ public final class IngestJobSettingsPanel extends javax.swing.JPanel {
isSameDataSource = isSameDataSource || dataSource.getId() == objectId; isSameDataSource = isSameDataSource || dataSource.getId() == objectId;
} }
if (isSameDataSource) { if (isSameDataSource) {
for (IngestModuleInfo ingestModuleInfo : ingestJob.getIngestModuleInfo()) { IngestModuleFactory factory = module.getIngestModuleTemplate().getModuleFactory();
boolean sameModule = ingestModuleInfo.getDisplayName().equals(module.getName()); if (factory.isDataSourceIngestModuleFactory()) {
if (sameModule) { String uniqueName = FactoryClassNameNormalizer.normalize(factory.getClass().getCanonicalName()) + "-"
if (ingestModuleInfo.getVersion().equals(module.getIngestModuleTemplate().getModuleFactory().getModuleVersionNumber())) { + factory.getModuleDisplayName() + "-"
return warningIcon; + IngestModuleInfo.IngestModuleType.DATA_SOURCE_LEVEL.toString() + "-"
+ factory.getModuleVersionNumber();
for (IngestModuleInfo ingestModuleInfo : ingestJob.getIngestModuleInfo()) {
boolean sameModule = ingestModuleInfo.getUniqueName().equals(uniqueName);
if (sameModule) {
if (ingestModuleInfo.getVersion().equals(module.getIngestModuleTemplate().getModuleFactory().getModuleVersionNumber())) {
return warningIcon;
}
} }
previousVersionRun = previousVersionRun || sameModule;
}
}
if (factory.isFileIngestModuleFactory()) {
String uniqueName = FactoryClassNameNormalizer.normalize(factory.getClass().getCanonicalName()) + "-"
+ factory.getModuleDisplayName() + "-"
+ IngestModuleInfo.IngestModuleType.FILE_LEVEL.toString() + "-"
+ factory.getModuleVersionNumber();
for (IngestModuleInfo ingestModuleInfo : ingestJob.getIngestModuleInfo()) {
boolean sameModule = ingestModuleInfo.getUniqueName().equals(uniqueName);
if (sameModule) {
if (ingestModuleInfo.getVersion().equals(module.getIngestModuleTemplate().getModuleFactory().getModuleVersionNumber())) {
return warningIcon;
}
}
previousVersionRun = previousVersionRun || sameModule;
} }
previousVersionRun = previousVersionRun || sameModule;
} }
} }
} }