From aa57fe1050b50b7e335f0a00b43afaccdb35e25e Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Mon, 8 Jul 2019 15:36:12 -0400
Subject: [PATCH] cvt - removed code to disable device checkbox

---
 .../AccountDeviceInstanceNodeFactory.java     |  4 ++--
 .../communications/CVTTopComponent.java       |  1 -
 .../autopsy/communications/FiltersPanel.java  | 24 ++-----------------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNodeFactory.java b/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNodeFactory.java
index c0043d9ba1..c2a279b4ad 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNodeFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/AccountDeviceInstanceNodeFactory.java
@@ -55,10 +55,10 @@ final class AccountDeviceInstanceNodeFactory extends ChildFactory<AccountDeviceI
                     commsManager.getAccountDeviceInstancesWithRelationships(commsFilter);
             for (AccountDeviceInstance accountDeviceInstance : accountDeviceInstancesWithRelationships) {
                 //Filter out device accounts, in the table.
-                if (Account.Type.DEVICE.equals(accountDeviceInstance.getAccount().getAccountType()) ==false) {
+//                if (Account.Type.DEVICE.equals(accountDeviceInstance.getAccount().getAccountType()) ==false) {
                     long communicationsCount = commsManager.getRelationshipSourcesCount(accountDeviceInstance, commsFilter);
                     accountDeviceInstanceKeys.add(new AccountDeviceInstanceKey(accountDeviceInstance, commsFilter, communicationsCount));
-                }
+//                }
             }
         } catch (TskCoreException tskCoreException) {
             logger.log(Level.SEVERE, "Error getting filtered account device instances", tskCoreException);
diff --git a/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java b/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java
index 0032793584..989456e157 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java
@@ -68,7 +68,6 @@ public final class CVTTopComponent extends TopComponent {
                 Lookup lookup = ((Lookup.Provider)selectedComponent).getLookup();
                 proxyLookup.setNewLookups(lookup);
             }
-            filtersPane.setDeviceAccountTypeEnabled(browseVisualizeTabPane.getSelectedIndex() != 0);
         });
         
         
diff --git a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
index 76c2f189ad..50bdb30764 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
@@ -322,11 +322,6 @@ final public class FiltersPanel extends JPanel {
 
         panel.setSelected(initalState);
         panel.addItemListener(validationListener);
-        if (type.equals(Account.Type.DEVICE)) {
-            //Deveice type filter is enabled based on whether we are in table or graph view.
-            panel.setEnabled(deviceAccountTypeEnabled);
-        }
-
         return panel;
     }
     
@@ -913,21 +908,6 @@ final public class FiltersPanel extends JPanel {
         return new DateControlState (endDatePicker.getDate(), endCheckBox.isSelected());
     }
 
-    /**
-     * Enable or disable the device account type filter. The filter should be
-     * disabled for the browse/table mode and enabled for the visualization.
-     *
-     * @param enable True to enable the device account type filter, False to
-     *               disable it.
-     */
-    void setDeviceAccountTypeEnabled(boolean enable) {
-        deviceAccountTypeEnabled = enable;
-        JCheckBox deviceCheckbox = accountTypeMap.get(Account.Type.DEVICE);
-        if (deviceCheckbox != null) {
-            deviceCheckbox.setEnabled(deviceAccountTypeEnabled);
-        }
-    }
-
     /**
      * Set the selection state of all the account type check boxes
      *
@@ -949,11 +929,11 @@ final public class FiltersPanel extends JPanel {
     }
 
     /**
-     * Helper method that sets all the checkboxes in the given map to the given
+     * Helper method that sets all the check boxes in the given map to the given
      * selection state.
      *
      * @param map      A map from anything to JCheckBoxes.
-     * @param selected The selection state to set all the checkboxes to.
+     * @param selected The selection state to set all the check boxes to.
      */
     @ThreadConfined(type = ThreadConfined.ThreadType.AWT)
     private void setAllSelected(Map<?, JCheckBox> map, boolean selected) {