From 81ed9165dc6e454f833a83d92b4954ae7836c46d Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Wed, 19 Aug 2020 15:27:25 -0400 Subject: [PATCH 1/2] move datasourcesummary to new package --- .../sleuthkit/autopsy/casemodule/Case.java | 2 +- .../autopsy/datamodel/ImageNode.java | 2 +- .../datamodel/SpecialDirectoryNode.java | 2 +- .../ui}/Bundle.properties | 0 .../ui}/Bundle.properties-MERGED | 5 +- .../ui}/Bundle_ja.properties | 0 .../ui}/DataSourceBrowser.form | 0 .../ui}/DataSourceBrowser.java | 5 +- .../ui}/DataSourceInfoUtilities.java | 2 +- .../ui}/DataSourceLabeledValueCallback.java | 2 +- .../ui}/DataSourceSingleValueCallback.java | 2 +- .../ui}/DataSourceSummary.java | 2 +- .../ui}/DataSourceSummaryAction.java | 3 +- .../ui}/DataSourceSummaryCountsPanel.form | 4 +- .../ui}/DataSourceSummaryCountsPanel.java | 3 +- .../ui}/DataSourceSummaryDetailsPanel.form | 68 +++++++++---------- .../ui}/DataSourceSummaryDetailsPanel.java | 3 +- .../ui}/DataSourceSummaryDialog.form | 2 +- .../ui}/DataSourceSummaryDialog.java | 3 +- .../ui}/DataSourceSummaryNode.java | 3 +- .../ui}/DataSourceSummaryTabbedPane.java | 3 +- .../DataSourceSummaryUserActivityPanel.form | 2 +- .../DataSourceSummaryUserActivityPanel.java | 3 +- .../ui}/FileTypePieChart.java | 3 +- .../ui}/NonEditableTableModel.java | 2 +- .../ui}/RightAlignedTableCellRenderer.java | 2 +- .../ui}/ViewSummaryInformationAction.java | 3 +- .../DataSourceSummaryResultViewer.java | 2 +- 28 files changed, 71 insertions(+), 62 deletions(-) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/Bundle.properties (100%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/Bundle.properties-MERGED (97%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/Bundle_ja.properties (100%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceBrowser.form (100%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceBrowser.java (98%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceInfoUtilities.java (99%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceLabeledValueCallback.java (97%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSingleValueCallback.java (97%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummary.java (98%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummaryAction.java (95%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummaryCountsPanel.form (96%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummaryCountsPanel.java (99%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummaryDetailsPanel.form (84%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummaryDetailsPanel.java (99%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummaryDialog.form (94%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummaryDialog.java (98%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummaryNode.java (98%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummaryTabbedPane.java (96%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummaryUserActivityPanel.form (92%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/DataSourceSummaryUserActivityPanel.java (99%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/FileTypePieChart.java (98%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/NonEditableTableModel.java (94%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/RightAlignedTableCellRenderer.java (97%) rename Core/src/org/sleuthkit/autopsy/{casemodule/datasourcesummary => datasourcesummary/ui}/ViewSummaryInformationAction.java (95%) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java index 8ada5fa596..fe17ac712f 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -70,7 +70,7 @@ import org.sleuthkit.autopsy.actions.OpenOutputFolderAction; import org.sleuthkit.autopsy.appservices.AutopsyService; import org.sleuthkit.autopsy.appservices.AutopsyService.CaseContext; import org.sleuthkit.autopsy.casemodule.CaseMetadata.CaseMetadataException; -import org.sleuthkit.autopsy.casemodule.datasourcesummary.DataSourceSummaryAction; +import org.sleuthkit.autopsy.datasourcesummary.ui.DataSourceSummaryAction; import org.sleuthkit.autopsy.casemodule.events.AddingDataSourceEvent; import org.sleuthkit.autopsy.casemodule.events.AddingDataSourceFailedEvent; import org.sleuthkit.autopsy.casemodule.events.BlackBoardArtifactTagAddedEvent; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java index f668893eb1..06a50eb788 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java @@ -36,7 +36,7 @@ import org.openide.util.NbBundle.Messages; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.DeleteDataSourceAction; import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; -import org.sleuthkit.autopsy.casemodule.datasourcesummary.ViewSummaryInformationAction; +import org.sleuthkit.autopsy.datasourcesummary.ui.ViewSummaryInformationAction; import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance; import org.sleuthkit.autopsy.corecomponents.DataResultViewerTable; import org.sleuthkit.autopsy.coreutils.Logger; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/SpecialDirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/SpecialDirectoryNode.java index ca73a64468..a3c6691ba2 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/SpecialDirectoryNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/SpecialDirectoryNode.java @@ -24,7 +24,7 @@ import java.util.List; import javax.swing.Action; import org.openide.util.NbBundle; import org.sleuthkit.autopsy.casemodule.DeleteDataSourceAction; -import org.sleuthkit.autopsy.casemodule.datasourcesummary.ViewSummaryInformationAction; +import org.sleuthkit.autopsy.datasourcesummary.ui.ViewSummaryInformationAction; import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint; import org.sleuthkit.autopsy.directorytree.ExportCSVAction; import org.sleuthkit.autopsy.directorytree.ExtractAction; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/Bundle.properties b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties similarity index 100% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/Bundle.properties rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED similarity index 97% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/Bundle.properties-MERGED rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED index 58c1fc4516..811040a3ca 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties-MERGED @@ -16,6 +16,8 @@ DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.executables.row=Executabl DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.images.row=Images DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.type.header=File Type DataSourceSummaryCountsPanel.FilesByMimeTypeTableModel.videos.row=Videos +DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_notAnalyzed_label=Not Analyzed +DataSourceSummaryCountsPanel_FilesByMimeTypeTableModel_other_label=Other DataSourceSummaryDetailsPanel.getDataSources.error.text=Failed to get the list of datasources for the current case. DataSourceSummaryDetailsPanel.getDataSources.error.title=Load Failure DataSourceSummaryDetailsPanel.units.bytes=\ bytes @@ -61,9 +63,6 @@ DataSourceSummaryDetailsPanel.unallocatedSizeLabel.text=Unallocated Space: DataSourceSummaryDetailsPanel.unallocatedSizeValue.text= DataSourceSummaryCountsPanel.byCategoryLabel.text=Files by Category DataSourceSummaryCountsPanel.resultsByTypeLabel.text=Results by Type -DataSourceSummaryDialog.countsTab.title=Counts -DataSourceSummaryDialog.detailsTab.title=Details -DataSourceSummaryDialog.ingestHistoryTab.title=Ingest History 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/casemodule/datasourcesummary/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle_ja.properties similarity index 100% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/Bundle_ja.properties rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/Bundle_ja.properties diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceBrowser.form b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceBrowser.form similarity index 100% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceBrowser.form rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceBrowser.form diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceBrowser.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceBrowser.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceBrowser.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceBrowser.java index 92967738b0..789fcbed25 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceBrowser.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceBrowser.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.awt.EventQueue; import java.beans.PropertyVetoException; @@ -35,10 +35,11 @@ import javax.swing.event.ListSelectionListener; import org.openide.nodes.Node; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; -import org.sleuthkit.autopsy.casemodule.datasourcesummary.DataSourceSummaryNode.DataSourceSummaryEntryNode; +import org.sleuthkit.autopsy.datasourcesummary.ui.DataSourceSummaryNode.DataSourceSummaryEntryNode; import static javax.swing.SwingConstants.RIGHT; import javax.swing.SwingUtilities; import javax.swing.table.TableColumn; +import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; import org.sleuthkit.datamodel.DataSource; import org.sleuthkit.datamodel.IngestJobInfo; import org.sleuthkit.datamodel.SleuthkitCase; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceInfoUtilities.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceInfoUtilities.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceInfoUtilities.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceInfoUtilities.java index 12f4ad738d..68091fb595 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceInfoUtilities.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceInfoUtilities.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.io.File; import java.sql.ResultSet; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceLabeledValueCallback.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceLabeledValueCallback.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceLabeledValueCallback.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceLabeledValueCallback.java index 1a44e2a76b..cbb4b18e86 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceLabeledValueCallback.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceLabeledValueCallback.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSingleValueCallback.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSingleValueCallback.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSingleValueCallback.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSingleValueCallback.java index fc7eea15e5..901c3d9416 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSingleValueCallback.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSingleValueCallback.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummary.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummary.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummary.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummary.java index b50c3596bd..1894e8968b 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummary.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummary.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryAction.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryAction.java similarity index 95% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryAction.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryAction.java index 7514d61599..12a3ed3059 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryAction.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryAction.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; @@ -28,6 +28,7 @@ import org.openide.util.HelpCtx; import org.openide.util.NbBundle.Messages; import org.openide.util.actions.CallableSystemAction; import org.sleuthkit.autopsy.casemodule.Case; +import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; @ActionID(category = "Case", id = "org.sleuthkit.autopsy.casemodule.datasourcesummary.DataSourceSummaryAction") @ActionRegistration(displayName = "#CTL_DataSourceSummaryAction", lazy = false) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryCountsPanel.form b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryCountsPanel.form similarity index 96% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryCountsPanel.form rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryCountsPanel.form index f922bf9288..c9c1930787 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryCountsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryCountsPanel.form @@ -127,7 +127,7 @@ - + @@ -138,7 +138,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryCountsPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryCountsPanel.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryCountsPanel.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryCountsPanel.java index 1c3e93c47c..6c74542745 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryCountsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryCountsPanel.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.util.Map; import org.sleuthkit.autopsy.coreutils.Logger; @@ -24,6 +24,7 @@ import javax.swing.JLabel; import javax.swing.table.DefaultTableCellRenderer; import org.openide.util.NbBundle.Messages; import org.sleuthkit.autopsy.casemodule.Case; +import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; import org.sleuthkit.datamodel.DataSource; /** diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDetailsPanel.form similarity index 84% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDetailsPanel.form rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDetailsPanel.form index 9efc00faa0..a882623946 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDetailsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDetailsPanel.form @@ -40,7 +40,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -88,10 +88,10 @@ - + - + @@ -103,7 +103,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -139,10 +139,10 @@ - + - + @@ -179,7 +179,7 @@ - <ResourceString bundle="org/sleuthkit/autopsy/casemodule/datasourcesummary/Bundle.properties" key="DataSourceSummaryDetailsPanel.filePathsTable.columnModel.title0" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <ResourceString bundle="org/sleuthkit/autopsy/datasourcesummary/ui/Bundle.properties" key="DataSourceSummaryDetailsPanel.filePathsTable.columnModel.title0" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> @@ -196,7 +196,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -220,10 +220,10 @@ - + - + @@ -235,10 +235,10 @@ - + - + @@ -250,7 +250,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -310,7 +310,7 @@ - + @@ -322,7 +322,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -346,7 +346,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -382,7 +382,7 @@ - + @@ -394,7 +394,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -466,7 +466,7 @@ - + @@ -478,7 +478,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDetailsPanel.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDetailsPanel.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDetailsPanel.java index 21caa2c4b8..c83128f7bf 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDetailsPanel.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.text.DecimalFormat; import java.util.logging.Level; @@ -25,6 +25,7 @@ import javax.swing.table.DefaultTableModel; import org.apache.commons.lang3.StringUtils; import org.openide.util.NbBundle.Messages; import org.sleuthkit.autopsy.casemodule.Case; +import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; import org.sleuthkit.datamodel.DataSource; import org.sleuthkit.datamodel.Image; import org.sleuthkit.datamodel.TskCoreException; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDialog.form b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDialog.form similarity index 94% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDialog.form rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDialog.form index 2ee3ae314a..d4edf4b0ee 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDialog.form +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDialog.form @@ -48,7 +48,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDialog.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDialog.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDialog.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDialog.java index 19a1fb093e..4497c50708 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryDialog.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDialog.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.awt.Frame; import java.beans.PropertyChangeEvent; @@ -27,6 +27,7 @@ import java.util.Observer; import java.util.Set; import javax.swing.event.ListSelectionEvent; import org.openide.util.NbBundle.Messages; +import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent; import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent.Reason; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryNode.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryNode.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryNode.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryNode.java index 0411d94bb2..a4c48e7adf 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryNode.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryNode.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.awt.event.ActionEvent; import java.util.ArrayList; @@ -30,6 +30,7 @@ import org.openide.nodes.Children; import org.openide.nodes.Node; import org.openide.nodes.Sheet; import org.openide.util.NbBundle.Messages; +import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; import org.sleuthkit.autopsy.datamodel.NodeProperty; import org.sleuthkit.autopsy.directorytree.ViewContextAction; import org.sleuthkit.datamodel.DataSource; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryTabbedPane.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryTabbedPane.java similarity index 96% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryTabbedPane.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryTabbedPane.java index dddc4ee123..9298646a9d 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryTabbedPane.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryTabbedPane.java @@ -16,11 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import javax.swing.JTabbedPane; import org.openide.util.NbBundle.Messages; import org.sleuthkit.autopsy.casemodule.IngestJobInfoPanel; +import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; import org.sleuthkit.datamodel.DataSource; /** diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryUserActivityPanel.form b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.form similarity index 92% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryUserActivityPanel.form rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.form index b938286e96..0829b9e045 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryUserActivityPanel.form +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.form @@ -42,7 +42,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryUserActivityPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryUserActivityPanel.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.java index c97e2ec18c..297711498c 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/DataSourceSummaryUserActivityPanel.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.awt.Component; import java.text.DateFormat; @@ -32,6 +32,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; import org.openide.util.NbBundle.Messages; import org.sleuthkit.autopsy.casemodule.Case; +import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; import org.sleuthkit.datamodel.DataSource; /** diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/FileTypePieChart.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/FileTypePieChart.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/FileTypePieChart.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/FileTypePieChart.java index f7700e2ce3..9a6315d8d4 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/FileTypePieChart.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/FileTypePieChart.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.awt.BorderLayout; import java.awt.Font; @@ -37,6 +37,7 @@ import java.util.Set; import java.util.stream.Collectors; import javax.swing.JLabel; import org.openide.util.NbBundle.Messages; +import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; import org.sleuthkit.autopsy.coreutils.FileTypeUtils; import static org.sleuthkit.autopsy.coreutils.FileTypeUtils.FileTypeCategory; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/NonEditableTableModel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/NonEditableTableModel.java similarity index 94% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/NonEditableTableModel.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/NonEditableTableModel.java index 8ed965e2ab..3274415a89 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/NonEditableTableModel.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/NonEditableTableModel.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import javax.swing.table.DefaultTableModel; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/RightAlignedTableCellRenderer.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/RightAlignedTableCellRenderer.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/RightAlignedTableCellRenderer.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/RightAlignedTableCellRenderer.java index 12f111bba2..989e97da82 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/RightAlignedTableCellRenderer.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/RightAlignedTableCellRenderer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.awt.Component; import java.lang.reflect.InvocationTargetException; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/ViewSummaryInformationAction.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/ViewSummaryInformationAction.java similarity index 95% rename from Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/ViewSummaryInformationAction.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/ViewSummaryInformationAction.java index babe2197a1..c62cb8c214 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourcesummary/ViewSummaryInformationAction.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/ViewSummaryInformationAction.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.casemodule.datasourcesummary; +package org.sleuthkit.autopsy.datasourcesummary.ui; import java.awt.Frame; import java.awt.event.ActionEvent; @@ -24,6 +24,7 @@ import javax.swing.AbstractAction; import javax.swing.SwingUtilities; import org.openide.util.NbBundle.Messages; import org.openide.windows.WindowManager; +import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; /** * ViewSummaryInformationAction action for opening a Data Sources Summary Dialog diff --git a/Core/src/org/sleuthkit/autopsy/resultviewers/summary/DataSourceSummaryResultViewer.java b/Core/src/org/sleuthkit/autopsy/resultviewers/summary/DataSourceSummaryResultViewer.java index 1b1b3cb127..4cc90e9843 100644 --- a/Core/src/org/sleuthkit/autopsy/resultviewers/summary/DataSourceSummaryResultViewer.java +++ b/Core/src/org/sleuthkit/autopsy/resultviewers/summary/DataSourceSummaryResultViewer.java @@ -26,7 +26,7 @@ import org.openide.explorer.ExplorerManager; import org.openide.nodes.Node; import org.openide.util.NbBundle.Messages; import org.openide.util.lookup.ServiceProvider; -import org.sleuthkit.autopsy.casemodule.datasourcesummary.DataSourceSummaryTabbedPane; +import org.sleuthkit.autopsy.datasourcesummary.ui.DataSourceSummaryTabbedPane; import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer; import org.sleuthkit.autopsy.corecomponents.AbstractDataResultViewer; import org.sleuthkit.datamodel.DataSource; From 75e9b9133b06a63bfdc9bd12ebd1954cfadc6f69 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Wed, 19 Aug 2020 16:09:47 -0400 Subject: [PATCH 2/2] move items to datamodel package --- .../DataSourceInfoUtilities.java | 48 +++++++++---------- .../DataSourceLabeledValueCallback.java | 2 +- .../DataSourceSingleValueCallback.java | 2 +- .../ui/DataSourceBrowser.java | 1 + .../ui/DataSourceSummaryCountsPanel.java | 1 + .../ui/DataSourceSummaryDetailsPanel.java | 2 +- .../ui/DataSourceSummaryDialog.java | 2 +- .../DataSourceSummaryUserActivityPanel.java | 2 +- .../ui/FileTypePieChart.java | 2 +- 9 files changed, 32 insertions(+), 30 deletions(-) rename Core/src/org/sleuthkit/autopsy/datasourcesummary/{ui => datamodel}/DataSourceInfoUtilities.java (95%) rename Core/src/org/sleuthkit/autopsy/datasourcesummary/{ui => datamodel}/DataSourceLabeledValueCallback.java (97%) rename Core/src/org/sleuthkit/autopsy/datasourcesummary/{ui => datamodel}/DataSourceSingleValueCallback.java (97%) diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceInfoUtilities.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/DataSourceInfoUtilities.java similarity index 95% rename from Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceInfoUtilities.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/DataSourceInfoUtilities.java index 68091fb595..978cc2fd01 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceInfoUtilities.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/DataSourceInfoUtilities.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.datasourcesummary.ui; +package org.sleuthkit.autopsy.datasourcesummary.datamodel; import java.io.File; import java.sql.ResultSet; @@ -53,7 +53,7 @@ import org.sleuthkit.datamodel.TskData.TSK_FS_META_TYPE_ENUM; * Utilities for getting information about a data source or all data sources * from the case database. */ -final class DataSourceInfoUtilities { +public final class DataSourceInfoUtilities { private static final Logger logger = Logger.getLogger(DataSourceInfoUtilities.class.getName()); @@ -112,7 +112,7 @@ final class DataSourceInfoUtilities { * * @return The count. */ - static Long getCountOfFiles(DataSource currentDataSource) { + public static Long getCountOfFiles(DataSource currentDataSource) { return getCountOfRegularFiles(currentDataSource, null, "Unable to get count of files, providing empty results"); } @@ -124,7 +124,7 @@ final class DataSourceInfoUtilities { * * @return The count. */ - static Long getCountOfAllocatedFiles(DataSource currentDataSource) { + public static Long getCountOfAllocatedFiles(DataSource currentDataSource) { return getCountOfRegularFiles(currentDataSource, getMetaFlagsContainsStatement(TSK_FS_META_FLAG_ENUM.ALLOC), "Unable to get counts of unallocated files for datasource, providing empty results"); @@ -137,7 +137,7 @@ final class DataSourceInfoUtilities { * * @return The count. */ - static Long getCountOfUnallocatedFiles(DataSource currentDataSource) { + public static Long getCountOfUnallocatedFiles(DataSource currentDataSource) { return getCountOfRegularFiles(currentDataSource, getMetaFlagsContainsStatement(TSK_FS_META_FLAG_ENUM.UNALLOC) + " AND type<>" + TSK_DB_FILES_TYPE_ENUM.SLACK.getFileType(), @@ -151,7 +151,7 @@ final class DataSourceInfoUtilities { * * @return The count. */ - static Long getCountOfDirectories(DataSource currentDataSource) { + public static Long getCountOfDirectories(DataSource currentDataSource) { return getCountOfTskFiles(currentDataSource, "meta_type=" + TskData.TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_DIR.getValue() + " AND type<>" + TskData.TSK_DB_FILES_TYPE_ENUM.VIRTUAL_DIR.getFileType(), @@ -165,7 +165,7 @@ final class DataSourceInfoUtilities { * * @return The count. */ - static Long getCountOfSlackFiles(DataSource currentDataSource) { + public static Long getCountOfSlackFiles(DataSource currentDataSource) { return getCountOfRegularFiles(currentDataSource, getMetaFlagsContainsStatement(TSK_FS_META_FLAG_ENUM.UNALLOC) + " AND type=" + TskData.TSK_DB_FILES_TYPE_ENUM.SLACK.getFileType(), @@ -212,7 +212,7 @@ final class DataSourceInfoUtilities { * * @return The size or null if the query could not be executed. */ - static Long getSizeOfUnallocatedFiles(DataSource currentDataSource) { + public static Long getSizeOfUnallocatedFiles(DataSource currentDataSource) { if (currentDataSource == null) { return null; } @@ -275,7 +275,7 @@ final class DataSourceInfoUtilities { * @return A mapping of artifact type name to the counts or null if there * was an error executing the query. */ - static Map getCountsOfArtifactsByType(DataSource selectedDataSource) { + public static Map getCountsOfArtifactsByType(DataSource selectedDataSource) { if (selectedDataSource == null) { return Collections.emptyMap(); } @@ -296,7 +296,7 @@ final class DataSourceInfoUtilities { /** * Describes a result of a program run on a datasource. */ - static class TopProgramsResult { + public static class TopProgramsResult { private final String programName; private final String programPath; @@ -320,21 +320,21 @@ final class DataSourceInfoUtilities { /** * @return The name of the program */ - String getProgramName() { + public String getProgramName() { return programName; } /** * @return The path of the program. */ - String getProgramPath() { + public String getProgramPath() { return programPath; } /** * @return The number of run times or null if not present. */ - Long getRunTimes() { + public Long getRunTimes() { return runTimes; } @@ -453,7 +453,7 @@ final class DataSourceInfoUtilities { * * @return */ - static List getTopPrograms(DataSource dataSource, int count) { + public static List getTopPrograms(DataSource dataSource, int count) { if (dataSource == null || count <= 0) { return Collections.emptyList(); } @@ -569,7 +569,7 @@ final class DataSourceInfoUtilities { * * @return The short folder name or empty string if not found. */ - static String getShortFolderName(String strPath, String applicationName) { + public static String getShortFolderName(String strPath, String applicationName) { if (strPath == null) { return ""; } @@ -667,7 +667,7 @@ final class DataSourceInfoUtilities { * @return The concatenated value or null if the query could not be * executed. */ - static String getOperatingSystems(DataSource dataSource) { + public static String getOperatingSystems(DataSource dataSource) { if (dataSource == null) { return null; } @@ -686,7 +686,7 @@ final class DataSourceInfoUtilities { * @return The concatenated value or null if the query could not be * executed. */ - static String getDataSourceType(DataSource dataSource) { + public static String getDataSourceType(DataSource dataSource) { if (dataSource == null) { return null; } @@ -704,7 +704,7 @@ final class DataSourceInfoUtilities { * comma seperated list of values of data source usage types * expected to be in the datasource */ - static Map getDataSourceTypes() { + public static Map getDataSourceTypes() { try { SleuthkitCase skCase = Case.getCurrentCaseThrows().getSleuthkitCase(); List listOfArtifacts = skCase.getBlackboardArtifacts(BlackboardArtifact.ARTIFACT_TYPE.TSK_DATA_SOURCE_USAGE); @@ -737,7 +737,7 @@ final class DataSourceInfoUtilities { * files in the datasource, will only contain entries for * datasources which have at least 1 file */ - static Map getCountsOfFiles() { + public static Map getCountsOfFiles() { try { final String countFilesQuery = "data_source_obj_id, COUNT(*) AS value FROM tsk_files" + " WHERE meta_type=" + TSK_FS_META_TYPE_ENUM.TSK_FS_META_TYPE_REG.getValue() @@ -760,7 +760,7 @@ final class DataSourceInfoUtilities { * artifacts in the datasource, will only contain entries for * datasources which have at least 1 artifact */ - static Map getCountsOfArtifacts() { + public static Map getCountsOfArtifacts() { try { final String countArtifactsQuery = "data_source_obj_id, COUNT(*) AS value" + " FROM blackboard_artifacts WHERE review_status_id !=" + BlackboardArtifact.ReviewStatus.REJECTED.getID() @@ -781,7 +781,7 @@ final class DataSourceInfoUtilities { * tags which have been applied in the datasource, will only contain * entries for datasources which have at least 1 item tagged. */ - static Map getCountsOfTags() { + public static Map getCountsOfTags() { try { final String countFileTagsQuery = "data_source_obj_id, COUNT(*) AS value" + " FROM content_tags as content_tags, tsk_files as tsk_files" @@ -816,7 +816,7 @@ final class DataSourceInfoUtilities { * specified mime types in the current case for the specified data * source, null if no count was retrieved */ - static Long getCountOfFilesForMimeTypes(DataSource currentDataSource, Set setOfMimeTypes) { + public static Long getCountOfFilesForMimeTypes(DataSource currentDataSource, Set setOfMimeTypes) { return getCountOfRegularFiles(currentDataSource, "mime_type IN " + getSqlSet(setOfMimeTypes), "Unable to get count of files for specified mime types"); @@ -834,7 +834,7 @@ final class DataSourceInfoUtilities { * @return a Long value which represents the number of files that do not * have the specific mime type, but do have a mime type. */ - static Long getCountOfFilesNotInMimeTypes(DataSource currentDataSource, Set setOfMimeTypes) { + public static Long getCountOfFilesNotInMimeTypes(DataSource currentDataSource, Set setOfMimeTypes) { return getCountOfRegularFiles(currentDataSource, "mime_type NOT IN " + getSqlSet(setOfMimeTypes) + " AND mime_type IS NOT NULL AND mime_type <> '' ", @@ -850,7 +850,7 @@ final class DataSourceInfoUtilities { * issue searching the data source. * */ - static Long getCountOfFilesWithNoMimeType(DataSource currentDataSource) { + public static Long getCountOfFilesWithNoMimeType(DataSource currentDataSource) { return getCountOfRegularFiles(currentDataSource, "(mime_type IS NULL OR mime_type = '') ", "Unable to get count of files without a mime type"); diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceLabeledValueCallback.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/DataSourceLabeledValueCallback.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceLabeledValueCallback.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/DataSourceLabeledValueCallback.java index cbb4b18e86..6c9c918667 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceLabeledValueCallback.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/DataSourceLabeledValueCallback.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.datasourcesummary.ui; +package org.sleuthkit.autopsy.datasourcesummary.datamodel; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSingleValueCallback.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/DataSourceSingleValueCallback.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSingleValueCallback.java rename to Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/DataSourceSingleValueCallback.java index 901c3d9416..6b1ff205fa 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSingleValueCallback.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/DataSourceSingleValueCallback.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.datasourcesummary.ui; +package org.sleuthkit.autopsy.datasourcesummary.datamodel; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceBrowser.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceBrowser.java index 789fcbed25..ad022aa637 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceBrowser.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceBrowser.java @@ -39,6 +39,7 @@ import org.sleuthkit.autopsy.datasourcesummary.ui.DataSourceSummaryNode.DataSour import static javax.swing.SwingConstants.RIGHT; import javax.swing.SwingUtilities; import javax.swing.table.TableColumn; +import org.sleuthkit.autopsy.datasourcesummary.datamodel.DataSourceInfoUtilities; import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; import org.sleuthkit.datamodel.DataSource; import org.sleuthkit.datamodel.IngestJobInfo; diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryCountsPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryCountsPanel.java index 6c74542745..2609af97ed 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryCountsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryCountsPanel.java @@ -24,6 +24,7 @@ import javax.swing.JLabel; import javax.swing.table.DefaultTableCellRenderer; import org.openide.util.NbBundle.Messages; import org.sleuthkit.autopsy.casemodule.Case; +import org.sleuthkit.autopsy.datasourcesummary.datamodel.DataSourceInfoUtilities; import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; import org.sleuthkit.datamodel.DataSource; diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDetailsPanel.java index c83128f7bf..e64041e906 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDetailsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDetailsPanel.java @@ -25,7 +25,7 @@ import javax.swing.table.DefaultTableModel; import org.apache.commons.lang3.StringUtils; import org.openide.util.NbBundle.Messages; import org.sleuthkit.autopsy.casemodule.Case; -import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; +import org.sleuthkit.autopsy.datasourcesummary.datamodel.DataSourceInfoUtilities; import org.sleuthkit.datamodel.DataSource; import org.sleuthkit.datamodel.Image; import org.sleuthkit.datamodel.TskCoreException; diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDialog.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDialog.java index 4497c50708..9cf519a7e9 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDialog.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryDialog.java @@ -27,7 +27,7 @@ import java.util.Observer; import java.util.Set; import javax.swing.event.ListSelectionEvent; import org.openide.util.NbBundle.Messages; -import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; +import org.sleuthkit.autopsy.datasourcesummary.datamodel.DataSourceInfoUtilities; import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent; import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent.Reason; diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.java index 297711498c..1a1e674c17 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/DataSourceSummaryUserActivityPanel.java @@ -32,7 +32,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; import org.openide.util.NbBundle.Messages; import org.sleuthkit.autopsy.casemodule.Case; -import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; +import org.sleuthkit.autopsy.datasourcesummary.datamodel.DataSourceInfoUtilities; import org.sleuthkit.datamodel.DataSource; /** diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/FileTypePieChart.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/FileTypePieChart.java index 9a6315d8d4..a01959b737 100644 --- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/FileTypePieChart.java +++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/FileTypePieChart.java @@ -37,9 +37,9 @@ import java.util.Set; import java.util.stream.Collectors; import javax.swing.JLabel; import org.openide.util.NbBundle.Messages; -import org.sleuthkit.autopsy.datasourcesummary.ui.Bundle; import org.sleuthkit.autopsy.coreutils.FileTypeUtils; import static org.sleuthkit.autopsy.coreutils.FileTypeUtils.FileTypeCategory; +import org.sleuthkit.autopsy.datasourcesummary.datamodel.DataSourceInfoUtilities; /** * A Pie Chart that shows file mime types in a data source.