mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-13 08:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix more compile warnings in keyword search

Browse Source
This commit is contained in:
adam-m 2012-03-19 21:29:18 -04:00
parent c928788bb6
commit f6d1b8951f
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
View File

@ -844,7 +844,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
}
class TableEntry implements Comparable {
class TableEntry implements Comparable<TableEntry> {
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());
}
}
}

4
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
View File

@ -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<Keyword, List<FsContent>> currentResults;
@ -504,7 +504,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
}
}
private class Searcher extends SwingWorker {
private class Searcher extends SwingWorker<Object,Void> {
private List<Keyword> keywords;
private ProgressHandle progress;

6
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
View File

@ -396,7 +396,7 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel {
}
//single model entry
class TableEntry implements Comparable {
class TableEntry implements Comparable<TableEntry> {
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);
}
}
}

12
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
View File

@ -506,7 +506,7 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer {
}
//single model entry
private class ListTableEntry implements Comparable {
private class ListTableEntry implements Comparable<ListTableEntry> {
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<KeywordTableEntry> {
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);
}
}
}

2
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java
View File

@ -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<List<Term>, Void> worker = new TermsQueryWorker(q);
worker.execute();
}