tab title has more detail about search criteria

# Conflicts: # Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesMetaDataBuilder.java
2026-10-06 01:06:20 +00:00 · 2018-04-19 12:14:15 -06:00
parent bccb50c092
commit ae0a708284
7 changed files with 132 additions and 61 deletions
@@ -42,4 +42,9 @@ final class AllDataSources extends CommonFilesMetaDataBuilder {
        Object[] args = new String[] {SELECT_PREFIX, determineMimeTypeFilter()};
        return String.format(WHERE_CLAUSE, args);
    }
+
+    @Override
+    protected String buildTabTitle() {
+        return String.format(Bundle.CommonFilesMetaDataBuilder_buildTabTitle_titleAll(), new Object[]{this.buildCategorySelectionString()});
+    }
 }
@@ -3,10 +3,10 @@ CommonFilesPanel.withinDataSourceRadioButton.text=Files must be in data source:
 CommonFilesPanel.allDataSourcesRadioButton.text=Files can be in any data source
 CommonFilesPanel.cancelButton.text=Cancel
 CommonFilesPanel.cancelButton.actionCommand=Cancel
-CommonFilesPanel.allRadioButton.text=Match on all file types
 CommonFilesPanel.selectedFileCategoriesButton.text=Match on the following file categories:
 CommonFilesPanel.selectedFileCategoriesButton.toolTipText=Select from the options below...
-CommonFilesPanel.allRadioButton.toolTipText=No filtering applied to results...
 CommonFilesPanel.pictureVideoCheckbox.text=Pictures and Videos
 CommonFilesPanel.documentsCheckbox.text=Documents
 CommonFilesPanel.commonFilesSearchLabel.text=<html>Search for files that exist in multiple data sources:</html>
+CommonFilesPanel.allFileCategoriesRadioButton.toolTipText=No filtering applied to results...
+CommonFilesPanel.allFileCategoriesRadioButton.text=Match on all file types
@@ -29,16 +29,14 @@ import java.util.Map;
 final class CommonFilesMetaData {
    
    private final Map<String, Md5MetaData> metadata;
-    private final Map<Long, String> dataSourceIdToNameMap;

    /**
     * Create meta dat object which can be handed off to the node factories
     * @param metadata map of md5 to parent-level node meta data
     * @param dataSourcesMap map of obj_id to data source name
     */
-    CommonFilesMetaData(Map<String, Md5MetaData> metadata, Map<Long,String> dataSourcesMap) {
+    CommonFilesMetaData(Map<String, Md5MetaData> metadata) {
        this.metadata = metadata;
-        this.dataSourceIdToNameMap = dataSourcesMap;
    }
    
    /**
@@ -33,6 +33,7 @@ import org.openide.util.Exceptions;
 import org.openide.util.Exceptions;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.modules.filetypeid.FileTypeDetector;
@@ -176,8 +177,8 @@ abstract class CommonFilesMetaDataBuilder {
                String md5 = resultSet.getString(2);
                Long dataSourceId = resultSet.getLong(3);
                String dataSource = this.dataSourceIdToNameMap.get(dataSourceId);
-                
-                if(md5 == null || HashUtility.isNoDataMd5(md5)){
+
+                if (md5 == null || HashUtility.isNoDataMd5(md5)) {
                    continue;
                }

@@ -193,7 +194,7 @@ abstract class CommonFilesMetaDataBuilder {
            }
        }

-        return new CommonFilesMetaData(commonFiles, this.dataSourceIdToNameMap);
+        return new CommonFilesMetaData(commonFiles);
    }

    String determineMimeTypeFilter() {
@@ -216,4 +217,30 @@ abstract class CommonFilesMetaDataBuilder {
        }
        return mimeTypeString;
    }
+
+    @NbBundle.Messages({
+        "CommonFilesMetaDataBuilder.buildTabTitle.titleAll=Common Files (All Data Sources, %s)",
+        "CommonFilesMetaDataBuilder.buildTabTitle.titleSingle=Common Files (Match Within Data Source: %s, %s)"
+    })
+    protected abstract String buildTabTitle();
+    
+    @NbBundle.Messages({
+        "CommonFilesMetaDataBuilder.buildCategorySelectionString.doc=Documents",
+        "CommonFilesMetaDataBuilder.buildCategorySelectionString.media=Media",
+        "CommonFilesMetaDataBuilder.buildCategorySelectionString.all=All File Categories"
+    })
+    protected String buildCategorySelectionString(){
+        if(!this.filterByDoc && !this.filterByMedia){
+            return Bundle.CommonFilesMetaDataBuilder_buildCategorySelectionString_all();
+        } else {
+            List<String> filters = new ArrayList<String>();
+            if(this.filterByDoc){
+                filters.add(Bundle.CommonFilesMetaDataBuilder_buildCategorySelectionString_doc());
+            }
+            if(this.filterByMedia){
+                filters.add(Bundle.CommonFilesMetaDataBuilder_buildCategorySelectionString_media());
+            }
+            return String.join(", ", filters);
+        }
+    }
 }
@@ -27,35 +27,38 @@
  <Layout>
    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
+          <Group type="102" attributes="0">
              <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="withinDataSourceRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="allDataSourcesRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="commonFilesSearchLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="allRadioButton" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="searchButton" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="cancelButton" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <Component id="selectedFileCategoriesButton" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Group type="102" attributes="0">
-                      <EmptySpace min="21" pref="21" max="-2" attributes="0"/>
                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="pictureVideoCheckbox" min="-2" max="-2" attributes="0"/>
-                          <Component id="documentsCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="withinDataSourceRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="allDataSourcesRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="commonFilesSearchLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Group type="102" alignment="0" attributes="0">
+                              <Component id="allFileCategoriesRadioButton" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Component id="searchButton" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Component id="cancelButton" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <Component id="selectedFileCategoriesButton" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Group type="102" attributes="0">
+                              <EmptySpace min="21" pref="21" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="0" attributes="0">
+                                  <Component id="pictureVideoCheckbox" min="-2" max="-2" attributes="0"/>
+                                  <Component id="documentsCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                          </Group>
                      </Group>
                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="-2" pref="38" max="-2" attributes="0"/>
+                      <Component id="selectDataSourceComboBox" min="-2" pref="261" max="-2" attributes="0"/>
+                  </Group>
              </Group>
              <EmptySpace max="32767" attributes="0"/>
          </Group>
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace min="-2" pref="38" max="-2" attributes="0"/>
-              <Component id="selectDataSourceComboBox" min="-2" pref="261" max="-2" attributes="0"/>
-              <EmptySpace min="-2" pref="19" max="-2" attributes="0"/>
-          </Group>
      </Group>
    </DimensionLayout>
    <DimensionLayout dim="1">
@@ -86,7 +89,7 @@
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="documentsCheckbox" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="allRadioButton" min="-2" max="-2" attributes="0"/>
+                      <Component id="allFileCategoriesRadioButton" min="-2" max="-2" attributes="0"/>
                      <EmptySpace min="-2" pref="38" max="-2" attributes="0"/>
                  </Group>
              </Group>
@@ -172,18 +175,21 @@
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelButtonActionPerformed"/>
      </Events>
    </Component>
-    <Component class="javax.swing.JRadioButton" name="allRadioButton">
+    <Component class="javax.swing.JRadioButton" name="allFileCategoriesRadioButton">
      <Properties>
        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
          <ComponentRef name="fileTypeFilterButtonGroup"/>
        </Property>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/commonfilesearch/Bundle.properties" key="CommonFilesPanel.allRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/commonfilesearch/Bundle.properties" key="CommonFilesPanel.allFileCategoriesRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/commonfilesearch/Bundle.properties" key="CommonFilesPanel.allRadioButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/commonfilesearch/Bundle.properties" key="CommonFilesPanel.allFileCategoriesRadioButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="allFileCategoriesRadioButtonActionPerformed"/>
+      </Events>
    </Component>
    <Component class="javax.swing.JRadioButton" name="selectedFileCategoriesButton">
      <Properties>
@@ -198,6 +204,9 @@
          <ResourceString bundle="org/sleuthkit/autopsy/commonfilesearch/Bundle.properties" key="CommonFilesPanel.selectedFileCategoriesButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="selectedFileCategoriesButtonActionPerformed"/>
+      </Events>
    </Component>
    <Component class="javax.swing.JCheckBox" name="pictureVideoCheckbox">
      <Properties>
@@ -246,11 +246,11 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
                CommonFilesMetaDataBuilder builder;
                boolean filterByMedia = false;
                boolean filterByDocuments = false;
-                if(selectedFileCategoriesButton.isSelected()) {
-                    if(pictureVideoCheckbox.isSelected()) {
+                if (selectedFileCategoriesButton.isSelected()) {
+                    if (pictureVideoCheckbox.isSelected()) {
                        filterByMedia = true;
                    }
-                     if(documentsCheckbox.isSelected()) {
+                    if (documentsCheckbox.isSelected()) {
                        filterByDocuments = true;
                    }
                }
@@ -263,9 +263,11 @@ public final class CommonFilesPanel extends javax.swing.JPanel {

                    setTitleForSingleSource(dataSourceId);
                }
-                                
+                
+                this.tabTitle = builder.buildTabTitle();
+                
                CommonFilesMetaData metaData = builder.findCommonFiles();
-
+                
                return metaData;
            }

@@ -382,7 +384,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
        selectDataSourceComboBox = new javax.swing.JComboBox<>();
        commonFilesSearchLabel = new javax.swing.JLabel();
        cancelButton = new javax.swing.JButton();
-        allRadioButton = new javax.swing.JRadioButton();
+        allFileCategoriesRadioButton = new javax.swing.JRadioButton();
        selectedFileCategoriesButton = new javax.swing.JRadioButton();
        pictureVideoCheckbox = new javax.swing.JCheckBox();
        documentsCheckbox = new javax.swing.JCheckBox();
@@ -437,14 +439,24 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
            }
        });

-        fileTypeFilterButtonGroup.add(allRadioButton);
-        org.openide.awt.Mnemonics.setLocalizedText(allRadioButton, org.openide.util.NbBundle.getMessage(CommonFilesPanel.class, "CommonFilesPanel.allRadioButton.text")); // NOI18N
-        allRadioButton.setToolTipText(org.openide.util.NbBundle.getMessage(CommonFilesPanel.class, "CommonFilesPanel.allRadioButton.toolTipText")); // NOI18N
+        fileTypeFilterButtonGroup.add(allFileCategoriesRadioButton);
+        org.openide.awt.Mnemonics.setLocalizedText(allFileCategoriesRadioButton, org.openide.util.NbBundle.getMessage(CommonFilesPanel.class, "CommonFilesPanel.allFileCategoriesRadioButton.text")); // NOI18N
+        allFileCategoriesRadioButton.setToolTipText(org.openide.util.NbBundle.getMessage(CommonFilesPanel.class, "CommonFilesPanel.allFileCategoriesRadioButton.toolTipText")); // NOI18N
+        allFileCategoriesRadioButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                allFileCategoriesRadioButtonActionPerformed(evt);
+            }
+        });

        fileTypeFilterButtonGroup.add(selectedFileCategoriesButton);
        selectedFileCategoriesButton.setSelected(true);
        org.openide.awt.Mnemonics.setLocalizedText(selectedFileCategoriesButton, org.openide.util.NbBundle.getMessage(CommonFilesPanel.class, "CommonFilesPanel.selectedFileCategoriesButton.text")); // NOI18N
        selectedFileCategoriesButton.setToolTipText(org.openide.util.NbBundle.getMessage(CommonFilesPanel.class, "CommonFilesPanel.selectedFileCategoriesButton.toolTipText")); // NOI18N
+        selectedFileCategoriesButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                selectedFileCategoriesButtonActionPerformed(evt);
+            }
+        });

        pictureVideoCheckbox.setSelected(true);
        org.openide.awt.Mnemonics.setLocalizedText(pictureVideoCheckbox, org.openide.util.NbBundle.getMessage(CommonFilesPanel.class, "CommonFilesPanel.pictureVideoCheckbox.text")); // NOI18N
@@ -457,28 +469,29 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
        layout.setHorizontalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(withinDataSourceRadioButton)
-                    .addComponent(allDataSourcesRadioButton)
-                    .addComponent(commonFilesSearchLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(allRadioButton)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(searchButton)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(cancelButton))
-                    .addComponent(selectedFileCategoriesButton)
-                    .addGroup(layout.createSequentialGroup()
-                        .addGap(21, 21, 21)
+                        .addContainerGap()
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(pictureVideoCheckbox)
-                            .addComponent(documentsCheckbox))))
+                            .addComponent(withinDataSourceRadioButton)
+                            .addComponent(allDataSourcesRadioButton)
+                            .addComponent(commonFilesSearchLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addGroup(layout.createSequentialGroup()
+                                .addComponent(allFileCategoriesRadioButton)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addComponent(searchButton)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addComponent(cancelButton))
+                            .addComponent(selectedFileCategoriesButton)
+                            .addGroup(layout.createSequentialGroup()
+                                .addGap(21, 21, 21)
+                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                    .addComponent(pictureVideoCheckbox)
+                                    .addComponent(documentsCheckbox)))))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(38, 38, 38)
+                        .addComponent(selectDataSourceComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 261, javax.swing.GroupLayout.PREFERRED_SIZE)))
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-            .addGroup(layout.createSequentialGroup()
-                .addGap(38, 38, 38)
-                .addComponent(selectDataSourceComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 261, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(19, 19, 19))
        );
        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -506,7 +519,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                        .addComponent(documentsCheckbox)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(allRadioButton)
+                        .addComponent(allFileCategoriesRadioButton)
                        .addGap(38, 38, 38))))
        );
    }// </editor-fold>//GEN-END:initComponents
@@ -538,6 +551,20 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
        SwingUtilities.windowForComponent(this).dispose();
    }//GEN-LAST:event_cancelButtonActionPerformed

+    private void allFileCategoriesRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_allFileCategoriesRadioButtonActionPerformed
+        if (this.allFileCategoriesRadioButton.isSelected()) {
+            this.pictureVideoCheckbox.setEnabled(false);
+            this.documentsCheckbox.setEnabled(false);
+        }
+    }//GEN-LAST:event_allFileCategoriesRadioButtonActionPerformed
+
+    private void selectedFileCategoriesButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectedFileCategoriesButtonActionPerformed
+        if (this.selectedFileCategoriesButton.isSelected()) {
+            this.pictureVideoCheckbox.setEnabled(true);
+            this.documentsCheckbox.setEnabled(true);
+        }
+    }//GEN-LAST:event_selectedFileCategoriesButtonActionPerformed
+
    private void withinDataSourceSelected(boolean selected) {
        selectDataSourceComboBox.setEnabled(selected);
        if (selectDataSourceComboBox.isEnabled()) {
@@ -548,7 +575,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel {

    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JRadioButton allDataSourcesRadioButton;
-    private javax.swing.JRadioButton allRadioButton;
+    private javax.swing.JRadioButton allFileCategoriesRadioButton;
    private javax.swing.JButton cancelButton;
    private javax.swing.JLabel commonFilesSearchLabel;
    private javax.swing.ButtonGroup dataSourcesButtonGroup;
@@ -45,4 +45,9 @@ final class SingleDataSource extends CommonFilesMetaDataBuilder {
        Object[] args = new String[]{SELECT_PREFIX, Long.toString(this.selectedDataSourceId), determineMimeTypeFilter()};
        return String.format(SingleDataSource.WHERE_CLAUSE, args);
    }
+
+    @Override
+    protected String buildTabTitle() {
+        return String.format(Bundle.CommonFilesMetaDataBuilder_buildTabTitle_titleSingle(), new Object[]{this.buildCategorySelectionString()});
+    }
 }