#52: save selected properties in moduleDir

sepinf-inc · Jan 18, 2023 · 2c3e3ab · 2c3e3ab
1 parent 4255dcd
commit 2c3e3ab
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/IPED-SearchApp.log b/IPED-SearchApp.log
diff --git a/iped-app/src/main/java/iped/app/ui/ColumnsManager.java b/iped-app/src/main/java/iped/app/ui/ColumnsManager.java
@@ -92,7 +92,9 @@ private static final File getGlobalColsFile() {
 
     private IPEDSource lastCase;
 
+    File moduleDir;
     private File caseCols;
+    private File reportCols;
 
     String[] indexFields = null;
 
@@ -144,6 +146,24 @@ static class ColumnState implements Serializable {
         ArrayList<String> visibleFields = new ArrayList<String>();
     }
 
+    static class ColumnsReport implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+        ArrayList<String> selectedCols = new ArrayList<String>();
+    }
+
+    protected void saveReportColumns() {
+        try {
+            ColumnsReport cr = new ColumnsReport();
+            cr.selectedCols.addAll(ColumnsManagerUI.getInstance().getSelectedProperties());
+            if (cr.selectedCols.size() > 0) {
+                Util.writeObject(cr, reportCols.getAbsolutePath());
+            }
+        } catch (Exception e1) {
+            e1.printStackTrace();
+        }
+    }
+
     public void saveColumnsState() {
         try {
             ColumnState cs = new ColumnState();
@@ -165,17 +185,19 @@ public void saveColumnsState() {
         }
     }
 
-    private ColumnsManager() {
+    protected ColumnsManager() {
         AnalysisConfig analysisConfig = ConfigurationManager.get().findObject(AnalysisConfig.class);
         autoManageCols = analysisConfig.isAutoManageCols();
 
+        moduleDir = App.get().appCase.getAtomicSourceBySourceId(0).getModuleDir();
+        reportCols = new File(moduleDir, "reportCols.dat");
+
         updateDinamicFields();
 
         loadSavedCols();
     }
 
     private File getColStateFile() {
-        File moduleDir = App.get().appCase.getAtomicSourceBySourceId(0).getModuleDir();
         caseCols = new File(moduleDir, "visibleCols.dat"); //$NON-NLS-1$
         File cols = caseCols;
         if (!cols.exists())

diff --git a/iped-app/src/main/java/iped/app/ui/ColumnsManagerReportUI.java b/iped-app/src/main/java/iped/app/ui/ColumnsManagerReportUI.java
@@ -65,7 +65,7 @@ public void actionPerformed(ActionEvent e) {
             String text = source.getText();
             boolean isSelected = source.isSelected();
             columnsManager.updateCol(text, isSelected);
-            // updateGUICol(source.getText(), isSelected);
+            columnsManager.saveReportColumns();
         }
     }
 

diff --git a/iped-app/src/main/java/iped/app/ui/ColumnsManagerUI.java b/iped-app/src/main/java/iped/app/ui/ColumnsManagerUI.java
@@ -197,7 +197,7 @@ public void setColumnRenderer(TableColumn tc) {
             tc.setCellRenderer(new ProgressCellRenderer());
     }
 
-    public static List<String> getSelectedProperties() {
+    public List<String> getSelectedProperties() {
         List<String> selectedColumns = new ArrayList<>();
         for (Map.Entry<String, JCheckBox> hmEntry : columnsCheckBoxes.entrySet()) {
             JCheckBox check = hmEntry.getValue();