Bug 3352 - Replace our Navigator View with the JSDT one
authorEugene Ostroukhov <eugeneo@symbian.org>
Wed, 21 Jul 2010 11:26:43 -0700
changeset 454 38d6944cff88
parent 452 68002774437e
child 455 5da55957c779
Bug 3352 - Replace our Navigator View with the JSDT one
org.symbian.tools.mtw.ui/.classpath
org.symbian.tools.mtw.ui/.project
org.symbian.tools.mtw.ui/.settings/org.eclipse.jdt.core.prefs
org.symbian.tools.mtw.ui/META-INF/MANIFEST.MF
org.symbian.tools.mtw.ui/build.properties
org.symbian.tools.mtw.ui/plugin.xml
org.symbian.tools.mtw.ui/src/org/symbian/tools/mtw/ui/Activator.java
org.symbian.tools.mtw.ui/src/org/symbian/tools/mtw/ui/navigator/PackagingInformationDecorator.java
org.symbian.tools.mtw.ui/src/org/symbian/tools/mtw/ui/navigator/RenameMoveActionProvider.java
org.symbian.tools.wrttools.previewer/plugin.xml
org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch
org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/perspective/WRTPerspective.java
org.symbian.tools.wrttools.product/wrt-ide.product
org.symbian.tools.wrttools/META-INF/MANIFEST.MF
org.symbian.tools.wrttools/plugin.xml
org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/Activator.java
org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/NavigatorSorter.java
org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/RenameMoveActionProvider.java
org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/WRTNavigatorContentProvider.java
org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/WrtNavigatorLinkHelper.java
org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.mtw.ui/.classpath	Wed Jul 21 11:26:43 2010 -0700
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.mtw.ui/.project	Wed Jul 21 11:26:43 2010 -0700
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.symbian.tools.mtw.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.mtw.ui/.settings/org.eclipse.jdt.core.prefs	Wed Jul 21 11:26:43 2010 -0700
@@ -0,0 +1,8 @@
+#Tue Jul 20 13:28:21 PDT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.mtw.ui/META-INF/MANIFEST.MF	Wed Jul 21 11:26:43 2010 -0700
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Mobile Tools for Web main UI plug-in
+Bundle-SymbolicName: org.symbian.tools.mtw.ui;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.symbian.tools.mtw.ui.Activator
+Bundle-Vendor: Symbian Foundation
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.6.0",
+ org.symbian.tools.wrttools;bundle-version="1.0.0",
+ org.eclipse.ui.navigator;bundle-version="3.5.0",
+ org.eclipse.ui.navigator.resources;bundle-version="3.4.200",
+ org.eclipse.wst.jsdt.ui;bundle-version="1.1.0",
+ org.eclipse.wst.jsdt.core;bundle-version="1.1.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.mtw.ui/build.properties	Wed Jul 21 11:26:43 2010 -0700
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               icons/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.mtw.ui/plugin.xml	Wed Jul 21 11:26:43 2010 -0700
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+	<!-- Navigator Extensions -->
+	<extension point="org.eclipse.ui.navigator.viewer">
+	  <viewerActionBinding
+	        viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+	     <includes>
+	        <actionExtension
+	              pattern="org.symbian.mtw.ui.navigator.MoveRename">
+	        </actionExtension>
+	     </includes>
+	  </viewerActionBinding>
+	</extension>
+	 <extension
+       point="org.eclipse.ui.navigator.navigatorContent">
+       <commonWizard
+             associatedExtensionId="org.eclipse.wst.jsdt.java.ui.javaContent"
+             type="import"
+             wizardId="org.symbian.tools.wrttools.importwgz">
+          <enablement>
+             <or>
+                <adapt
+                      type="org.eclipse.core.resources.IResource">
+                </adapt>
+                <adapt
+                      type="java.util.Collection">
+                </adapt>
+             </or>
+          </enablement>
+       </commonWizard>
+       <commonWizard
+             associatedExtensionId="org.eclipse.wst.jsdt.java.ui.javaContent"
+             menuGroupId="group.new.z"
+             type="new"
+             wizardId="org.symbian.tools.wrttools.core.wrtwidgetwizard">
+          <enablement>
+             <or>
+                <adapt
+                      type="org.eclipse.core.resources.IResource">
+                </adapt>
+                <adapt
+                      type="java.util.Collection">
+                </adapt>
+             </or>
+          </enablement>
+       </commonWizard>
+       <commonWizard
+             associatedExtensionId="org.eclipse.wst.jsdt.java.ui.javaContent"
+             menuGroupId="org.eclipse.wst.jsdt.ui.java"
+             type="new"
+             wizardId="org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard">
+          <enablement>
+             <adapt
+                   type="org.eclipse.core.resources.IResource">
+             </adapt>
+          </enablement>
+       </commonWizard>
+       <commonWizard
+             associatedExtensionId="org.eclipse.wst.jsdt.java.ui.javaContent"
+             menuGroupId="org.eclipse.wst.jsdt.ui.java"
+             type="new"
+             wizardId="org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard">
+          <enablement>
+             <adapt
+                   type="org.eclipse.core.resources.IResource">
+             </adapt>
+          </enablement>
+       </commonWizard>
+       <commonWizard
+             associatedExtensionId="org.eclipse.wst.jsdt.java.ui.javaContent"
+             type="import"
+             wizardId="org.symbian.tools.wrttools.import.projectImport">
+          <enablement>
+             <or>
+                <adapt
+                      type="org.eclipse.core.resources.IResource">
+                </adapt>
+                <adapt
+                      type="java.util.Collection">
+                </adapt>
+             </or>
+          </enablement>
+       </commonWizard>
+		  <commonWizard
+          associatedExtensionId="org.eclipse.wst.jsdt.java.ui.javaContent"
+          menuGroupId="org.eclipse.wst.jsdt.ui.java"
+          type="new"
+          wizardId="org.eclipse.wst.jsdt.ui.NewJSWizard">
+		     <enablement>
+			     <or>
+     <adapt
+           type="org.eclipse.core.resources.IFolder">
+        <test
+              property="org.eclipse.core.resources.projectNature"
+              value="org.eclipse.wst.jsdt.core.jsNature">
+        </test>
+     </adapt>
+				</or>
+		     </enablement>
+		  </commonWizard>
+    <actionProvider
+          class="org.symbian.tools.mtw.ui.navigator.RenameMoveActionProvider"
+          id="org.symbian.mtw.ui.navigator.MoveRename"
+          overrides="org.eclipse.wst.jsdt.ui.navigator.actions.RefactorActions"
+          priority="highest">
+          <enablement>
+             <and>
+                <adapt
+                  type="org.eclipse.core.resources.IProject">
+                </adapt>
+             </and>
+          </enablement>
+    </actionProvider>
+ </extension>
+  <extension
+        point="org.eclipse.ui.views">
+     <category
+           id="org.symbian.tools.mtw"
+           name="Tools for Mobile Web">
+     </category>
+  </extension>
+
+</plugin>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.mtw.ui/src/org/symbian/tools/mtw/ui/Activator.java	Wed Jul 21 11:26:43 2010 -0700
@@ -0,0 +1,60 @@
+package org.symbian.tools.mtw.ui;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.symbian.tools.mtw.ui"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+    public static void log(String message, Exception e) {
+        getDefault().getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, message, e));
+    }
+
+    public static void log(Exception e) {
+        log(null, e);
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.mtw.ui/src/org/symbian/tools/mtw/ui/navigator/PackagingInformationDecorator.java	Wed Jul 21 11:26:43 2010 -0700
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2010 Symbian Foundation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Symbian Foundation - initial contribution.
+ * Contributors:
+ * Description:
+ * Overview:
+ * Details:
+ * Platforms/Drives/Compatibility:
+ * Assumptions/Requirement/Pre-requisites:
+ * Failures and causes:
+ */
+package org.symbian.tools.mtw.ui.navigator;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ILightweightLabelDecorator;
+import org.symbian.tools.wrttools.core.WRTImages;
+import org.symbian.tools.wrttools.util.ProjectUtils;
+
+public class PackagingInformationDecorator implements ILightweightLabelDecorator {
+
+    public void decorate(Object element, IDecoration decoration) {
+        IResource resource = null;
+        if (element instanceof IResource) {
+            resource = (IResource) element;
+        } else if (element instanceof IAdaptable) {
+            resource = (IResource) ((IAdaptable) element).getAdapter(IResource.class);
+        }
+        if (resource != null && resource.isAccessible() && ProjectUtils.isExcluded(resource)) {
+            decoration.addOverlay(WRTImages.getExcludedImageDescriptor(), IDecoration.TOP_RIGHT);
+        }
+    }
+
+    public void addListener(ILabelProviderListener listener) {
+        // Do nothing
+
+    }
+
+    public void dispose() {
+        // Do nothing
+
+    }
+
+    public boolean isLabelProperty(Object element, String property) {
+        // Do nothing
+        return false;
+    }
+
+    public void removeListener(ILabelProviderListener listener) {
+        // Do nohing
+
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.symbian.tools.mtw.ui/src/org/symbian/tools/mtw/ui/navigator/RenameMoveActionProvider.java	Wed Jul 21 11:26:43 2010 -0700
@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) 2010 Symbian Foundation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Symbian Foundation - initial contribution.
+ * Contributors:
+ * Description:
+ * Overview:
+ * Details:
+ * Platforms/Drives/Compatibility:
+ * Assumptions/Requirement/Pre-requisites:
+ * Failures and causes:
+ */
+package org.symbian.tools.mtw.ui.navigator;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.actions.ActionContext;
+import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.navigator.CommonActionProvider;
+import org.eclipse.ui.navigator.ICommonActionExtensionSite;
+import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
+import org.eclipse.wst.jsdt.ui.IContextMenuConstants;
+import org.eclipse.wst.jsdt.ui.actions.IJavaEditorActionDefinitionIds;
+import org.eclipse.wst.jsdt.ui.actions.JdtActionConstants;
+import org.eclipse.wst.jsdt.ui.actions.MoveAction;
+import org.eclipse.wst.jsdt.ui.actions.RenameAction;
+import org.eclipse.wst.jsdt.ui.actions.SelectionDispatchAction;
+
+public class RenameMoveActionProvider extends CommonActionProvider {
+ 	private SelectionDispatchAction fMoveAction;
+	private SelectionDispatchAction fRenameAction;
+	
+	private final Collection<IAction> fActions = new HashSet<IAction>();
+
+	public void fillActionBars(IActionBars actionBars) {
+		if (fActions.size() > 0) {
+			actionBars.setGlobalActionHandler(JdtActionConstants.RENAME, fRenameAction);
+			actionBars.setGlobalActionHandler(ActionFactory.RENAME.getId(), fRenameAction);
+
+			actionBars.setGlobalActionHandler(JdtActionConstants.MOVE, fMoveAction);
+			actionBars.setGlobalActionHandler(ActionFactory.MOVE.getId(), fMoveAction);
+		}
+	}
+
+	public void fillContextMenu(IMenuManager menu) {
+		menu.appendToGroup(IContextMenuConstants.GROUP_REORGANIZE, new Separator());
+		for (IAction action : fActions) {
+			menu.appendToGroup(IContextMenuConstants.GROUP_REORGANIZE, action);
+		}
+	}
+
+	public void init(ICommonActionExtensionSite site) {
+		ICommonViewerWorkbenchSite workbenchSite= null;
+		if (site.getViewSite() instanceof ICommonViewerWorkbenchSite) {
+            workbenchSite= (ICommonViewerWorkbenchSite) site.getViewSite();
+        }
+
+		// we only initialize the refactor group when in a view part 
+		// (required for the constructor)
+		if (workbenchSite != null) {
+			if (workbenchSite.getPart() != null && workbenchSite.getPart() instanceof IViewPart) {
+				IViewPart viewPart= (IViewPart) workbenchSite.getPart();
+				IWorkbenchPartSite s = viewPart.getSite();
+
+				fRenameAction= new RenameAction(s);
+				initUpdatingAction(fRenameAction, workbenchSite.getSelectionProvider(), workbenchSite.getSelectionProvider().getSelection(), IJavaEditorActionDefinitionIds.RENAME_ELEMENT);
+				fMoveAction= new MoveAction(s);
+				initUpdatingAction(fMoveAction, workbenchSite.getSelectionProvider(), workbenchSite.getSelectionProvider().getSelection(), IJavaEditorActionDefinitionIds.RENAME_ELEMENT);
+			}
+		}
+	}
+
+	private void initUpdatingAction(SelectionDispatchAction action, ISelectionProvider provider, ISelection selection, String actionDefinitionId){
+		action.setActionDefinitionId(actionDefinitionId);
+		action.update(selection);
+		if (provider != null) {
+            provider.addSelectionChangedListener(action);
+        }
+		fActions.add(action);
+	}
+
+	
+	public void setContext(ActionContext context) {
+		// Do nothing
+	}
+}
--- a/org.symbian.tools.wrttools.previewer/plugin.xml	Wed Jul 21 10:18:21 2010 -0700
+++ b/org.symbian.tools.wrttools.previewer/plugin.xml	Wed Jul 21 11:26:43 2010 -0700
@@ -6,7 +6,7 @@
          point="org.eclipse.ui.views">
       <view
             allowMultiple="false"
-            category="org.symbian.tools.wrttools.views"
+            category="org.symbian.tools.mtw"
             class="org.symbian.tools.wrttools.previewer.preview.PreviewView"
             icon="icons/obj16/preview_view.gif"
             id="org.symbian.tools.wrttools.editing.wrtpreview"
--- a/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch	Wed Jul 21 10:18:21 2010 -0700
+++ b/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch	Wed Jul 21 11:26:43 2010 -0700
@@ -22,8 +22,8 @@
 <stringAttribute key="productFile" value="\org.symbian.tools.wrttools.product\wrt-ide.product"/>
 <booleanAttribute key="restart" value="false"/>
 <stringAttribute key="selectedPlugin" value="org.symbian.tools.wrttools.previewer"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.gef@default:default,org.eclipse.jface@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.security@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.core.resources@default:default,org.apache.xml.resolver@default:default,com.ibm.icu@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.swt@default:default,org.eclipse.draw2d@default:default,org.eclipse.wst.xml.xpath2.processor@default:default,org.eclipse.jsch.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ui.ide@default:default,javax.xml@default:default,org.eclipse.equinox.p2.core@default:default,javax.servlet.jsp@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.app@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.wst.sse.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jface.text@default:default,org.apache.commons.el@default:default,org.eclipse.core.commands@default:default,org.eclipse.wst.html.ui.infopop@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.apache.log4j@default:default,org.eclipse.help.appserver@default:default,org.eclipse.rcp@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.lucene.analysis@default:default,org.eclipse.platform@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.editors@default:default,org.eclipse.wst.html.core@default:default,org.mozilla.xpcom@default:default,org.eclipse.ui.net@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.wst.jsdt.web.ui@default:default,java_cup.runtime@default:default,org.eclipse.jem.util@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.common.emf@default:default,org.apache.commons.lang@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.ui.presentations.r21@default:default,org.eclipse.ui@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.ecore@default:default,org.apache.lucene@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.help.base@default:default,org.eclipse.wst.dtd.core@default:default,org.eclipse.ecf@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.equinox.http.registry@default:default,org.mozilla.xulrunner@default:default,org.apache.jasper@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.osgi@-1:true,org.apache.bcel@default:default,org.eclipse.wst.jsdt.support.ie@default:default,org.eclipse.text@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.util@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.search@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.forms@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.wst.jsdt.support.firefox@default:default,org.sat4j.pb@default:default,org.mortbay.jetty.server@default:default,org.eclipse.help.ui@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.apache.xerces@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.apache.commons.collections@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.validation.infopop@default:default,org.eclipse.update.ui@default:default,org.eclipse.core.expressions@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ui.intro@default:default,org.eclipse.help@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.net@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.internet.monitor.ui@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.emf.edit.ui@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.core.boot@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.jsdt.doc@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.ui.browser@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.xml.xpath.core@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.security.ui@default:default,org.apache.xalan@default:default,org.eclipse.wst.doc.user@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.compare.win32@default:default,org.eclipse.team.ui@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.sat4j.core@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,javax.servlet@default:default,org.eclipse.emf.common.ui@default:default,org.apache.commons.httpclient*3.1.0.v20080605-1935@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.cvs@default:default,org.eclipse.ui.win32@default:false,org.eclipse.wst.xml.xpath.ui@default:default,com.jcraft.jsch@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.eclipse.update.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.debug.ui@default:default,org.mozilla.xulrunner.win32.win32.x86@default:false,org.apache.velocity@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ui.navigator@default:default,org.jdom@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.apache.xml.serializer@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.debug.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.equinox.registry@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.chromium.debug.ui@default:default,org.symbian.tools.wrttools@default:default,org.symbian.tools.wrttools.product@default:default,org.symbian.tools.wrttools.doc.WebDeveloper@default:default,org.chromium.debug.core@default:default,org.symbian.tools.wrttools.debug.core@default:default,org.w3c.css@default:default,org.symbian.tools.wrttools.previewer@default:default,org.symbian.tools.wrttools.doc.WRTKit@default:default,org.chromium.sdk@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.core.contenttype@default:default,org.apache.velocity@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.equinox.app@default:default,org.eclipse.osgi@-1:true,org.eclipse.wst.jsdt.web.ui@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.core.jobs@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.core.expressions@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.debug.core@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.core.variables@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.team.ui@default:default,org.eclipse.core.databinding.beans@default:default,org.apache.lucene.analysis@default:default,org.eclipse.emf.ecore.xmi@default:default,javax.xml@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.help.base@default:default,org.eclipse.equinox.security.ui@default:default,org.apache.xerces@default:default,org.mozilla.xulrunner.win32.win32.x86@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.core.databinding@default:default,org.eclipse.wst.jsdt.ui@default:default,org.jdom@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.sse.ui@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.update.ui@default:default,org.eclipse.text@default:default,org.sat4j.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.team.cvs.ssh2@default:default,java_cup.runtime@default:default,org.eclipse.equinox.common@2:true,org.eclipse.compare.win32@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.ui.net@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.filesystem.win32.x86@default:false,org.apache.lucene@default:default,org.eclipse.update.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf@default:default,org.apache.xml.resolver@default:default,org.eclipse.jsch.core@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.util@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.ui.intro@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.wst.xml.xpath.core@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.wst.css.core@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.apache.log4j@default:default,org.apache.xalan@default:default,org.eclipse.debug.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.team.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.eclipse.jface.text@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.dtd.core@default:default,org.eclipse.wst.doc.user@default:default,org.eclipse.wst.html.ui.infopop@default:default,org.eclipse.core.boot@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.equinox.security@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.help@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.equinox.p2.repository@default:default,com.jcraft.jsch@default:default,org.apache.commons.httpclient*3.1.0.v20080605-1935@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.ui.views@default:default,org.apache.commons.collections@default:default,org.mozilla.xpcom@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.wst.jsdt.doc@default:default,org.eclipse.rcp@default:default,javax.servlet.jsp@default:default,org.eclipse.search@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ui.browser@default:default,org.eclipse.equinox.launcher@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,com.ibm.icu@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.compare@default:default,org.eclipse.swt@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.wst.xml.ui@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.wst.validation.infopop@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.apache.commons.lang@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.bcel@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.xml.serializer@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime.compatibility@default:default,org.mortbay.jetty.util@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.wst.jsdt.support.ie@default:default,org.eclipse.draw2d@default:default,org.eclipse.wst.jsdt.support.firefox@default:default,org.eclipse.wst.xml.xpath.ui@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jem.util@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.wst.xml.xpath2.processor@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.help.ui@default:default,org.eclipse.ui.forms@default:default,org.eclipse.gef@default:default,org.eclipse.wst.internet.monitor.ui@default:default,org.mozilla.xulrunner@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.edit@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.cvs@default:default,org.apache.jasper@default:default,org.eclipse.ui.win32@default:false,org.eclipse.wst.common.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.platform@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.engine@default:default,javax.servlet@default:default,org.eclipse.ui@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.help.appserver@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.symbian.tools.wrttools.debug.core@default:default,org.chromium.sdk@default:default,org.symbian.tools.wrttools.doc.WebDeveloper@default:default,org.symbian.tools.wrttools.doc.WRTKit@default:default,org.symbian.tools.wrttools.previewer@default:default,org.w3c.css@default:default,org.chromium.debug.core@default:default,org.symbian.tools.wrttools.product@default:default,org.symbian.tools.mtw.ui@default:default,org.chromium.debug.ui@default:default,org.symbian.tools.wrttools@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="true"/>
 <mapAttribute key="tracingOptions">
--- a/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/perspective/WRTPerspective.java	Wed Jul 21 10:18:21 2010 -0700
+++ b/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/perspective/WRTPerspective.java	Wed Jul 21 11:26:43 2010 -0700
@@ -8,7 +8,6 @@
 import org.eclipse.ui.console.IConsoleConstants;
 import org.eclipse.ui.progress.IProgressConstants;
 import org.eclipse.wst.jsdt.ui.JavaScriptUI;
-import org.symbian.tools.wrttools.Activator;
 import org.symbian.tools.wrttools.previewer.PreviewerPlugin;
 
 public class WRTPerspective implements IPerspectiveFactory {
@@ -17,7 +16,7 @@
  		String editorArea = layout.getEditorArea();
 		
 		IFolderLayout folder= layout.createFolder("left", IPageLayout.LEFT, (float)0.15, editorArea); //$NON-NLS-1$
-		folder.addView(Activator.NAVIGATOR_ID);
+        folder.addView(IPageLayout.ID_PROJECT_EXPLORER);
 
         IFolderLayout snippetsFolder = layout.createFolder("snippets", IPageLayout.BOTTOM, (float) 0.5, "left"); //$NON-NLS-1$
         snippetsFolder.addView("org.eclipse.wst.common.snippets.internal.ui.SnippetsView");
@@ -42,6 +41,7 @@
 		
 		// views - java
 		layout.addShowViewShortcut(JavaScriptUI.ID_TYPE_HIERARCHY);
+        layout.addShowViewShortcut(IPageLayout.ID_PROJECT_EXPLORER);
 		layout.addShowViewShortcut(JavaScriptUI.ID_SOURCE_VIEW);
 		layout.addShowViewShortcut(JavaScriptUI.ID_JAVADOC_VIEW);
 		layout.addShowViewShortcut("org.symbian.tools.wrttools.wrtnavigator");
--- a/org.symbian.tools.wrttools.product/wrt-ide.product	Wed Jul 21 10:18:21 2010 -0700
+++ b/org.symbian.tools.wrttools.product/wrt-ide.product	Wed Jul 21 11:26:43 2010 -0700
@@ -1,298 +1,299 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="Mobile Web IDE" uid="org.symbian.wrtide" id="org.symbian.tools.wrttools.product.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
-
-   <aboutInfo>
-      <image path="icons/WRT_blurb_image.png"/>
-      <text>
-         %productBlurb
-      </text>
-   </aboutInfo>
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgsLin>-os linux -ws gtk -arch x86</programArgsLin>
-      <programArgsMac>-os macosx -ws cocoa -arch x86</programArgsMac>
-      <programArgsWin>-os win32 -ws win32 -arch x86</programArgsWin>
-      <vmArgs>-Xms128m -Xmx768m -XX:MaxPermSize=192m</vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <windowImages i16="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_16px.png" i32="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_32px.png" i48="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_48px.png" i64="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_64px.png" i128="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_128px.png"/>
-
-   <splash
-      location="org.symbian.tools.wrttools.product"
-      startupProgressRect="5,245,410,15"
-      startupMessageRect="7,220,400,20"
-      startupForegroundColor="000000" />
-   <launcher name="wrtide">
-      <linux icon="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.xpm"/>
-      <macosx icon="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.icns"/>
-      <solaris/>
-      <win useIco="true">
-         <ico path="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.ico"/>
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-      <macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</macos>
-      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>
-   </vm>
-
-   <plugins>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="com.jcraft.jsch"/>
-      <plugin id="java_cup.runtime"/>
-      <plugin id="javax.servlet"/>
-      <plugin id="javax.servlet.jsp"/>
-      <plugin id="javax.xml"/>
-      <plugin id="org.apache.ant"/>
-      <plugin id="org.apache.bcel"/>
-      <plugin id="org.apache.commons.codec"/>
-      <plugin id="org.apache.commons.collections"/>
-      <plugin id="org.apache.commons.el"/>
-      <plugin id="org.apache.commons.httpclient" version="3.1.0.v201005080502"/>
-      <plugin id="org.apache.commons.lang" version="2.3.0.v200803061910"/>
-      <plugin id="org.apache.commons.logging"/>
-      <plugin id="org.apache.jasper"/>
-      <plugin id="org.apache.log4j"/>
-      <plugin id="org.apache.lucene"/>
-      <plugin id="org.apache.lucene.analysis"/>
-      <plugin id="org.apache.velocity"/>
-      <plugin id="org.apache.xalan"/>
-      <plugin id="org.apache.xerces"/>
-      <plugin id="org.apache.xml.resolver"/>
-      <plugin id="org.apache.xml.serializer"/>
-      <plugin id="org.chromium.debug.core"/>
-      <plugin id="org.chromium.debug.ui"/>
-      <plugin id="org.chromium.sdk"/>
-      <plugin id="org.eclipse.ant.core"/>
-      <plugin id="org.eclipse.compare"/>
-      <plugin id="org.eclipse.compare.core"/>
-      <plugin id="org.eclipse.compare.win32"/>
-      <plugin id="org.eclipse.core.boot"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.databinding.beans"/>
-      <plugin id="org.eclipse.core.databinding.observable"/>
-      <plugin id="org.eclipse.core.databinding.property"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.filebuffers"/>
-      <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.net"/>
-      <plugin id="org.eclipse.core.net.linux.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.net.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.resources"/>
-      <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.auth"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
-      <plugin id="org.eclipse.core.variables"/>
-      <plugin id="org.eclipse.cvs"/>
-      <plugin id="org.eclipse.debug.core"/>
-      <plugin id="org.eclipse.debug.ui"/>
-      <plugin id="org.eclipse.draw2d"/>
-      <plugin id="org.eclipse.ecf"/>
-      <plugin id="org.eclipse.ecf.filetransfer"/>
-      <plugin id="org.eclipse.ecf.identity"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
-      <plugin id="org.eclipse.emf.common"/>
-      <plugin id="org.eclipse.emf.common.ui"/>
-      <plugin id="org.eclipse.emf.ecore"/>
-      <plugin id="org.eclipse.emf.ecore.change"/>
-      <plugin id="org.eclipse.emf.ecore.edit"/>
-      <plugin id="org.eclipse.emf.ecore.xmi"/>
-      <plugin id="org.eclipse.emf.edit"/>
-      <plugin id="org.eclipse.emf.edit.ui"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.concurrent"/>
-      <plugin id="org.eclipse.equinox.ds"/>
-      <plugin id="org.eclipse.equinox.frameworkadmin"/>
-      <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
-      <plugin id="org.eclipse.equinox.http.jetty"/>
-      <plugin id="org.eclipse.equinox.http.registry"/>
-      <plugin id="org.eclipse.equinox.http.servlet"/>
-      <plugin id="org.eclipse.equinox.jsp.jasper"/>
-      <plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
-      <plugin id="org.eclipse.equinox.launcher"/>
-      <plugin id="org.eclipse.equinox.launcher.cocoa.macosx" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" fragment="true"/>
-      <plugin id="org.eclipse.equinox.launcher.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.artifact.repository"/>
-      <plugin id="org.eclipse.equinox.p2.console"/>
-      <plugin id="org.eclipse.equinox.p2.core"/>
-      <plugin id="org.eclipse.equinox.p2.director"/>
-      <plugin id="org.eclipse.equinox.p2.director.app"/>
-      <plugin id="org.eclipse.equinox.p2.directorywatcher"/>
-      <plugin id="org.eclipse.equinox.p2.engine"/>
-      <plugin id="org.eclipse.equinox.p2.extensionlocation"/>
-      <plugin id="org.eclipse.equinox.p2.garbagecollector"/>
-      <plugin id="org.eclipse.equinox.p2.jarprocessor"/>
-      <plugin id="org.eclipse.equinox.p2.metadata"/>
-      <plugin id="org.eclipse.equinox.p2.metadata.generator"/>
-      <plugin id="org.eclipse.equinox.p2.metadata.repository"/>
-      <plugin id="org.eclipse.equinox.p2.operations"/>
-      <plugin id="org.eclipse.equinox.p2.publisher"/>
-      <plugin id="org.eclipse.equinox.p2.ql"/>
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins"/>
-      <plugin id="org.eclipse.equinox.p2.repository"/>
-      <plugin id="org.eclipse.equinox.p2.repository.tools"/>
-      <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
-      <plugin id="org.eclipse.equinox.p2.touchpoint.natives"/>
-      <plugin id="org.eclipse.equinox.p2.ui"/>
-      <plugin id="org.eclipse.equinox.p2.ui.sdk"/>
-      <plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler"/>
-      <plugin id="org.eclipse.equinox.p2.updatechecker"/>
-      <plugin id="org.eclipse.equinox.p2.updatesite"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.security"/>
-      <plugin id="org.eclipse.equinox.security.macosx" fragment="true"/>
-      <plugin id="org.eclipse.equinox.security.ui"/>
-      <plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.equinox.simpleconfigurator"/>
-      <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
-      <plugin id="org.eclipse.equinox.util"/>
-      <plugin id="org.eclipse.gef"/>
-      <plugin id="org.eclipse.help"/>
-      <plugin id="org.eclipse.help.appserver"/>
-      <plugin id="org.eclipse.help.base"/>
-      <plugin id="org.eclipse.help.ui"/>
-      <plugin id="org.eclipse.help.webapp"/>
-      <plugin id="org.eclipse.jem.util"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.jface.text"/>
-      <plugin id="org.eclipse.jsch.core"/>
-      <plugin id="org.eclipse.ltk.core.refactoring"/>
-      <plugin id="org.eclipse.ltk.ui.refactoring"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.osgi.util"/>
-      <plugin id="org.eclipse.platform"/>
-      <plugin id="org.eclipse.platform.doc.user"/>
-      <plugin id="org.eclipse.rcp"/>
-      <plugin id="org.eclipse.search"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.cocoa.macosx" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.team.core"/>
-      <plugin id="org.eclipse.team.cvs.core"/>
-      <plugin id="org.eclipse.team.cvs.ssh2"/>
-      <plugin id="org.eclipse.team.cvs.ui"/>
-      <plugin id="org.eclipse.team.ui"/>
-      <plugin id="org.eclipse.text"/>
-      <plugin id="org.eclipse.ui"/>
-      <plugin id="org.eclipse.ui.browser"/>
-      <plugin id="org.eclipse.ui.cheatsheets"/>
-      <plugin id="org.eclipse.ui.cocoa" fragment="true"/>
-      <plugin id="org.eclipse.ui.console"/>
-      <plugin id="org.eclipse.ui.editors"/>
-      <plugin id="org.eclipse.ui.forms"/>
-      <plugin id="org.eclipse.ui.ide"/>
-      <plugin id="org.eclipse.ui.ide.application"/>
-      <plugin id="org.eclipse.ui.intro"/>
-      <plugin id="org.eclipse.ui.intro.universal"/>
-      <plugin id="org.eclipse.ui.navigator"/>
-      <plugin id="org.eclipse.ui.navigator.resources"/>
-      <plugin id="org.eclipse.ui.net"/>
-      <plugin id="org.eclipse.ui.views"/>
-      <plugin id="org.eclipse.ui.views.properties.tabbed"/>
-      <plugin id="org.eclipse.ui.win32" fragment="true"/>
-      <plugin id="org.eclipse.ui.workbench"/>
-      <plugin id="org.eclipse.ui.workbench.texteditor"/>
-      <plugin id="org.eclipse.update.configurator"/>
-      <plugin id="org.eclipse.update.core"/>
-      <plugin id="org.eclipse.update.core.linux" fragment="true"/>
-      <plugin id="org.eclipse.update.core.win32" fragment="true"/>
-      <plugin id="org.eclipse.update.scheduler"/>
-      <plugin id="org.eclipse.update.ui"/>
-      <plugin id="org.eclipse.wst.common.core"/>
-      <plugin id="org.eclipse.wst.common.emf"/>
-      <plugin id="org.eclipse.wst.common.emfworkbench.integration"/>
-      <plugin id="org.eclipse.wst.common.environment"/>
-      <plugin id="org.eclipse.wst.common.frameworks"/>
-      <plugin id="org.eclipse.wst.common.frameworks.ui"/>
-      <plugin id="org.eclipse.wst.common.infopop"/>
-      <plugin id="org.eclipse.wst.common.modulecore"/>
-      <plugin id="org.eclipse.wst.common.project.facet.core"/>
-      <plugin id="org.eclipse.wst.common.snippets"/>
-      <plugin id="org.eclipse.wst.common.ui"/>
-      <plugin id="org.eclipse.wst.common.uriresolver"/>
-      <plugin id="org.eclipse.wst.css.core"/>
-      <plugin id="org.eclipse.wst.css.ui"/>
-      <plugin id="org.eclipse.wst.doc.user"/>
-      <plugin id="org.eclipse.wst.dtd.core"/>
-      <plugin id="org.eclipse.wst.html.core"/>
-      <plugin id="org.eclipse.wst.html.ui"/>
-      <plugin id="org.eclipse.wst.html.ui.infopop"/>
-      <plugin id="org.eclipse.wst.internet.cache"/>
-      <plugin id="org.eclipse.wst.internet.monitor.core"/>
-      <plugin id="org.eclipse.wst.internet.monitor.ui"/>
-      <plugin id="org.eclipse.wst.jsdt.core"/>
-      <plugin id="org.eclipse.wst.jsdt.doc"/>
-      <plugin id="org.eclipse.wst.jsdt.manipulation"/>
-      <plugin id="org.eclipse.wst.jsdt.support.firefox"/>
-      <plugin id="org.eclipse.wst.jsdt.support.ie"/>
-      <plugin id="org.eclipse.wst.jsdt.ui"/>
-      <plugin id="org.eclipse.wst.jsdt.web.core"/>
-      <plugin id="org.eclipse.wst.jsdt.web.ui"/>
-      <plugin id="org.eclipse.wst.sse.core"/>
-      <plugin id="org.eclipse.wst.sse.doc.user"/>
-      <plugin id="org.eclipse.wst.sse.ui"/>
-      <plugin id="org.eclipse.wst.sse.ui.infopop"/>
-      <plugin id="org.eclipse.wst.standard.schemas"/>
-      <plugin id="org.eclipse.wst.validation"/>
-      <plugin id="org.eclipse.wst.validation.infopop"/>
-      <plugin id="org.eclipse.wst.validation.ui"/>
-      <plugin id="org.eclipse.wst.xml.core"/>
-      <plugin id="org.eclipse.wst.xml.ui"/>
-      <plugin id="org.eclipse.wst.xml.ui.infopop"/>
-      <plugin id="org.eclipse.wst.xml.xpath.core"/>
-      <plugin id="org.eclipse.wst.xml.xpath.ui"/>
-      <plugin id="org.eclipse.wst.xml.xpath2.processor"/>
-      <plugin id="org.eclipse.wst.xmleditor.doc.user"/>
-      <plugin id="org.jdom"/>
-      <plugin id="org.mortbay.jetty.server"/>
-      <plugin id="org.mortbay.jetty.util"/>
-      <plugin id="org.mozilla.xpcom"/>
-      <plugin id="org.mozilla.xulrunner"/>
-      <plugin id="org.mozilla.xulrunner.carbon.macosx" fragment="true"/>
-      <plugin id="org.mozilla.xulrunner.gtk.linux.x86" fragment="true"/>
-      <plugin id="org.mozilla.xulrunner.win32.win32.x86" fragment="true"/>
-      <plugin id="org.sat4j.core"/>
-      <plugin id="org.sat4j.pb"/>
-      <plugin id="org.symbian.tools.wrttools"/>
-      <plugin id="org.symbian.tools.wrttools.debug.core"/>
-      <plugin id="org.symbian.tools.wrttools.doc.WRTKit"/>
-      <plugin id="org.symbian.tools.wrttools.doc.WebDeveloper"/>
-      <plugin id="org.symbian.tools.wrttools.previewer"/>
-      <plugin id="org.symbian.tools.wrttools.product"/>
-      <plugin id="org.w3c.css"/>
-   </plugins>
-
-   <configurations>
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <plugin id="org.symbian.tools.wrttools.product" autoStart="false" startLevel="5" />
-   </configurations>
-
-</product>
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Mobile Web IDE" uid="org.symbian.wrtide" id="org.symbian.tools.wrttools.product.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
+
+   <aboutInfo>
+      <image path="icons/WRT_blurb_image.png"/>
+      <text>
+         %productBlurb
+      </text>
+   </aboutInfo>
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgsLin>-os linux -ws gtk -arch x86</programArgsLin>
+      <programArgsMac>-os macosx -ws cocoa -arch x86</programArgsMac>
+      <programArgsWin>-os win32 -ws win32 -arch x86</programArgsWin>
+      <vmArgs>-Xms128m -Xmx768m -XX:MaxPermSize=192m</vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages i16="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_16px.png" i32="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_32px.png" i48="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_48px.png" i64="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_64px.png" i128="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon_128px.png"/>
+
+   <splash
+      location="org.symbian.tools.wrttools.product"
+      startupProgressRect="5,245,410,15"
+      startupMessageRect="7,220,400,20"
+      startupForegroundColor="000000" />
+   <launcher name="wrtide">
+      <linux icon="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.xpm"/>
+      <macosx icon="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.icns"/>
+      <solaris/>
+      <win useIco="true">
+         <ico path="/org.symbian.tools.wrttools.product/icons/ico/WRT_main-icon.ico"/>
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+      <macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</macos>
+      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>
+   </vm>
+
+   <plugins>
+      <plugin id="com.ibm.icu"/>
+      <plugin id="com.jcraft.jsch"/>
+      <plugin id="java_cup.runtime"/>
+      <plugin id="javax.servlet"/>
+      <plugin id="javax.servlet.jsp"/>
+      <plugin id="javax.xml"/>
+      <plugin id="org.apache.ant"/>
+      <plugin id="org.apache.bcel"/>
+      <plugin id="org.apache.commons.codec"/>
+      <plugin id="org.apache.commons.collections"/>
+      <plugin id="org.apache.commons.el"/>
+      <plugin id="org.apache.commons.httpclient" version="3.1.0.v201005080502"/>
+      <plugin id="org.apache.commons.lang" version="2.3.0.v200803061910"/>
+      <plugin id="org.apache.commons.logging"/>
+      <plugin id="org.apache.jasper"/>
+      <plugin id="org.apache.log4j"/>
+      <plugin id="org.apache.lucene"/>
+      <plugin id="org.apache.lucene.analysis"/>
+      <plugin id="org.apache.velocity"/>
+      <plugin id="org.apache.xalan"/>
+      <plugin id="org.apache.xerces"/>
+      <plugin id="org.apache.xml.resolver"/>
+      <plugin id="org.apache.xml.serializer"/>
+      <plugin id="org.chromium.debug.core"/>
+      <plugin id="org.chromium.debug.ui"/>
+      <plugin id="org.chromium.sdk"/>
+      <plugin id="org.eclipse.ant.core"/>
+      <plugin id="org.eclipse.compare"/>
+      <plugin id="org.eclipse.compare.core"/>
+      <plugin id="org.eclipse.compare.win32"/>
+      <plugin id="org.eclipse.core.boot"/>
+      <plugin id="org.eclipse.core.commands"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.databinding"/>
+      <plugin id="org.eclipse.core.databinding.beans"/>
+      <plugin id="org.eclipse.core.databinding.observable"/>
+      <plugin id="org.eclipse.core.databinding.property"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.filebuffers"/>
+      <plugin id="org.eclipse.core.filesystem"/>
+      <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
+      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.net"/>
+      <plugin id="org.eclipse.core.net.linux.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.net.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.resources"/>
+      <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.core.runtime.compatibility"/>
+      <plugin id="org.eclipse.core.runtime.compatibility.auth"/>
+      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
+      <plugin id="org.eclipse.core.variables"/>
+      <plugin id="org.eclipse.cvs"/>
+      <plugin id="org.eclipse.debug.core"/>
+      <plugin id="org.eclipse.debug.ui"/>
+      <plugin id="org.eclipse.draw2d"/>
+      <plugin id="org.eclipse.ecf"/>
+      <plugin id="org.eclipse.ecf.filetransfer"/>
+      <plugin id="org.eclipse.ecf.identity"/>
+      <plugin id="org.eclipse.ecf.provider.filetransfer"/>
+      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
+      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" fragment="true"/>
+      <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
+      <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
+      <plugin id="org.eclipse.emf.common"/>
+      <plugin id="org.eclipse.emf.common.ui"/>
+      <plugin id="org.eclipse.emf.ecore"/>
+      <plugin id="org.eclipse.emf.ecore.change"/>
+      <plugin id="org.eclipse.emf.ecore.edit"/>
+      <plugin id="org.eclipse.emf.ecore.xmi"/>
+      <plugin id="org.eclipse.emf.edit"/>
+      <plugin id="org.eclipse.emf.edit.ui"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.concurrent"/>
+      <plugin id="org.eclipse.equinox.ds"/>
+      <plugin id="org.eclipse.equinox.frameworkadmin"/>
+      <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
+      <plugin id="org.eclipse.equinox.http.jetty"/>
+      <plugin id="org.eclipse.equinox.http.registry"/>
+      <plugin id="org.eclipse.equinox.http.servlet"/>
+      <plugin id="org.eclipse.equinox.jsp.jasper"/>
+      <plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
+      <plugin id="org.eclipse.equinox.launcher"/>
+      <plugin id="org.eclipse.equinox.launcher.cocoa.macosx" fragment="true"/>
+      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" fragment="true"/>
+      <plugin id="org.eclipse.equinox.launcher.win32.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.equinox.p2.artifact.repository"/>
+      <plugin id="org.eclipse.equinox.p2.console"/>
+      <plugin id="org.eclipse.equinox.p2.core"/>
+      <plugin id="org.eclipse.equinox.p2.director"/>
+      <plugin id="org.eclipse.equinox.p2.director.app"/>
+      <plugin id="org.eclipse.equinox.p2.directorywatcher"/>
+      <plugin id="org.eclipse.equinox.p2.engine"/>
+      <plugin id="org.eclipse.equinox.p2.extensionlocation"/>
+      <plugin id="org.eclipse.equinox.p2.garbagecollector"/>
+      <plugin id="org.eclipse.equinox.p2.jarprocessor"/>
+      <plugin id="org.eclipse.equinox.p2.metadata"/>
+      <plugin id="org.eclipse.equinox.p2.metadata.generator"/>
+      <plugin id="org.eclipse.equinox.p2.metadata.repository"/>
+      <plugin id="org.eclipse.equinox.p2.operations"/>
+      <plugin id="org.eclipse.equinox.p2.publisher"/>
+      <plugin id="org.eclipse.equinox.p2.ql"/>
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins"/>
+      <plugin id="org.eclipse.equinox.p2.repository"/>
+      <plugin id="org.eclipse.equinox.p2.repository.tools"/>
+      <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
+      <plugin id="org.eclipse.equinox.p2.touchpoint.natives"/>
+      <plugin id="org.eclipse.equinox.p2.ui"/>
+      <plugin id="org.eclipse.equinox.p2.ui.sdk"/>
+      <plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler"/>
+      <plugin id="org.eclipse.equinox.p2.updatechecker"/>
+      <plugin id="org.eclipse.equinox.p2.updatesite"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.equinox.security"/>
+      <plugin id="org.eclipse.equinox.security.macosx" fragment="true"/>
+      <plugin id="org.eclipse.equinox.security.ui"/>
+      <plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.equinox.simpleconfigurator"/>
+      <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
+      <plugin id="org.eclipse.equinox.util"/>
+      <plugin id="org.eclipse.gef"/>
+      <plugin id="org.eclipse.help"/>
+      <plugin id="org.eclipse.help.appserver"/>
+      <plugin id="org.eclipse.help.base"/>
+      <plugin id="org.eclipse.help.ui"/>
+      <plugin id="org.eclipse.help.webapp"/>
+      <plugin id="org.eclipse.jem.util"/>
+      <plugin id="org.eclipse.jface"/>
+      <plugin id="org.eclipse.jface.databinding"/>
+      <plugin id="org.eclipse.jface.text"/>
+      <plugin id="org.eclipse.jsch.core"/>
+      <plugin id="org.eclipse.ltk.core.refactoring"/>
+      <plugin id="org.eclipse.ltk.ui.refactoring"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.osgi.services"/>
+      <plugin id="org.eclipse.osgi.util"/>
+      <plugin id="org.eclipse.platform"/>
+      <plugin id="org.eclipse.platform.doc.user"/>
+      <plugin id="org.eclipse.rcp"/>
+      <plugin id="org.eclipse.search"/>
+      <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.cocoa.macosx" fragment="true"/>
+      <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
+      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.team.core"/>
+      <plugin id="org.eclipse.team.cvs.core"/>
+      <plugin id="org.eclipse.team.cvs.ssh2"/>
+      <plugin id="org.eclipse.team.cvs.ui"/>
+      <plugin id="org.eclipse.team.ui"/>
+      <plugin id="org.eclipse.text"/>
+      <plugin id="org.eclipse.ui"/>
+      <plugin id="org.eclipse.ui.browser"/>
+      <plugin id="org.eclipse.ui.cheatsheets"/>
+      <plugin id="org.eclipse.ui.cocoa" fragment="true"/>
+      <plugin id="org.eclipse.ui.console"/>
+      <plugin id="org.eclipse.ui.editors"/>
+      <plugin id="org.eclipse.ui.forms"/>
+      <plugin id="org.eclipse.ui.ide"/>
+      <plugin id="org.eclipse.ui.ide.application"/>
+      <plugin id="org.eclipse.ui.intro"/>
+      <plugin id="org.eclipse.ui.intro.universal"/>
+      <plugin id="org.eclipse.ui.navigator"/>
+      <plugin id="org.eclipse.ui.navigator.resources"/>
+      <plugin id="org.eclipse.ui.net"/>
+      <plugin id="org.eclipse.ui.views"/>
+      <plugin id="org.eclipse.ui.views.properties.tabbed"/>
+      <plugin id="org.eclipse.ui.win32" fragment="true"/>
+      <plugin id="org.eclipse.ui.workbench"/>
+      <plugin id="org.eclipse.ui.workbench.texteditor"/>
+      <plugin id="org.eclipse.update.configurator"/>
+      <plugin id="org.eclipse.update.core"/>
+      <plugin id="org.eclipse.update.core.linux" fragment="true"/>
+      <plugin id="org.eclipse.update.core.win32" fragment="true"/>
+      <plugin id="org.eclipse.update.scheduler"/>
+      <plugin id="org.eclipse.update.ui"/>
+      <plugin id="org.eclipse.wst.common.core"/>
+      <plugin id="org.eclipse.wst.common.emf"/>
+      <plugin id="org.eclipse.wst.common.emfworkbench.integration"/>
+      <plugin id="org.eclipse.wst.common.environment"/>
+      <plugin id="org.eclipse.wst.common.frameworks"/>
+      <plugin id="org.eclipse.wst.common.frameworks.ui"/>
+      <plugin id="org.eclipse.wst.common.infopop"/>
+      <plugin id="org.eclipse.wst.common.modulecore"/>
+      <plugin id="org.eclipse.wst.common.project.facet.core"/>
+      <plugin id="org.eclipse.wst.common.snippets"/>
+      <plugin id="org.eclipse.wst.common.ui"/>
+      <plugin id="org.eclipse.wst.common.uriresolver"/>
+      <plugin id="org.eclipse.wst.css.core"/>
+      <plugin id="org.eclipse.wst.css.ui"/>
+      <plugin id="org.eclipse.wst.doc.user"/>
+      <plugin id="org.eclipse.wst.dtd.core"/>
+      <plugin id="org.eclipse.wst.html.core"/>
+      <plugin id="org.eclipse.wst.html.ui"/>
+      <plugin id="org.eclipse.wst.html.ui.infopop"/>
+      <plugin id="org.eclipse.wst.internet.cache"/>
+      <plugin id="org.eclipse.wst.internet.monitor.core"/>
+      <plugin id="org.eclipse.wst.internet.monitor.ui"/>
+      <plugin id="org.eclipse.wst.jsdt.core"/>
+      <plugin id="org.eclipse.wst.jsdt.doc"/>
+      <plugin id="org.eclipse.wst.jsdt.manipulation"/>
+      <plugin id="org.eclipse.wst.jsdt.support.firefox"/>
+      <plugin id="org.eclipse.wst.jsdt.support.ie"/>
+      <plugin id="org.eclipse.wst.jsdt.ui"/>
+      <plugin id="org.eclipse.wst.jsdt.web.core"/>
+      <plugin id="org.eclipse.wst.jsdt.web.ui"/>
+      <plugin id="org.eclipse.wst.sse.core"/>
+      <plugin id="org.eclipse.wst.sse.doc.user"/>
+      <plugin id="org.eclipse.wst.sse.ui"/>
+      <plugin id="org.eclipse.wst.sse.ui.infopop"/>
+      <plugin id="org.eclipse.wst.standard.schemas"/>
+      <plugin id="org.eclipse.wst.validation"/>
+      <plugin id="org.eclipse.wst.validation.infopop"/>
+      <plugin id="org.eclipse.wst.validation.ui"/>
+      <plugin id="org.eclipse.wst.xml.core"/>
+      <plugin id="org.eclipse.wst.xml.ui"/>
+      <plugin id="org.eclipse.wst.xml.ui.infopop"/>
+      <plugin id="org.eclipse.wst.xml.xpath.core"/>
+      <plugin id="org.eclipse.wst.xml.xpath.ui"/>
+      <plugin id="org.eclipse.wst.xml.xpath2.processor"/>
+      <plugin id="org.eclipse.wst.xmleditor.doc.user"/>
+      <plugin id="org.jdom"/>
+      <plugin id="org.mortbay.jetty.server"/>
+      <plugin id="org.mortbay.jetty.util"/>
+      <plugin id="org.mozilla.xpcom"/>
+      <plugin id="org.mozilla.xulrunner"/>
+      <plugin id="org.mozilla.xulrunner.carbon.macosx" fragment="true"/>
+      <plugin id="org.mozilla.xulrunner.gtk.linux.x86" fragment="true"/>
+      <plugin id="org.mozilla.xulrunner.win32.win32.x86" fragment="true"/>
+      <plugin id="org.sat4j.core"/>
+      <plugin id="org.sat4j.pb"/>
+      <plugin id="org.symbian.tools.mtw.ui"/>
+      <plugin id="org.symbian.tools.wrttools"/>
+      <plugin id="org.symbian.tools.wrttools.debug.core"/>
+      <plugin id="org.symbian.tools.wrttools.doc.WRTKit"/>
+      <plugin id="org.symbian.tools.wrttools.doc.WebDeveloper"/>
+      <plugin id="org.symbian.tools.wrttools.previewer"/>
+      <plugin id="org.symbian.tools.wrttools.product"/>
+      <plugin id="org.w3c.css"/>
+   </plugins>
+
+   <configurations>
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.symbian.tools.wrttools.product" autoStart="false" startLevel="5" />
+   </configurations>
+
+</product>
--- a/org.symbian.tools.wrttools/META-INF/MANIFEST.MF	Wed Jul 21 10:18:21 2010 -0700
+++ b/org.symbian.tools.wrttools/META-INF/MANIFEST.MF	Wed Jul 21 11:26:43 2010 -0700
@@ -51,6 +51,7 @@
  org.eclipse.ui.internal.ide.dialogs,
  org.eclipse.ui.wizards.newresource
 Export-Package: org.symbian.tools.wrttools,
+ org.symbian.tools.wrttools.core,
  org.symbian.tools.wrttools.util,
  org.symbian.tools.wrttools.wizards
 Bundle-ClassPath: .,
--- a/org.symbian.tools.wrttools/plugin.xml	Wed Jul 21 10:18:21 2010 -0700
+++ b/org.symbian.tools.wrttools/plugin.xml	Wed Jul 21 11:26:43 2010 -0700
@@ -252,284 +252,6 @@
 		</perspectiveExtension>
 	</extension>
 	
-<!-- Navigator Extensions -->
-	<extension point="org.eclipse.ui.views">
-		<view allowMultiple="false" category="org.symbian.tools.wrttools.views"
-			class="org.eclipse.ui.navigator.CommonNavigator" icon="icons/main16.gif"
-			id="org.symbian.tools.wrttools.wrtnavigator" name="Projects"
-			restorable="true">
-		</view>
-		<category id="org.symbian.tools.wrttools.views" name="Tools for Mobile Web">
-		</category>
-	</extension>
-	<extension point="org.eclipse.ui.navigator.viewer">
-		<viewer viewerId="org.symbian.tools.wrttools.wrtnavigator">
-			<popupMenu allowsPlatformContributions="true"
-				id="org.eclipse.ui.navigator.ProjectExplorer#PopupMenu">
-				<insertionPoint name="group.new" />
-				<insertionPoint name="group.open" separator="true" />
-				<insertionPoint name="group.openWith" />
-				<insertionPoint name="group.edit" separator="true" />
-				<insertionPoint name="group.reorganize" separator="true" />
-				<insertionPoint name="group.port" separator="true" />
-				<insertionPoint name="group.build" separator="true" />
-				<insertionPoint name="group.generate" separator="true" />
-				<insertionPoint name="group.search" separator="true" />
-				<insertionPoint name="additions" separator="true" />
-				<insertionPoint name="group.properties" separator="true" />
-			</popupMenu>
-		</viewer>
-		<viewerContentBinding viewerId="org.symbian.tools.wrttools.wrtnavigator">
-			<includes>
-				<contentExtension
-          isRoot="true"
-          pattern="org.symbian.tools.wrttools.navigatorcontent"/>
-				<contentExtension pattern="org.eclipse.ui.navigator.resources.filters.*" />
-				<contentExtension
-          isRoot="true"
-          pattern="org.symbian.tools.wrttools.wrtLinkHelper"/>
-			</includes>
-		</viewerContentBinding>
-		<viewerActionBinding viewerId="org.symbian.tools.wrttools.wrtnavigator">
-			<includes>
-				<actionExtension pattern="org.eclipse.ui.navigator.resources.PortingActions" />
-				<actionExtension pattern="org.eclipse.ui.navigator.resources.GotoActions" />
-				<actionExtension pattern="org.eclipse.ui.navigator.resources.GoIntoActions" />
-				<actionExtension pattern="org.eclipse.ui.navigator.resources.NewActions" />
-				<actionExtension pattern="org.eclipse.ui.navigator.resources.PropertiesActionProvider" />
-				<actionExtension pattern="org.eclipse.ui.navigator.resources.WorkManagementActionProvider" />
-				<actionExtension pattern="org.eclipse.ui.navigator.resources.ResourceMgmtActions" />
-				<actionExtension pattern="org.eclipse.ui.navigator.resources.UndoRedoActionProvider" />
-				<actionExtension pattern="org.eclipse.ui.navigator.resources.WorkingSetActions" />
-			</includes>
-		</viewerActionBinding>
-		<dragAssistant
-			class="org.eclipse.ui.navigator.resources.ResourceDragAdapterAssistant"
-			viewerId="org.symbian.tools.wrttools.wrtnavigator" />
-	</extension>
-	 <extension
-       point="org.eclipse.ui.navigator.navigatorContent">
-    <navigatorContent
-          activeByDefault="true"
-          contentProvider="org.symbian.tools.wrttools.navigator.WRTNavigatorContentProvider"
-          icon="icons/main16.gif"
-          id="org.symbian.tools.wrttools.navigatorcontent"
-          labelProvider="org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorLabelProvider"
-          name="Mobile Web"
-          priority="high"
-          providesSaveables="false">
-       <triggerPoints>
-          <or>
-             <instanceof
-                   value="org.eclipse.wst.jsdt.core.IJavaScriptElement">
-             </instanceof>
-             <instanceof
-                   value="org.eclipse.wst.jsdt.core.IJarEntryResource">
-             </instanceof>
-             <instanceof
-                   value="org.eclipse.wst.jsdt.internal.ui.packageview.PackageFragmentRootContainer">
-             </instanceof>
-             <instanceof
-                   value="org.eclipse.wst.jsdt.ui.ProjectLibraryRoot">
-             </instanceof>
-             <instanceof
-                   value="org.eclipse.core.resources.IResource">
-             </instanceof>
-             <adapt
-                   type="org.eclipse.core.resources.IProject">
-                <test
-                      property="org.eclipse.core.resources.projectNature"
-                      value="org.symbian.tools.wrttools.WidgetProjectNature">
-                </test>
-             </adapt>
-          </or>
-       </triggerPoints>
-       <possibleChildren>
-          <or>
-             <instanceof
-                   value="org.eclipse.core.resources.IResource">
-             </instanceof>
-             <instanceof
-                   value="org.eclipse.wst.jsdt.core.IJavaScriptElement">
-             </instanceof>
-             <instanceof
-                   value="org.eclipse.wst.jsdt.core.IJarEntryResource">
-             </instanceof>
-             <instanceof
-                   value="org.eclipse.wst.jsdt.ui.ProjectLibraryRoot">
-             </instanceof>
-          </or>
-       </possibleChildren>
-       <actionProvider
-             class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorActionProvider"
-             id="org.eclipse.wst.jsdt.ui.navigator.actions.StandardActions">
-       </actionProvider>
-       <actionProvider
-             class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorRefactorActionProvider"
-             id="org.eclipse.wst.jsdt.ui.navigator.actions.RefactorActions"
-             overrides="org.eclipse.ui.navigator.resources.actions.RefactorActions">
-          <enablement>
-             <or>
-                <adapt
-                      type="java.util.Collection">
-                   <count
-                         value="0">
-                   </count>
-                </adapt>
-                <and>
-                   <or>
-                      <instanceof
-                            value="org.eclipse.wst.jsdt.core.IJavaScriptElement">
-                      </instanceof>
-                      <instanceof
-                            value="org.eclipse.wst.jsdt.core.IJarEntryResource">
-                      </instanceof>
-                   </or>
-                   <not>
-                      <instanceof
-                            value="org.eclipse.wst.jsdt.core.ITypeRoot">
-                      </instanceof>
-                   </not>
-                </and>
-             </or>
-          </enablement>
-       </actionProvider>
-       <actionProvider
-             class="org.symbian.tools.wrttools.navigator.RenameMoveActionProvider"
-             id="org.symbian.wrttools.navigator.MoveRename"
-             overrides="org.eclipse.ui.navigator.resources.actions.RefactorActions">
-          <enablement>
-             <and>
-                <adapt
-                      type="org.eclipse.core.resources.IResource">
-                </adapt>
-                <not>
-                   <instanceof
-                         value="org.eclipse.wst.jsdt.core.IType">
-                   </instanceof>
-                </not>
-             </and>
-          </enablement>
-       </actionProvider>
-       <actionProvider
-             class="org.eclipse.wst.jsdt.internal.ui.navigator.PackageExplorerOpenActionProvider"
-             id="org.eclipse.wst.jsdt.ui.navigator.actions.OpenActions"
-             overrides="org.eclipse.ui.navigator.resources.OpenActions">
-       </actionProvider>
-       <override
-             policy="InvokeAlwaysRegardlessOfSuppressedExt"
-             suppressedExtensionId="org.eclipse.ui.navigator.resourceContent">
-       </override>
-       <commonWizard
-             type="import"
-             wizardId="org.symbian.tools.wrttools.importwgz">
-          <enablement>
-             <or>
-                <adapt
-                      type="org.eclipse.core.resources.IResource">
-                </adapt>
-                <adapt
-                      type="java.util.Collection">
-                </adapt>
-             </or>
-          </enablement>
-       </commonWizard>
-       <commonWizard
-             menuGroupId="group.new.z"
-             type="new"
-             wizardId="org.symbian.tools.wrttools.core.wrtwidgetwizard">
-          <enablement>
-             <or>
-                <adapt
-                      type="org.eclipse.core.resources.IResource">
-                </adapt>
-                <adapt
-                      type="java.util.Collection">
-                </adapt>
-             </or>
-          </enablement>
-       </commonWizard>
-       <commonWizard
-             type="new"
-             wizardId="org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard">
-          <enablement>
-             <adapt
-                   type="org.eclipse.core.resources.IResource">
-             </adapt>
-          </enablement>
-       </commonWizard>
-       <commonWizard
-             menuGroupId="group.new.generic"
-             type="new"
-             wizardId="org.eclipse.ui.wizards.new.folder">
-          <enablement>
-             <adapt
-                   type="org.eclipse.core.resources.IResource">
-             </adapt>
-          </enablement>
-       </commonWizard>
-       <commonWizard
-             menuGroupId="group.new.generic"
-             type="new"
-             wizardId="org.eclipse.ui.wizards.new.file">
-          <enablement>
-             <adapt
-                   type="org.eclipse.core.resources.IResource">
-             </adapt>
-          </enablement>
-       </commonWizard>
-       <commonWizard
-             type="new"
-             wizardId="org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard">
-          <enablement>
-             <adapt
-                   type="org.eclipse.core.resources.IResource">
-             </adapt>
-          </enablement>
-       </commonWizard>
-       <commonWizard
-             type="new"
-             wizardId="org.eclipse.wst.jsdt.ui.NewJSWizard">
-          <enablement>
-             <adapt
-                   type="org.eclipse.core.resources.IResource">
-             </adapt>
-          </enablement>
-       </commonWizard>
-       <commonWizard
-             type="import"
-             wizardId="org.symbian.tools.wrttools.import.projectImport">
-          <enablement>
-             <or>
-                <adapt
-                      type="org.eclipse.core.resources.IResource">
-                </adapt>
-                <adapt
-                      type="java.util.Collection">
-                </adapt>
-             </or>
-          </enablement>
-       </commonWizard>
-       <dropAssistant
-             class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaDropAdapterAssistant"
-             id="org.eclipse.wst.jsdt.ui.dropAssistant">
-          <possibleDropTargets>
-             <or>
-                <instanceof
-                      value="org.eclipse.core.resources.IResource">
-                </instanceof>
-                <instanceof
-                      value="org.eclipse.wst.jsdt.core.IJavaScriptElement">
-                </instanceof>
-             </or>
-          </possibleDropTargets>
-       </dropAssistant>
-       <commonSorter
-             class="org.symbian.tools.wrttools.navigator.NavigatorSorter"
-             id="org.symbian.tools.wrttools.sorter">
-       </commonSorter>
-    </navigatorContent>
- </extension>
  <extension
        point="org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer">
     <JsGlobalScopeContainerInitializer
@@ -572,31 +294,6 @@
     </keyword>
  </extension>
  <extension
-       point="org.eclipse.ui.navigator.linkHelper">
-    <linkHelper
-          class="org.symbian.tools.wrttools.navigator.WrtNavigatorLinkHelper"
-          id="org.symbian.tools.wrttools.wrtLinkHelper">
-       <editorInputEnablement>
-          <adapt
-                type="org.eclipse.ui.IFileEditorInput">
-          </adapt>
-       </editorInputEnablement>
-       <selectionEnablement>
-          <or>
-             <adapt
-                   type="org.eclipse.wst.jsdt.core.IJavaScriptElement">
-             </adapt>
-             <instanceof
-                   value="java.util.Collection">
-             </instanceof>
-             <adapt
-                   type="org.eclipse.core.resources.IResource">
-             </adapt>
-          </or>
-       </selectionEnablement>
-    </linkHelper>
- </extension>
- <extension
        id="org.symbian.tools.wrttools.platformservices"
        name="Platform Services Inferrence Support"
        point="org.eclipse.wst.jsdt.core.inferrenceSupport">
@@ -827,8 +524,12 @@
           label="Mobile Web Packaging Information"
           lightweight="true"
           location="TOP_RIGHT"
-          objectClass="org.eclipse.core.resources.IResource"
           state="true">
+       <enablement>
+       	<objectClass
+              name="org.eclipse.core.resources.IResource">
+       	</objectClass>
+       </enablement>
     </decorator>
  </extension>
  <extension
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/Activator.java	Wed Jul 21 10:18:21 2010 -0700
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/Activator.java	Wed Jul 21 11:26:43 2010 -0700
@@ -46,8 +46,6 @@
 
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.symbian.tools.wrttools";
-	
-	public static final String NAVIGATOR_ID = PLUGIN_ID + ".wrtnavigator";
 
 	// The shared instance
 	private static Activator plugin;
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/NavigatorSorter.java	Wed Jul 21 10:18:21 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-package org.symbian.tools.wrttools.navigator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.ui.JavaScriptElementComparator;
-
-public class NavigatorSorter extends ViewerSorter {
-	private final JavaScriptElementComparator jsComparator = new JavaScriptElementComparator();
-	
-	@Override
-	public int compare(Viewer viewer, Object e1, Object e2) {
-		if (e1 == e2) {
-			return 0;
-		} else if (e1 == null) { 
-			return 1;
-		} else if (e2 == null) {
-			return -1;
-		}
-		
-		if (e1 instanceof IJavaScriptElement && e2 instanceof IJavaScriptElement) {
-			return compareJavaScriptElements(viewer, (IJavaScriptElement) e1, (IJavaScriptElement) e2);
-		}
-		IResource res1 = getResource(e1);
-		IResource res2 = getResource(e2);
-		
-		if (res1 == res2) {
-			return 0;
-		} else if (res1 == null) {
-			return 1;
-		} else if (res2 == null) {
-			return -1;
-		} else {
-			int res1type = res1.getType();
-			int res2type = res2.getType();
-			if (res1type == res2type) {
-				// Note: Files cannot have same name in different case - enforced by Eclipse
-				return res1.getName().toLowerCase().compareTo(res2.getName().toLowerCase());
-			} else if (res1type == IResource.PROJECT) {
-				return -1;
-			} else if (res1type == IResource.PROJECT) {
-				return 1;
-			} else if (res1type == IResource.FOLDER) {
-				return -1;
-			} else {
-				return 1;
-			}
-		}
-	}
-
-	private IResource getResource(Object e1) {
-		if (e1 instanceof IResource) {
-			return (IResource) e1;
-		} else if (e1 instanceof IAdaptable) {
-			return (IResource) ((IAdaptable) e1).getAdapter(IResource.class);
-		} else {
-			return null;
-		}
-	}
-
-	private int compareJavaScriptElements(Viewer viewer, IJavaScriptElement e1, IJavaScriptElement e2) {
-		return jsComparator.compare(viewer, e1, e2);
-	}
-	
-}
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/RenameMoveActionProvider.java	Wed Jul 21 10:18:21 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-package org.symbian.tools.wrttools.navigator;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
-import org.eclipse.wst.jsdt.ui.IContextMenuConstants;
-import org.eclipse.wst.jsdt.ui.actions.IJavaEditorActionDefinitionIds;
-import org.eclipse.wst.jsdt.ui.actions.JdtActionConstants;
-import org.eclipse.wst.jsdt.ui.actions.MoveAction;
-import org.eclipse.wst.jsdt.ui.actions.RenameAction;
-import org.eclipse.wst.jsdt.ui.actions.SelectionDispatchAction;
-
-public class RenameMoveActionProvider extends CommonActionProvider {
- 	private SelectionDispatchAction fMoveAction;
-	private SelectionDispatchAction fRenameAction;
-	
-	private Collection<IAction> fActions = new HashSet<IAction>();
-
-	public void fillActionBars(IActionBars actionBars) {
-		if (fActions.size() > 0) {
-			actionBars.setGlobalActionHandler(JdtActionConstants.RENAME, fRenameAction);
-			actionBars.setGlobalActionHandler(ActionFactory.RENAME.getId(), fRenameAction);
-
-			actionBars.setGlobalActionHandler(JdtActionConstants.MOVE, fMoveAction);
-			actionBars.setGlobalActionHandler(ActionFactory.MOVE.getId(), fMoveAction);
-		}
-	}
-
-	public void fillContextMenu(IMenuManager menu) {
-		menu.appendToGroup(IContextMenuConstants.GROUP_REORGANIZE, new Separator());
-		for (IAction action : fActions) {
-			menu.appendToGroup(IContextMenuConstants.GROUP_REORGANIZE, action);
-		}
-	}
-
-	public void init(ICommonActionExtensionSite site) {
-		ICommonViewerWorkbenchSite workbenchSite= null;
-		if (site.getViewSite() instanceof ICommonViewerWorkbenchSite)
-			workbenchSite= (ICommonViewerWorkbenchSite) site.getViewSite();
-
-		// we only initialize the refactor group when in a view part 
-		// (required for the constructor)
-		if (workbenchSite != null) {
-			if (workbenchSite.getPart() != null && workbenchSite.getPart() instanceof IViewPart) {
-				IViewPart viewPart= (IViewPart) workbenchSite.getPart();
-				IWorkbenchPartSite s = viewPart.getSite();
-
-				fRenameAction= new RenameAction(s);
-				initUpdatingAction(fRenameAction, workbenchSite.getSelectionProvider(), workbenchSite.getSelectionProvider().getSelection(), IJavaEditorActionDefinitionIds.RENAME_ELEMENT);
-				fMoveAction= new MoveAction(s);
-				initUpdatingAction(fMoveAction, workbenchSite.getSelectionProvider(), workbenchSite.getSelectionProvider().getSelection(), IJavaEditorActionDefinitionIds.RENAME_ELEMENT);
-			}
-		}
-	}
-
-	private void initUpdatingAction(SelectionDispatchAction action, ISelectionProvider provider, ISelection selection, String actionDefinitionId){
-		action.setActionDefinitionId(actionDefinitionId);
-		action.update(selection);
-		if (provider != null)
-			provider.addSelectionChangedListener(action);
-		fActions.add(action);
-	}
-
-	
-	public void setContext(ActionContext context) {
-		// Do nothing
-	}
-}
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/WRTNavigatorContentProvider.java	Wed Jul 21 10:18:21 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-package org.symbian.tools.wrttools.navigator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorContentProvider;
-import org.symbian.tools.wrttools.Activator;
-
-@SuppressWarnings("restriction")
-public class WRTNavigatorContentProvider extends JavaNavigatorContentProvider
-		implements ITreeContentProvider {
-	private static final class RootResourceFinder implements
-			IResourceDeltaVisitor {
-		public IResource resource = null;
-
-		private IResource getCommonAncestor(IResource r1, IResource r2) {
-			if (r1 == null) {
-				return r2;
-			}
-			if (r2 == null) {
-				return null;
-			}
-			if (r1.equals(r2)) {
-				return r1;
-			}
-			IPath p1 = r1.getFullPath();
-			IPath p2 = r2.getFullPath();
-			int l1 = p1.segmentCount();
-			int l2 = p2.segmentCount();
-
-			if (l1 == 0 || l2 == 0) {
-				return null;
-			}
-			int l = Math.min(l1, l2);
-			do {
-				p1 = p1.uptoSegment(l);
-				p2 = p2.uptoSegment(l);
-				l = l - 1;
-			} while (l > 0 && (p1 != p2));
-			IWorkspaceRoot r = r1.getWorkspace().getRoot();
-			return l == 0 ? null : l == 1 ? r.getProject(p1.lastSegment()) : r
-					.getFolder(p1);
-		}
-
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			if ((delta.getKind() & (IResourceDelta.ADDED | IResourceDelta.REMOVED)) != 0) {
-				resource = getCommonAncestor(resource, delta.getResource()
-						.getParent());
-				return false;
-			}
-			return true;
-		}
-	}
-
-	private final IResourceChangeListener listener = new IResourceChangeListener() {
-		public void resourceChanged(IResourceChangeEvent event) {
-			IResource refresh = null;
-			if (event.getDelta() != null) {
-				RootResourceFinder visitor = new RootResourceFinder();
-				try {
-					event.getDelta().accept(visitor);
-				} catch (CoreException e) {
-					Activator.log(e);
-					refreshViewer(null);
-				}
-				refresh = visitor.resource;
-			}
-			refreshViewer(refresh);
-		}
-	};
-	private Viewer viewer;
-
-	@Override
-	public void dispose() {
-		if (viewer != null) {
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(
-					listener);
-		}
-		super.dispose();
-	}
-
-	@Override
-	protected Object[] getFolderContent(IFolder folder) throws CoreException {
-        return folder.members();
-	}
-
-	@Override
-	protected Object[] getPackageFragmentRoots(IJavaScriptProject project)
-			throws JavaScriptModelException {
-		try {
-            return project.getProject().members();
-		} catch (CoreException e) {
-			Activator.log(e);
-		}
-		return new Object[0];
-	}
-
-	@Override
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		if (this.viewer == null) {
-			ResourcesPlugin.getWorkspace().addResourceChangeListener(listener);
-		}
-		this.viewer = viewer;
-		super.inputChanged(viewer, oldInput, newInput);
-	}
-
-	protected void refreshViewer(final IResource resource) {
-		viewer.getControl().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-                if (!viewer.getControl().isDisposed()) {
-                    ((TreeViewer) viewer).refresh(resource);
-                }
-			}
-		});
-	}
-
-    @Override
-    public Object[] getChildren(Object parentElement) {
-        if (parentElement instanceof IFile) {
-            IFile file = (IFile) parentElement;
-            IJavaScriptElement element = JavaScriptCore.create(file);
-            if (element != null) {
-                return super.getChildren(element);
-            }
-        }
-        return super.getChildren(parentElement);
-    }
-
-    @Override
-    public Object getParent(Object element) {
-        Object parent = super.getParent(element);
-        if (parent instanceof IJavaScriptElement) {
-            IJavaScriptElement jsParent = (IJavaScriptElement) parent;
-            try {
-                IResource parentResource = jsParent.getCorrespondingResource();
-                if (parentResource != null) {
-                    return parentResource;
-                }
-            } catch (JavaScriptModelException e) {
-                Activator.log(e);
-            }
-        }
-        return parent;
-    }
-}
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/WrtNavigatorLinkHelper.java	Wed Jul 21 10:18:21 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/**
- * Copyright (c) 2010 Symbian Foundation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of the License "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Symbian Foundation - initial contribution.
- * Contributors:
- * Description:
- * Overview:
- * Details:
- * Platforms/Drives/Compatibility:
- * Assumptions/Requirement/Pre-requisites:
- * Failures and causes:
- */
-package org.symbian.tools.wrttools.navigator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.navigator.ILinkHelper;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.symbian.tools.wrttools.Activator;
-
-public class WrtNavigatorLinkHelper implements ILinkHelper {
-
-    public void activateEditor(IWorkbenchPage aPage, IStructuredSelection aSelection) {
-        IResource selection = filter(aSelection.toArray());
-        if (selection == null) {
-            return;
-        }
-        IEditorReference[] references = aPage.getEditorReferences();
-        for (IEditorReference editorReference : references) {
-            IEditorInput input;
-            try {
-                input = editorReference.getEditorInput();
-                Object resource = input.getAdapter(IResource.class);
-                if (resource != null && selection.equals(resource)) {
-                    IWorkbenchPart part = editorReference.getPart(true);
-                    if (part != null) {
-                        aPage.activate(part);
-                    }
-                    return;
-                }
-            } catch (PartInitException e) {
-                Activator.log(e);
-            }
-        }
-    }
-
-    private IResource filter(Object[] array) {
-        IResource selection = null;
-        for (Object object : array) {
-            IResource resource = null;
-            if (object instanceof IResource) {
-                resource = (IResource) object;
-            } else if (object instanceof IJavaScriptElement) {
-                resource = ((IJavaScriptElement) object).getResource();
-            }
-            if (selection == null) {
-                selection = resource;
-            } else if (!selection.equals(resource)) {
-                return null;
-            }
-        }
-        return selection;
-    }
-
-    public IStructuredSelection findSelection(IEditorInput anInput) {
-        final IFileEditorInput input = (IFileEditorInput) anInput.getAdapter(IFileEditorInput.class);
-        IFile file = input.getFile();
-        return new StructuredSelection(file);
-    }
-}
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java	Wed Jul 21 10:18:21 2010 -0700
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java	Wed Jul 21 11:26:43 2010 -0700
@@ -66,6 +66,7 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
@@ -124,7 +125,7 @@
                         public void run() {
                             IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
                                     .getActivePage();
-                            IViewReference reference = activePage.findViewReference(Activator.NAVIGATOR_ID);
+                            IViewReference reference = activePage.findViewReference(IPageLayout.ID_PROJECT_EXPLORER);
                             IWorkbenchPart part = reference.getPart(false);
                             if (part instanceof ISetSelectionTarget) {
                                 StructuredSelection selection;