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