3155: Busy cursor in ingest inbox

Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/BlackboardResultViewer.java

@@ -24,7 +24,10 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
 /**
  * Additional functionality of viewers supporting black board results such as
  * the directory tree
+ * 
+ *@deprecated No longer used.
  */
+@Deprecated
 public interface BlackboardResultViewer {
 
     public static final String FINISHED_DISPLAY_EVT = "FINISHED_DISPLAY_EVT"; //NON-NLS

Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties

@@ -59,8 +59,6 @@ DirectoryTreeFilterNode.action.collapseAll.text=Collapse All
 DirectoryTreeFilterNode.action.openFileSrcByAttr.text=Open File Search by Attributes
 DirectoryTreeFilterNode.action.runIngestMods.text=Run Ingest Modules
 DirectoryTreeTopComponent.action.viewArtContent.text=View Artifact Content
-DirectoryTreeTopComponent.moduleErr=Module Error
-DirectoryTreeTopComponent.moduleErr.msg=A module caused an error listening to DirectoryTreeTopComponent updates. See log to determine which module. Some data could be incomplete.
 DirectoryTreeTopComponent.showRejectedCheckBox.text=Show Rejected Results
 ExplorerNodeActionVisitor.action.imgDetails.title=Image Details
 ExplorerNodeActionVisitor.action.extUnallocToSingleFiles=Extract Unallocated Space to Single Files

Core/src/org/sleuthkit/autopsy/directorytree/Bundle_ja.properties

@@ -56,8 +56,6 @@ DataResultFilterNode.action.viewInDir.text=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\
 DirectoryTreeFilterNode.action.openFileSrcByAttr.text=\u5c5e\u6027\u306b\u3088\u308b\u30d5\u30a1\u30a4\u30eb\u691c\u7d22\u3092\u958b\u304f
 DirectoryTreeFilterNode.action.runIngestMods.text=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u5b9f\u884c
 DirectoryTreeTopComponent.action.viewArtContent.text=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u8868\u793a
-DirectoryTreeTopComponent.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
-DirectoryTreeTopComponent.moduleErr.msg=DirectoryTreeTopComponent\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u78ba\u8a8d\u4e2d\u306b\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u30a8\u30e9\u30fc\u3092\u8d77\u3053\u3057\u307e\u3057\u305f\u3002\u3069\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u304b\u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u4e0d\u5b8c\u5168\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
 ExplorerNodeActionVisitor.action.imgDetails.title=\u30a4\u30e1\u30fc\u30b8\u8a73\u7d30
 ExplorerNodeActionVisitor.action.extUnallocToSingleFiles=\u672a\u5272\u308a\u5f53\u3066\u9818\u57df\u5185\u306e\u30c7\u30fc\u30bf\u3092\u30b7\u30f3\u30b0\u30eb\u30d5\u30a1\u30a4\u30eb\u306b\u62bd\u51fa
 ExplorerNodeActionVisitor.action.fileSystemDetails.title=\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u8a73\u7d30
@@ -87,4 +85,4 @@ ExtractUnallocAction.done.notifyMsg.completedExtract.msg=\u30d5\u30a1\u30a4\u30e
 ExtractUnallocAction.done.errMsg.title=\u62bd\u51fa\u30a8\u30e9\u30fc
 ExtractUnallocAction.done.errMsg.msg=\u672a\u5272\u308a\u5f53\u3066\u9818\u57df\u3092\u62bd\u51fa\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a{0}
 DirectoryTreeFilterNode.action.collapseAll.text=\u3059\u3079\u3066\u30b3\u30e9\u30d7\u30b9
-ExtractAction.done.notifyMsg.extractErr=\u4e0b\u8a18\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u62bd\u51fa\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a {0}
+ExtractAction.done.notifyMsg.extractErr=\u4e0b\u8a18\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u62bd\u51fa\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a {0}

Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java

@@ -27,7 +27,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -56,13 +55,11 @@ import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.core.RuntimeProperties;
 import org.sleuthkit.autopsy.core.UserPreferences;
-import org.sleuthkit.autopsy.corecomponentinterfaces.BlackboardResultViewer;
 import org.sleuthkit.autopsy.corecomponentinterfaces.CoreComponentControl;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataExplorer;
 import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent;
 import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.autopsy.datamodel.ArtifactNodeSelectionInfo;
 import org.sleuthkit.autopsy.datamodel.BlackboardArtifactNode;
 import org.sleuthkit.autopsy.datamodel.CreditCards;
@@ -99,7 +96,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 @Messages({
     "DirectoryTreeTopComponent.resultsView.title=Listing"
 })
-public final class DirectoryTreeTopComponent extends TopComponent implements DataExplorer, ExplorerManager.Provider, BlackboardResultViewer {
+public final class DirectoryTreeTopComponent extends TopComponent implements DataExplorer, ExplorerManager.Provider {
 
     private final transient ExplorerManager em = new ExplorerManager();
     private static DirectoryTreeTopComponent instance;
@@ -851,7 +848,6 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
         return false;
     }
 
-    @Override
     public void viewArtifact(final BlackboardArtifact art) {
         int typeID = art.getArtifactTypeID();
         String typeName = art.getArtifactTypeName();
@@ -1064,28 +1060,14 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
         // Another thread is needed because we have to wait for dataResult to populate
     }
 
-    @Override
     public void viewArtifactContent(BlackboardArtifact art) {
         new ViewContextAction(
                 NbBundle.getMessage(this.getClass(), "DirectoryTreeTopComponent.action.viewArtContent.text"),
                 new BlackboardArtifactNode(art)).actionPerformed(null);
     }
 
-    @Override
     public void addOnFinishedListener(PropertyChangeListener l) {
         DirectoryTreeTopComponent.this.addPropertyChangeListener(l);
     }
 
-    void fireViewerComplete() {
-
-        try {
-            firePropertyChange(BlackboardResultViewer.FINISHED_DISPLAY_EVT, 0, 1);
-        } catch (Exception e) {
-            LOGGER.log(Level.SEVERE, "DirectoryTreeTopComponent listener threw exception", e); //NON-NLS
-            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "DirectoryTreeTopComponent.moduleErr"),
-                    NbBundle.getMessage(this.getClass(),
-                            "DirectoryTreeTopComponent.moduleErr.msg"),
-                    MessageNotifyUtil.MessageType.ERROR);
-        }
-    }
 }

Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java

@@ -21,14 +21,11 @@ package org.sleuthkit.autopsy.ingest;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import javax.swing.JMenuItem;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
-import org.openide.util.Lookup;
 import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.autopsy.corecomponentinterfaces.BlackboardResultViewer;
+import org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent;
 import org.sleuthkit.autopsy.ingest.IngestMessagePanel.IngestMessageGroup;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
@@ -40,7 +37,8 @@ import org.sleuthkit.datamodel.TskException;
  */
 class IngestMessageDetailsPanel extends javax.swing.JPanel {
 
-    private IngestMessageMainPanel mainPanel;
+    private final IngestMessageMainPanel mainPanel;
+    private final DirectoryTreeTopComponent dtc = DirectoryTreeTopComponent.findInstance();
 
     /**
      * Creates new form IngestMessageDetailsPanel
@@ -69,18 +67,6 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel {
         styleSheet.addRule("td {white-space:pre-wrap;overflow:hidden;}"); //NON-NLS
         styleSheet.addRule("th {font-weight:bold;}"); //NON-NLS
 
-        BlackboardResultViewer v = Lookup.getDefault().lookup(BlackboardResultViewer.class);
-        v.addOnFinishedListener(new PropertyChangeListener() {
-
-            @Override
-            public void propertyChange(PropertyChangeEvent evt) {
-                if (evt.getPropertyName().equals(BlackboardResultViewer.FINISHED_DISPLAY_EVT)) {
-                    artifactViewerFinished();
-                }
-            }
-
-        });
-
         //right click
         messageDetailsPane.setComponentPopupMenu(rightClickMenu);
         ActionListener actList = new ActionListener() {
@@ -193,11 +179,27 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel {
     }// </editor-fold>//GEN-END:initComponents
 
     private void viewContentButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_viewContentButtonActionPerformed
-        viewContent(evt);
+        messageDetailsPane.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+        final IngestMessageGroup messageGroup = mainPanel.getMessagePanel().getSelectedMessage();
+        if (messageGroup != null) {
+            BlackboardArtifact art = messageGroup.getData();
+            if (art != null) {
+                dtc.viewArtifactContent(art);
+            }
+        }
+        messageDetailsPane.setCursor(null);
     }//GEN-LAST:event_viewContentButtonActionPerformed
 
     private void viewArtifactButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_viewArtifactButtonActionPerformed
-        viewArtifact(evt);
+        messageDetailsPane.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+        final IngestMessageGroup messageGroup = mainPanel.getMessagePanel().getSelectedMessage();
+        if (messageGroup != null) {
+            BlackboardArtifact art = messageGroup.getData();
+            if (art != null) {
+                dtc.viewArtifact(art);
+            }
+        }
+        messageDetailsPane.setCursor(null);
     }//GEN-LAST:event_viewArtifactButtonActionPerformed
 
     private void backButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_backButtonActionPerformed
@@ -216,46 +218,6 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel {
     private javax.swing.JButton viewContentButton;
     // End of variables declaration//GEN-END:variables
 
-    private void viewArtifact(java.awt.event.ActionEvent evt) {
-        artifactViewerInvoked();
-
-        final IngestMessageGroup messageGroup = mainPanel.getMessagePanel().getSelectedMessage();
-        if (messageGroup != null) {
-            BlackboardArtifact art = messageGroup.getData();
-            if (art != null) {
-                BlackboardResultViewer v = Lookup.getDefault().lookup(BlackboardResultViewer.class);
-                v.viewArtifact(art);
-            }
-        }
-
-    }
-
-    private void viewContent(java.awt.event.ActionEvent evt) {
-        artifactViewerInvoked();
-
-        final IngestMessageGroup messageGroup = mainPanel.getMessagePanel().getSelectedMessage();
-        if (messageGroup != null) {
-            BlackboardArtifact art = messageGroup.getData();
-            if (art != null) {
-                BlackboardResultViewer v = Lookup.getDefault().lookup(BlackboardResultViewer.class);
-                v.viewArtifactContent(art);
-            }
-        }
-    }
-
-    private void artifactViewerInvoked() {
-        //viewArtifactButton.setEnabled(false);
-        //viewContentButton.setEnabled(false);
-        messageDetailsPane.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-
-    }
-
-    private void artifactViewerFinished() {
-        //viewArtifactButton.setEnabled(true);
-        //viewContentButton.setEnabled(true);
-        messageDetailsPane.setCursor(null);
-    }
-
     /**
      * Display the details of a given message
      *