From 031c3f7d16c7ffb03f2c789db70081d1ee3e749d Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 1 Sep 2020 08:54:12 -0400 Subject: [PATCH] update for codacy --- .../datasourcesummary/ui/Bundle.properties | 10 +- .../ui/Bundle.properties-MERGED | 44 ++++----- ...rm => DataSourceSummaryActivityPanel.form} | 10 +- ...va => DataSourceSummaryActivityPanel.java} | 92 +++++++++---------- .../ui/DataSourceSummaryTabbedPane.java | 2 +- 5 files changed, 79 insertions(+), 79 deletions(-) rename Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/{DataSourceSummaryUserActivityPanel.form => DataSourceSummaryActivityPanel.form} (96%) rename Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/{DataSourceSummaryUserActivityPanel.java => DataSourceSummaryActivityPanel.java} (79%) diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties index 1d80aefc73..b9413d12da 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties @@ -35,8 +35,8 @@ DataSourceSummaryDetailsPanel.unallocatedSizeLabel.text=Unallocated Space: DataSourceSummaryDetailsPanel.unallocatedSizeValue.text= DataSourceSummaryCountsPanel.byCategoryLabel.text=Files by Category DataSourceSummaryCountsPanel.resultsByTypeLabel.text=Results by Type -DataSourceSummaryUserActivityPanel.programsRunLabel.text=Recent Programs -DataSourceSummaryUserActivityPanel.recentDomainsLabel.text=Recent Domains -DataSourceSummaryUserActivityPanel.topWebSearchLabel.text=Recent Web Searches -DataSourceSummaryUserActivityPanel.topDevicesAttachedLabel.text=Recent Devices Attached -DataSourceSummaryUserActivityPanel.recentAccountsLabel.text=Recent Accounts +DataSourceSummaryActivityPanel.programsRunLabel.text=Recent Programs +DataSourceSummaryActivityPanel.recentAccountsLabel.text=Recent Accounts +DataSourceSummaryActivityPanel.topWebSearchLabel.text=Recent Web Searches +DataSourceSummaryActivityPanel.topDevicesAttachedLabel.text=Recent Devices Attached +DataSourceSummaryActivityPanel.recentDomainsLabel.text=Recent Domains diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED index 69302f6333..f7116e518d 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED @@ -1,4 +1,21 @@ CTL_DataSourceSummaryAction=Data Source Summary +DataSourceSummaryActivityPanel_noDataExists=No communication data exists +DataSourceSummaryActivityPanel_tab_title=User Activity +DataSourceSummaryActivityPanel_TopAccountTableModel_accountType_header=Account Type +DataSourceSummaryActivityPanel_TopAccountTableModel_lastAccess_header=Last Accessed +DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_dateAccessed_header=Last Accessed +DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_deviceId_header=Device Id +DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_makeModel_header=Make and Model +DataSourceSummaryActivityPanel_TopDomainsTableModel_domain_header=Domain +DataSourceSummaryActivityPanel_TopDomainsTableModel_lastAccess_header=Last Access +DataSourceSummaryActivityPanel_TopDomainsTableModel_url_header=URL +DataSourceSummaryActivityPanel_TopProgramsTableModel_count_header=Run Times +DataSourceSummaryActivityPanel_TopProgramsTableModel_folder_header=Folder +DataSourceSummaryActivityPanel_TopProgramsTableModel_lastrun_header=Last Run +DataSourceSummaryActivityPanel_TopProgramsTableModel_name_header=Program +DataSourceSummaryActivityPanel_TopWebSearchTableModel_dateAccessed_header=Date Accessed +DataSourceSummaryActivityPanel_TopWebSearchTableModel_searchString_header=Search String +DataSourceSummaryActivityPanel_TopWebSearchTableModel_translatedResult_header=Translated DataSourceSummaryCountsPanel.ArtifactCountsTableModel.count.header=Count DataSourceSummaryCountsPanel.ArtifactCountsTableModel.type.header=Result Type DataSourceSummaryCountsPanel.byMimeTypeLabel.text=Files by MIME Type @@ -61,6 +78,11 @@ DataSourceSummaryDetailsPanel.unallocatedSizeLabel.text=Unallocated Space: DataSourceSummaryDetailsPanel.unallocatedSizeValue.text= DataSourceSummaryCountsPanel.byCategoryLabel.text=Files by Category DataSourceSummaryCountsPanel.resultsByTypeLabel.text=Results by Type +DataSourceSummaryActivityPanel.programsRunLabel.text=Recent Programs +DataSourceSummaryActivityPanel.recentAccountsLabel.text=Recent Accounts +DataSourceSummaryActivityPanel.topWebSearchLabel.text=Recent Web Searches +DataSourceSummaryActivityPanel.topDevicesAttachedLabel.text=Recent Devices Attached +DataSourceSummaryActivityPanel.recentDomainsLabel.text=Recent Domains DataSourceSummaryDialog.window.title=Data Sources Summary DataSourceSummaryNode.column.dataSourceName.header=Data Source Name DataSourceSummaryNode.column.files.header=Files @@ -73,26 +95,4 @@ DataSourceSummaryTabbedPane_countsTab_title=Counts DataSourceSummaryTabbedPane_detailsTab_title=Details DataSourceSummaryTabbedPane_ingestHistoryTab_title=Ingest History DataSourceSummaryTabbedPane_userActivityTab_title=User Activity -DataSourceSummaryUserActivityPanel.programsRunLabel.text=Recent Programs -DataSourceSummaryUserActivityPanel.recentDomainsLabel.text=Recent Domains -DataSourceSummaryUserActivityPanel.topWebSearchLabel.text=Recent Web Searches -DataSourceSummaryUserActivityPanel.topDevicesAttachedLabel.text=Recent Devices Attached -DataSourceSummaryUserActivityPanel.recentAccountsLabel.text=Recent Accounts -DataSourceSummaryUserActivityPanel_noDataExists=No communication data exists -DataSourceSummaryUserActivityPanel_tab_title=User Activity -DataSourceSummaryUserActivityPanel_TopAccountTableModel_accountType_header=Account Type -DataSourceSummaryUserActivityPanel_TopAccountTableModel_lastAccess_header=Last Accessed -DataSourceSummaryUserActivityPanel_TopDeviceAttachedTableModel_dateAccessed_header=Last Accessed -DataSourceSummaryUserActivityPanel_TopDeviceAttachedTableModel_deviceId_header=Device Id -DataSourceSummaryUserActivityPanel_TopDeviceAttachedTableModel_makeModel_header=Make and Model -DataSourceSummaryUserActivityPanel_TopDomainsTableModel_domain_header=Domain -DataSourceSummaryUserActivityPanel_TopDomainsTableModel_lastAccess_header=Last Access -DataSourceSummaryUserActivityPanel_TopDomainsTableModel_url_header=URL -DataSourceSummaryUserActivityPanel_TopProgramsTableModel_count_header=Run Times -DataSourceSummaryUserActivityPanel_TopProgramsTableModel_folder_header=Folder -DataSourceSummaryUserActivityPanel_TopProgramsTableModel_lastrun_header=Last Run -DataSourceSummaryUserActivityPanel_TopProgramsTableModel_name_header=Program -DataSourceSummaryUserActivityPanel_TopWebSearchTableModel_dateAccessed_header=Date Accessed -DataSourceSummaryUserActivityPanel_TopWebSearchTableModel_searchString_header=Search String -DataSourceSummaryUserActivityPanel_TopWebSearchTableModel_translatedResult_header=Translated ViewSummaryInformationAction.name.text=View Summary Information diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.form b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.form similarity index 96% rename from Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.form rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.form index 850a8e1f29..2919e2ab84 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.form +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.form @@ -64,7 +64,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -205,7 +205,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -343,7 +343,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.java similarity index 79% rename from Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.java index 199420b490..9b513b3ff2 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.java @@ -48,24 +48,24 @@ import org.sleuthkit.datamodel.DataSource; * A panel to display user activity. */ @Messages({ - "DataSourceSummaryUserActivityPanel_tab_title=User Activity", - "DataSourceSummaryUserActivityPanel_TopProgramsTableModel_name_header=Program", - "DataSourceSummaryUserActivityPanel_TopProgramsTableModel_folder_header=Folder", - "DataSourceSummaryUserActivityPanel_TopProgramsTableModel_count_header=Run Times", - "DataSourceSummaryUserActivityPanel_TopProgramsTableModel_lastrun_header=Last Run", - "DataSourceSummaryUserActivityPanel_TopDomainsTableModel_domain_header=Domain", - "DataSourceSummaryUserActivityPanel_TopDomainsTableModel_url_header=URL", - "DataSourceSummaryUserActivityPanel_TopDomainsTableModel_lastAccess_header=Last Access", - "DataSourceSummaryUserActivityPanel_noDataExists=No communication data exists", - "DataSourceSummaryUserActivityPanel_TopWebSearchTableModel_searchString_header=Search String", - "DataSourceSummaryUserActivityPanel_TopWebSearchTableModel_dateAccessed_header=Date Accessed", - "DataSourceSummaryUserActivityPanel_TopWebSearchTableModel_translatedResult_header=Translated", - "DataSourceSummaryUserActivityPanel_TopDeviceAttachedTableModel_deviceId_header=Device Id", - "DataSourceSummaryUserActivityPanel_TopDeviceAttachedTableModel_makeModel_header=Make and Model", - "DataSourceSummaryUserActivityPanel_TopDeviceAttachedTableModel_dateAccessed_header=Last Accessed", - "DataSourceSummaryUserActivityPanel_TopAccountTableModel_accountType_header=Account Type", - "DataSourceSummaryUserActivityPanel_TopAccountTableModel_lastAccess_header=Last Accessed",}) -public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPanel { + "DataSourceSummaryActivityPanel_tab_title=User Activity", + "DataSourceSummaryActivityPanel_TopProgramsTableModel_name_header=Program", + "DataSourceSummaryActivityPanel_TopProgramsTableModel_folder_header=Folder", + "DataSourceSummaryActivityPanel_TopProgramsTableModel_count_header=Run Times", + "DataSourceSummaryActivityPanel_TopProgramsTableModel_lastrun_header=Last Run", + "DataSourceSummaryActivityPanel_TopDomainsTableModel_domain_header=Domain", + "DataSourceSummaryActivityPanel_TopDomainsTableModel_url_header=URL", + "DataSourceSummaryActivityPanel_TopDomainsTableModel_lastAccess_header=Last Access", + "DataSourceSummaryActivityPanel_noDataExists=No communication data exists", + "DataSourceSummaryActivityPanel_TopWebSearchTableModel_searchString_header=Search String", + "DataSourceSummaryActivityPanel_TopWebSearchTableModel_dateAccessed_header=Date Accessed", + "DataSourceSummaryActivityPanel_TopWebSearchTableModel_translatedResult_header=Translated", + "DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_deviceId_header=Device Id", + "DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_makeModel_header=Make and Model", + "DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_dateAccessed_header=Last Accessed", + "DataSourceSummaryActivityPanel_TopAccountTableModel_accountType_header=Account Type", + "DataSourceSummaryActivityPanel_TopAccountTableModel_lastAccess_header=Last Accessed",}) +public class DataSourceSummaryActivityPanel extends BaseDataSourceSummaryPanel { private static final long serialVersionUID = 1L; private static final DateFormat DATETIME_FORMAT = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss", Locale.getDefault()); @@ -91,17 +91,17 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan /** * Creates a new DataSourceUserActivityPanel. */ - public DataSourceSummaryUserActivityPanel() { + public DataSourceSummaryActivityPanel() { this(new DataSourceTopProgramsSummary(), new DataSourceUserActivitySummary()); } /** - * Creates a new DataSourceSummaryUserActivityPanel. + * Creates a new DataSourceSummaryActivityPanel. * * @param topProgramsData Class from which to obtain top programs data. * @param topDomainsData Class from which to obtain recent domains data. */ - public DataSourceSummaryUserActivityPanel( + public DataSourceSummaryActivityPanel( DataSourceTopProgramsSummary topProgramsData, DataSourceUserActivitySummary topDomainsData) { @@ -109,7 +109,7 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan this.topProgramsTable = JTablePanel.getJTablePanel(Arrays.asList( // program name column new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopProgramsTableModel_name_header(), + Bundle.DataSourceSummaryActivityPanel_TopProgramsTableModel_name_header(), (prog) -> { return new DefaultCellModel(prog.getProgramName()) .setTooltip(prog.getProgramPath()); @@ -117,7 +117,7 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan 250), // program folder column new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopProgramsTableModel_folder_header(), + Bundle.DataSourceSummaryActivityPanel_TopProgramsTableModel_folder_header(), (prog) -> { return new DefaultCellModel( topProgramsData.getShortFolderName( @@ -127,7 +127,7 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan 150), // run count column new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopProgramsTableModel_count_header(), + Bundle.DataSourceSummaryActivityPanel_TopProgramsTableModel_count_header(), (prog) -> { String runTimes = prog.getRunTimes() == null ? "" : Long.toString(prog.getRunTimes()); return new DefaultCellModel(runTimes); @@ -135,7 +135,7 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan 80), // last run date column new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopProgramsTableModel_lastrun_header(), + Bundle.DataSourceSummaryActivityPanel_TopProgramsTableModel_lastrun_header(), (prog) -> new DefaultCellModel(getFormatted(prog.getLastRun())), 150) )); @@ -144,17 +144,17 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan this.recentDomainsTable = JTablePanel.getJTablePanel(Arrays.asList( // domain column new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopDomainsTableModel_domain_header(), + Bundle.DataSourceSummaryActivityPanel_TopDomainsTableModel_domain_header(), (recentDomain) -> new DefaultCellModel(recentDomain.getDomain()), 250), // url column new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopDomainsTableModel_url_header(), + Bundle.DataSourceSummaryActivityPanel_TopDomainsTableModel_url_header(), (recentDomain) -> new DefaultCellModel(recentDomain.getUrl()), 250), // last accessed column new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopDomainsTableModel_lastAccess_header(), + Bundle.DataSourceSummaryActivityPanel_TopDomainsTableModel_lastAccess_header(), (recentDomain) -> new DefaultCellModel(getFormatted(recentDomain.getLastVisit())), 150) )); @@ -163,19 +163,19 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan this.topWebSearchesTable = JTablePanel.getJTablePanel(Arrays.asList( // search string column new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopWebSearchTableModel_searchString_header(), + Bundle.DataSourceSummaryActivityPanel_TopWebSearchTableModel_searchString_header(), (webSearch) -> new DefaultCellModel(webSearch.getSearchString()), 250 ), // last accessed new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopWebSearchTableModel_dateAccessed_header(), + Bundle.DataSourceSummaryActivityPanel_TopWebSearchTableModel_dateAccessed_header(), (webSearch) -> new DefaultCellModel(getFormatted(webSearch.getDateAccessed())), 150 ), // translated value new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopWebSearchTableModel_translatedResult_header(), + Bundle.DataSourceSummaryActivityPanel_TopWebSearchTableModel_translatedResult_header(), (webSearch) -> new DefaultCellModel(webSearch.getTranslatedResult()), 250 ) @@ -185,19 +185,19 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan this.topDevicesAttachedTable = JTablePanel.getJTablePanel(Arrays.asList( // device id column new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopDeviceAttachedTableModel_deviceId_header(), + Bundle.DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_deviceId_header(), (device) -> new DefaultCellModel(device.getDeviceId()), 250 ), // last accessed new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopDeviceAttachedTableModel_dateAccessed_header(), + Bundle.DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_dateAccessed_header(), (device) -> new DefaultCellModel(getFormatted(device.getDateAccessed())), 150 ), // make and model new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopDeviceAttachedTableModel_makeModel_header(), + Bundle.DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_makeModel_header(), (device) -> { String make = StringUtils.isBlank(device.getDeviceMake()) ? "" : device.getDeviceMake().trim(); String model = StringUtils.isBlank(device.getDeviceModel()) ? "" : device.getDeviceModel().trim(); @@ -214,13 +214,13 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan this.topAccountsTable = JTablePanel.getJTablePanel(Arrays.asList( // account type column new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopAccountTableModel_accountType_header(), + Bundle.DataSourceSummaryActivityPanel_TopAccountTableModel_accountType_header(), (account) -> new DefaultCellModel(account.getAccountType()), 250 ), // last accessed new ColumnModel<>( - Bundle.DataSourceSummaryUserActivityPanel_TopAccountTableModel_lastAccess_header(), + Bundle.DataSourceSummaryActivityPanel_TopAccountTableModel_lastAccess_header(), (account) -> new DefaultCellModel(getFormatted(account.getLastAccess())), 150 ) @@ -240,27 +240,27 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan new DataFetchComponents<>( (dataSource) -> topProgramsData.getTopPrograms(dataSource, TOP_PROGS_COUNT), (result) -> topProgramsTable.showDataFetchResult(result, JTablePanel.getDefaultErrorMessage(), - Bundle.DataSourceSummaryUserActivityPanel_noDataExists())), + Bundle.DataSourceSummaryActivityPanel_noDataExists())), // top domains query new DataFetchComponents<>( (dataSource) -> topDomainsData.getRecentDomains(dataSource, TOP_DOMAINS_COUNT), (result) -> recentDomainsTable.showDataFetchResult(result, JTablePanel.getDefaultErrorMessage(), - Bundle.DataSourceSummaryUserActivityPanel_noDataExists())), + Bundle.DataSourceSummaryActivityPanel_noDataExists())), // top web searches query new DataFetchComponents<>( (dataSource) -> topDomainsData.getMostRecentWebSearches(dataSource, TOP_SEARCHES_COUNT), (result) -> topWebSearchesTable.showDataFetchResult(result, JTablePanel.getDefaultErrorMessage(), - Bundle.DataSourceSummaryUserActivityPanel_noDataExists())), + Bundle.DataSourceSummaryActivityPanel_noDataExists())), // top devices query new DataFetchComponents<>( (dataSource) -> topDomainsData.getRecentDevices(dataSource, TOP_DEVICES_COUNT), (result) -> topDevicesAttachedTable.showDataFetchResult(result, JTablePanel.getDefaultErrorMessage(), - Bundle.DataSourceSummaryUserActivityPanel_noDataExists())), + Bundle.DataSourceSummaryActivityPanel_noDataExists())), // top accounts query new DataFetchComponents<>( (dataSource) -> topDomainsData.getRecentAccounts(dataSource, TOP_ACCOUNTS_COUNT), (result) -> topAccountsTable.showDataFetchResult(result, JTablePanel.getDefaultErrorMessage(), - Bundle.DataSourceSummaryUserActivityPanel_noDataExists())) + Bundle.DataSourceSummaryActivityPanel_noDataExists())) ); initComponents(); @@ -331,7 +331,7 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan contentPanel.setLayout(new javax.swing.BoxLayout(contentPanel, javax.swing.BoxLayout.PAGE_AXIS)); programsRunLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); - org.openide.awt.Mnemonics.setLocalizedText(programsRunLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryUserActivityPanel.class, "DataSourceSummaryUserActivityPanel.programsRunLabel.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(programsRunLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryActivityPanel.class, "DataSourceSummaryActivityPanel.programsRunLabel.text")); // NOI18N programsRunLabel.setAlignmentX(Component.LEFT_ALIGNMENT); contentPanel.add(programsRunLabel); contentPanel.add(filler1); @@ -344,7 +344,7 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan contentPanel.add(filler3); recentDomainsLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); - org.openide.awt.Mnemonics.setLocalizedText(recentDomainsLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryUserActivityPanel.class, "DataSourceSummaryUserActivityPanel.recentDomainsLabel.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(recentDomainsLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryActivityPanel.class, "DataSourceSummaryActivityPanel.recentDomainsLabel.text")); // NOI18N contentPanel.add(recentDomainsLabel); contentPanel.add(filler2); @@ -356,7 +356,7 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan contentPanel.add(filler4); topWebSearchLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); - org.openide.awt.Mnemonics.setLocalizedText(topWebSearchLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryUserActivityPanel.class, "DataSourceSummaryUserActivityPanel.topWebSearchLabel.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(topWebSearchLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryActivityPanel.class, "DataSourceSummaryActivityPanel.topWebSearchLabel.text")); // NOI18N contentPanel.add(topWebSearchLabel); contentPanel.add(filler5); @@ -368,7 +368,7 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan contentPanel.add(filler6); topDevicesAttachedLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); - org.openide.awt.Mnemonics.setLocalizedText(topDevicesAttachedLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryUserActivityPanel.class, "DataSourceSummaryUserActivityPanel.topDevicesAttachedLabel.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(topDevicesAttachedLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryActivityPanel.class, "DataSourceSummaryActivityPanel.topDevicesAttachedLabel.text")); // NOI18N contentPanel.add(topDevicesAttachedLabel); contentPanel.add(filler7); @@ -380,7 +380,7 @@ public class DataSourceSummaryUserActivityPanel extends BaseDataSourceSummaryPan contentPanel.add(filler8); recentAccountsLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); - org.openide.awt.Mnemonics.setLocalizedText(recentAccountsLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryUserActivityPanel.class, "DataSourceSummaryUserActivityPanel.recentAccountsLabel.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(recentAccountsLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryActivityPanel.class, "DataSourceSummaryActivityPanel.recentAccountsLabel.text")); // NOI18N contentPanel.add(recentAccountsLabel); contentPanel.add(filler9); diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryTabbedPane.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryTabbedPane.java index 1d2eb13920..ce55bad49c 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryTabbedPane.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryTabbedPane.java @@ -45,7 +45,7 @@ public class DataSourceSummaryTabbedPane extends JTabbedPane { private final List> tabs = Arrays.asList( Pair.of(Bundle.DataSourceSummaryTabbedPane_detailsTab_title(), new DataSourceSummaryDetailsPanel()), Pair.of(Bundle.DataSourceSummaryTabbedPane_countsTab_title(), new DataSourceSummaryCountsPanel()), - Pair.of(Bundle.DataSourceSummaryTabbedPane_userActivityTab_title(), new DataSourceSummaryUserActivityPanel()) + Pair.of(Bundle.DataSourceSummaryTabbedPane_userActivityTab_title(), new DataSourceSummaryActivityPanel()) ); private final IngestJobInfoPanel ingestHistoryPanel = new IngestJobInfoPanel();