← Back to branch summary

~smaioli/azureus/upstream

« back to all changes in this revision

Viewing changes to com/aelitis/azureus/ui/swt/views/skin/SearchResultsTabArea.java

  • Committer: Stefano Maioli
  • Date: 2009-06-14 03:14:00 UTC
  • Revision ID: maio@naoweb.it-20090614031400-694ny3y9d323n9gl
Vuze 4.2.0.2 tarball.

Show diffs side-by-side

added added

removed removed

Lines of Context:
com/aelitis/azureus/ui/swt/views/skin/SearchResultsTabArea.java
34
34
import org.eclipse.swt.widgets.Shell;
35
35
 
36
36
import org.gudy.azureus2.core3.internat.MessageText;
37
 
import org.gudy.azureus2.core3.util.*;
 
37
import org.gudy.azureus2.core3.util.AERunnable;
 
38
import org.gudy.azureus2.core3.util.Debug;
38
39
import org.gudy.azureus2.ui.swt.PropertiesWindow;
39
40
import org.gudy.azureus2.ui.swt.Utils;
40
41
import org.gudy.azureus2.ui.swt.mainwindow.TorrentOpener;
41
42
 
42
43
import com.aelitis.azureus.core.AzureusCoreFactory;
43
 
import com.aelitis.azureus.core.messenger.config.PlatformConfigMessenger;
44
44
import com.aelitis.azureus.core.metasearch.Engine;
45
45
import com.aelitis.azureus.core.metasearch.MetaSearchManagerFactory;
46
46
import com.aelitis.azureus.core.metasearch.impl.web.WebEngine;
47
47
import com.aelitis.azureus.ui.common.viewtitleinfo.ViewTitleInfo;
48
48
import com.aelitis.azureus.ui.common.viewtitleinfo.ViewTitleInfoManager;
49
49
import com.aelitis.azureus.ui.skin.SkinConstants;
 
50
import com.aelitis.azureus.ui.swt.browser.BrowserContext;
50
51
import com.aelitis.azureus.ui.swt.browser.CookiesListener;
51
52
import com.aelitis.azureus.ui.swt.browser.OpenCloseSearchDetailsListener;
52
53
import com.aelitis.azureus.ui.swt.browser.BrowserContext.loadingListener;
53
54
import com.aelitis.azureus.ui.swt.browser.listener.ExternalLoginCookieListener;
54
55
import com.aelitis.azureus.ui.swt.browser.listener.MetaSearchListener;
55
 
import com.aelitis.azureus.ui.swt.skin.SWTSkin;
56
 
import com.aelitis.azureus.ui.swt.skin.SWTSkinObject;
57
 
import com.aelitis.azureus.ui.swt.skin.SWTSkinObjectBrowser;
 
56
import com.aelitis.azureus.ui.swt.skin.*;
58
57
import com.aelitis.azureus.ui.swt.views.skin.sidebar.SideBar;
59
58
import com.aelitis.azureus.ui.swt.views.skin.sidebar.SideBarEntrySWT;
60
 
import com.aelitis.azureus.util.ConstantsV3;
 
59
import com.aelitis.azureus.util.ConstantsVuze;
61
60
import com.aelitis.azureus.util.MapUtils;
 
61
import com.aelitis.azureus.util.UrlFilter;
62
62
 
63
63
import org.gudy.azureus2.plugins.PluginInterface;
64
64
import org.gudy.azureus2.plugins.PluginManager;
102
102
                browserSkinObject = (SWTSkinObjectBrowser) skin.getSkinObject(
103
103
                                SkinConstants.VIEWID_BROWSER_SEARCHRESULTS, skinObject);
104
104
 
105
 
                createBrowseArea(browserSkinObject);
 
105
                browserSkinObject.addListener(new SWTSkinObjectListener() {
 
106
                        
 
107
                        public Object eventOccured(SWTSkinObject skinObject, int eventType,
 
108
                                        Object params) {
 
109
                                if (eventType == EVENT_SHOW) {
 
110
                                        browserSkinObject.removeListener(this);
 
111
 
 
112
                                        createBrowseArea(browserSkinObject);
 
113
                                }
 
114
                                return null;
 
115
                        }
 
116
                });
106
117
 
107
118
                /**
108
119
                                final SWTSkinTabSet tabSetMain = skin.getTabSet(SkinConstants.TABSET_MAIN);
351
362
                
352
363
                SideBar sidebar = (SideBar) SkinViewManager.getByClass(SideBar.class);
353
364
                if (sidebar != null) {
354
 
                        final SideBarEntrySWT entry = sidebar.getSideBarEntry(this);
 
365
                        final SideBarEntrySWT entry = sidebar.getEntryBySkinView(this);
355
366
                        if (entry != null) {
356
367
                                vitalityImage = entry.addVitalityImage("image.sidebar.vitality.dots");
357
368
                                vitalityImage.setVisible(false);
430
441
                                Browser search = ((SWTSkinObjectBrowser) soSearchResults).getBrowser();
431
442
                                String url = MapUtils.getMapString(params, "url",
432
443
                                                "http://google.com/search?q=" + Math.random());
433
 
                                if (PlatformConfigMessenger.urlCanRPC(url)) {
434
 
                                        url = ConstantsV3.appendURLSuffix(url);
 
444
                                if (UrlFilter.getInstance().urlCanRPC(url)) {
 
445
                                        url = ConstantsVuze.getDefaultContentNetwork().appendURLSuffix(url, false, true);
435
446
                                }
436
447
 
437
448
                                //Gudy, Not Tux, Listener Added
514
525
 
515
526
                                controlBottom.getParent().layout(true);
516
527
                                search.setUrl("about:blank");
 
528
                                
 
529
                                BrowserContext context = browserSkinObject.getContext();
 
530
                                if (context != null) {
 
531
                                        context.executeInBrowser("searchResultsClosed()");
 
532
                                }
517
533
                        }
518
534
                });
519
535
        }
534
550
        
535
551
        public void anotherSearch(String searchText,boolean toSubscribe) {
536
552
                this.searchText = searchText;
537
 
                String url = ConstantsV3.URL_PREFIX + ConstantsV3.URL_ADD_SEARCH
538
 
                                + UrlUtils.encode(searchText) + "&" + ConstantsV3.URL_SUFFIX + "&rand="
539
 
                                + SystemTime.getCurrentTime();
 
553
                String url = 
 
554
                        ConstantsVuze.getDefaultContentNetwork().getSearchService( searchText );
540
555
 
541
556
                if (System.getProperty("metasearch", "1").equals("1")) {
542
 
                        url = ConstantsV3.URL_PREFIX + "xsearch?q=" + UrlUtils.encode(searchText)
543
 
                                        + "&" + ConstantsV3.URL_SUFFIX + "&rand=" + SystemTime.getCurrentTime();
544
 
                        if(toSubscribe) {
545
 
                                url += "&createSubscription=1";
546
 
                        }
 
557
                        
 
558
                        url = ConstantsVuze.getDefaultContentNetwork().getXSearchService( searchText, toSubscribe );
547
559
                }
548
560
 
549
561
                closeSearchResults(null);