Heads merge
authorEugene Ostroukhov <eugeneo@symbian.org>
Wed, 10 Feb 2010 13:59:00 -0800
changeset 130 c5aaef2bcaf2
parent 127 f095ed39206d (diff)
parent 129 06a71481cb0d (current diff)
child 131 c0fe3a61f17e
Heads merge
org.symbian.tools.wrttools.product/icons/main16_prev.gif
org.symbian.tools.wrttools.product/plugin.xml
org.symbian.tools.wrttools/icons/main16_bkup.gif
--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java	Wed Feb 10 13:49:18 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java	Wed Feb 10 13:59:00 2010 -0800
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.net.URL;
 
 import org.eclipse.core.net.proxy.IProxyData;
@@ -40,13 +39,11 @@
 				if (resourceUrl != null) {
 					try {
 						URL fileUrl = FileLocator.toFileURL(resourceUrl);
-						File file = new File(fileUrl.toURI());
+						File file = new File(fileUrl.getPath());
 						System.setProperty(XUL_RUNNER_PATH_PARAMETER, file
 								.getAbsolutePath()); //$NON-NLS-1$
 					} catch (IOException e) {
-						// log the exception
-					} catch (URISyntaxException e) {
-						// log the exception
+						PreviewerPlugin.log(e);
 					}
 				}
 			}
--- a/org.symbian.tools.wrttools.product/plugin.xml	Wed Feb 10 13:49:18 2010 -0800
+++ b/org.symbian.tools.wrttools.product/plugin.xml	Wed Feb 10 13:59:00 2010 -0800
@@ -91,6 +91,10 @@
             activityId="org.symbian.tools.wrttools.product.wtp"
             pattern="org\.eclipse\.wst\.jsdt\.web\.ui/org\.eclipse\.wst\.jsdt\.internal\.web\.ui\.convertProjects">
       </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.symbian.tools.wrttools.product.wtp"
+            pattern="org\.eclipse\.debug\.ui/org\.eclipse\.debug\.ui\.contextualLaunch\.profile\.submenu">
+      </activityPatternBinding>
       <category
             description="WTP UI elements that are not compatible with WRT widget development"
             id="org.symbian.tools.wrttools.product.wtp"