6715 fix domain list model

Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties-MERGED

@@ -36,6 +36,11 @@ DocumentPanel.numberOfImages.noImages=No images
 # {0} - numberOfImages
 DocumentPanel.numberOfImages.text=1 of {0} images
 DocumentWrapper.previewInitialValue=Preview not generated yet.
+# {0} - startDate
+# {1} - endDate
+DomainSummaryPanel.activity.text=Activity: {0} to {1}
+DomainSummaryPanel.downloads.text=Files downloaded: 
+DomainSummaryPanel.pages.text=Pages in past 60 days: 
 GroupsListPanel.noResults.message.text=No results were found for the selected filters.\n\nReminder:\n  -The File Type Identification module must be run on each data source you want to find results in.\n  -The Hash Lookup module must be run on each data source if you want to filter by past occurrence.\n  -The Exif module must be run on each data source if you are filtering by User Created content.
 GroupsListPanel.noResults.title.text=No results found
 ImageThumbnailPanel.isDeleted.text=All instances of file are deleted.
@@ -108,6 +113,9 @@ ObjectDetectedFilterPanel.text=Object Detected:
 DetailsPanel.instancesList.border.title=Instances
 DateFilterPanel.mostRecentRadioButton.text=Only last:
 DateFilterPanel.dateFilterCheckBox.text=Date Filter:
+DomainSummaryPanel.activityLabel.text=
+DomainSummaryPanel.pagesLabel.text=
+DomainSummaryPanel.filesDownloadedLabel.text=
 VideoThumbnailPanel.bytes.text=bytes
 VideoThumbnailPanel.deleted.text=All instances of file are deleted.
 VideoThumbnailPanel.gigaBytes.text=GB

Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryPanel.java

@@ -24,7 +24,6 @@ import java.awt.Point;
 import java.awt.event.MouseEvent;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.swing.GroupLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JList;
@@ -33,7 +32,7 @@ import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ImageUtils;
 
 /**
- * Class which displays a preview and details about a document.
+ * Class which displays a preview and details about a domain.
  */
 class DomainSummaryPanel extends javax.swing.JPanel implements ListCellRenderer<DomainWrapper> {
 
@@ -43,7 +42,7 @@ class DomainSummaryPanel extends javax.swing.JPanel implements ListCellRenderer<
     private static final SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd yyyy");
 
     /**
-     * Creates new form DocumentPanel.
+     * Creates new form DomainPanel.
      */
     DomainSummaryPanel() {
         initComponents();

Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryViewer.java

@@ -61,6 +61,7 @@ public class DomainSummaryViewer extends javax.swing.JPanel {
 
         setLayout(new java.awt.BorderLayout());
 
+        domainList.setModel(domainListModel);
         domainScrollPane.setViewportView(domainList);
 
         add(domainScrollPane, java.awt.BorderLayout.CENTER);
@@ -68,7 +69,7 @@ public class DomainSummaryViewer extends javax.swing.JPanel {
 
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JList<String> domainList;
+    private javax.swing.JList<DomainWrapper> domainList;
     private javax.swing.JScrollPane domainScrollPane;
     // End of variables declaration//GEN-END:variables
 

Core/src/org/sleuthkit/autopsy/discovery/ui/ResultsPanel.java

@@ -48,6 +48,7 @@ import org.sleuthkit.autopsy.discovery.search.ResultsSorter;
 import org.sleuthkit.autopsy.discovery.search.Result;
 import org.sleuthkit.autopsy.discovery.search.ResultDomain;
 import org.sleuthkit.autopsy.discovery.search.ResultFile;
+import static org.sleuthkit.autopsy.discovery.search.SearchData.Type.DOMAIN;
 import org.sleuthkit.autopsy.textsummarizer.TextSummary;
 
 /**
@@ -166,8 +167,9 @@ final class ResultsPanel extends javax.swing.JPanel {
     void handlePageRetrievedEvent(DiscoveryEventUtils.PageRetrievedEvent pageRetrievedEvent) {
         SwingUtilities.invokeLater(() -> {
             //send populateMesage
-            DiscoveryEventUtils.getDiscoveryEventBus().post(new DiscoveryEventUtils.PopulateInstancesListEvent(getInstancesForSelected()));
-
+            if (pageRetrievedEvent.getType() != DOMAIN) {
+                DiscoveryEventUtils.getDiscoveryEventBus().post(new DiscoveryEventUtils.PopulateInstancesListEvent(getInstancesForSelected()));
+            }
             currentPage = pageRetrievedEvent.getPageNumber();
             updateControls();
             resetResultViewer();
@@ -256,7 +258,8 @@ final class ResultsPanel extends javax.swing.JPanel {
      * Populate the document preview viewer, cancelling any content which is
      * currently being created first.
      *
-     * @param results The list of ResultFiles to populate the document viewer with.
+     * @param results The list of ResultFiles to populate the document viewer
+     *                with.
      */
     synchronized void populateDocumentViewer(List<Result> results) {
         for (Result result : results) {
@@ -267,11 +270,12 @@ final class ResultsPanel extends javax.swing.JPanel {
         }
     }
 
-        /**
+    /**
      * Populate the domain summary viewer, cancelling any content which is
      * currently being created first.
      *
-     * @param results The list of ResultDomains to populate the domain summary viewer with.
+     * @param results The list of ResultDomains to populate the domain summary
+     *                viewer with.
      */
     synchronized void populateDomainViewer(List<Result> results) {
         for (Result result : results) {
@@ -281,7 +285,7 @@ final class ResultsPanel extends javax.swing.JPanel {
             resultContentWorkers.add(domainWorker);
         }
     }
-    
+
     /**
      * Subscribe and respond to GroupSelectedEvents.
      *