From ed36fbb5feec3073d61b714c94b53acbb94e2a45 Mon Sep 17 00:00:00 2001
From: Oliver Spohngellert <oliver@basistech.net>
Date: Wed, 29 Jun 2016 14:25:25 -0400
Subject: [PATCH] Fixed icon behavior.

---
 .../ingest/IngestJobSettingsPanel.java        | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.java
index ad3967efaa..0a368a635e 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettingsPanel.java
@@ -548,14 +548,36 @@ public final class IngestJobSettingsPanel extends javax.swing.JPanel {
                     isSameDataSource = isSameDataSource || dataSource.getId() == objectId;
                 }
                 if (isSameDataSource) {
-                    for (IngestModuleInfo ingestModuleInfo : ingestJob.getIngestModuleInfo()) {
-                        boolean sameModule = ingestModuleInfo.getDisplayName().equals(module.getName());
-                        if (sameModule) {
-                            if (ingestModuleInfo.getVersion().equals(module.getIngestModuleTemplate().getModuleFactory().getModuleVersionNumber())) {
-                                return warningIcon;
+                    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.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;
                     }
                 }
             }