mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

4014 clean up files that might be modified to determine the presence of CR comments

Browse Source
This commit is contained in:
William Schaefer 2018-08-07 17:37:39 -04:00
parent d7c20b386f
commit 6fd7482e6e
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
View File

@ -922,7 +922,7 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
* Used as a key to ensure we eliminate duplicates from the result set by * Used as a key to ensure we eliminate duplicates from the result set by
* not overwriting CR correlation instances. * not overwriting CR correlation instances.
*/ */
static final class UniquePathKey { private static final class UniquePathKey {
private final String dataSourceID; private final String dataSourceID;
private final String filePath; private final String filePath;
@ -943,9 +943,9 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
public boolean equals(Object other) { public boolean equals(Object other) {
if (other instanceof UniquePathKey) { if (other instanceof UniquePathKey) {
UniquePathKey otherKey = (UniquePathKey) (other); UniquePathKey otherKey = (UniquePathKey) (other);
return (Objects.equals(otherKey.dataSourceID, this.dataSourceID) return (Objects.equals(otherKey.getDataSourceID(), this.getDataSourceID())
&& Objects.equals(otherKey.filePath, this.filePath) && Objects.equals(otherKey.getFilePath(), this.getFilePath())
&& Objects.equals(otherKey.type, this.type)); && Objects.equals(otherKey.getType(), this.getType()));
} }
return false; return false;
} }
@ -955,7 +955,34 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
//int hash = 7; //int hash = 7;
//hash = 67 * hash + this.dataSourceID.hashCode(); //hash = 67 * hash + this.dataSourceID.hashCode();
//hash = 67 * hash + this.filePath.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;
} }
} }

8
Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java
View File

@ -28,6 +28,8 @@ import org.openide.util.NbBundle.Messages;
*/ */
public class DataContentViewerOtherCasesTableModel extends AbstractTableModel { public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
private static final long serialVersionUID = 1L;
@Messages({"DataContentViewerOtherCasesTableModel.case=Case", @Messages({"DataContentViewerOtherCasesTableModel.case=Case",
"DataContentViewerOtherCasesTableModel.device=Device", "DataContentViewerOtherCasesTableModel.device=Device",
"DataContentViewerOtherCasesTableModel.dataSource=Data Source", "DataContentViewerOtherCasesTableModel.dataSource=Data Source",
@ -66,7 +68,7 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
} }
}; };
List<OtherOccurrenceNodeData> nodeDataList; private final List<OtherOccurrenceNodeData> nodeDataList;
DataContentViewerOtherCasesTableModel() { DataContentViewerOtherCasesTableModel() {
nodeDataList = new ArrayList<>(); nodeDataList = new ArrayList<>();
@ -118,7 +120,7 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
/** /**
* Map a column ID to the value in that cell for node message data. * 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. * @param columnId The ID of the cell column.
* *
* @return The value in the cell. * @return The value in the cell.
@ -133,7 +135,7 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
/** /**
* Map a column ID to the value in that cell for node instance data. * 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. * @param columnId The ID of the cell column.
* *
* @return The value in the cell. * @return The value in the cell.