From 8aba6c9d9ee6bf32b7e8679d65d84220f12e9437 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Wed, 4 Sep 2019 17:46:52 -0400 Subject: [PATCH] 5423 address codacy complaints --- .../org/sleuthkit/autopsy/filequery/FileSearch.java | 4 ++-- .../autopsy/filequery/ImageThumbnailPanel.form | 4 ++++ .../autopsy/filequery/ImageThumbnailPanel.java | 3 +-- .../autopsy/filequery/ImageThumbnailViewer.form | 2 ++ .../autopsy/filequery/ImageThumbnailViewer.java | 3 +-- .../org/sleuthkit/autopsy/filequery/ResultsPanel.form | 10 ++++++++++ .../org/sleuthkit/autopsy/filequery/ResultsPanel.java | 9 +++------ .../org/sleuthkit/autopsy/filequery/SearchResults.java | 4 ++-- 8 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java index 5d269629f8..fcabca4238 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java @@ -116,7 +116,7 @@ class FileSearch { // Sort and group the results searchResults.sortGroupsAndFiles(); - LinkedHashMap> resultHashMap = searchResults.toLinkedHashMap(); + Map> resultHashMap = searchResults.toLinkedHashMap(); for (String groupName : resultHashMap.keySet()) { groupCache.put(groupName, resultHashMap.get(groupName)); } @@ -251,7 +251,7 @@ class FileSearch { // Collect everything in the search results SearchResults searchResults = new SearchResults(groupSortingType, groupAttributeType, fileSortingMethod); searchResults.add(resultFiles); - LinkedHashMap> resultHashMap = searchResults.toLinkedHashMap(); + Map> resultHashMap = searchResults.toLinkedHashMap(); for (String groupName : resultHashMap.keySet()) { groupCache.put(groupName, resultHashMap.get(groupName)); } diff --git a/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailPanel.form b/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailPanel.form index ac95e5b3f3..bc2f036c23 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailPanel.form +++ b/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailPanel.form @@ -43,6 +43,10 @@ + + + + diff --git a/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailPanel.java b/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailPanel.java index f2ad61326c..d73a6e4d0c 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailPanel.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailPanel.java @@ -49,7 +49,7 @@ public class ImageThumbnailPanel extends javax.swing.JPanel implements ListCellR // //GEN-BEGIN:initComponents private void initComponents() { - thumbnailPanel = new javax.swing.JPanel(); + javax.swing.JPanel thumbnailPanel = new javax.swing.JPanel(); thumbnailLabel = new javax.swing.JLabel(); fileSizeLabel = new javax.swing.JLabel(); countLabel = new javax.swing.JLabel(); @@ -87,7 +87,6 @@ public class ImageThumbnailPanel extends javax.swing.JPanel implements ListCellR private javax.swing.JLabel countLabel; private javax.swing.JLabel fileSizeLabel; private javax.swing.JLabel thumbnailLabel; - private javax.swing.JPanel thumbnailPanel; // End of variables declaration//GEN-END:variables @NbBundle.Messages({"# {0} - fileSize", diff --git a/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailViewer.form b/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailViewer.form index 4d065c3bf9..4b96bac8ae 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailViewer.form +++ b/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailViewer.form @@ -18,6 +18,8 @@ + + diff --git a/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailViewer.java b/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailViewer.java index 140d211bfe..1524f60820 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailViewer.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/ImageThumbnailViewer.java @@ -50,7 +50,7 @@ public class ImageThumbnailViewer extends javax.swing.JPanel { // //GEN-BEGIN:initComponents private void initComponents() { - thumbnailListScrollPane = new javax.swing.JScrollPane(); + javax.swing.JScrollPane thumbnailListScrollPane = new javax.swing.JScrollPane(); thumbnailList = new javax.swing.JList<>(); setLayout(new java.awt.BorderLayout()); @@ -68,7 +68,6 @@ public class ImageThumbnailViewer extends javax.swing.JPanel { // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JList thumbnailList; - private javax.swing.JScrollPane thumbnailListScrollPane; // End of variables declaration//GEN-END:variables /** diff --git a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.form b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.form index 8e26e73944..c666c85413 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.form @@ -238,10 +238,18 @@ + + + + + + + + @@ -269,6 +277,8 @@ + + diff --git a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java index c4e6191da9..3477c614bd 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java @@ -313,9 +313,9 @@ public class ResultsPanel extends javax.swing.JPanel { javax.swing.JLabel gotoPageLabel = new javax.swing.JLabel(); gotoPageField = new javax.swing.JTextField(); javax.swing.JLabel pageSizeLabel = new javax.swing.JLabel(); - resultsSplitPane = new javax.swing.JSplitPane(); - instancesPanel = new javax.swing.JPanel(); - instancesScrollPane = new javax.swing.JScrollPane(); + javax.swing.JSplitPane resultsSplitPane = new javax.swing.JSplitPane(); + javax.swing.JPanel instancesPanel = new javax.swing.JPanel(); + javax.swing.JScrollPane instancesScrollPane = new javax.swing.JScrollPane(); instancesList = new javax.swing.JList<>(); resultsViewerPanel = new javax.swing.JPanel(); @@ -540,13 +540,10 @@ public class ResultsPanel extends javax.swing.JPanel { private javax.swing.JLabel currentPageLabel; private javax.swing.JTextField gotoPageField; private javax.swing.JList instancesList; - private javax.swing.JPanel instancesPanel; - private javax.swing.JScrollPane instancesScrollPane; private javax.swing.JButton nextPageButton; private javax.swing.JSpinner pageSizeSpinner; private javax.swing.JPanel pagingPanel; private javax.swing.JButton previousPageButton; - private javax.swing.JSplitPane resultsSplitPane; private javax.swing.JPanel resultsViewerPanel; // End of variables declaration//GEN-END:variables diff --git a/Core/src/org/sleuthkit/autopsy/filequery/SearchResults.java b/Core/src/org/sleuthkit/autopsy/filequery/SearchResults.java index 91bb93e865..f48cd4d1f8 100644 --- a/Core/src/org/sleuthkit/autopsy/filequery/SearchResults.java +++ b/Core/src/org/sleuthkit/autopsy/filequery/SearchResults.java @@ -150,8 +150,8 @@ class SearchResults { * * @return the grouped and sorted results */ - LinkedHashMap> toLinkedHashMap() throws FileSearchException { - LinkedHashMap> map = new LinkedHashMap<>(); + Map> toLinkedHashMap() throws FileSearchException { + Map> map = new LinkedHashMap<>(); // Sort the groups and files sortGroupsAndFiles();