From 9a8b51d51c2ab7af930174448ab640f402e59600 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 1 Sep 2020 09:08:11 -0400 Subject: [PATCH] rename for codacy --- .../datasourcesummary/ui/Bundle.properties | 10 +- .../ui/Bundle.properties-MERGED | 44 +- .../ui/DataSourceSummaryActivityPanel.form | 398 ----------------- .../ui/DataSourceSummaryActivityPanel.java | 400 ------------------ .../ui/DataSourceSummaryTabbedPane.java | 2 +- 5 files changed, 28 insertions(+), 826 deletions(-) delete mode 100644 Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.form delete mode 100644 Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.java diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties index b9413d12da..1fafe8d6bb 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 -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 +DataSourceUserActivityPanel.programsRunLabel.text=Recent Programs +DataSourceUserActivityPanel.recentAccountsLabel.text=Recent Accounts +DataSourceUserActivityPanel.topWebSearchLabel.text=Recent Web Searches +DataSourceUserActivityPanel.topDevicesAttachedLabel.text=Recent Devices Attached +DataSourceUserActivityPanel.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 f7116e518d..9809dd2255 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED @@ -1,21 +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 +DataSourceUserActivityPanel_noDataExists=No communication data exists +DataSourceUserActivityPanel_tab_title=User Activity +DataSourceUserActivityPanel_TopAccountTableModel_accountType_header=Account Type +DataSourceUserActivityPanel_TopAccountTableModel_lastAccess_header=Last Accessed +DataSourceUserActivityPanel_TopDeviceAttachedTableModel_dateAccessed_header=Last Accessed +DataSourceUserActivityPanel_TopDeviceAttachedTableModel_deviceId_header=Device Id +DataSourceUserActivityPanel_TopDeviceAttachedTableModel_makeModel_header=Make and Model +DataSourceUserActivityPanel_TopDomainsTableModel_domain_header=Domain +DataSourceUserActivityPanel_TopDomainsTableModel_lastAccess_header=Last Access +DataSourceUserActivityPanel_TopDomainsTableModel_url_header=URL +DataSourceUserActivityPanel_TopProgramsTableModel_count_header=Run Times +DataSourceUserActivityPanel_TopProgramsTableModel_folder_header=Folder +DataSourceUserActivityPanel_TopProgramsTableModel_lastrun_header=Last Run +DataSourceUserActivityPanel_TopProgramsTableModel_name_header=Program +DataSourceUserActivityPanel_TopWebSearchTableModel_dateAccessed_header=Date Accessed +DataSourceUserActivityPanel_TopWebSearchTableModel_searchString_header=Search String +DataSourceUserActivityPanel_TopWebSearchTableModel_translatedResult_header=Translated DataSourceSummaryCountsPanel.ArtifactCountsTableModel.count.header=Count DataSourceSummaryCountsPanel.ArtifactCountsTableModel.type.header=Result Type DataSourceSummaryCountsPanel.byMimeTypeLabel.text=Files by MIME Type @@ -78,11 +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 +DataSourceUserActivityPanel.programsRunLabel.text=Recent Programs +DataSourceUserActivityPanel.recentAccountsLabel.text=Recent Accounts +DataSourceUserActivityPanel.topWebSearchLabel.text=Recent Web Searches +DataSourceUserActivityPanel.topDevicesAttachedLabel.text=Recent Devices Attached +DataSourceUserActivityPanel.recentDomainsLabel.text=Recent Domains DataSourceSummaryDialog.window.title=Data Sources Summary DataSourceSummaryNode.column.dataSourceName.header=Data Source Name DataSourceSummaryNode.column.files.header=Files diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.form b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.form deleted file mode 100644 index 2919e2ab84..0000000000 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.form +++ /dev/null @@ -1,398 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.java deleted file mode 100644 index 9b513b3ff2..0000000000 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryActivityPanel.java +++ /dev/null @@ -1,400 +0,0 @@ -/* - * Autopsy Forensic Browser - * - * Copyright 2020 Basis Technology Corp. - * Contact: carrier sleuthkit 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.sleuthkit.autopsy.datasourcesummary.ui; - -import java.awt.Component; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Locale; -import java.util.stream.Collectors; -import org.apache.commons.lang.StringUtils; -import org.openide.util.NbBundle.Messages; -import org.sleuthkit.autopsy.casemodule.Case; -import org.sleuthkit.autopsy.datasourcesummary.datamodel.DataSourceUserActivitySummary; -import org.sleuthkit.autopsy.datasourcesummary.datamodel.DataSourceTopProgramsSummary; -import org.sleuthkit.autopsy.datasourcesummary.datamodel.DataSourceUserActivitySummary.TopAccountResult; -import org.sleuthkit.autopsy.datasourcesummary.datamodel.DataSourceUserActivitySummary.TopDeviceAttachedResult; -import org.sleuthkit.autopsy.datasourcesummary.datamodel.DataSourceUserActivitySummary.TopWebSearchResult; -import org.sleuthkit.autopsy.datasourcesummary.datamodel.TopDomainsResult; -import org.sleuthkit.autopsy.datasourcesummary.datamodel.TopProgramsResult; -import org.sleuthkit.autopsy.datasourcesummary.uiutils.CellModelTableCellRenderer.DefaultCellModel; -import org.sleuthkit.autopsy.datasourcesummary.uiutils.DataFetchWorker; -import org.sleuthkit.autopsy.datasourcesummary.uiutils.DataFetchWorker.DataFetchComponents; -import org.sleuthkit.autopsy.datasourcesummary.uiutils.DataFetchResult; -import org.sleuthkit.autopsy.datasourcesummary.uiutils.JTablePanel; -import org.sleuthkit.autopsy.datasourcesummary.uiutils.JTablePanel.ColumnModel; -import org.sleuthkit.datamodel.DataSource; - -/** - * A panel to display user activity. - */ -@Messages({ - "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()); - private static final int TOP_PROGS_COUNT = 10; - private static final int TOP_DOMAINS_COUNT = 10; - private static final int TOP_SEARCHES_COUNT = 10; - private static final int TOP_ACCOUNTS_COUNT = 5; - private static final int TOP_DEVICES_COUNT = 10; - - private static String getFormatted(Date date) { - return date == null ? "" : DATETIME_FORMAT.format(date); - } - - private final JTablePanel topProgramsTable; - private final JTablePanel recentDomainsTable; - private final JTablePanel topWebSearchesTable; - private final JTablePanel topDevicesAttachedTable; - private final JTablePanel topAccountsTable; - - private final List> dataFetchComponents; - private final List> tables; - - /** - * Creates a new DataSourceUserActivityPanel. - */ - public DataSourceSummaryActivityPanel() { - this(new DataSourceTopProgramsSummary(), new DataSourceUserActivitySummary()); - } - - /** - * 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 DataSourceSummaryActivityPanel( - DataSourceTopProgramsSummary topProgramsData, - DataSourceUserActivitySummary topDomainsData) { - - // set up recent programs table - this.topProgramsTable = JTablePanel.getJTablePanel(Arrays.asList( - // program name column - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopProgramsTableModel_name_header(), - (prog) -> { - return new DefaultCellModel(prog.getProgramName()) - .setTooltip(prog.getProgramPath()); - }, - 250), - // program folder column - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopProgramsTableModel_folder_header(), - (prog) -> { - return new DefaultCellModel( - topProgramsData.getShortFolderName( - prog.getProgramPath(), - prog.getProgramName())); - }, - 150), - // run count column - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopProgramsTableModel_count_header(), - (prog) -> { - String runTimes = prog.getRunTimes() == null ? "" : Long.toString(prog.getRunTimes()); - return new DefaultCellModel(runTimes); - }, - 80), - // last run date column - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopProgramsTableModel_lastrun_header(), - (prog) -> new DefaultCellModel(getFormatted(prog.getLastRun())), - 150) - )); - - // set up recent domains table - this.recentDomainsTable = JTablePanel.getJTablePanel(Arrays.asList( - // domain column - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopDomainsTableModel_domain_header(), - (recentDomain) -> new DefaultCellModel(recentDomain.getDomain()), - 250), - // url column - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopDomainsTableModel_url_header(), - (recentDomain) -> new DefaultCellModel(recentDomain.getUrl()), - 250), - // last accessed column - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopDomainsTableModel_lastAccess_header(), - (recentDomain) -> new DefaultCellModel(getFormatted(recentDomain.getLastVisit())), - 150) - )); - - // top web searches table - this.topWebSearchesTable = JTablePanel.getJTablePanel(Arrays.asList( - // search string column - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopWebSearchTableModel_searchString_header(), - (webSearch) -> new DefaultCellModel(webSearch.getSearchString()), - 250 - ), - // last accessed - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopWebSearchTableModel_dateAccessed_header(), - (webSearch) -> new DefaultCellModel(getFormatted(webSearch.getDateAccessed())), - 150 - ), - // translated value - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopWebSearchTableModel_translatedResult_header(), - (webSearch) -> new DefaultCellModel(webSearch.getTranslatedResult()), - 250 - ) - )); - - // top devices attached table - this.topDevicesAttachedTable = JTablePanel.getJTablePanel(Arrays.asList( - // device id column - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_deviceId_header(), - (device) -> new DefaultCellModel(device.getDeviceId()), - 250 - ), - // last accessed - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_dateAccessed_header(), - (device) -> new DefaultCellModel(getFormatted(device.getDateAccessed())), - 150 - ), - // make and model - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopDeviceAttachedTableModel_makeModel_header(), - (device) -> { - String make = StringUtils.isBlank(device.getDeviceMake()) ? "" : device.getDeviceMake().trim(); - String model = StringUtils.isBlank(device.getDeviceModel()) ? "" : device.getDeviceModel().trim(); - String makeModelString = (make.isEmpty() || model.isEmpty()) - ? make + model - : String.format("%s - %s", make, model); - return new DefaultCellModel(makeModelString); - }, - 250 - ) - )); - - // top accounts table - this.topAccountsTable = JTablePanel.getJTablePanel(Arrays.asList( - // account type column - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopAccountTableModel_accountType_header(), - (account) -> new DefaultCellModel(account.getAccountType()), - 250 - ), - // last accessed - new ColumnModel<>( - Bundle.DataSourceSummaryActivityPanel_TopAccountTableModel_lastAccess_header(), - (account) -> new DefaultCellModel(getFormatted(account.getLastAccess())), - 150 - ) - )); - - this.tables = Arrays.asList( - topProgramsTable, - recentDomainsTable, - topWebSearchesTable, - topDevicesAttachedTable, - topAccountsTable - ); - - // set up data acquisition methods - dataFetchComponents = Arrays.asList( - // top programs query - new DataFetchComponents<>( - (dataSource) -> topProgramsData.getTopPrograms(dataSource, TOP_PROGS_COUNT), - (result) -> topProgramsTable.showDataFetchResult(result, JTablePanel.getDefaultErrorMessage(), - Bundle.DataSourceSummaryActivityPanel_noDataExists())), - // top domains query - new DataFetchComponents<>( - (dataSource) -> topDomainsData.getRecentDomains(dataSource, TOP_DOMAINS_COUNT), - (result) -> recentDomainsTable.showDataFetchResult(result, JTablePanel.getDefaultErrorMessage(), - Bundle.DataSourceSummaryActivityPanel_noDataExists())), - // top web searches query - new DataFetchComponents<>( - (dataSource) -> topDomainsData.getMostRecentWebSearches(dataSource, TOP_SEARCHES_COUNT), - (result) -> topWebSearchesTable.showDataFetchResult(result, JTablePanel.getDefaultErrorMessage(), - Bundle.DataSourceSummaryActivityPanel_noDataExists())), - // top devices query - new DataFetchComponents<>( - (dataSource) -> topDomainsData.getRecentDevices(dataSource, TOP_DEVICES_COUNT), - (result) -> topDevicesAttachedTable.showDataFetchResult(result, JTablePanel.getDefaultErrorMessage(), - Bundle.DataSourceSummaryActivityPanel_noDataExists())), - // top accounts query - new DataFetchComponents<>( - (dataSource) -> topDomainsData.getRecentAccounts(dataSource, TOP_ACCOUNTS_COUNT), - (result) -> topAccountsTable.showDataFetchResult(result, JTablePanel.getDefaultErrorMessage(), - Bundle.DataSourceSummaryActivityPanel_noDataExists())) - ); - - initComponents(); - } - - @Override - protected void onNewDataSource(DataSource dataSource) { - // if no data source is present or the case is not open, - // set results for tables to null. - if (dataSource == null || !Case.isCaseOpen()) { - this.dataFetchComponents.forEach((item) -> item.getResultHandler() - .accept(DataFetchResult.getSuccessResult(null))); - - } else { - // set tables to display loading screen - this.tables.forEach((table) -> table.showDefaultLoadingMessage()); - - // create swing workers to run for each table - List> workers = dataFetchComponents - .stream() - .map((components) -> new DataFetchWorker<>(components, dataSource)) - .collect(Collectors.toList()); - - // submit swing workers to run - submit(workers); - } - } - - /** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents - private void initComponents() { - - javax.swing.JScrollPane contentScrollPane = new javax.swing.JScrollPane(); - javax.swing.JPanel contentPanel = new javax.swing.JPanel(); - javax.swing.JLabel programsRunLabel = new javax.swing.JLabel(); - javax.swing.Box.Filler filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2)); - javax.swing.JPanel topProgramsTablePanel = topProgramsTable; - javax.swing.Box.Filler filler3 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20)); - javax.swing.JLabel recentDomainsLabel = new javax.swing.JLabel(); - javax.swing.Box.Filler filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2)); - javax.swing.JPanel recentDomainsTablePanel = recentDomainsTable; - javax.swing.Box.Filler filler4 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20)); - javax.swing.JLabel topWebSearchLabel = new javax.swing.JLabel(); - javax.swing.Box.Filler filler5 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2)); - javax.swing.JPanel topWebSearches = topWebSearchesTable; - javax.swing.Box.Filler filler6 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20)); - javax.swing.JLabel topDevicesAttachedLabel = new javax.swing.JLabel(); - javax.swing.Box.Filler filler7 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2)); - javax.swing.JPanel recentDevicesAttached = topDevicesAttachedTable; - javax.swing.Box.Filler filler8 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20)); - javax.swing.JLabel recentAccountsLabel = new javax.swing.JLabel(); - javax.swing.Box.Filler filler9 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2), new java.awt.Dimension(0, 2)); - javax.swing.JPanel topAccounts = topAccountsTable; - - setLayout(new java.awt.BorderLayout()); - - contentScrollPane.setMaximumSize(null); - contentScrollPane.setMinimumSize(null); - - contentPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10)); - contentPanel.setMaximumSize(new java.awt.Dimension(720, 450)); - contentPanel.setMinimumSize(new java.awt.Dimension(720, 450)); - 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(DataSourceSummaryActivityPanel.class, "DataSourceSummaryActivityPanel.programsRunLabel.text")); // NOI18N - programsRunLabel.setAlignmentX(Component.LEFT_ALIGNMENT); - contentPanel.add(programsRunLabel); - contentPanel.add(filler1); - - topProgramsTablePanel.setAlignmentX(0.0F); - topProgramsTablePanel.setMaximumSize(new java.awt.Dimension(700, 106)); - topProgramsTablePanel.setMinimumSize(new java.awt.Dimension(700, 106)); - topProgramsTablePanel.setPreferredSize(new java.awt.Dimension(700, 106)); - contentPanel.add(topProgramsTablePanel); - contentPanel.add(filler3); - - recentDomainsLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); - org.openide.awt.Mnemonics.setLocalizedText(recentDomainsLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryActivityPanel.class, "DataSourceSummaryActivityPanel.recentDomainsLabel.text")); // NOI18N - contentPanel.add(recentDomainsLabel); - contentPanel.add(filler2); - - recentDomainsTablePanel.setAlignmentX(0.0F); - recentDomainsTablePanel.setMaximumSize(new java.awt.Dimension(700, 106)); - recentDomainsTablePanel.setMinimumSize(new java.awt.Dimension(700, 106)); - recentDomainsTablePanel.setPreferredSize(new java.awt.Dimension(700, 106)); - contentPanel.add(recentDomainsTablePanel); - contentPanel.add(filler4); - - topWebSearchLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); - org.openide.awt.Mnemonics.setLocalizedText(topWebSearchLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryActivityPanel.class, "DataSourceSummaryActivityPanel.topWebSearchLabel.text")); // NOI18N - contentPanel.add(topWebSearchLabel); - contentPanel.add(filler5); - - topWebSearches.setAlignmentX(0.0F); - topWebSearches.setMaximumSize(new java.awt.Dimension(700, 106)); - topWebSearches.setMinimumSize(new java.awt.Dimension(700, 106)); - topWebSearches.setPreferredSize(new java.awt.Dimension(700, 106)); - contentPanel.add(topWebSearches); - contentPanel.add(filler6); - - topDevicesAttachedLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); - org.openide.awt.Mnemonics.setLocalizedText(topDevicesAttachedLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryActivityPanel.class, "DataSourceSummaryActivityPanel.topDevicesAttachedLabel.text")); // NOI18N - contentPanel.add(topDevicesAttachedLabel); - contentPanel.add(filler7); - - recentDevicesAttached.setAlignmentX(0.0F); - recentDevicesAttached.setMaximumSize(new java.awt.Dimension(700, 106)); - recentDevicesAttached.setMinimumSize(new java.awt.Dimension(700, 106)); - recentDevicesAttached.setPreferredSize(new java.awt.Dimension(700, 106)); - contentPanel.add(recentDevicesAttached); - contentPanel.add(filler8); - - recentAccountsLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); - org.openide.awt.Mnemonics.setLocalizedText(recentAccountsLabel, org.openide.util.NbBundle.getMessage(DataSourceSummaryActivityPanel.class, "DataSourceSummaryActivityPanel.recentAccountsLabel.text")); // NOI18N - contentPanel.add(recentAccountsLabel); - contentPanel.add(filler9); - - topAccounts.setAlignmentX(0.0F); - topAccounts.setMaximumSize(new java.awt.Dimension(700, 106)); - topAccounts.setMinimumSize(new java.awt.Dimension(700, 106)); - topAccounts.setPreferredSize(new java.awt.Dimension(700, 106)); - contentPanel.add(topAccounts); - - contentScrollPane.setViewportView(contentPanel); - - add(contentScrollPane, java.awt.BorderLayout.CENTER); - }// //GEN-END:initComponents - - // Variables declaration - do not modify//GEN-BEGIN:variables - // End of variables declaration//GEN-END:variables -} diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryTabbedPane.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryTabbedPane.java index ce55bad49c..0d4bd718b6 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 DataSourceSummaryActivityPanel()) + Pair.of(Bundle.DataSourceSummaryTabbedPane_userActivityTab_title(), new DataSourceUserActivityPanel()) ); private final IngestJobInfoPanel ingestHistoryPanel = new IngestJobInfoPanel();