3904, remove CommonFilesDialog

Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesDialog.form

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
-  <Properties>
-    <Property name="defaultCloseOperation" type="int" value="2"/>
-    <Property name="size" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[340, 320]"/>
-    </Property>
-  </Properties>
-  <SyntheticProperties>
-    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
-    <SyntheticProperty name="generateCenter" type="boolean" value="true"/>
-  </SyntheticProperties>
-  <Events>
-    <EventHandler event="windowClosed" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowClosed"/>
-  </Events>
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <Component id="commonFilesPanel1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <Component id="commonFilesPanel1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-  <SubComponents>
-    <Component class="org.sleuthkit.autopsy.commonfilesearch.CommonFilesPanel" name="commonFilesPanel1">
-    </Component>
-  </SubComponents>
-</Form>

Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesDialog.java

@@ -1,94 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2018 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.commonfilesearch;
-
-import javax.swing.JFrame;
-import javax.swing.SwingUtilities;
-import org.openide.util.NbBundle;
-import org.openide.windows.WindowManager;
-
-/**
- * Dialog box for configuring and running common files search.
- */
-@SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-public final class CommonFilesDialog extends javax.swing.JDialog {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Creates new form CommonFilesDialog
-     */
-    @NbBundle.Messages({
-        "CommonFilesDialog.frame.title=Find Common Files",
-        "CommonFilesDialog.frame.msg=Find Common Files"})
-    public CommonFilesDialog() {
-        super(new JFrame(Bundle.CommonFilesDialog_frame_title()),
-                Bundle.CommonFilesDialog_frame_msg(), true);
-        initComponents();
-        
-        this.setResizable(false);
-        this.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
-    }
-
-    /**
-     * This method is called from within the constructor to initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is always
-     * regenerated by the Form Editor.
-     */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        commonFilesPanel1 = new org.sleuthkit.autopsy.commonfilesearch.CommonFilesPanel();
-
-        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
-        setSize(new java.awt.Dimension(340, 320));
-        addWindowListener(new java.awt.event.WindowAdapter() {
-            public void windowClosed(java.awt.event.WindowEvent evt) {
-                formWindowClosed(evt);
-            }
-        });
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
-        getContentPane().setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addComponent(commonFilesPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(0, 0, Short.MAX_VALUE))
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addComponent(commonFilesPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(0, 0, Short.MAX_VALUE))
-        );
-
-        pack();
-        setLocationRelativeTo(null);
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void formWindowClosed(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosed
-        SwingUtilities.windowForComponent(this).dispose();
-    }//GEN-LAST:event_formWindowClosed
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private org.sleuthkit.autopsy.commonfilesearch.CommonFilesPanel commonFilesPanel1;
-    // End of variables declaration//GEN-END:variables
-}

Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.form

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <NonVisualComponents>
     <Component class="javax.swing.ButtonGroup" name="fileTypeFilterButtonGroup">
     </Component>
     <Component class="javax.swing.ButtonGroup" name="interIntraButtonGroup">
     </Component>
   </NonVisualComponents>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="2"/>
+  </SyntheticProperties>
+  <Events>
+    <EventHandler event="windowClosed" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowClosed"/>
+  </Events>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>

Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java

@@ -26,11 +26,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
+import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 import org.netbeans.api.progress.ProgressHandle;
 import org.openide.explorer.ExplorerManager;
 import org.openide.util.NbBundle;
+import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
@@ -50,7 +52,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  * logic. Nested within CommonFilesDialog.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-public final class CommonFilesPanel extends javax.swing.JPanel {
+public final class CommonFilesPanel extends javax.swing.JDialog  {
 
     private static final long serialVersionUID = 1L;
 
@@ -65,10 +67,15 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
      */
     @NbBundle.Messages({
         "CommonFilesPanel.title=Common Files Panel",
-        "CommonFilesPanel.exception=Unexpected Exception loading DataSources."})
+        "CommonFilesPanel.exception=Unexpected Exception loading DataSources.",
+        "CommonFilesPanel.frame.title=Find Common Files",
+        "CommonFilesPanel.frame.msg=Find Common Files"})
     public CommonFilesPanel() {
+        super(new JFrame(Bundle.CommonFilesDialog_frame_title()),
+                Bundle.CommonFilesDialog_frame_msg(), true);
         initComponents();
-
+        this.setResizable(false);
+        this.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
         this.errorText.setVisible(false);
         this.setupDataSources();
 
@@ -395,6 +402,12 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
         intraCasePanel = new org.sleuthkit.autopsy.commonfilesearch.IntraCasePanel();
         interCasePanel = new org.sleuthkit.autopsy.commonfilesearch.InterCasePanel();
 
+        addWindowListener(new java.awt.event.WindowAdapter() {
+            public void windowClosed(java.awt.event.WindowEvent evt) {
+                formWindowClosed(evt);
+            }
+        });
+
         org.openide.awt.Mnemonics.setLocalizedText(commonFilesSearchLabel2, org.openide.util.NbBundle.getMessage(CommonFilesPanel.class, "CommonFilesPanel.commonFilesSearchLabel2.text")); // NOI18N
         commonFilesSearchLabel2.setFocusable(false);
 
@@ -481,8 +494,8 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
         layoutPanel.add(intraCasePanel, "card3");
         layoutPanel.add(interCasePanel, "card2");
 
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
-        this.setLayout(layout);
+        getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
@@ -495,9 +508,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
                                 .addGap(21, 21, 21)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                     .addComponent(pictureVideoCheckbox)
-                                    .addGroup(layout.createSequentialGroup()
+                                    .addComponent(documentsCheckbox)))
-                                        .addComponent(documentsCheckbox)
-                                        .addContainerGap())))
                             .addComponent(allFileCategoriesRadioButton)
                             .addComponent(selectedFileCategoriesButton)
                             .addComponent(interCaseRadio)
@@ -596,6 +607,10 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
         handleInterCaseSearchCriteriaChanged();
     }//GEN-LAST:event_interCaseRadioActionPerformed
 
+    private void formWindowClosed(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosed
+        SwingUtilities.windowForComponent(this).dispose();
+    }//GEN-LAST:event_formWindowClosed
+
     public void handleInterCaseSearchCriteriaChanged() {
         if (this.areInterCaseSearchCriteriaMet()) {
             this.searchButton.setEnabled(true);

Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchAction.java

@@ -70,12 +70,12 @@ final public class CommonFilesSearchAction extends CallableSystemAction {
 
     @Override
     public void actionPerformed(ActionEvent event) {
-        new CommonFilesDialog().setVisible(true);
+        new CommonFilesPanel().setVisible(true);
     }
 
     @Override
     public void performAction() {
-        new CommonFilesDialog().setVisible(true);
+        new CommonFilesPanel().setVisible(true);
     }
 
     @NbBundle.Messages({