diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties index 688d11430a..ecda3c4a8d 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties @@ -7,16 +7,4 @@ DataContentViewerOtherCases.earliestCaseDate.text=Earliest Case Date DataContentViewerOtherCases.earliestCaseLabel.toolTipText= DataContentViewerOtherCases.earliestCaseLabel.text=Central Repository Starting Date: DataContentViewerOtherCases.foundInLabel.text= -OccurrencePanelOld.filePathLabel.text=File Path: -OccurrencePanelOld.valueFieldLabel.text=Value: -OccurrencePanelOld.typeLabel.text=Type: -OccurrencePanelOld.deviceIdLabel.text=Device ID: -OccurrencePanelOld.dataSourceNameLabel.text=Data Source Name: -OccurrencePanelOld.caseCreatedDateLabel.text=Case Created: -OccurrencePanelOld.caseNameLabel.text=Case Name: -OccurrencePanelOld.deviceIdValue.text= -OccurrencePanelOld.dataSourceNameValue.text= -OccurrencePanelOld.jLabel1.text=jLabel1 -OccurrencePanelOld.commentLabel.text=Comment: -OccurrencePanelOld.knownStatusLabel.text=Known Status: DataContentViewerOtherCases.caseDatasourceFileSplitPane.toolTipText= diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED index 5c6c5d7a99..e659b44c9c 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED @@ -24,6 +24,7 @@ DataContentViewerOtherCases.earliestCaseDate.text=Earliest Case Date DataContentViewerOtherCases.earliestCaseLabel.toolTipText= DataContentViewerOtherCases.earliestCaseLabel.text=Central Repository Starting Date: DataContentViewerOtherCases.foundInLabel.text= +DataContentViewerOtherCases.caseDatasourceFileSplitPane.toolTipText= DataContentViewerOtherCases.title=Other Occurrences DataContentViewerOtherCases.toolTip=Displays instances of the selected file/artifact from other occurrences. OccurrencePanel.caseCreatedDateLabel.text=Created Date: @@ -38,19 +39,6 @@ OccurrencePanel.dataSourceDetails.text=Data Source Details OccurrencePanel.dataSourceNameLabel.text=Name: OccurrencePanel.fileDetails.text=File Details OccurrencePanel.filePathLabel.text=File Path: -OccurrencePanelOld.filePathLabel.text=File Path: -OccurrencePanelOld.valueFieldLabel.text=Value: -OccurrencePanelOld.typeLabel.text=Type: -OccurrencePanelOld.deviceIdLabel.text=Device ID: -OccurrencePanelOld.dataSourceNameLabel.text=Data Source Name: -OccurrencePanelOld.caseCreatedDateLabel.text=Case Created: -OccurrencePanelOld.caseNameLabel.text=Case Name: -OccurrencePanelOld.deviceIdValue.text= -OccurrencePanelOld.dataSourceNameValue.text= -OccurrencePanelOld.jLabel1.text=jLabel1 -OccurrencePanelOld.commentLabel.text=Comment: -OccurrencePanelOld.knownStatusLabel.text=Known Status: -DataContentViewerOtherCases.caseDatasourceFileSplitPane.toolTipText= OtherOccurrencesCasesTableModel.case=Case OtherOccurrencesCasesTableModel.noData=No Data. OtherOccurrencesDataSourcesTableModel.dataSourceName=Data Source Name diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java index 71f08cb08c..a257e53191 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java @@ -1,7 +1,7 @@ /* * Central Repository * - * Copyright 2019 Basis Technology Corp. + * Copyright 2017-2019 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -99,12 +99,12 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi private final OtherOccurrencesDataSourcesTableModel dataSourcesTableModel; private OccurrencePanel occurrencePanel; private final Collection correlationAttributes; - private String dataSourceName = ""; - private String deviceId = ""; + private String dataSourceName = ""; //the data source of the file which the content viewer is being populated for + private String deviceId = ""; //the device id of the data source for the file which the content viewer is being populated for /** * Could be null. */ - private AbstractFile file; + private AbstractFile file; //the file which the content viewer is being populated for /** * Creates new form DataContentViewerOtherCases