--- a/org.symbian.tools.wrttools/plugin.xml	Mon Feb 15 15:24:16 2010 -0800
+++ b/org.symbian.tools.wrttools/plugin.xml	Mon Feb 15 16:31:27 2010 -0800
@@ -41,6 +41,20 @@
            </image>
         </extension>
         
+<!-- WRT Validators -->		
+<!--	<extension
+			point="org.eclipse.wst.validation.validatorV2"
+			id="org.symbian.tools.wrttools.core.validator"
+			name="%VALIDATOR.Name">
+		<validator class="org.symbian.tools.wrttools.core.validator.ValidateAction">
+         	<include>
+         	     <rules>
+		               <fileext ext="plist"/>
+		         </rules>
+            </include>
+		</validator>
+    </extension> --> 
+    
 <!-- Validator Marker -->
    
         <extension
@@ -63,11 +77,6 @@
           id="org.symbian.tools.wrttools.core.deploy.DeployPreferencePage"
           category="org.symbian.tools.wrttools.WrtRootPreferences"
           name="Deployment "/>
-    <page
-          class="org.symbian.tools.wrttools.WrtRootPreferences"
-          id="org.symbian.tools.wrttools.WrtRootPreferences"
-          name="Web Runtime">
-    </page>
  </extension>
 
 <!-- WRT Tool Integration (Package, Validate, Include, Exclude Settings)-->
@@ -436,8 +445,53 @@
           </or>
        </possibleChildren>
        <actionProvider
+             class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorViewActionProvider"
+             id="org.eclipse.wst.jsdt.ui.navigator.actions.ViewActions">
+          <enablement>
+             <or>
+                <instanceof
+                      value="org.eclipse.core.resources.IWorkspaceRoot">
+                </instanceof>
+                <adapt
+                      type="java.util.Collection">
+                   <count
+                         value="0">
+                   </count>
+                </adapt>
+             </or>
+          </enablement>
+       </actionProvider>
+       <actionProvider
              class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorActionProvider"
              id="org.eclipse.wst.jsdt.ui.navigator.actions.StandardActions">
+<!--          <enablement>
+             <or>
+                <and>
+                   <instanceof
+                         value="org.eclipse.core.resources.IProject">
+                   </instanceof>
+                   <test
+                         property="org.eclipse.core.resources.projectNature"
+                         value="org.symbian.tools.wrttools.WidgetProjectNature">
+                   </test>
+                </and>
+                <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>
+                <adapt
+                      type="java.util.Collection">
+                   <count
+                         value="0">
+                   </count>
+                </adapt>
+             </or>
+          </enablement>-->
        </actionProvider>
        <actionProvider
              class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorRefactorActionProvider"
@@ -445,48 +499,34 @@
              overrides="org.eclipse.ui.navigator.resources.actions.RefactorActions">
           <enablement>
              <or>
+                <and>
+                   <instanceof
+                         value="org.eclipse.core.resources.IProject">
+                   </instanceof>
+                   <test
+                         property="org.eclipse.core.resources.projectNature"
+                         value="org.symbian.tools.wrttools.WidgetProjectNature">
+                   </test>
+                </and>
+                <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>
                 <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">
@@ -504,9 +544,9 @@
                 <adapt
                       type="org.eclipse.core.resources.IResource">
                 </adapt>
-                <adapt
-                      type="java.util.Collection">
-                </adapt>
+                <count
+                      value="0">
+                </count>
              </or>
           </enablement>
        </commonWizard>
@@ -547,6 +587,9 @@
                 </adapt>
                 <adapt
                       type="java.util.Collection">
+	                <count
+	                      value="0">
+	                </count>
                 </adapt>
              </or>
           </enablement>
@@ -561,6 +604,9 @@
                 </adapt>
                 <adapt
                       type="java.util.Collection">
+	                <count
+	                      value="0">
+	                </count>
                 </adapt>
              </or>
           </enablement>