Heads were merged
authorEugene Ostroukhov <eugeneo@symbian.org>
Wed, 10 Feb 2010 10:41:40 -0800
changeset 127 f095ed39206d
parent 124 71bbda100c42 (diff)
parent 126 d496880b1e8b (current diff)
child 128 511f7a424042
child 130 c5aaef2bcaf2
Heads were merged
org.symbian.tools.wrttools.previewer/icons/deploy_settings.gif
org.symbian.tools.wrttools.previewer/icons/deploy_widget.gif
org.symbian.tools.wrttools.previewer/icons/exclude_archive.gif
org.symbian.tools.wrttools.previewer/icons/include_archive.gif
org.symbian.tools.wrttools.previewer/icons/package_widget.gif
org.symbian.tools.wrttools.previewer/icons/upgrade-project-over.gif
org.symbian.tools.wrttools.previewer/icons/upgrade_project.gif
org.symbian.tools.wrttools.previewer/icons/upgrade_red.gif
org.symbian.tools.wrttools.previewer/icons/validate_widget.gif
org.symbian.tools.wrttools.previewer/preview/images/IconArea-hover.png
org.symbian.tools.wrttools.previewer/preview/images/active-orientation-icon.png
org.symbian.tools.wrttools.previewer/preview/images/battery-icon.png
org.symbian.tools.wrttools.previewer/preview/images/console-clear-button.png
org.symbian.tools.wrttools.previewer/preview/images/console-close-icon.png
org.symbian.tools.wrttools.previewer/preview/images/console-open-icon.png
org.symbian.tools.wrttools.previewer/preview/images/default-Icon.png
org.symbian.tools.wrttools.previewer/preview/images/device/360x640/hs-landscape.png
org.symbian.tools.wrttools.previewer/preview/images/device/360x640/hs-portrait.png
org.symbian.tools.wrttools.previewer/preview/images/errorIcon.png
org.symbian.tools.wrttools.previewer/preview/images/hs-iframeMask.png
org.symbian.tools.wrttools.previewer/preview/images/infoIcon.png
org.symbian.tools.wrttools.previewer/preview/images/memory-icon.png
org.symbian.tools.wrttools.previewer/preview/images/messaging-icon.png
org.symbian.tools.wrttools.previewer/preview/images/normal-orientation-icon.png
org.symbian.tools.wrttools.previewer/preview/images/statusBar_240x320.png
org.symbian.tools.wrttools.previewer/preview/images/statusBar_320x240.png
org.symbian.tools.wrttools.previewer/preview/images/statusBar_360x640.png
org.symbian.tools.wrttools.previewer/preview/images/statusBar_640x360.png
org.symbian.tools.wrttools.previewer/preview/images/statusBar_800x352.png
org.symbian.tools.wrttools.previewer/preview/images/sub-menu-arrow.png
org.symbian.tools.wrttools.previewer/preview/images/warningIcon.png
org.symbian.tools.wrttools.previewer/preview/images/wrt-help-icon.png
--- a/org.symbian.tools.wrttools.debug.core/META-INF/MANIFEST.MF	Tue Feb 09 18:33:04 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/META-INF/MANIFEST.MF	Wed Feb 10 10:41:40 2010 -0800
@@ -22,7 +22,7 @@
  org.eclipse.wst.sse.ui;bundle-version="1.1.100",
  org.eclipse.wst.sse.core;bundle-version="1.1.400",
  org.eclipse.wst.html.core;bundle-version="1.1.300",
- org.eclipse.wst.jsdt.core;bundle-version="1.0.201"
+ org.eclipse.wst.jsdt.core;bundle-version="1.0.200"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  JavaSE-1.6
 Bundle-ActivationPolicy: lazy
--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java	Tue Feb 09 18:33:04 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java	Wed Feb 10 10:41:40 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	Tue Feb 09 18:33:04 2010 -0800
+++ b/org.symbian.tools.wrttools.product/plugin.xml	Wed Feb 10 10:41:40 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"