diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java
index ef7e853d68427c64b945c309f180ab5036835adc..cf0c27fb2756a19dc1124e5f45b4c4630e302a93 100644
--- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java
@@ -24,10 +24,8 @@
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.logging.Level;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.TreeMap;
import javax.swing.AbstractAction;
import javax.swing.ActionMap;
@@ -57,7 +55,7 @@ public class GetTagNameAndCommentDialog extends JDialog {
private final List<TagName> tagNamesList = new ArrayList<>();
private final List<TagName> standardTagNamesList = new ArrayList<>();
private TagNameAndComment tagNameAndComment = null;
-
+
public static class TagNameAndComment {
private final TagName tagName;
@@ -105,7 +103,16 @@ public static TagNameAndComment doDialog() {
public static TagNameAndComment doDialog(Window owner) {
GetTagNameAndCommentDialog dialog = new GetTagNameAndCommentDialog(owner);
dialog.display();
- return dialog.tagNameAndComment;
+ return dialog.getTagNameAndComment();
+ }
+
+ /**
+ * Get the TagNameAndComment.
+ *
+ * @return the tagNameAndComment
+ */
+ private TagNameAndComment getTagNameAndComment() {
+ return tagNameAndComment;
}
private GetTagNameAndCommentDialog(Window owner) {
@@ -114,14 +121,14 @@ private GetTagNameAndCommentDialog(Window owner) {
ModalityType.APPLICATION_MODAL);
}
-
private void display() {
initComponents();
tagCombo.setRenderer(new DefaultListCellRenderer() {
private static final long serialVersionUID = 1L;
+
@Override
public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
- String status = ((TagName) value).getKnownStatus() == TskData.FileKnown.BAD ?TagsManager.getNotableTagLabel() : "";
+ String status = ((TagName) value).getKnownStatus() == TskData.FileKnown.BAD ? TagsManager.getNotableTagLabel() : "";
String newValue = ((TagName) value).getDisplayName() + status;
return super.getListCellRendererComponent(list, newValue, index, isSelected, cellHasFocus);
}
@@ -151,7 +158,7 @@ public void actionPerformed(ActionEvent e) {
TagsManager tagsManager = Case.getCurrentCaseThrows().getServices().getTagsManager();
List<String> standardTagNames = TagsManager.getStandardTagNames();
Map<String, TagName> tagNamesMap = new TreeMap<>(tagsManager.getDisplayNamesToTagNamesMap());
-
+
tagNamesMap.entrySet().stream().map((entry) -> entry.getValue()).forEachOrdered((tagName) -> {
if (standardTagNames.contains(tagName.getDisplayName())) {
standardTagNamesList.add(tagName);
@@ -159,7 +166,6 @@ public void actionPerformed(ActionEvent e) {
tagNamesList.add(tagName);
}
});
-
} catch (TskCoreException | NoCurrentCaseException ex) {
Logger.getLogger(GetTagNameAndCommentDialog.class
@@ -320,4 +326,5 @@ private void newTagButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
private javax.swing.JComboBox<TagName> tagCombo;
private javax.swing.JLabel tagLabel;
// End of variables declaration//GEN-END:variables
+
}
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
index 6579b15e08130b4e0902ef74ec7e42441ffc6c48..8a1ce6864e8d81fb5d52c7f7fa71b6bdfbff9725 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
@@ -922,7 +922,7 @@ private void rightClickPopupMenuPopupMenuWillBecomeVisible(javax.swing.event.Pop
* Used as a key to ensure we eliminate duplicates from the result set by
* not overwriting CR correlation instances.
*/
- static final class UniquePathKey {
+ private static final class UniquePathKey {
private final String dataSourceID;
private final String filePath;
@@ -943,9 +943,9 @@ static final class UniquePathKey {
public boolean equals(Object other) {
if (other instanceof UniquePathKey) {
UniquePathKey otherKey = (UniquePathKey) (other);
- return (Objects.equals(otherKey.dataSourceID, this.dataSourceID)
- && Objects.equals(otherKey.filePath, this.filePath)
- && Objects.equals(otherKey.type, this.type));
+ return (Objects.equals(otherKey.getDataSourceID(), this.getDataSourceID())
+ && Objects.equals(otherKey.getFilePath(), this.getFilePath())
+ && Objects.equals(otherKey.getType(), this.getType()));
}
return false;
}
@@ -955,7 +955,34 @@ public int hashCode() {
//int hash = 7;
//hash = 67 * hash + this.dataSourceID.hashCode();
//hash = 67 * hash + this.filePath.hashCode();
- return Objects.hash(dataSourceID, filePath, type);
+ return Objects.hash(getDataSourceID(), getFilePath(), getType());
+ }
+
+ /**
+ * Get the type of this UniquePathKey.
+ *
+ * @return the type
+ */
+ String getType() {
+ return type;
+ }
+
+ /**
+ * Get the file path for the UniquePathKey.
+ *
+ * @return the filePath
+ */
+ String getFilePath() {
+ return filePath;
+ }
+
+ /**
+ * Get the data source id for the UniquePathKey.
+ *
+ * @return the dataSourceID
+ */
+ String getDataSourceID() {
+ return dataSourceID;
}
}
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java
index 1f04f1f47884f25d11beed59da09a0425176bbb5..1a3527d94081982cdc6d6f6af1d72758aec8d9d7 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java
@@ -28,6 +28,8 @@
*/
public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
+ private static final long serialVersionUID = 1L;
+
@Messages({"DataContentViewerOtherCasesTableModel.case=Case",
"DataContentViewerOtherCasesTableModel.device=Device",
"DataContentViewerOtherCasesTableModel.dataSource=Data Source",
@@ -66,7 +68,7 @@ public int columnWidth() {
}
};
- List<OtherOccurrenceNodeData> nodeDataList;
+ private final List<OtherOccurrenceNodeData> nodeDataList;
DataContentViewerOtherCasesTableModel() {
nodeDataList = new ArrayList<>();
@@ -118,7 +120,7 @@ public Object getValueAt(int rowIdx, int colIdx) {
/**
* Map a column ID to the value in that cell for node message data.
*
- * @param nodeData The node message data.
+ * @param nodeData The node message data.
* @param columnId The ID of the cell column.
*
* @return The value in the cell.
@@ -133,7 +135,7 @@ private Object mapNodeMessageData(OtherOccurrenceNodeMessageData nodeData, Table
/**
* Map a column ID to the value in that cell for node instance data.
*
- * @param nodeData The node instance data.
+ * @param nodeData The node instance data.
* @param columnId The ID of the cell column.
*
* @return The value in the cell.
diff --git a/Core/src/org/sleuthkit/autopsy/communications/RelationshipNode.java b/Core/src/org/sleuthkit/autopsy/communications/RelationshipNode.java
index eb448f4f8aa2655c18b4899fc0898f3e86c2a26b..2fd30addcc1839f2f1e1e4fcee10740a35fc2769 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/RelationshipNode.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/RelationshipNode.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2017-18 Basis Technology Corp.
+ * Copyright 2017-2018 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,7 +46,7 @@
final class RelationshipNode extends BlackboardArtifactNode {
private static final Logger logger = Logger.getLogger(RelationshipNode.class.getName());
-
+
RelationshipNode(BlackboardArtifact artifact) {
super(artifact);
final String stripEnd = StringUtils.stripEnd(artifact.getDisplayName(), "s");
@@ -115,7 +115,7 @@ protected Sheet createSheet() {
}
addTagProperty(sheetSet);
-
+
return sheet;
}
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java
index 8f08b248fdf102ec4e1862d62844be6bc69b6f1d..a95dd307f5a89fb8b9ad2b55c3dc40047bb4e101 100644
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/MessageContentViewer.java
@@ -117,8 +117,8 @@ public void addNotify() {
drp.open();
drpExplorerManager = drp.getExplorerManager();
- drpExplorerManager.addPropertyChangeListener(evt ->
- viewInNewWindowButton.setEnabled(drpExplorerManager.getSelectedNodes().length == 1));
+ drpExplorerManager.addPropertyChangeListener(evt
+ -> viewInNewWindowButton.setEnabled(drpExplorerManager.getSelectedNodes().length == 1));
}
/**
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
index 1a52a61bb269580075215fa699e5c2970a12f019..b4f8f76728460e7bc58ac25ec73b586501e33376 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
@@ -21,14 +21,12 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.stream.Collectors;
-import javax.swing.Action;
import org.apache.commons.lang3.StringUtils;
import org.openide.nodes.Children;
import org.openide.nodes.Sheet;
@@ -38,9 +36,6 @@
import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent;
import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent;
-import org.sleuthkit.autopsy.centralrepository.AddEditCentralRepoCommentAction;
-import org.sleuthkit.autopsy.centralrepository.datamodel.EamArtifactUtil;
-import org.sleuthkit.autopsy.centralrepository.datamodel.EamDbUtil;
import org.sleuthkit.autopsy.coreutils.Logger;
import static org.sleuthkit.autopsy.datamodel.AbstractAbstractFileNode.AbstractFilePropertyType.*;
import static org.sleuthkit.autopsy.datamodel.Bundle.*;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
index b0e33c13bf65b811dad503b3bfec3bf78af65c2d..824407c417afded5f564d28fb3bef962b02898d0 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2018 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,6 +29,7 @@
* Abstract class that implements the commonality between File and Directory
* Nodes (same properties).
*
+ * @param <T> extends AbstractFile
*/
public abstract class AbstractFsContentNode<T extends AbstractFile> extends AbstractAbstractFileNode<T> {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index d6fb9afc049cb0db53dec4ddc3814c97976a2307..5b20c92c6e041ce3cdb3ba1cbe425a7eae2b861c 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -48,8 +48,6 @@
import org.sleuthkit.autopsy.casemodule.events.BlackBoardArtifactTagDeletedEvent;
import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent;
import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent;
-import org.sleuthkit.autopsy.centralrepository.AddEditCentralRepoCommentAction;
-import org.sleuthkit.autopsy.centralrepository.datamodel.EamDbUtil;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
import static org.sleuthkit.autopsy.datamodel.DisplayableItemNode.findLinked;
@@ -456,10 +454,10 @@ protected Sheet createSheet() {
dataSourceStr));
}
}
-
+
// If EXIF, add props for file size and path
if (artifactTypeId == BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID()) {
-
+
long size = 0;
String path = ""; //NON-NLS
if (associated instanceof AbstractFile) {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
index 20d4601e9de8846652052e4b482de898c3f69cc0..c7f20b5c285ad7fbe4335638090454f73c5b2de8 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
@@ -1,15 +1,15 @@
/*
* Autopsy Forensic Browser
- *
- * Copyright 2011-2017 Basis Technology Corp.
+ *
+ * Copyright 2011-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.
@@ -19,6 +19,7 @@
package org.sleuthkit.autopsy.datamodel;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -46,11 +47,11 @@ public class LayoutFileNode extends AbstractAbstractFileNode<LayoutFile> {
public static enum LayoutContentPropertyType {
PARTS {
- @Override
- public String toString() {
- return NbBundle.getMessage(this.getClass(), "LayoutFileNode.propertyType.parts");
- }
- }
+ @Override
+ public String toString() {
+ return NbBundle.getMessage(this.getClass(), "LayoutFileNode.propertyType.parts");
+ }
+ }
}
public static String nameForLayoutFile(LayoutFile lf) {
@@ -115,9 +116,7 @@ public <T> T accept(DisplayableItemNodeVisitor<T> visitor) {
@Override
public Action[] getActions(boolean context) {
List<Action> actionsList = new ArrayList<>();
- for (Action a : super.getActions(true)) {
- actionsList.add(a);
- }
+ actionsList.addAll(Arrays.asList(super.getActions(true)));
actionsList.add(new NewWindowViewAction(
NbBundle.getMessage(this.getClass(), "LayoutFileNode.getActions.viewInNewWin.text"), this));
actionsList.add(new ExternalViewerAction(
@@ -126,19 +125,18 @@ public Action[] getActions(boolean context) {
actionsList.add(ExtractAction.getInstance());
actionsList.add(null); // creates a menu separator
actionsList.add(AddContentTagAction.getInstance());
-
- final Collection<AbstractFile> selectedFilesList =
- new HashSet<>(Utilities.actionsGlobalContext().lookupAll(AbstractFile.class));
- if(selectedFilesList.size() == 1) {
+
+ final Collection<AbstractFile> selectedFilesList
+ = new HashSet<>(Utilities.actionsGlobalContext().lookupAll(AbstractFile.class));
+ if (selectedFilesList.size() == 1) {
actionsList.add(DeleteFileContentTagAction.getInstance());
}
-
+
actionsList.addAll(ContextMenuExtensionPoint.getActions());
return actionsList.toArray(new Action[actionsList.size()]);
}
-
- void fillPropertyMap(Map<String, Object> map) {
+ void fillPropertyMap(Map<String, Object> map) {
AbstractAbstractFileNode.fillPropertyMap(map, getContent());
map.put(LayoutContentPropertyType.PARTS.toString(), content.getNumParts());
}
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/LocalDirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LocalDirectoryNode.java
index 053146daea754571058aed4e9bd9ab9d98c9bde6..9b360763a56a1cdca2427a42eb973d3a5a5304eb 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/LocalDirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/LocalDirectoryNode.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2011-2017 Basis Technology Corp.
+ * Copyright 2011-2018 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,7 +40,7 @@ public LocalDirectoryNode(LocalDirectory ld) {
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/Folder-icon.png"); //NON-NLS
}
-
+
@Override
@NbBundle.Messages({
"LocalDirectoryNode.createSheet.name.name=Name",
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
index d5064312b3a6e6206233629d18f314712d864503..00c63b745ea064d3a8646056f9e0569e71b66300 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
@@ -96,7 +96,7 @@ protected Sheet createSheet() {
public Action[] getActions(boolean context) {
List<Action> actionsList = new ArrayList<>();
actionsList.addAll(Arrays.asList(super.getActions(true)));
-
+
actionsList.add(new ViewContextAction(NbBundle.getMessage(this.getClass(), "LocalFileNode.viewFileInDir.text"), this.content));
actionsList.add(null); // creates a menu separator
actionsList.add(new NewWindowViewAction(
@@ -125,7 +125,7 @@ public Action[] getActions(boolean context) {
logger.log(Level.WARNING, "Unable to add unzip with password action to context menus", ex);
}
}
- return actionsList.toArray(new Action[0]);
+ return actionsList.toArray(new Action[actionsList.size()]);
}
@Override
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
index 9a7e3eae8e7a0be362078b7edb4feb795428009e..837a2ae268d87f69b4254bad8ead095a7d85c395 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
@@ -50,8 +50,6 @@ public VirtualDirectoryNode(VirtualDirectory ld) {
this.setDisplayName(nameForVirtualDirectory(ld));
- String name = ld.getName();
-
//set icon for name, special case for logical file set
if (ld.isDataSource()) {
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/fileset-icon-16.png"); //NON-NLS
@@ -59,7 +57,7 @@ public VirtualDirectoryNode(VirtualDirectory ld) {
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-icon-virtual.png"); //TODO NON-NLS
}
}
-
+
@Override
@NbBundle.Messages({"VirtualDirectoryNode.createSheet.size.name=Size (Bytes)",
"VirtualDirectoryNode.createSheet.size.displayName=Size (Bytes)",