diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java index c571a43787..e3b2a929b1 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java @@ -60,7 +60,6 @@ class AddImageWizardIterator implements WizardDescriptor.Iterator= 7.8, can use WizardDescriptor.PROP_*: jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(i)); // Sets steps names for a panel jc.putClientProperty("WizardPanel_contentData", steps); diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/Case.java b/Case/src/org/sleuthkit/autopsy/casemodule/Case.java index 6f169581bd..ebc3ae8a29 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -54,7 +54,7 @@ import org.sleuthkit.datamodel.SleuthkitJNI.CaseDbHandle.AddImageProcess; */ public class Case { // change the CTL_MainWindow_Title in Bundle.properties as well if you change this value - private static final String autopsyVer = "3.0.0b2"; // current version of autopsy. Changed it when the version is changed + private static final String autopsyVer = "3.0.0b2"; // current version of autopsy. Change it when the version is changed private static final String appName = "Autopsy " + autopsyVer; /** @@ -150,8 +150,7 @@ public class Case { currentCase = newCase; pcs.firePropertyChange(CASE_CURRENT_CASE, null, currentCase); - //TODO: This will fire off a bunch of stuff in CaseListener.propertyChange() - // that should probably be migrated into here + // TODO: This will fire off a bunch of stuff in CaseListener.propertyChange() that should probably be migrated into here pcs.firePropertyChange(CASE_NAME, "", currentCase.name); RecentCases.getInstance().addRecentCase(currentCase.name, currentCase.configFilePath); // update the recent cases diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java b/Case/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java index 48ebfeb639..295a01cfc2 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java @@ -37,6 +37,7 @@ import org.sleuthkit.autopsy.logging.Log; */ @ServiceProvider(service = CaseOpenAction.class) public final class CaseOpenAction implements ActionListener { + private static final Logger logger = Logger.getLogger(CaseOpenAction.class.getName()); JFileChooser fc = new JFileChooser(); GeneralFilter autFilter = new GeneralFilter(new String[]{".aut"}, "AUTOPSY File (*.aut)", false); @@ -73,7 +74,7 @@ public final class CaseOpenAction implements ActionListener { StartupWindow.getInstance().close(); } catch (Exception ex) { // no need to show the error message to the user. - // TODO: But maybe put the error message in the log in the future. + logger.log(Level.INFO, "Error closing startup window.", ex); } try { Case.open(path); // open the case diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java b/Case/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java index 8e07f6fbd2..9475e1e547 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java @@ -119,7 +119,6 @@ public final class NewCaseWizardAction extends CallableSystemAction { if (c instanceof JComponent) { // assume Swing components JComponent jc = (JComponent) c; // Sets step number of a component - // TODO if using org.openide.dialogs >= 7.8, can use WizardDescriptor.PROP_*: jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(i)); // Sets steps names for a panel jc.putClientProperty("WizardPanel_contentData", steps); diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java b/Case/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java index 4f0fc0903f..eaefdf7b1f 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java @@ -191,7 +191,6 @@ class OpenRecentCasePanel extends javax.swing.JPanel { }// //GEN-END:initComponents private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed - // TODO add your handling code here: }//GEN-LAST:event_cancelButtonActionPerformed diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContentViewer.java b/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContentViewer.java index 5601d9fd13..4ee9f424cd 100644 --- a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContentViewer.java +++ b/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContentViewer.java @@ -43,8 +43,7 @@ public interface DataContentViewer { * instance returned by the Lookup as a factory for the instances that * are actually used.) */ - // TODO: extract the factory method out into a seperate interface that - // is used for the Lookup. + // TODO: extract the factory method out into a seperate interface that is used for the Lookup. public DataContentViewer getInstance(); /** diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java index 5f65c777b8..40c5549a2c 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java @@ -274,7 +274,7 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont @Override public void setNode(Node selectedNode) { if (selectedNode != null) { - Content content = ((Node) selectedNode).getLookup().lookup(Content.class); + Content content = (selectedNode).getLookup().lookup(Content.class); if (content != null) { this.setDataView(content, 0, false); return; diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.java index 61a11c020b..3a7aeaddc4 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.java @@ -131,9 +131,7 @@ public class DataContentViewerPicture extends javax.swing.JPanel implements Data } @Override - public boolean isSupported(Node cNode) { - Node node = (Node) cNode; - + public boolean isSupported(Node node) { if (node != null) { // Note: only supports JPG, GIF, and PNG for now return node.getDisplayName().toLowerCase().endsWith(".jpg") diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java index e30633e055..29f4a6e69f 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java @@ -268,7 +268,7 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC @Override public void setNode(Node selectedNode) { if (selectedNode != null) { - Content content = ((Node) selectedNode).getLookup().lookup(Content.class); + Content content = selectedNode.getLookup().lookup(Content.class); if (content != null) { this.setDataView(content, 0, false); return; diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java index 7eef046120..bedf96df7c 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java @@ -38,7 +38,6 @@ import org.openide.nodes.Node.PropertySet; import org.openide.nodes.Sheet; import org.openide.util.lookup.ServiceProvider; import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer; -// TODO We should not have anything specific to Image in here... /** * DataResult sortable table viewer @@ -145,13 +144,13 @@ public class DataResultViewerTable extends AbstractDataResultViewer { if (selectedNode != null) { - hasChildren = ((Node) selectedNode).getChildren().getNodesCount() > 0; + hasChildren = selectedNode.getChildren().getNodesCount() > 0; } // if there's no selection node, do nothing if (hasChildren) { - Node root = (Node) selectedNode; + Node root = selectedNode; if (!(root instanceof TableFilterNode)) { root = new TableFilterNode(root, true); @@ -161,7 +160,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer { OutlineView ov = ((OutlineView) this.tableScrollPanel); - List tempProps = new ArrayList(Arrays.asList(getChildPropertyHeaders((Node) selectedNode))); + List tempProps = new ArrayList(Arrays.asList(getChildPropertyHeaders(selectedNode))); tempProps.remove(0); diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java index d29e1ea8f3..49a71ce744 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java @@ -170,7 +170,7 @@ private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve } catch (MalformedURLException ex) { //ignore } - url = null; // TODO add your handling code here: + url = null; }//GEN-LAST:event_jLabel1MouseClicked private void activateVerboseLogging(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_activateVerboseLogging diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java index d094396b45..d06c7510d1 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java @@ -35,7 +35,7 @@ class ThumbnailViewChildren extends FilterNode.Children { /** the constructor */ ThumbnailViewChildren(Node arg) { - super((Node) arg); + super(arg); this.totalChildren = 1; } diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java b/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java index 8051055ee2..5c7ff513f6 100644 --- a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java +++ b/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java @@ -34,12 +34,14 @@ import org.sleuthkit.autopsy.logging.Log; import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.TskException; +// TODO: clean up external viewer action + + /** * * @author jantonius */ public class ExternalViewerAction extends AbstractAction { - private byte[] content; private Content contentObject; private String fileName; diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java b/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java index fb436a16cd..60f0ff1718 100644 --- a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java +++ b/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java @@ -47,7 +47,7 @@ class NewWindowViewAction extends AbstractAction{ public void actionPerformed(ActionEvent e) { Log.noteAction(this.getClass()); - String[] filePaths = ContentUtils.getDisplayPath(((Node) contentNode).getLookup().lookup(Content.class)); + String[] filePaths = ContentUtils.getDisplayPath((contentNode).getLookup().lookup(Content.class)); String filePath = DataConversion.getformattedPath(filePaths, 0); DataContentTopComponent dctc = DataContentTopComponent.createUndocked(filePath, this.contentNode); diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ShowDetailActionVisitor.java b/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ShowDetailActionVisitor.java index 84e678cb1e..d4fa64a89c 100644 --- a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ShowDetailActionVisitor.java +++ b/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ShowDetailActionVisitor.java @@ -84,8 +84,7 @@ class ShowDetailActionVisitor extends ContentVisitor.Default