[desktop] Not using rxjava in search, using old plain listener.

frostwire · Mar 22, 2016 · 9f8f16d · 9f8f16d
1 parent bff4c1e
commit 9f8f16d
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/desktop/src/com/limegroup/gnutella/gui/search/SearchMediator.java b/desktop/src/com/limegroup/gnutella/gui/search/SearchMediator.java
@@ -31,12 +31,10 @@
 import com.limegroup.gnutella.settings.SearchSettings;
 import org.limewire.util.I18NConvert;
 import org.limewire.util.StringUtils;
-import rx.functions.Action1;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.io.File;
 import java.text.Normalizer;
 import java.util.*;
 
@@ -93,10 +91,7 @@ public final class SearchMediator {
 
     static final String CLOSE_TABS_TO_THE_RIGHT = I18n.tr("Close Tabs to the Right");
 
-    private static final int SEARCH_MANAGER_NUM_THREADS = 6;
-
-
-    private final SearchManager manager;
+    private final SearchManager2 manager;
 
     /**
      * This instance handles the display of all search results.
@@ -140,15 +135,21 @@ public void stateChanged(ChangeEvent e) {
 
         CrawlPagedWebSearchPerformer.setMagnetDownloader(new LibTorrentMagnetDownloader());
 
-        this.manager = new SearchManagerImpl(SEARCH_MANAGER_NUM_THREADS);
-        this.manager.observable().subscribe(new Action1<SearchManagerSignal>() {
+        this.manager = SearchManager2.getInstance();
+        this.manager.setListener(new SearchListener() {
             @Override
-            public void call(SearchManagerSignal s) {
-                if (s instanceof SearchManagerSignal.Results) {
-                    onResults(s.token, ((SearchManagerSignal.Results) s).elements);
-                } else {
-                    onFinished(s.token);
-                }
+            public void onResults(long token, List<? extends SearchResult> results) {
+                SearchMediator.this.onResults(token, results);
+            }
+
+            @Override
+            public void onError(long token, SearchError error) {
+
+            }
+
+            @Override
+            public void onStopped(long token) {
+                SearchMediator.this.onFinished(token);
             }
         });
     }