diff --git a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryThumbnailChildren.java b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryThumbnailChildren.java index 1fad5d82ae..35ee60ac5c 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryThumbnailChildren.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryThumbnailChildren.java @@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.datamodel.FileNode; import org.sleuthkit.datamodel.AbstractFile; /** - * Create a node containing the children for the to display in the + * Create a node containing the children to display in the * DataResultViewerThumbnail */ class DiscoveryThumbnailChildren extends Children.Keys { diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java index 648eb6457a..495b70f4e4 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java @@ -977,16 +977,6 @@ class FileSearch { GroupKey getGroupKey(ResultFile file) { return new FileTypeGroupKey(file); } - - @Override - void addAttributeToResultFiles(List files, SleuthkitCase caseDb, - EamDb centralRepoDb) throws FileSearchException { - for (ResultFile file : files) { - if (file.getFileType().equals(FileType.OTHER)) { - file.setFileType(FileType.fromMIMEtype(file.getFirstInstance().getMIMEType())); - } - } - } } /** diff --git a/Core/src/org/sleuthkit/autopsy/filequery/ResultFile.java b/Core/src/org/sleuthkit/autopsy/filequery/ResultFile.java index 3b28a5e97d..8b903bf8b9 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/ResultFile.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/ResultFile.java @@ -72,7 +72,7 @@ class ResultFile { tagNames = new ArrayList<>(); interestingSetNames = new ArrayList<>(); objectDetectedNames = new ArrayList<>(); - fileType = FileType.OTHER; + fileType = FileType.fromMIMEtype(abstractFile.getMIMEType()); } /** @@ -103,6 +103,9 @@ class ResultFile { if (deleted && !duplicate.isDirNameFlagSet(TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC)) { deleted = false; } + if (fileType == FileType.OTHER) { + fileType = FileType.fromMIMEtype(duplicate.getMIMEType()); + } updateScoreAndDescription(duplicate); instances.add(duplicate); } @@ -156,15 +159,6 @@ class ResultFile { return fileType; } - /** - * Set the file type - * - * @param fileType the type - */ - void setFileType(FileType fileType) { - this.fileType = fileType; - } - /** * Add a keyword list name that matched this file. * diff --git a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java index c7f7ff9614..b5bbca49f5 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java @@ -88,17 +88,21 @@ public class ResultsPanel extends javax.swing.JPanel { imageThumbnailViewer = new ImageThumbnailViewer(); videoThumbnailViewer = new VideoThumbnailViewer(); videoThumbnailViewer.addListSelectionListener((e) -> { - if (!e.getValueIsAdjusting()) { - populateInstancesList(); - } else { - instancesList.clearSelection(); + if (resultType == FileSearchData.FileType.VIDEO) { + if (!e.getValueIsAdjusting()) { + populateInstancesList(); + } else { + instancesList.clearSelection(); + } } }); imageThumbnailViewer.addListSelectionListener((e) -> { - if (!e.getValueIsAdjusting()) { - populateInstancesList(); - } else { - instancesList.clearSelection(); + if (resultType == FileSearchData.FileType.IMAGE) { + if (!e.getValueIsAdjusting()) { + populateInstancesList(); + } else { + instancesList.clearSelection(); + } } }); //Add the context menu when right clicking diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties index 5525fed84c..e21db15ee9 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties @@ -24,7 +24,7 @@ GeolocationSettingsPanel.mbtileFileField.toolTipText= GeolocationSettingsPanel.mbtileFileField.text= GeolocationSettingsPanel.defaultDataSource.text=Default online tile server (bing.com/maps) GeolocationSettingsPanel.osmServerRBnt.text=OpenStreetMap server -GeolocationSettingsPanel.zipFileRBnt.text=OpenStreeMap zip file +GeolocationSettingsPanel.zipFileRBnt.text=OpenStreetMap zip file GeolocationSettingsPanel.zipFileRBnt.actionCommand=OpenStreeMap tile ZIP file GeolocationSettingsPanel.mbtilesRBtn.text=MBTiles file GeolocationSettingsPanel.osmServerAddressField.text= diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED index 19ce2c9a59..1fbba07220 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED @@ -59,7 +59,7 @@ GeolocationSettingsPanel.mbtileFileField.toolTipText= GeolocationSettingsPanel.mbtileFileField.text= GeolocationSettingsPanel.defaultDataSource.text=Default online tile server (bing.com/maps) GeolocationSettingsPanel.osmServerRBnt.text=OpenStreetMap server -GeolocationSettingsPanel.zipFileRBnt.text=OpenStreeMap zip file +GeolocationSettingsPanel.zipFileRBnt.text=OpenStreetMap zip file GeolocationSettingsPanel.zipFileRBnt.actionCommand=OpenStreeMap tile ZIP file GeolocationSettingsPanel.mbtilesRBtn.text=MBTiles file GeolocationSettingsPanel.osmServerAddressField.text= diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationSettingsPanel.form index e2121d0772..ed4de8758a 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationSettingsPanel.form @@ -145,7 +145,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -200,36 +200,45 @@ - - - - - - - - - + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationSettingsPanel.java index f66d05c08d..c2819d4a4f 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/geolocation/GeolocationSettingsPanel.java @@ -159,6 +159,7 @@ final class GeolocationSettingsPanel extends javax.swing.JPanel implements Optio serverTestBtn = new javax.swing.JButton(); mbtilesRBtn = new javax.swing.JRadioButton(); mbtileFileField = new javax.swing.JTextField(); + javax.swing.JPanel MBTilesBtnPanel = new javax.swing.JPanel(); mbtilesBrowseBtn = new javax.swing.JButton(); mbtileTestBtn = new javax.swing.JButton(); @@ -236,7 +237,7 @@ final class GeolocationSettingsPanel extends javax.swing.JPanel implements Optio gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 2; gridBagConstraints.gridy = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(0, 9, 9, 9); tilePane.add(zipFileBrowseBnt, gridBagConstraints); @@ -249,8 +250,8 @@ final class GeolocationSettingsPanel extends javax.swing.JPanel implements Optio gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 2; gridBagConstraints.gridy = 1; - gridBagConstraints.ipadx = 20; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(0, 9, 9, 9); tilePane.add(serverTestBtn, gridBagConstraints); @@ -277,18 +278,15 @@ final class GeolocationSettingsPanel extends javax.swing.JPanel implements Optio gridBagConstraints.insets = new java.awt.Insets(0, 0, 9, 0); tilePane.add(mbtileFileField, gridBagConstraints); + MBTilesBtnPanel.setLayout(new java.awt.GridLayout(1, 0, 5, 0)); + org.openide.awt.Mnemonics.setLocalizedText(mbtilesBrowseBtn, org.openide.util.NbBundle.getMessage(GeolocationSettingsPanel.class, "GeolocationSettingsPanel.mbtilesBrowseBtn.text")); // NOI18N mbtilesBrowseBtn.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { mbtilesBrowseBtnActionPerformed(evt); } }); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 2; - gridBagConstraints.gridy = 3; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(0, 9, 9, 9); - tilePane.add(mbtilesBrowseBtn, gridBagConstraints); + MBTilesBtnPanel.add(mbtilesBrowseBtn); org.openide.awt.Mnemonics.setLocalizedText(mbtileTestBtn, org.openide.util.NbBundle.getMessage(GeolocationSettingsPanel.class, "GeolocationSettingsPanel.mbtileTestBtn.text")); // NOI18N mbtileTestBtn.addActionListener(new java.awt.event.ActionListener() { @@ -296,13 +294,15 @@ final class GeolocationSettingsPanel extends javax.swing.JPanel implements Optio mbtileTestBtnActionPerformed(evt); } }); + MBTilesBtnPanel.add(mbtileTestBtn); + gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 3; + gridBagConstraints.gridx = 2; gridBagConstraints.gridy = 3; - gridBagConstraints.ipadx = 20; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weightx = 1.0; - tilePane.add(mbtileTestBtn, gridBagConstraints); + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(0, 9, 9, 9); + tilePane.add(MBTilesBtnPanel, gridBagConstraints); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;