Compilation fixes

frostwire · Mar 22, 2016 · 9da6f3d · 9da6f3d
1 parent 6946dfd
commit 9da6f3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/android/src/com/frostwire/android/gui/LocalSearchEngine.java b/android/src/com/frostwire/android/gui/LocalSearchEngine.java
@@ -26,9 +26,6 @@
 import com.frostwire.search.torrent.TorrentSearchResult;
 import com.frostwire.search.youtube.YouTubeCrawledSearchResult;
 import com.frostwire.util.StringUtils;
-import rx.Observable;
-import rx.functions.Action1;
-import rx.subjects.PublishSubject;
 
 import java.text.Normalizer;
 import java.util.*;
@@ -39,7 +36,7 @@
  */
 public final class LocalSearchEngine {
 
-    private final SearchManager2 manager;
+    private final SearchManager manager;
     private SearchListener listener;
 
     // filter constants
@@ -64,7 +61,7 @@ public static LocalSearchEngine instance() {
     }
 
     private LocalSearchEngine() {
-        this.manager = SearchManager2.getInstance();
+        this.manager = SearchManager.getInstance();
         this.manager.setListener(new SearchListener() {
             @Override
             public void onResults(long token, List<? extends SearchResult> results) {

diff --git a/desktop/src/com/limegroup/gnutella/gui/search/SearchMediator.java b/desktop/src/com/limegroup/gnutella/gui/search/SearchMediator.java
@@ -91,7 +91,7 @@ public final class SearchMediator {
 
     static final String CLOSE_TABS_TO_THE_RIGHT = I18n.tr("Close Tabs to the Right");
 
-    private final SearchManager2 manager;
+    private final SearchManager manager;
 
     /**
      * This instance handles the display of all search results.
@@ -135,7 +135,7 @@ public void stateChanged(ChangeEvent e) {
 
         CrawlPagedWebSearchPerformer.setMagnetDownloader(new LibTorrentMagnetDownloader());
 
-        this.manager = SearchManager2.getInstance();
+        this.manager = SearchManager.getInstance();
         this.manager.setListener(new SearchListener() {
             @Override
             public void onResults(long token, List<? extends SearchResult> results) {