From f6d1b8951f710b3785da84887d7a57c93b3b0cfd Mon Sep 17 00:00:00 2001 From: adam-m Date: Mon, 19 Mar 2012 21:29:18 -0400 Subject: [PATCH] Fix more compile warnings in keyword search --- .../keywordsearch/KeywordSearchEditListPanel.java | 8 ++++---- .../keywordsearch/KeywordSearchIngestService.java | 4 ++-- .../KeywordSearchListsManagementPanel.java | 6 +++--- .../keywordsearch/KeywordSearchListsViewerPanel.java | 12 ++++++------ .../autopsy/keywordsearch/TermComponentQuery.java | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java index d0f7e2096b..c9228d544a 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java @@ -844,7 +844,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec } - class TableEntry implements Comparable { + class TableEntry implements Comparable { Keyword keyword; @@ -853,12 +853,12 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec } @Override - public int compareTo(Object o) { - int keywords = this.keyword.getQuery().compareTo(((TableEntry) o).keyword.getQuery()); + public int compareTo(TableEntry te) { + int keywords = this.keyword.getQuery().compareTo(te.keyword.getQuery()); if (keywords != 0) { return keywords; } else { - return Boolean.valueOf(keyword.isLiteral()).compareTo(((TableEntry) o).keyword.isLiteral()); + return Boolean.valueOf(keyword.isLiteral()).compareTo(te.keyword.isLiteral()); } } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java index 1a586823bb..3d64f4a671 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java @@ -68,7 +68,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent //private final Object lock = new Object(); private Thread timer; private Indexer indexer; - private SwingWorker searcher; + private Searcher searcher; private volatile boolean searcherDone = true; private static PropertyChangeSupport pcs = null; private Map> currentResults; @@ -504,7 +504,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent } } - private class Searcher extends SwingWorker { + private class Searcher extends SwingWorker { private List keywords; private ProgressHandle progress; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java index 71f90cc2c2..03e5ba8eef 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java @@ -396,7 +396,7 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel { } //single model entry - class TableEntry implements Comparable { + class TableEntry implements Comparable { String name; @@ -405,8 +405,8 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel { } @Override - public int compareTo(Object o) { - return this.name.compareTo(((TableEntry) o).name); + public int compareTo(TableEntry te) { + return this.name.compareTo(te.name); } } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java index 74c3fe83c0..db3f8db9ea 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java @@ -506,7 +506,7 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { } //single model entry - private class ListTableEntry implements Comparable { + private class ListTableEntry implements Comparable { String name; Boolean selected; @@ -520,8 +520,8 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { } @Override - public int compareTo(Object o) { - return this.name.compareTo(((ListTableEntry) o).name); + public int compareTo(ListTableEntry e) { + return this.name.compareTo(e.name); } } } @@ -606,7 +606,7 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { } //single model entry - private class KeywordTableEntry implements Comparable { + private class KeywordTableEntry implements Comparable { String name; Boolean regex; @@ -617,8 +617,8 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer { } @Override - public int compareTo(Object o) { - return this.name.compareTo(((KeywordTableEntry) o).name); + public int compareTo(KeywordTableEntry e) { + return this.name.compareTo(e.name); } } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java index 3d0cfc8321..f296739a34 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java @@ -298,7 +298,7 @@ public class TermComponentQuery implements KeywordSearchQuery { logger.log(Level.INFO, "Executing TermsComponent query: " + q.toString()); - final SwingWorker worker = new TermsQueryWorker(q); + final SwingWorker, Void> worker = new TermsQueryWorker(q); worker.execute(); }