← Back to branch summary

~smaioli/azureus/ubuntu-experimental

« back to all changes in this revision

Viewing changes to com/aelitis/azureus/ui/swt/columns/vuzeactivity/ColumnActivityText.java

Merged Vuze 4.2.0.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
com/aelitis/azureus/ui/swt/columns/vuzeactivity/ColumnActivityText.java
35
35
 
36
36
import com.aelitis.azureus.activities.VuzeActivitiesEntry;
37
37
import com.aelitis.azureus.activities.VuzeActivitiesEntryContentShare;
38
 
import com.aelitis.azureus.core.messenger.config.PlatformConfigMessenger;
39
38
import com.aelitis.azureus.core.util.GeneralUtils;
40
39
import com.aelitis.azureus.ui.skin.SkinConstants;
41
40
import com.aelitis.azureus.ui.swt.UIFunctionsManagerSWT;
42
41
import com.aelitis.azureus.ui.swt.UIFunctionsSWT;
43
42
import com.aelitis.azureus.ui.swt.skin.SWTSkinFactory;
44
43
import com.aelitis.azureus.ui.swt.skin.SWTSkinProperties;
 
44
import com.aelitis.azureus.util.ContentNetworkUtils;
45
45
import com.aelitis.azureus.util.StringCompareUtils;
 
46
import com.aelitis.azureus.util.UrlFilter;
46
47
 
47
48
import org.gudy.azureus2.plugins.ui.tables.*;
48
49
 
167
168
                                        if (VuzeActivitiesEntryContentShare.URL_USERMESSAGE.equals(hitUrl.url)) {
168
169
                                                String userMessage = ((VuzeActivitiesEntryContentShare) entry).getUserMessage();
169
170
                                                Utils.openMessageBox(null, SWT.OK, "", userMessage);
170
 
                                        } else if (!PlatformConfigMessenger.urlCanRPC(hitUrl.url)) {
 
171
                                        } else if (!UrlFilter.getInstance().urlCanRPC(hitUrl.url)) {
171
172
                                                Utils.launch(hitUrl.url);
172
173
                                        } else {
173
174
                                                UIFunctionsSWT uif = UIFunctionsManagerSWT.getUIFunctionsSWT();
174
175
                                                if (uif != null) {
175
 
                                                        String target = hitUrl.target == null
176
 
                                                                        ? SkinConstants.VIEWID_BROWSER_BROWSE : hitUrl.target;
177
 
                                                        uif.viewURL(hitUrl.url, target, 0, 0, false, false);
 
176
                                                        String target = hitUrl.target;
 
177
                                                        if (target == null) {
 
178
                                                                target = ContentNetworkUtils.getTarget(entry.getContentNetwork());
 
179
                                                        }
 
180
                                                        uif.viewURL(hitUrl.url, target, "column.activity.text");
178
181
                                                        return;
179
182
                                                }
180
183
                                        }
181
184
                                }
182
185
 
183
186
                                newCursor = SWT.CURSOR_HAND;
184
 
                                if (PlatformConfigMessenger.urlCanRPC(hitUrl.url)
 
187
                                if (UrlFilter.getInstance().urlCanRPC(hitUrl.url)
185
188
                                                || VuzeActivitiesEntryContentShare.URL_USERMESSAGE.equals(hitUrl.url)) {
186
189
                                        try {
187
190
                                                tooltip = hitUrl.title == null ? null : URLDecoder.decode(