#52: set idindatasource to be always the last property of an item to …

…show
sepinf-inc · Feb 9, 2023 · 8b34806 · 8b34806
1 parent db9c48e
commit 8b34806
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/iped-app/src/main/java/iped/app/ui/ColumnsManager.java b/iped-app/src/main/java/iped/app/ui/ColumnsManager.java
@@ -418,11 +418,11 @@ protected void enableOnlySelectedProperties(List<String> props) {
     }
 
     protected void enableAllProperties() {
-        enableOnlySelectedProperties(new ArrayList<String>(allCheckBoxesState.keySet()));
+        allCheckBoxesState.replaceAll((name, state) -> state = true);
     }
 
     protected void disableAllProperties() {
-        enableOnlySelectedProperties(new ArrayList<String>());
+        allCheckBoxesState.replaceAll((name, state) -> state = false);
     }
 
 }
diff --git a/iped-engine/src/main/java/iped/engine/task/HTMLReportTask.java b/iped-engine/src/main/java/iped/engine/task/HTMLReportTask.java
@@ -767,7 +767,7 @@ private void createBookmarkPage(DateFormat dateFormat, NumberFormat longFormat,
                 }
             }
 
-            // // Fill Basic Properties if present
+            // Fill Basic Properties if present
             if (selectedProperties.contains(BasicProps.NAME))
                 fillItemProperty(it, "Name", "<b>" + reg.name + "</b>");
             if (selectedProperties.contains(BasicProps.PATH))
@@ -788,17 +788,16 @@ private void createBookmarkPage(DateFormat dateFormat, NumberFormat longFormat,
                 fillItemProperty(it, "Carved", String.valueOf(reg.carved));
             if (selectedProperties.contains(BasicProps.HASH))
                 fillItemProperty(it, "Hash", reg.hash);
-            if (selectedProperties.contains(IndexItem.ID_IN_SOURCE)) {
-                String export = reg.export == null ? "-" : "<b><a href=\"../" + reg.export + "\">" + reg.export + "</a></b>";
-                fillItemProperty(it, "Exported as", export);
-            }
             for (String property : selectedProperties) {
-                if (!basicReportProps.contains(property)) {
+                if (!basicReportProps.contains(property)) {     // filter for additional properties selected by the user
                     String propertyValue = ipedCase.getItemProperty(reg.evidenceId, property);
                     fillItemProperty(it, property, propertyValue);
                 }
             }
-
+            if (selectedProperties.contains(IndexItem.ID_IN_SOURCE)) {
+                String export = reg.export == null ? "-" : "<b><a href=\"../" + reg.export + "\">" + reg.export + "</a></b>";
+                fillItemProperty(it, "Exported as", export);
+            }
             items.append(it);
         }