[562357] Re-add and reorganize some of the preferences relevant
         to remaining functionality
diff --git a/bundles/org.eclipse.wst.jsdt.ui/plugin.properties b/bundles/org.eclipse.wst.jsdt.ui/plugin.properties
index ac48fa8..170d60b 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.jsdt.ui/plugin.properties
@@ -140,7 +140,8 @@
 coloredLabels.inherited.label=Inherited members
 coloredLabels.inherited.description=The color used to render to inherited members. 
 
-javaPrefName=Client-side JavaScript
+javaPrefName=JavaScript
+clientsidejavaPrefName=Client-side JavaScript
 organizeImportsPrefName=Organize Imports
 typeFilterPrefName=Type Filters
 cleanUpPrefName=Clean Up
diff --git a/bundles/org.eclipse.wst.jsdt.ui/plugin.xml b/bundles/org.eclipse.wst.jsdt.ui/plugin.xml
index 7c974f9..7d4d42c 100755
--- a/bundles/org.eclipse.wst.jsdt.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.jsdt.ui/plugin.xml
@@ -1,6 +1,135 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
+
+   <extension-point id="javaElementFilters" name="%elementFiltersName" schema="schema/javaElementFilters.exsd"/>
+   <extension-point id="javaEditorTextHovers" name="%javaEditorTextHoversName" schema="schema/javaEditorTextHovers.exsd"/>
+   <extension-point id="javadocCompletionProcessor" name="%javadocCompletionProcessor" schema="schema/javadocCompletionProcessor.exsd"/>
+   <extension-point id="quickFixProcessors" name="%quickFixProcessorExtensionPoint" schema="schema/quickFixProcessors.exsd"/>
+   <extension-point id="quickAssistProcessors" name="%quickAssistProcessorExtensionPoint" schema="schema/quickAssistProcessors.exsd"/>
+   <extension-point id="JsGlobalScopeContainerPage" name="%JsGlobalScopeContainerPageExtensionPoint" schema="schema/JsGlobalScopeContainerPage.exsd"/>
+   <extension-point id="foldingStructureProviders" name="%foldingStructureProvidersExtensionPoint" schema="schema/foldingStructureProviders.exsd"/>
+   <extension-point id="queryParticipants" name="%queryParticipantsExtensionPoint" schema="schema/queryParticipants.exsd"/>
+   <extension-point id="javaCompletionProposalComputer" name="%javaCompletionProposalComputer" schema="schema/javaCompletionProposalComputer.exsd"/>
+   <extension-point id="javaCompletionProposalSorters" name="%javaCompletionProposalSorters" schema="schema/javaCompletionProposalSorters.exsd"/>
+   <extension-point id="classpathAttributeConfiguration" name="%classpathAttributeConfiguration" schema="schema/classpathAttributeConfiguration.exsd"/>
+   <extension-point id="documentationProvider" name="%documentationProvider" schema="schema/DocumentationProvider.exsd"/>
+   <extension-point id="JsGlobalScopeUIInitializer" name="%extension-point.name.1" schema="schema/JsGlobalScopeUIInitializer.exsd"/>
+   <extension-point id="javascriptValidationHelper" name="%extension-point.name.validationHelper" schema="schema/javascriptValidationHelper.exsd"/>
+
+   <extension point="org.eclipse.core.runtime.adapters">
+		<factory 
+            class="org.eclipse.wst.jsdt.internal.ui.JavaElementAdapterFactory" 
+            adaptableType="org.eclipse.wst.jsdt.core.IJavaScriptElement">
+            <adapter type="org.eclipse.core.resources.IResource"/>
+            <adapter type="org.eclipse.ui.IPersistableElement"/>
+            <adapter type="org.eclipse.ui.IContributorResourceAdapter"/>
+            <adapter type="org.eclipse.ui.ide.IContributorResourceAdapter2"/>
+            <adapter type="org.eclipse.ui.IContainmentAdapter"/>
+            <adapter type="org.eclipse.search.ui.ISearchPageScoreComputer"/>
+            <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
+            <adapter type="org.eclipse.ui.views.properties.IPropertySource"/>
+            <adapter type="org.eclipse.ui.views.tasklist.ITaskListResourceAdapter"/>
+            <adapter type="org.eclipse.wst.jsdt.internal.ui.IResourceLocator"/>
+            <adapter type="org.eclipse.team.ui.history.IHistoryPageSource"/>
+		</factory>
+		
+		<factory 
+            class="org.eclipse.wst.jsdt.internal.ui.JavaProjectAdapterFactory" 
+            adaptableType="org.eclipse.wst.jsdt.core.IJavaScriptProject">
+            <adapter type="org.eclipse.core.resources.IProject"/>
+		</factory>
+		
+		<factory 
+            class="org.eclipse.wst.jsdt.internal.ui.ResourceAdapterFactory" 
+            adaptableType="org.eclipse.core.resources.IResource">
+            <adapter type="org.eclipse.wst.jsdt.core.IJavaScriptElement"/>
+		</factory>
+		
+		<factory 
+            class="org.eclipse.wst.jsdt.internal.ui.MarkerAdapterFactory" 
+            adaptableType="org.eclipse.core.resources.IMarker">
+            <adapter type="org.eclipse.search.ui.ISearchPageScoreComputer"/>
+		</factory>
+		
+		<factory 
+            class="org.eclipse.wst.jsdt.internal.ui.EditorInputAdapterFactory" 
+            adaptableType="org.eclipse.ui.IEditorInput">
+            <adapter type="org.eclipse.search.ui.ISearchPageScoreComputer"/>
+            <adapter type="org.eclipse.wst.jsdt.core.IJavaScriptElement"/>
+		</factory>
+		
+		<factory 
+            class="org.eclipse.wst.jsdt.internal.ui.LogicalPackageAdapterFactory" 
+            adaptableType="org.eclipse.wst.jsdt.internal.ui.browsing.LogicalPackage">
+            <adapter type="org.eclipse.search.ui.ISearchPageScoreComputer"/>
+            <adapter type="org.eclipse.core.resources.mapping.ResourceMapping"/>
+		</factory>
+		
+		<factory 
+            class="org.eclipse.wst.jsdt.internal.ui.refactoring.RefactoringAdapterFactory" 
+            adaptableType="org.eclipse.wst.jsdt.internal.corext.refactoring.changes.CompilationUnitChange">
+            
+            <adapter type="org.eclipse.ltk.ui.refactoring.TextEditChangeNode"/>
+		</factory>
+		
+        <factory
+            class="org.eclipse.wst.jsdt.internal.ui.refactoring.RefactoringAdapterFactory"
+            adaptableType="org.eclipse.ltk.core.refactoring.MultiStateTextFileChange">
+            
+            <adapter type="org.eclipse.ltk.ui.refactoring.TextEditChangeNode"/>
+        </factory>
+
+   </extension>     	
+
+   <extension
+         point="org.eclipse.wst.jsdt.ui.JsGlobalScopeContainerPage">
+		<JsGlobalScopeContainerPage
+            name="%defaultJsGlobalScopeContainerPage"
+            class="org.eclipse.wst.jsdt.internal.ui.wizards.buildpaths.JsGlobalScopeContainerDefaultPage"
+            id="*">
+		</JsGlobalScopeContainerPage>
+   </extension>
+   
+   <extension
+         point="org.eclipse.wst.jsdt.ui.classpathAttributeConfiguration">
+      <classpathAttributeConfiguration
+      		attributeName="javadoc_location"
+            class="org.eclipse.wst.jsdt.internal.ui.wizards.buildpaths.JavadocAttributeConfiguration">
+      </classpathAttributeConfiguration>           
+   </extension>
+   
+   <extension
+         point="org.eclipse.wst.jsdt.ui.quickFixProcessors">
+      <quickFixProcessor
+            name="%defaultQuickFixProcessor"
+            class="org.eclipse.wst.jsdt.internal.ui.text.correction.QuickFixProcessor"
+            id="org.eclipse.wst.jsdt.ui.text.correction.QuickFixProcessor">
+      </quickFixProcessor>
+      <quickFixProcessor
+            name="%spellingQuickFixProcessor"
+            class="org.eclipse.wst.jsdt.internal.ui.text.spelling.SpellingQuickFixProcessor"
+            id="org.eclipse.wst.jsdt.ui.text.spelling.SpellingQuickFixProcessor" >
+            <handledMarkerTypes>
+	            <markerType id="org.eclipse.ui.workbench.texteditor.spelling"/>
+            </handledMarkerTypes>
+      </quickFixProcessor>
+   </extension>
+   
+   <extension
+         point="org.eclipse.wst.jsdt.ui.quickAssistProcessors">
+      <quickAssistProcessor
+            name="%defaultQuickAssistProcessor"
+            class="org.eclipse.wst.jsdt.internal.ui.text.correction.QuickAssistProcessor"
+            id="org.eclipse.wst.jsdt.ui.text.correction.QuickAssistProcessor">
+      </quickAssistProcessor>
+      <quickAssistProcessor
+            name="%advancedQuickAssistProcessor"
+            class="org.eclipse.wst.jsdt.internal.ui.text.correction.AdvancedQuickAssistProcessor"
+            id="org.eclipse.wst.jsdt.ui.text.correction.AdvancedQuickAssistProcessor">
+      </quickAssistProcessor>
+   </extension>
+
 	<!-- content assist processors - do not change their order -->  
 	<!-- JavaScript and javadoc category -->
 	<!--
@@ -153,11 +282,66 @@
 		</javaCompletionProposalComputer>
 	</extension>
 
-	<!-- the parameterized content assist action and keybindings for our contributed computers -->
-	
-	<!-- commands to surface JavaScript elements given handle id encoded parameter -->
-	
+	<extension
+		point="org.eclipse.wst.jsdt.ui.javaCompletionProposalSorters">
+		<proposalSorter
+			id="org.eclipse.wst.jsdt.ui.RelevanceSorter"
+			name="%RelevanceSorter.name"
+			class="org.eclipse.wst.jsdt.internal.ui.text.java.RelevanceSorter"/>
+		<proposalSorter
+			id="org.eclipse.wst.jsdt.ui.AlphabeticSorter"
+			name="%AlphabeticSorter.name"
+			class="org.eclipse.wst.jsdt.internal.ui.text.java.AlphabeticSorter"/>
+	</extension>
+
    <!-- Note: Do not change the sequence of those hover contributions -->
+   <extension
+         point="org.eclipse.wst.jsdt.ui.javaEditorTextHovers">
+      <hover
+            label="%sequentialHover"
+            description="%sequentialHoverDescription"
+            class="org.eclipse.wst.jsdt.internal.ui.text.java.hover.BestMatchHover"
+            id="org.eclipse.wst.jsdt.ui.BestMatchHover">
+      </hover>
+      <hover
+            label="%problemHover"
+            description="%problemHoverDescription"
+            class="org.eclipse.wst.jsdt.internal.ui.text.java.hover.ProblemHover"
+            id="org.eclipse.wst.jsdt.ui.ProblemHover">
+      </hover>
+      <hover
+            label="%nlsStringHover"
+            description="%nlsStringHoverDescription"
+            class="org.eclipse.wst.jsdt.internal.ui.text.java.hover.NLSStringHover"
+            id="org.eclipse.wst.jsdt.ui.NLS">
+      </hover>
+      <hover
+            label="%javadocHover"
+            description="%javadocHoverDescription"
+            class="org.eclipse.wst.jsdt.internal.ui.text.java.hover.JavadocHover"
+            id="org.eclipse.wst.jsdt.ui.JavadocHover">
+      </hover>
+      <hover
+            label="%sourceHover"
+            description="%sourceHoverDescription"
+            class="org.eclipse.wst.jsdt.internal.ui.text.java.hover.JavaSourceHover"
+            id="org.eclipse.wst.jsdt.ui.JavaSourceHover">
+      </hover>
+      <hover
+            label="%genericHover"
+            description="%genericHoverDescription"
+            class="org.eclipse.wst.jsdt.internal.ui.text.java.hover.GenericTextHover"
+            id="org.eclipse.wst.jsdt.ui.GenericHover">
+      </hover>
+<!--
+      <hover
+            label="%annotationHover"
+            description="%annotationHoverDescription"
+            class="org.eclipse.wst.jsdt.internal.ui.text.java.hover.AnnotationHover"
+            id="org.eclipse.wst.jsdt.ui.AnnotationHover">
+      </hover>
+-->
+   </extension>
 
    <extension
          point="org.eclipse.ui.ide.projectNatureImages">
@@ -183,38 +367,236 @@
 			<selection class="org.eclipse.core.resources.IResource" />
 		</wizard>
    </extension>
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            name="%javaScriptPropertiesPageName"        
+            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage"
+            id="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage">
+         <enabledWhen>
+		     <adapt type="org.eclipse.core.resources.IProject">
+		          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.wst.jsdt.core.jsNature"/>
+		     </adapt>         
+         </enabledWhen>
+         <keywordReference id="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage"/>
+      </page>
+
+      <page
+            name="%buildPathPageName"        
+            category="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage"
+            class="org.eclipse.wst.jsdt.internal.ui.preferences.BuildPathsPropertyPage"
+            id="org.eclipse.wst.jsdt.ui.propertyPages.BuildPathsPropertyPage">
+         <enabledWhen>
+         	 <or>
+			     <adapt type="org.eclipse.core.resources.IProject">
+			          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.wst.jsdt.core.jsNature"/>
+			     </adapt>
+			     <adapt type="org.eclipse.wst.jsdt.ui.ProjectLibraryRoot"/>
+			 </or>
+         </enabledWhen>
+         <keywordReference id="org.eclipse.wst.jsdt.ui.buildpath"/>
+      </page>
+
+      <page
+            name="%codeFormatterPageName"
+            category="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage"
+            class="org.eclipse.wst.jsdt.internal.ui.preferences.CodeFormatterPreferencePage"
+            id="org.eclipse.wst.jsdt.ui.propertyPages.CodeFormatterPreferencePage">
+         <enabledWhen>
+		     <adapt type="org.eclipse.core.resources.IProject">
+		          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.wst.jsdt.core.jsNature"/>
+		     </adapt>         
+         </enabledWhen>
+         <keywordReference id="org.eclipse.wst.jsdt.ui.formatter"/>
+      </page>
+      <page
+            name="%codeTemplatePageName"
+            category="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage"
+            class="org.eclipse.wst.jsdt.internal.ui.preferences.CodeTemplatePreferencePage"
+            id="org.eclipse.wst.jsdt.ui.propertyPages.CodeTemplatePreferencePage">
+         <enabledWhen>
+		     <adapt type="org.eclipse.core.resources.IProject">
+		          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.wst.jsdt.core.jsNature"/>
+		     </adapt>         
+         </enabledWhen>
+         <keywordReference id="org.eclipse.wst.jsdt.ui.codetemplates"/>
+      </page>
+      <page
+            name="%compliancePageName"
+            category="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage"
+            class="org.eclipse.wst.jsdt.internal.ui.preferences.CompliancePreferencePage"
+            id="org.eclipse.wst.jsdt.ui.propertyPages.CompliancePreferencePage">
+         <enabledWhen>
+		     <adapt type="org.eclipse.core.resources.IProject">
+		          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.wst.jsdt.core.jsNature"/>
+		     </adapt>         
+         </enabledWhen>
+          <keywordReference id="org.eclipse.wst.jsdt.ui.compliance"/>
+      </page>
+      <page
+            name="%problemSeveritiesPageName"
+            category="org.eclipse.wst.jsdt.ui.propertyPages.CompliancePreferencePage"
+            class="org.eclipse.wst.jsdt.internal.ui.preferences.ProblemSeveritiesPreferencePage"
+            id="org.eclipse.wst.jsdt.ui.propertyPages.ProblemSeveritiesPreferencePage">
+         <enabledWhen>
+		     <adapt type="org.eclipse.core.resources.IProject">
+		          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.wst.jsdt.core.jsNature"/>
+		     </adapt>         
+         </enabledWhen>
+         <keywordReference id="org.eclipse.wst.jsdt.ui.severities"/>
+      </page>
+      <page
+            name="%javadocProblemsPageName"
+            category="org.eclipse.wst.jsdt.ui.propertyPages.CompliancePreferencePage"
+            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavadocProblemsPreferencePage"
+            id="org.eclipse.wst.jsdt.ui.propertyPages.JavadocProblemsPreferencePage">
+         <enabledWhen>
+		     <adapt type="org.eclipse.core.resources.IProject">
+		          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.wst.jsdt.core.jsNature"/>
+		     </adapt>         
+         </enabledWhen>
+         <keywordReference id="org.eclipse.wst.jsdt.ui.javadocproblems"/>
+      </page>
+      <page
+            name="%sourceAttachmentPageName"
+            category="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage"
+            class="org.eclipse.wst.jsdt.internal.ui.preferences.SourceAttachmentPropertyPage"
+            id="org.eclipse.wst.jsdt.ui.propertyPages.SourceAttachmentPage">
+         <enabledWhen>
+            <and>
+		      <instanceof value="org.eclipse.wst.jsdt.core.IPackageFragmentRoot"/>
+		      <not>
+		        <test property="org.eclipse.wst.jsdt.core.inSourceFolder"/>
+		      </not>
+		    </and>
+         </enabledWhen>
+      </page>
+      <page
+            name="%javadocLocationPageName"
+            category="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage"
+            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavadocConfigurationPropertyPage"
+            id="org.eclipse.wst.jsdt.ui.preferences.JavadocConfigurationPropertyPage0">
+         <enabledWhen>
+            <and>
+              <instanceof value="org.eclipse.wst.jsdt.core.IPackageFragmentRoot"/>
+	          <not>
+	            <test property="org.eclipse.wst.jsdt.core.inSourceFolder"/>
+		      </not>
+		    </and>
+         </enabledWhen>
+      </page>
+      <!-- can be merged(?) again when http://bugs.eclipse.org/155422 is fixed --> 
+      <page
+            name="%javadocLocationPageName"
+            category="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage"
+            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavadocConfigurationPropertyPage"
+            id="org.eclipse.wst.jsdt.ui.preferences.JavadocConfigurationPropertyPage1">
+         <enabledWhen>
+             <adapt type="org.eclipse.core.resources.IProject">
+               <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.wst.jsdt.core.jsNature"/>
+		     </adapt>
+         </enabledWhen>
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.ui.elementFactories">
+      <factory
+            class="org.eclipse.wst.jsdt.internal.ui.javaeditor.ClassFileEditorInputFactory"
+            id="org.eclipse.wst.jsdt.ui.ClassFileEditorInputFactory">
+      </factory>
+      <factory
+            class="org.eclipse.wst.jsdt.internal.ui.PersistableJavaElementFactory"
+            id="org.eclipse.wst.jsdt.ui.PersistableJavaElementFactory">
+      </factory>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.editors.annotationTypes">
+      <type
+         name="org.eclipse.wst.jsdt.ui.error"
+         super="org.eclipse.ui.workbench.texteditor.error"
+         markerType="org.eclipse.wst.jsdt.core.problem"
+         markerSeverity="2">
+      </type>
+      <type
+         name="org.eclipse.wst.jsdt.ui.warning"
+         super="org.eclipse.ui.workbench.texteditor.warning"
+         markerType="org.eclipse.wst.jsdt.core.problem"
+         markerSeverity="1">
+      </type>
+      <type
+         name="org.eclipse.wst.jsdt.ui.info"
+         super="org.eclipse.ui.workbench.texteditor.info"
+         markerType="org.eclipse.wst.jsdt.core.problem"
+         markerSeverity="0">
+      </type>
+      <type
+         name="org.eclipse.wst.jsdt.ui.occurrences">
+      </type>
+      <type
+         name="org.eclipse.wst.jsdt.ui.overrideIndicator">
+      </type>
+   </extension>
+
+   <extension
+         id="JavaDocumentSetupParticipant"
+         name="%javaDocumentSetupParticipant"
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            contentTypeId="org.eclipse.wst.jsdt.core.jsSource"
+            extensions="js"
+            class="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaDocumentSetupParticipant">
+      </participant>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">
+      <target
+            id="org.eclipse.wst.jsdt.ui.javaCode"
+            name="%JavaEditorHyperlinkTarget">
+            <context type="org.eclipse.ui.texteditor.ITextEditor"/>
+      </target>
+      <target
+            id="org.eclipse.wst.jsdt.ui.PropertiesFileEditor"
+            name="%PropertiesFileEditorHyperlinkTarget">
+            <context type="org.eclipse.ui.texteditor.ITextEditor"/>
+      </target>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
+      <hyperlinkDetector
+            class="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaElementHyperlinkDetector"
+            id="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaElementHyperlinkDetector"
+            name="%JavaElementHyperlinkDetector"
+            targetId="org.eclipse.wst.jsdt.ui.javaCode">
+      </hyperlinkDetector>
+   </extension>
 
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            name="%javaPrefName"
+            name="%clientsidejavaPrefName"
             category="org.eclipse.wst.html.ui.preferences.web"
             class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaBasePreferencePage"
             id="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage">
             <keywordReference id="org.eclipse.wst.jsdt.ui.general"/>
       </page>
       <page
-            name="%codeStylePreferencePageName"
-            category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.CodeStylePreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.CodeStylePreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.codestyle"/>
+            name="%javaPrefName"
+            category="org.eclipse.wst.html.ui.preferences.web"
+            class="org.eclipse.wst.jsdt.internal.ui.preferences.StandaloneJSPreferencePage"
+            id="org.eclipse.wst.jsdt.internal.ui.preferences.TaskTagPreferencePage">
+            <keywordReference id="org.eclipse.wst.jsdt.ui.todo"/>
       </page>
       <page
             name="%codeFormatterPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.CodeStylePreferencePage"
+            category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
             class="org.eclipse.wst.jsdt.internal.ui.preferences.CodeFormatterPreferencePage"
             id="org.eclipse.wst.jsdt.ui.preferences.CodeFormatterPreferencePage">
             <keywordReference id="org.eclipse.wst.jsdt.ui.formatter"/>
       </page>
       <page
-            name="%todoTaskPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.CompliancePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.TodoTaskPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.TodoTaskPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.todo"/>
-      </page>
-      <page
             name="%templatePageName"
             category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
             class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaTemplatePreferencePage"
@@ -230,7 +612,7 @@
       </page>
       <page
             name="%codeTemplatePreferencePageName"
-            category="org.eclipse.wst.jsdt.ui.preferences.CodeStylePreferencePage"
+            category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
             class="org.eclipse.wst.jsdt.internal.ui.preferences.CodeTemplatePreferencePage"
             id="org.eclipse.wst.jsdt.ui.preferences.CodeTemplatePreferencePage">
             <keywordReference id="org.eclipse.wst.jsdt.ui.codetemplates"/>
@@ -341,6 +723,116 @@
 <!-- =========================================================================== -->
 <!-- END Work in Progress                                                        -->
 <!-- =========================================================================== -->
+
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <viewerContribution
+            targetID="#JavaScriptRulerContext"
+            id="org.eclipse.wst.jsdt.ui.CompilationUnitEditorPopupActions">
+         <action
+               label="%AddTask.label"
+               helpContextId="org.eclipse.ui.AddTask_action_context"
+               tooltip="%AddTask.tooltip"
+               class="org.eclipse.ui.texteditor.TaskRulerAction"
+               menubarPath="add"
+               id="org.eclipse.ui.texteditor.TaskRulerAction">
+         </action>
+         <action
+               label="%AddBookmark.label"
+               helpContextId="org.eclipse.ui.bookmark_action_context"
+               tooltip="%AddBookmark.tooltip"
+               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               menubarPath="add"
+               id="org.eclipse.ui.texteditor.BookmarkRulerAction">
+         </action>
+       </viewerContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editorActions">
+      <editorContribution
+            targetID="org.eclipse.wst.jsdt.ui.CompilationUnitEditor"
+            id="org.eclipse.wst.jsdt.internal.ui.CompilationUnitEditor.ruler.actions">
+         <action
+               label="%BookmarkRulerAction.label"
+               helpContextId="org.eclipse.ui.bookmark_action_context"
+               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               actionID="RulerDoubleClick"
+               id="org.eclipse.wst.jsdt.internal.ui.javaeditor.BookmarkRulerAction">
+         </action>
+         <action
+               label="%JavaSelectRulerAction.label"
+               class="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerAction"
+               actionID="RulerClick"
+               id="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerAction">
+         </action>
+      </editorContribution>
+      <editorContribution
+            targetID="org.eclipse.wst.jsdt.ui.ClassFileEditor"
+            id="org.eclipse.wst.jsdt.internal.ui.ClassFileEditor.ruler.actions">
+         <action
+               label="%JavaSelectRulerAction.label"
+               class="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerAction"
+               actionID="RulerClick"
+               id="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerAction">
+         </action>
+      </editorContribution>
+      <editorContribution
+            targetID="org.eclipse.wst.jsdt.ui.PropertiesFileEditor"
+            id="org.eclipse.wst.jsdt.internal.ui.PropertiesFileEditor.ruler.actions">
+         <action
+               label="%BookmarkRulerAction.label"
+               helpContextId="org.eclipse.ui.bookmark_action_context"
+               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               actionID="RulerDoubleClick"
+               id="org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.BookmarkRulerAction">
+         </action>
+         <action
+               label="%JavaSelectRulerAction.label"
+               class="org.eclipse.ui.texteditor.SelectRulerAction"
+               actionID="RulerClick"
+               id="org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.SelectRulerAction">
+         </action>
+      </editorContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <viewerContribution
+            targetID="#JavaScriptRulerContext"
+            id="org.eclipse.wst.jsdt.internal.ui.javaeditor.QuickFixRulerMenuAction">
+         <action
+               label="%action.label.0"
+               helpContextId="org.eclipse.wst.jsdt.ui.quick_fix_action"
+               class="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerAction"
+               menubarPath="additions"
+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.correction.assist.proposals"
+               id="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerMenuAction">
+         </action>
+      </viewerContribution>
+   </extension>
+   
+<!-- =========================================================================== -->
+<!-- JDT/UI command definitions                                                  -->
+<!-- =========================================================================== -->
+
+   <extension
+         point="org.eclipse.ui.contexts">
+      <context
+            name="%context.editingJavaSource.name"
+            description="%context.editingJavaSource.description"
+            parentId="org.eclipse.ui.textEditorScope"
+            id="org.eclipse.wst.jsdt.ui.javaEditorScope">
+      </context>
+      <!-- Not really the scope for the JavScript View.. just extends the editor
+           scope for now.  
+       -->
+      <context
+            name="%context.name.0"
+            description="%context.description.0"
+            parentId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            id="org.eclipse.wst.jsdt.ui.javascriptViewScope">
+      </context>
+   </extension>
+   
    <extension
          point="org.eclipse.ui.commands">
 <!-- categories -->
@@ -349,43 +841,8 @@
             description="%category.source.description"
             id="org.eclipse.wst.jsdt.ui.category.source">
       </category>
-      <category
-            name="%category.refactoring.name"
-            description="%category.refactoring.description"
-            id="org.eclipse.wst.jsdt.ui.category.refactoring">
-      </category>
 <!-- edit -->
       <command
-            name="%ActionDefinition.selectEnclosing.name"
-            description="%ActionDefinition.selectEnclosing.description"
-            categoryId="org.eclipse.ui.category.edit"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.select.enclosing">
-      </command>
-      <command
-            name="%ActionDefinition.selectNext.name"
-            description="%ActionDefinition.selectNext.description"
-            categoryId="org.eclipse.ui.category.edit"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.select.next">
-      </command>
-      <command
-            name="%ActionDefinition.selectPrevious.name"
-            description="%ActionDefinition.selectPrevious.description"
-            categoryId="org.eclipse.ui.category.edit"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.select.previous">
-      </command>
-      <command
-            name="%ActionDefinition.selectLast.name"
-            description="%ActionDefinition.selectLast.description"
-            categoryId="org.eclipse.ui.category.edit"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.select.last">
-      </command>
-      <command
-            name="%ActionDefinition.showInPackageView.name"
-            description="%ActionDefinition.showInPackageView.description"
-            categoryId="org.eclipse.ui.category.navigate"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.show.in.package.view">
-      </command>
-      <command
             name="%ActionDefinition.foldingCollapseMembers.name"
             description="%ActionDefinition.foldingCollapseMembers.description"
             categoryId="org.eclipse.ui.category.textEditor"
@@ -399,12 +856,6 @@
       </command>
 <!-- source -->
       <command
-            name="%ActionDefinition.sourceQuickMenu.name"
-            description="%ActionDefinition.sourceQuickMenu.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.source"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.source.quickMenu">
-      </command>
-      <command
             name="%ActionDefinition.comment.name"
             description="%ActionDefinition.comment.description"
             categoryId="org.eclipse.wst.jsdt.ui.category.source"
@@ -435,48 +886,6 @@
             id="org.eclipse.wst.jsdt.ui.edit.text.java.quick.format">
       </command>
       <command
-            name="%ActionDefinition.sortMembers.name"
-            description="%ActionDefinition.sortMembers.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.source"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.sort.members">
-      </command>
-      <command
-            name="%ActionDefinition.addImport.name"
-            description="%ActionDefinition.addImport.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.source"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.add.import">
-      </command>
-      <command
-            name="%ActionDefinition.organizeImports.name"
-            description="%ActionDefinition.organizeImports.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.source"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.organize.imports">
-      </command>
-      <command
-            name="%ActionDefinition.overrideMethods.name"
-            description="%ActionDefinition.overrideMethods.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.source"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.override.methods">
-      </command>
-      <command
-            name="%ActionDefinition.getterSetter.name"
-            description="%ActionDefinition.getterSetter.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.source"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.create.getter.setter">
-      </command>
-      <command
-            name="%ActionDefinition.generateHashCode.name"
-            description="%ActionDefinition.generateHashCode.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.source"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.generate.hashcode.equals">
-      </command>
-      <command
-            name="%ActionDefinition.delegateMethods.name"
-            description="%ActionDefinition.delegateMethods.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.source"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.create.delegate.methods">
-      </command>
-      <command
             name="%ActionDefinition.addJavadocComment.name"
             description="%ActionDefinition.addJavadocComment.description"
             categoryId="org.eclipse.wst.jsdt.ui.category.source"
@@ -669,239 +1078,6 @@
             categoryId="org.eclipse.wst.jsdt.ui.category.source"
             id="org.eclipse.wst.jsdt.ui.edit.text.java.surround.with.quickMenu">
       </command>
-<!-- perspectives -->
-      <command
-            name="%PerspectiveCommand.javaBrowsing.name"
-            description="%PerspectiveCommand.javaBrowsing.description"
-            categoryId="org.eclipse.ui.category.perspectives"
-            id="org.eclipse.wst.jsdt.ui.JavaBrowsingPerspective" />
-      <command
-            name="%PerspectiveCommand.java.name"
-            description="%PerspectiveCommand.java.description"
-            categoryId="org.eclipse.ui.category.perspectives"
-            id="org.eclipse.wst.jsdt.ui.JavaPerspective" />
-            
-<!-- views -->
-      <command
-            name="%ViewCommand.typeHierarchy.name"
-            description="%ViewCommand.typeHierarchy.description"
-            categoryId="org.eclipse.ui.category.views"
-            id="org.eclipse.wst.jsdt.ui.TypeHierarchy">
-      </command>
-      
-      <command
-            name="%ViewCommand.packageExplorer.name"
-            description="%ViewCommand.packageExplorer.description"
-            categoryId="org.eclipse.ui.category.views"
-            id="org.eclipse.wst.jsdt.ui.PackageExplorer">
-      </command>
-      
-      <command
-            name="%ViewCommand.projectsView.name"
-            description="%ViewCommand.projectsView.description"
-            categoryId="org.eclipse.ui.category.views"
-            id="org.eclipse.wst.jsdt.ui.ProjectsView">
-      </command>
-      
-      <command
-            name="%ViewCommand.packagesView.name"
-            description="%ViewCommand.packagesView.description"
-            categoryId="org.eclipse.ui.category.views"
-            id="org.eclipse.wst.jsdt.ui.PackagesView">
-      </command>
-      
-      <command
-            name="%ViewCommand.typesView.name"
-            description="%ViewCommand.typesView.description"
-            categoryId="org.eclipse.ui.category.views"
-            id="org.eclipse.wst.jsdt.ui.TypesView">
-      </command>
-
-      <command
-            name="%ViewCommand.membersView.name"
-            description="%ViewCommand.membersView.description"
-            categoryId="org.eclipse.ui.category.views"
-            id="org.eclipse.wst.jsdt.ui.MembersView">
-      </command>
-      
-      <command
-            name="%ViewCommand.sourceView.name"
-            description="%ViewCommand.sourceView.description"
-            categoryId="org.eclipse.ui.category.views"
-            id="org.eclipse.wst.jsdt.ui.SourceView">
-      </command>
-      
-      <command
-            name="%ViewCommand.javadocView.name"
-            description="%ViewCommand.javadocView.description"
-            categoryId="org.eclipse.ui.category.views"
-            id="org.eclipse.wst.jsdt.ui.JavadocView">
-      </command>
-      
-      <command
-            name="%ViewCommand.callHierarchy.name"
-            description="%ViewCommand.callHierarchy.description"
-            categoryId="org.eclipse.ui.category.views"
-            id="org.eclipse.wst.jsdt.callhierarchy.view">
-      </command>
-
-<!-- refactoring -->
-      <command
-            name="%ActionDefinition.refactorQuickMenu.name"
-            description="%ActionDefinition.refactorQuickMenu.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.refactor.quickMenu">
-      </command>
-      <command
-            name="%ActionDefinition.renameElement.name"
-            description="%ActionDefinition.renameElement.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.rename.element">
-      </command>
-      <command
-            name="%ActionDefinition.moveElement.name"
-            description="%ActionDefinition.moveElement.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.move.element">
-      </command>
-      <command
-            name="%ActionDefinition.modifyMethodParameters.name"
-            description="%ActionDefinition.modifyMethodParameters.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.modify.method.parameters">
-      </command>
-      <command
-            name="%ActionDefinition.convertAnonymousToNested.name"
-            description="%ActionDefinition.convertAnonymousToNested.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.convert.anonymous.to.nested">
-      </command>
-      <command
-            name="%ActionDefinition.convertNestedToTopLevel.name"
-            description="%ActionDefinition.convertNestedToTopLevel.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.move.inner.to.top.level">
-      </command>
-      <command
-            name="%ActionDefinition.pushDown.name"
-            description="%ActionDefinition.pushDown.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.push.down">
-      </command>
-      <command
-            name="%ActionDefinition.pullUp.name"
-            description="%ActionDefinition.pullUp.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.pull.up">
-      </command>
-      <command
-            name="%ActionDefinition.extractInterface.name"
-            description="%ActionDefinition.extractInterface.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.extract.interface">
-      </command>
-      <command
-            name="%ActionDefinition.extractSupertype.name"
-            description="%ActionDefinition.extractSupertype.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.extract.superclass">
-      </command>
-      <command
-            name="%ActionDefinition.changeType.name"
-            description="%ActionDefinition.changeType.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.change.type">
-      </command>
-      <command
-            name="%ActionDefinition.useSupertype.name"
-            description="%ActionDefinition.useSupertype.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.use.supertype">
-      </command>
-      <command
-            name="%ActionDefinition.inferTypeArguments.name"
-            description="%ActionDefinition.inferTypeArguments.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.infer.type.arguments">
-      </command>
-      <command
-            name="%ActionDefinition.inline.name"
-            description="%ActionDefinition.inline.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.inline">
-      </command>
-      <command
-            name="%ActionDefinition.extractMethod.name"
-            description="%ActionDefinition.extractMethod.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.extract.method">
-      </command>
-      <command
-            name="%ActionDefinition.extractLocalVariable.name"
-            description="%ActionDefinition.extractLocalVariable.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.extract.local.variable">
-      </command>
-      <command
-            name="%ActionDefinition.extractConstant.name"
-            description="%ActionDefinition.extractConstant.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.extract.constant">
-      </command>
-      <command
-            name="%ActionDefinition.replaceInvocations.name"
-            description="%ActionDefinition.replaceInvocations.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.replace.invocations">
-      </command>
-      <command
-            name="%ActionDefinition.introduceIndirection.name"
-            description="%ActionDefinition.introduceIndirection.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.introduce.indirection">
-      </command>
-      <command
-            name="%ActionDefinition.introduceParameter.name"
-            description="%ActionDefinition.introduceParameter.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.introduce.parameter">
-      </command>
-      <command
-            name="%ActionDefinition.introduceFactory.name"
-            description="%ActionDefinition.introduceFactory.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.introduce.factory">
-      </command>
-      <command
-            name="%ActionDefinition.convertLocalToField.name"
-            description="%ActionDefinition.convertLocalToField.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.promote.local.variable">
-      </command>
-      <command
-            name="%ActionDefinition.selfEncapsulateField.name"
-            description="%ActionDefinition.selfEncapsulateField.description"
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.self.encapsulate.field">
-      </command>
-      <command
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            description="%ActionDefinition.apply.description"
-            id="org.eclipse.wst.jsdt.ui.refactor.apply.refactoring.script"
-            name="%ActionDefinition.apply.name">
-      </command>
-      <command
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            description="%ActionDefinition.create.description"
-            id="org.eclipse.wst.jsdt.ui.refactor.create.refactoring.script"
-            name="%ActionDefinition.create.name">
-       </command>
-      <command
-            categoryId="org.eclipse.wst.jsdt.ui.category.refactoring"
-            description="%ActionDefinition.migrate.description"
-            id="org.eclipse.wst.jsdt.ui.refactor.migrate.jar"
-            name="%ActionDefinition.migrate.name">
-       </command>
 <!-- navigate -->
       <command
             name="%ActionDefinition.gotoNextMember.name"
@@ -928,12 +1104,6 @@
             id="org.eclipse.wst.jsdt.ui.edit.text.java.show.outline">
       </command>
       <command
-            name="%ActionDefinition.open.hierarchy.name"
-            description="%ActionDefinition.open.hierarchy.description"
-            categoryId="org.eclipse.ui.category.navigate"
-            id="org.eclipse.wst.jsdt.ui.edit.text.java.open.hierarchy">
-      </command>
-      <command
             name="%ActionDefinition.open.structure.name"
             description="%ActionDefinition.open.structure.description"
             categoryId="org.eclipse.ui.category.navigate"
@@ -1143,7 +1313,1044 @@
             id="org.eclipse.wst.jsdt.ui.edit.text.java.search.implement.occurrences">
       </command>
    </extension>
+   
+   <extension
+         point="org.eclipse.ui.bindings">
+      <!--  win32:  M1=CTRL,    M2=SHIFT, M3=ALT, M4=-
+            carbon: M1=COMMAND, M2=SHIFT, M3=ALT, M4=CTRL -->
+      
+<!-- edit -->
+      <key
+            sequence="M2+M3+ARROW_UP"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.select.enclosing"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+ARROW_UP"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="CTRL+SHIFT+ARROW_UP"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.select.enclosing"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+      <key
+            sequence="M2+M3+ARROW_RIGHT"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.select.next"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+ARROW_RIGHT"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="CTRL+SHIFT+ARROW_RIGHT"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.select.next"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M2+M3+ARROW_LEFT"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.select.previous"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+ARROW_LEFT"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="CTRL+SHIFT+ARROW_LEFT"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.select.previous"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M2+M3+ARROW_DOWN"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.select.last"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+ARROW_DOWN"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="CTRL+SHIFT+ARROW_DOWN"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.select.last"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
 
+<!-- source -->
+      <key
+            sequence="M2+M3+S"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.source.quickMenu"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+S"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+S"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.source.quickMenu"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+      <key
+            sequence="M1+M2+C"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+7"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+/"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <!-- alternative for some gtk input modes -->
+      <key
+            platform="gtk"
+            sequence="ESC CTRL+C"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+      <key
+            sequence="M1+M2+F"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.format"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <!-- alternative for some gtk input modes -->
+      <key
+            platform="gtk"
+            sequence="ESC CTRL+F"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.format"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+      <key
+            sequence="M1+M2+M"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.add.import"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+M2+O"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.organize.imports"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M2+M3+J"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.add.javadoc.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+J"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+J"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.add.javadoc.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      
+      <key
+            sequence="M1+M2+/"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.add.block.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <!-- free this on MAC, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=113981 -->
+      <key
+            platform="carbon"
+            sequence="M1+M2+/"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+
+      <key
+            sequence="M1+M2+\"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.remove.block.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+I"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.indent"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+	  <key
+	        sequence="M2+M3+O"
+	        contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+	        commandId="org.eclipse.wst.jsdt.ui.edit.text.java.toggleMarkOccurrences"
+	        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+O"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+O"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.toggleMarkOccurrences"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+      <key
+            sequence="M2+M3+U"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.remove.occurrence.annotations"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+U"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+U"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.remove.occurrence.annotations"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+       <key
+            sequence="M1+2 R"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.correction.renameInFile.assist"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+       <key
+            sequence="M1+2 L"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.correction.assignToLocal.assist"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>            
+       <key
+            sequence="M1+2 F"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.correction.assignToField.assist"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>              
+       <key
+            sequence="M2+M3+Z"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.surround.with.quickMenu"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>        
+       <key
+            platform="carbon"
+            sequence="M2+M3+Z"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+       <key
+            platform="carbon"
+            sequence="COMMAND+ALT+Z"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.surround.with.quickMenu"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+
+<!-- refactoring -->
+      <key
+            sequence="M2+M3+T"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.refactor.quickMenu"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+T"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+T"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.refactor.quickMenu"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M2+M3+R"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.rename.element"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+R"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+R"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.rename.element"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+      <key
+            sequence="M2+M3+V"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.move.element"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+V"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+V"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.move.element"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+      <key
+            sequence="M2+M3+C"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.modify.method.parameters"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+C"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+C"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.modify.method.parameters"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+      <key
+            sequence="M2+M3+I"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.inline"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+I"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+I"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.inline"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+      <key
+            sequence="M2+M3+M"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.method"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+M"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+M"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.method"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+      <key
+            sequence="M2+M3+L"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.local.variable"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+L"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+L"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.local.variable"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+<!-- navigate -->
+      <key
+            sequence="M1+M2+ARROW_DOWN"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.next.member"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M1+M2+ARROW_DOWN"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="CTRL+ALT+ARROW_DOWN"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.next.member"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+M2+ARROW_UP"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.previous.member"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M1+M2+ARROW_UP"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="CTRL+ALT+ARROW_UP"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.previous.member"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+M2+P"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.matching.bracket"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+O"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.show.outline"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+T"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.open.hierarchy"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+F3"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.navigate.java.open.structure"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+            
+       <!-- Changing context to JavaScript Editor -->     
+      <key
+            sequence="M1+M2+T"
+            contextId="org.eclipse.wst.jsdt.ui.javaEditorScope"
+            commandId="org.eclipse.wst.jsdt.ui.navigate.open.type"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+M2+H"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.navigate.open.type.in.hierarchy"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="F3"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.open.editor"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M2+F2"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.open.external.javadoc"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="F4"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.open.type.hierarchy"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="CTRL+ALT+H"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.open.call.hierarchy"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+	  <!-- COMMAND+ALT+H is "Hide Others" on carbon, so don't overwrite it -->
+      
+<!-- project -->
+
+<!-- search -->
+      <key
+            sequence="M1+M2+G"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.workspace"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+G"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.workspace"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+M2+U"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.edit.text.java.search.occurrences.in.file.quickMenu"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+
+<!-- perspectives -->
+
+<!-- views -->
+      <key
+            sequence="M2+M3+Q T"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.TypeHierarchy"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+Q T"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+Q T"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.TypeHierarchy"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M2+M3+Q P"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+Q P"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+Q P"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M2+M3+Q D"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.SourceView"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+Q D"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+Q D"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.SourceView"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M2+M3+Q J"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.JavadocView"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="M2+M3+Q J"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            platform="carbon"
+            sequence="COMMAND+ALT+Q J"
+            contextId="org.eclipse.wst.jsdt.ui.javascriptViewScope"
+            commandId="org.eclipse.wst.jsdt.ui.JavadocView"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+
+   </extension>
+   
+   
+   <extension
+         point="org.eclipse.ui.ide.markerResolution">
+      <markerResolutionGenerator
+            markerType="org.eclipse.wst.jsdt.core.problem"
+            class="org.eclipse.wst.jsdt.internal.ui.text.correction.CorrectionMarkerResolutionGenerator">
+      </markerResolutionGenerator>
+   </extension>
+   <extension
+         point="org.eclipse.ui.ide.markerResolution">
+      <markerResolutionGenerator
+            markerType="org.eclipse.wst.jsdt.core.buildpath_problem"
+            class="org.eclipse.wst.jsdt.internal.ui.wizards.buildpaths.UserLibraryMarkerResolutionGenerator">
+      </markerResolutionGenerator>
+   </extension>
+   
+   <extension point="org.eclipse.ui.ide.markerSupport">
+      <markerTypeCategory name="%markerCategory.problem">
+         <markerTypeReference id="org.eclipse.wst.jsdt.core.problem"/>
+         <markerTypeReference id="org.eclipse.wst.jsdt.core.transient_problem"/>
+      </markerTypeCategory>
+      <markerTypeCategory name="%markerCategory.buildpath_problem">
+         <markerTypeReference id="org.eclipse.wst.jsdt.core.buildpath_problem"/>
+         <!-- <markerTypeReference id="org.eclipse.wst.jsdt.launching.jreContainerMarker"/> -->
+      </markerTypeCategory>
+      
+    <markerGrouping id="org.eclipse.wst.jsdt.ui.java_marker_category" label="%MarkerCategory.name"/>
+    <markerGroupingEntry id="org.eclipse.wst.jsdt.ui.category.buildpath"
+        markerGrouping="org.eclipse.wst.jsdt.ui.java_marker_category"
+        label="%MarkerCategory.buildpath"
+        priority="100"/>
+    <markerGroupingEntry id="org.eclipse.wst.jsdt.ui.category.fatal"
+        markerGrouping="org.eclipse.wst.jsdt.ui.java_marker_category"
+        label="%MarkerCategory.fatal"
+        priority="90"/>
+    <markerGroupingEntry id="org.eclipse.wst.jsdt.ui.category.documentation"
+        markerGrouping="org.eclipse.wst.jsdt.ui.java_marker_category"
+        label="%MarkerCategory.documentation"
+        priority="80"/>
+    <markerGroupingEntry id="org.eclipse.wst.jsdt.ui.category.potential"
+        markerGrouping="org.eclipse.wst.jsdt.ui.java_marker_category"
+        label="%MarkerCategory.potential"
+        priority="70"/>        
+    <markerGroupingEntry id="org.eclipse.wst.jsdt.ui.category.codestyle"
+        markerGrouping="org.eclipse.wst.jsdt.ui.java_marker_category"
+        label="%MarkerCategory.codestyle"
+        priority="60"/>
+    <markerGroupingEntry id="org.eclipse.wst.jsdt.ui.category.restrictedAPI"
+        markerGrouping="org.eclipse.wst.jsdt.ui.java_marker_category"
+        label="%MarkerCategory.restrictedAPI"
+        priority="50"/>        
+    <markerGroupingEntry id="org.eclipse.wst.jsdt.ui.category.deprecation"
+        markerGrouping="org.eclipse.wst.jsdt.ui.java_marker_category"
+        label="%MarkerCategory.deprecation"
+        priority="40"/>
+    <markerGroupingEntry id="org.eclipse.wst.jsdt.ui.category.generictypes"
+        markerGrouping="org.eclipse.wst.jsdt.ui.java_marker_category"
+        label="%MarkerCategory.generictypes"
+        priority="30"/>
+    <markerGroupingEntry id="org.eclipse.wst.jsdt.ui.category.unnecessary"
+        markerGrouping="org.eclipse.wst.jsdt.ui.java_marker_category"
+        label="%MarkerCategory.unnecessary"
+        priority="20"/>          
+    <markerGroupingEntry id="org.eclipse.wst.jsdt.ui.category.nls"
+        markerGrouping="org.eclipse.wst.jsdt.ui.java_marker_category"
+        label="%MarkerCategory.nls"
+        priority="10"/>
+    <markerAttributeGrouping markerType="org.eclipse.wst.jsdt.core.problem" attribute="categoryId">
+        <markerAttributeMapping value="10" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.buildpath"/>
+        <markerAttributeMapping value="20" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.fatal"/>
+        <markerAttributeMapping value="30" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.fatal"/>
+        <markerAttributeMapping value="40" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.fatal"/>
+        <markerAttributeMapping value="50" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.fatal"/>
+        <markerAttributeMapping value="60" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.fatal"/>
+        <markerAttributeMapping value="70" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.documentation"/>
+        <markerAttributeMapping value="80" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.codestyle"/>
+        <markerAttributeMapping value="90" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.potential"/>
+        <markerAttributeMapping value="100" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.potential"/>
+        <markerAttributeMapping value="110" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.deprecation"/>
+        <markerAttributeMapping value="120" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.unnecessary"/>
+        <markerAttributeMapping value="130" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.generictypes"/>
+        <markerAttributeMapping value="140" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.nls"/>
+        <markerAttributeMapping value="150" markerGroupingEntry="org.eclipse.wst.jsdt.ui.category.restrictedAPI"/>
+     </markerAttributeGrouping>
+     <markerAttributeGrouping markerType="org.eclipse.wst.jsdt.core.buildpath_problem"
+        defaultGroupingEntry="org.eclipse.wst.jsdt.ui.category.buildpath"/>
+   </extension>
+   
+<!-- =========================================================================== -->
+<!-- Filter Support                                                              -->
+<!-- =========================================================================== -->
+   <extension
+         point="org.eclipse.wst.jsdt.ui.javaElementFilters">
+<!-- Package Explorer -->
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideSystemFiles.label"
+            enabled="true"
+            description="%HideSystemFiles.description"
+            pattern=".*">
+      </filter>
+      <!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideInnerClassFiles.label"
+            enabled="true"
+            description="%HideInnerClassFiles.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.InnerClassFilesFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideEmptyPackages.label"
+            enabled="false"
+            description="%HideEmptyPackages.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.EmptyPackageFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.PackageExplorer.EmptyPackageFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideEmptyInnerPackages.label"
+            enabled="true"
+            description="%HideEmptyInnerPackages.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.EmptyInnerPackageFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideNonJavaElements.label"
+            enabled="false"
+            description="%HideNonJavaElements.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.NonJavaElementFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.NonJavaElementFilter">
+      </filter>
+      -->
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideReferencedLibraries.label"
+            enabled="false"
+            description="%HideReferencedLibraries.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.LibraryFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.LibraryFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideContainedLibraries.label"
+            enabled="false"
+            description="%HideContainedLibraries.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.ContainedLibraryFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.ContainedLibraryFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideJavaFiles.label"
+            enabled="false"
+            description="%HideJavaFiles.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.JavaFileFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.CuAndClassFileFilter">
+      </filter>
+      <!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HidePackageDeclaration.label"
+            enabled="true"
+            description="%HidePackageDeclaration.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.PackageDeclarationFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.PackageDeclarationFilter">
+      </filter>
+      -->
+      <!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideImportDeclaration.label"
+            enabled="true"
+            description="%HideImportDeclaration.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.ImportDeclarationFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.ImportDeclarationFilter">
+      </filter>
+      -->
+      <!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideSyntheticMembers.label"
+            enabled="true"
+            description="%HideSyntheticMembers.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.SyntheticMembersFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.SyntheticMembersFilter">
+      </filter>
+      -->
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideNonSharedProjects.label"
+            enabled="false"
+            description="%HideNonSharedProjects.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.NonSharedProjectFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.NonSharedProjectsFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideClosedProjects.label"
+            enabled="false"
+            description="%HideClosedProjects.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.ClosedProjectFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.ClosedProjectsFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideFields.label"
+            enabled="false"
+            description="%HideFields.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.FieldsFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.FieldsFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideStatics.label"
+            enabled="false"
+            description="%HideStatics.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.StaticsFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.StaticsFilter">
+      </filter>
+      <!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideNonPublic.label"
+            enabled="false"
+            description="%HideNonPublic.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.NonPublicFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.NonPublicFilter">
+      </filter>
+      -->
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackageExplorer"
+            name="%HideLocalTypes.label"
+            enabled="false"
+            description="%HideLocalTypes.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.LocalTypesFilter"
+            id="org.eclipse.wst.jsdt.ui.PackageExplorer.LocalTypesFilter">
+      </filter>
+<!-- Types view -->
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.TypesView"
+            name="%HideNonPublicType.label"
+            enabled="false"
+            description="%HideNonPublicType.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.NonPublicTypeFilter"
+            id="org.eclipse.wst.jsdt.ui.TypesView.NonPublicTypeFilter">
+      </filter>
+      <!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.TypesView"
+            name="%HideInterface.label"
+            enabled="false"
+            description="%HideInterface.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.InterfaceFilter"
+            id="org.eclipse.wst.jsdt.ui.TypesView.InterfaceFilter">
+      </filter>
+      
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.TypesView"
+            name="%HideEnum.label"
+            enabled="false"
+            description="%HideEnum.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.EnumFilter"
+            id="org.eclipse.wst.jsdt.ui.TypesView.EnumFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.TypesView"
+            name="%HideAnnotation.label"
+            enabled="false"
+            description="%HideAnnotation.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.AnnotationFilter"
+            id="org.eclipse.wst.jsdt.ui.TypesView.AnnotationFilter">
+      </filter>
+-->
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.TypesView"
+            name="%HideClass.label"
+            enabled="false"
+            description="%HideClass.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.ClassFilter"
+            id="org.eclipse.wst.jsdt.ui.TypesView.ClassFilter">
+      </filter>
+<!-- Packages view -->
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackagesView"
+            name="%HideEmptyPackages.label"
+            enabled="false"
+            description="%HideEmptyPackages.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.EmptyPackageFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.PackagesView.EmptyPackageFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.PackagesView"
+            name="%HideEmptyInnerPackages.label"
+            enabled="true"
+            description="%HideEmptyInnerPackages.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.EmptyInnerPackageFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.PackagesView.EmptyInnerPackageFilter">
+      </filter>
+      <filter
+      		targetId="org.eclipse.wst.jsdt.ui.PackagesView"
+            name="%HideNoPackageContainingFolders.label"
+            enabled="true"
+            description="%HideNoPackageContainingFolders.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.NoPackageContainingFoldersFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.PackagesView.NoPackageContainingFolders">
+      </filter>
+<!-- Projects view -->
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.ProjectsView"
+            name="%HideReferencedLibraries.label"
+            enabled="false"
+            description="%HideReferencedLibraries.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.LibraryFilter"
+            id="org.eclipse.wst.jsdt.ui.ProjectsView.LibraryFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.ProjectsView"
+            name="%HideContainedLibraries.label"
+            enabled="false"
+            description="%HideContainedLibraries.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.ContainedLibraryFilter"
+            id="org.eclipse.wst.jsdt.ui.ProjectsView.ContainedLibraryFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.ProjectsView"
+            name="%HideNonSharedProjects.label"
+            enabled="false"
+            description="%HideNonSharedProjects.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.NonSharedProjectFilter"
+            id="org.eclipse.wst.jsdt.ui.ProjectsView.NonSharedProjectsFilter">
+      </filter>
+<!-- Members view -->
+<!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.MembersView"
+            name="%HideImportDeclaration.label"
+            enabled="false"
+            description="%HideImportDeclaration.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.ImportDeclarationFilter"
+            id="org.eclipse.wst.jsdt.ui.MembersView.ImportDeclarationFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.MembersView"
+            name="%HideSyntheticMembers.label"
+            enabled="true"
+            description="%HideSyntheticMembers.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.SyntheticMembersFilter"
+            id="org.eclipse.wst.jsdt.ui.MembersView.SyntheticMembersFilter">
+      </filter>
+      -->
+<!-- Outline Page -->
+<!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.JavaOutlinePage"
+            name="%HidePackageDeclaration.label"
+            enabled="false"
+            description="%HidePackageDeclaration.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.PackageDeclarationFilter"
+            id="org.eclipse.wst.jsdt.ui.JavaOutlinePage.PackageDeclarationFilter">
+      </filter>
+-->
+<!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.JavaOutlinePage"
+            name="%HideImportDeclaration.label"
+            enabled="false"
+            description="%HideImportDeclaration.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.ImportDeclarationFilter"
+            id="org.eclipse.wst.jsdt.ui.JavaOutlinePage.ImportDeclarationFilter">
+      </filter>
+ -->
+ <!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.ui.JavaOutlinePage"
+            name="%HideSyntheticMembers.label"
+            enabled="true"
+            description="%HideSyntheticMembers.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.SyntheticMembersFilter"
+            id="org.eclipse.wst.jsdt.ui.JavaOutlinePage.SyntheticMembersFilter">
+      </filter>
+      -->
+<!-- Quick Outline -->
+      <filter
+            targetId="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline"
+            name="%HideImportDeclaration.label"
+            enabled="true"
+            description="%HideImportDeclaration.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.ImportDeclarationFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline.ImportDeclarationFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline"
+            name="%HideFields.label"
+            enabled="false"
+            description="%HideFields.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.FieldsFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline.FieldsFilter">
+      </filter>
+      <filter
+            targetId="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline"
+            name="%HideStatics.label"
+            enabled="false"
+            description="%HideStatics.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.StaticsFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline.StaticsFilter">
+      </filter>
+      <!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline"
+            name="%HideNonPublic.label"
+            enabled="false"
+            description="%HideNonPublic.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.NonPublicFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline.NonPublicFilter">
+      </filter>
+      -->
+      <filter
+            targetId="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline"
+            name="%HideLocalTypes.label"
+            enabled="false"
+            description="%HideLocalTypes.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.LocalTypesFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline.LocalTypesFilter">
+      </filter>
+      <!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline"
+            name="%HideSyntheticMembers.label"
+            enabled="true"
+            description="%HideSyntheticMembers.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.SyntheticMembersFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.text.QuickOutline.SyntheticMembersFilter">
+      </filter>
+      -->
+<!-- Quick Hierarchy -->
+      <filter
+            targetId="org.eclipse.wst.jsdt.internal.ui.typehierarchy.QuickHierarchy"
+            name="%HideStatics.label"
+            enabled="false"
+            description="%HideStatics.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.StaticsFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.typehierarchy.QuickHierarchy.StaticsFilter">
+      </filter>
+      <!--
+      <filter
+            targetId="org.eclipse.wst.jsdt.internal.ui.typehierarchy.QuickHierarchy"
+            name="%HideNonPublic.label"
+            enabled="false"
+            description="%HideNonPublic.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.NonPublicFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.typehierarchy.QuickHierarchy.NonPublicFilter">
+      </filter>
+      -->
+      <filter
+            targetId="org.eclipse.wst.jsdt.internal.ui.typehierarchy.QuickHierarchy"
+            name="%HideLocalTypes.label"
+            enabled="false"
+            description="%HideLocalTypes.description"
+            class="org.eclipse.wst.jsdt.internal.ui.filters.LocalTypesFilter"
+            id="org.eclipse.wst.jsdt.internal.ui.typehierarchy.QuickHierarchy.LocalTypesFilter">
+      </filter>
+   </extension>
+<!-- =========================================================================== -->
+<!-- Call Hierarchy                                                              -->
+<!-- =========================================================================== -->
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            name="%callHierarchyViewName"
+            icon="$nl$/icons/full/eview16/call_hierarchy.gif"
+            category="org.eclipse.wst.jsdt.ui.java"
+            class="org.eclipse.wst.jsdt.internal.ui.callhierarchy.CallHierarchyViewPart"
+            id="org.eclipse.wst.jsdt.callhierarchy.view">
+      </view>
+   </extension>
+   
 <!-- =========================================================================== -->
 <!-- Templates                                                                   -->
 <!-- =========================================================================== -->
@@ -1205,10 +2412,351 @@
             type="argType"/>
    </extension>
 
+<!-- =========================================================================== -->
+<!-- Refactoring                                                                 -->
+<!-- =========================================================================== -->
+
+   <extension point="org.eclipse.ltk.ui.refactoring.statusContextViewers">
+      <statusContextViewer
+            class="org.eclipse.wst.jsdt.internal.ui.refactoring.JavaStatusContextViewer"
+            id="org.eclipse.wst.jsdt.ui.javaStatusContextViewer">
+         <enablement>
+            <or>
+               <instanceof value="org.eclipse.wst.jsdt.internal.corext.refactoring.base.JavaStatusContext"/>
+               <instanceof value="org.eclipse.wst.jsdt.internal.corext.refactoring.base.JavaStringStatusContext"/>
+            </or>
+         </enablement>
+      </statusContextViewer>
+   </extension>
+   
+   <extension point="org.eclipse.ltk.ui.refactoring.changePreviewViewers">
+      <changePreviewViewer
+            class="org.eclipse.wst.jsdt.internal.ui.refactoring.CreateTextFileChangePreviewViewer"
+            id="org.eclipse.wst.jsdt.ui.createTextFileChangePreviewViewer">
+         <enablement>
+            <instanceof value="org.eclipse.wst.jsdt.internal.corext.refactoring.nls.changes.CreateTextFileChange"/>
+         </enablement>
+      </changePreviewViewer>
+   </extension>
+
+   <extension
+         point="org.eclipse.ltk.core.refactoring.refactoringContributions">
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.RenameResourceRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.rename.resource"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.RenameCompilationUnitRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.rename.compilationunit"/>
+<!--            
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.RenameEnumConstRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.rename.enum.constant"/>
+-->            
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.RenameFieldRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.rename.field"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.RenameJavaProjectRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.rename.java.project"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.RenameLocalVariableRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.rename.local.variable"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.RenameMethodRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.rename.method"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.RenamePackageRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.rename.package"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.RenameSourceFolderRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.rename.source.folder"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.RenameTypeRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.rename.type"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.ChangeMethodSignatureRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.change.method.signature"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.MoveMethodRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.move.method"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.MoveStaticMembersRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.move.static"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.UseSupertypeRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.use.supertype"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.PullUpRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.pull.up"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.PushDownRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.push.down"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.ConvertAnonymousRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.convert.anonymous"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.MoveMemberTypeRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.move.inner"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.InlineMethodRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.inline.method"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.InlineTempRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.inline.temp"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.InlineConstantRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.inline.constant"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.ExtractMethodRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.extract.method"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.ExtractTempRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.extract.temp"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.ExtractConstantRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.extract.constant"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.IntroduceParameterRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.introduce.parameter"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.IntroduceFactoryRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.introduce.factory"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.IntroduceIndirectionRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.introduce.indirection"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.PromoteTempToFieldRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.promote.temp"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.SelfEncapsulateRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.self.encapsulate"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.ChangeTypeRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.change.type"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.ExtractSupertypeRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.extract.superclass"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.DeleteRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.delete"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.MoveRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.move"/>
+      <contribution
+            class="org.eclipse.wst.jsdt.internal.corext.refactoring.scripting.CopyRefactoringContribution"
+            id="org.eclipse.wst.jsdt.ui.copy"/>
+   </extension>
+
+<!-- End Refactoring -->
+
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            name="%JavaSourceView"
+            icon="$nl$/icons/full/eview16/source.gif"
+            category="org.eclipse.wst.jsdt.ui.java"
+            class="org.eclipse.wst.jsdt.internal.ui.infoviews.SourceView"
+            id="org.eclipse.wst.jsdt.ui.SourceView">
+      </view>
+   </extension>
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            name="%JavadocView"
+            icon="$nl$/icons/full/eview16/javadoc.gif"
+            category="org.eclipse.wst.jsdt.ui.java"
+            class="org.eclipse.wst.jsdt.internal.ui.infoviews.JavadocView"
+            id="org.eclipse.wst.jsdt.ui.JavadocView">
+            <description>%JavadocViewDescription</description>
+      </view>
+   </extension>
+
+<!-- classpath container -->
+   
+   <extension
+         point="org.eclipse.wst.jsdt.ui.JsGlobalScopeContainerPage">
+      <JsGlobalScopeContainerPage
+            name="%userLibrary.name"
+            class="org.eclipse.wst.jsdt.internal.ui.wizards.buildpaths.UserLibraryWizardPage"
+            id="org.eclipse.wst.jsdt.USER_LIBRARY">
+      </JsGlobalScopeContainerPage>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.popupMenus">    
+      <objectContribution
+            objectClass="org.eclipse.wst.jsdt.internal.ui.packageview.JsGlobalScopeContainer"
+            id="org.eclipse.wst.jsdt.ui.configure.JsGlobalScopeContainer">
+         <action
+               label="%ConfigJsGlobalScopeContainer.label"
+               tooltip="%ConfigJsGlobalScopeContainer.tooltip"
+               class="org.eclipse.wst.jsdt.internal.ui.actions.ConfigureContainerAction"
+               menubarPath="additions"
+               enablesFor="1"
+               id="ConfigureContainer">
+         </action>
+      </objectContribution>
+   </extension>
+   
+	<extension
+		point= "org.eclipse.wst.jsdt.ui.foldingStructureProviders">
+		<provider
+			id="org.eclipse.wst.jsdt.ui.text.defaultFoldingProvider"
+			name= "%defaultFoldingStructureProviderName"
+			class="org.eclipse.wst.jsdt.ui.text.folding.DefaultJavaFoldingStructureProvider"
+			preferencesClass="org.eclipse.wst.jsdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock">
+		</provider>
+	</extension>
+
+  	 <extension
+         point="org.eclipse.ui.popupMenus">
+  		<objectContribution
+            objectClass="org.eclipse.core.resources.IProject"
+            adaptable="true"
+            id="org.eclipse.wst.jsdt.ui.jsdtSetup">
+       	 <visibility>
+        	<not>
+	        	<or>
+		            <objectState 
+			            name="projectNature" 
+			            value="org.eclipse.wst.jsdt.core.jsNature"/>
+			        <objectState
+			        	name="open"
+			        	value="false"/>
+	            </or>
+            </not>
+       	 </visibility>
+         <action
+            class="org.eclipse.wst.jsdt.internal.ui.util.ConvertAction"
+            label="%action.label.projectConvert"
+            menubarPath="org.eclipse.ui.projectConfigure/additions"
+            enablesFor="+"
+            id="org.eclipse.wst.jsdt.internal.web.ui.convertProjects">
+      	</action>
+   		</objectContribution>
+   </extension> 
+
+<!--
+	<extension point="org.eclipse.debug.core.launchConfigurationTypes">
+    	<launchConfigurationType
+           delegate="org.eclipse.wst.jsdt.internal.ui.text.correction.SerialVersionLaunchConfigurationDelegate"
+           public="false"
+           name="%serialVersionLaunchConfigName"
+           modes="run"
+           id="org.eclipse.wst.jsdt.ui.serial.support">
+    	</launchConfigurationType>
+	</extension>
+-->
+
     <extension point="org.eclipse.core.runtime.preferences">
         <initializer class="org.eclipse.wst.jsdt.internal.ui.JavaUIPreferenceInitializer"/>
     </extension>
 
+   <extension
+         id="modelProvider"
+         name="%JavaModelProvider.name"
+         point="org.eclipse.core.resources.modelProviders">
+      <modelProvider
+            class="org.eclipse.wst.jsdt.internal.ui.model.JavaModelProvider"/>
+      <extends-model id="org.eclipse.core.resources.modelProvider"/>
+      <enablement>
+          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.wst.jsdt.core.jsNature" />
+      </enablement>
+   </extension>
+
+   <extension
+         point="org.eclipse.core.runtime.adapters">
+      <factory
+            adaptableType="org.eclipse.wst.jsdt.internal.ui.model.JavaModelProvider"
+            class="org.eclipse.wst.jsdt.internal.ui.model.JavaModelAdapterFactory">
+         <adapter type="org.eclipse.team.core.mapping.IResourceMappingMerger"/>
+         <adapter type="org.eclipse.team.ui.mapping.ISynchronizationCompareAdapter"/>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.ltk.core.refactoring.history.RefactoringHistory"
+            class="org.eclipse.wst.jsdt.internal.ui.model.JavaModelAdapterFactory">
+         <adapter type="org.eclipse.core.resources.mapping.ResourceMapping"/>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.ltk.core.refactoring.RefactoringDescriptorProxy"
+            class="org.eclipse.wst.jsdt.internal.ui.model.JavaModelAdapterFactory">
+         <adapter type="org.eclipse.core.resources.mapping.ResourceMapping"/>
+      </factory>
+   </extension>
+   
+   <!--
+   <extension
+         id="jdtContentProvider"
+         point="org.eclipse.team.ui.teamContentProviders">
+      <teamContentProvider
+            contentExtensionId="org.eclipse.wst.jsdt.ui.javaModelContent"
+            icon="$nl$/icons/full/obj16/java_model_obj.gif"
+            modelProviderId="org.eclipse.wst.jsdt.ui.modelProvider"/>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.navigator.viewer">
+      <viewerContentBinding viewerId="org.eclipse.team.cvs.ui.workspaceSynchronization">
+         <includes>
+            <contentExtension
+                  isRoot="true"
+                  pattern="org.eclipse.wst.jsdt.ui.javaModelContent"/>
+         </includes>
+      </viewerContentBinding>
+   </extension>-->
+   
+	
+	<extension
+			point="org.eclipse.ui.navigator.viewer">
+		<viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+			<includes>
+				<contentExtension pattern="org.eclipse.wst.jsdt.java.ui.javaContent" />
+				<contentExtension pattern="org.eclipse.wst.jsdt.java.ui.filters.*" />	
+				<contentExtension pattern="org.eclipse.wst.jsdt.java.ui.javaLinkHelper" />	
+			</includes>
+		</viewerContentBinding>
+  <viewerContentBinding
+        viewerId="org.eclipse.wst.jsdt.ui.outline">
+     <includes>
+        <contentExtension
+              pattern="org.eclipse.wst.jsdt.java.ui.javaContent">
+        </contentExtension>
+        <contentExtension
+              pattern="org.eclipse.wst.jsdt.java.ui.filters.*">
+        </contentExtension>
+        <contentExtension
+              pattern="org.eclipse.wst.jsdt.java.ui.javaLinkHelper">
+        </contentExtension>
+     </includes>
+  </viewerContentBinding>
+	</extension>
+
+   <extension
+       point="org.eclipse.ui.navigator.linkHelper">
+		<linkHelper
+	          class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaFileLinkHelper"
+	          id="org.eclipse.wst.jsdt.java.ui.javaLinkHelper">          
+	         <editorInputEnablement>
+		         <or> 
+		         	<instanceof value="org.eclipse.ui.IFileEditorInput" />
+		         	<instanceof value="org.eclipse.wst.jsdt.internal.ui.javaeditor.IClassFileEditorInput" />
+		         	<instanceof value="org.eclipse.wst.jsdt.internal.ui.javaeditor.JarEntryEditorInput" />
+		         </or>
+	         </editorInputEnablement>
+	         <selectionEnablement>
+	         	<or>
+					<adapt type="org.eclipse.core.resources.IProject" >
+						<test property="org.eclipse.core.resources.projectNature" value="org.eclipse.wst.jsdt.core.jsNature"/>
+					</adapt>
+					<instanceof value="org.eclipse.core.resources.IResource" />
+					<instanceof value="org.eclipse.wst.jsdt.core.IJavaScriptElement" />
+					<instanceof value="org.eclipse.wst.jsdt.core.IJarEntryResource" /> 
+					<instanceof value="org.eclipse.wst.jsdt.internal.ui.packageview.PackageFragmentRootContainer" />
+				</or>
+	         </selectionEnablement>
+      </linkHelper>          
+   </extension>
+   
       <extension
       point="org.eclipse.ui.themes">
       <colorDefinition
@@ -1697,6 +3245,57 @@
       </theme>
    </extension>
 
+   
+   <!--
+   From Launching
+   -->
+   
+   <extension point="org.eclipse.wst.jsdt.ui.JsGlobalScopeContainerPage">
+  	  <JsGlobalScopeContainerPage
+            name="%BaseWebBrowserLibrary"
+            class="org.eclipse.wst.jsdt.ui.wizards.BaseLibraryWizardPage"
+            id="org.eclipse.wst.jsdt.BASE">
+      </JsGlobalScopeContainerPage>
+   </extension>
+
+   
+   <!--  JSDT context menu contributions for the JavaScript Support object  -->
+   
+   <extension point="org.eclipse.wst.jsdt.ui.JsGlobalScopeUIInitializer">
+     <JsGlobalScopeUIInitializer
+     	id="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"
+     	class="org.eclipse.wst.jsdt.libraries.BasicBrowserLibraryContainerUIExtension">
+     </JsGlobalScopeUIInitializer>
+   </extension>
+   
+   <!--  ENd menu  -->
+      
+   <!-- UNCOMMENT to add a menu option for JSDT standalone setup on project -->
+   <!-- 
+   <extension
+         point="org.eclipse.ui.popupMenus">
+  		<objectContribution
+            objectClass="org.eclipse.core.resources.IProject"
+            adaptable="true"
+            id="org.eclipse.wst.jsdt.ui.jsdtSetup">
+            <menu
+               label="JavaScript Development Tools"
+               id="org.eclipse.wst.jsdt.ui.project.tools">
+            <separator
+               name="group0">
+            </separator>
+         </menu>
+         <action
+            class="org.eclipse.wst.jsdt.internal.ui.SetupProjectsWizzard"
+            label="Add Standalone JavaScript Support"
+            menubarPath="org.eclipse.wst.jsdt.ui.project.tools/group0"
+            enablesFor="+"
+            id="org.eclipse.wst.jsdt.internal.ui.convertProjects">
+      	</action>
+   		</objectContribution>
+   </extension>
+   --> 
+   
    <!-- dark theme defaults -->
    <extension
       point="org.eclipse.e4.ui.css.swt.theme">
@@ -1704,4 +3303,17 @@
          <themeid refid="org.eclipse.e4.ui.css.theme.e4_dark"></themeid>
       </stylesheet>
    </extension>
+   <extension
+         point="org.eclipse.ui.ide.projectConfigurators">
+      <projectConfigurator
+            class="org.eclipse.wst.jsdt.internal.ui.importer.JSDTProjectNature"
+            label="%importerLabel">
+         <activeWhen>
+            <hasFileWithSuffixRecursively
+                  suffix=".js">
+            </hasFileWithSuffixRecursively>
+         </activeWhen>
+      </projectConfigurator>
+   </extension>
+
 </plugin>
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/PreferencesMessages.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/PreferencesMessages.java
index 1a7520f..8423c6f 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/PreferencesMessages.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/PreferencesMessages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -825,4 +825,7 @@
 	public static String StandardRuntimeInstallPage_RuntimeDefinition_Title;
 	public static String StandardRuntimeInstallPage_RuntimeAttributes_Message;
 	public static String JSRuntimes_MissingPath;
+	public static String TaskTagLinkText;
+	public static String TaskTagLinkAlternateText;
+	public static String StandaloneJavaScriptPreferencePage_description;
 }
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/PreferencesMessages.properties b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/PreferencesMessages.properties
index 16ad7ff..1516b2a 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/PreferencesMessages.properties
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/PreferencesMessages.properties
@@ -76,6 +76,7 @@
 ImportOrganizeInputDialog_name_group_label=Enter a prefix (e.g. 'org.eclipse') or '*' to match all imports:
 ImportOrganizeInputDialog_name_group_static_label=Enter a prefix (e.g. 'org.eclipse') or '*' to match all imports:
 JavaBasePreferencePage_description=General settings for JavaScript development within web pages:
+StandaloneJavaScriptPreferencePage_description=General settings for JavaScript development:
 
 JavaBasePreferencePage_doubleclick_action=Action on double click in the Script and Project Explorers
 JavaBasePreferencePage_doubleclick_gointo=&Go into the selected element
@@ -961,4 +962,6 @@
 StandardRuntimeInstallPage_RuntimeUnexistingLocation_Error=Location does not exist
 StandardRuntimeInstallPage_RuntimeDefinition_Title=JavaScript Runtime install definition
 StandardRuntimeInstallPage_RuntimeAttributes_Message=Specify the JavaScript runtime installation attributes
-JSRuntimes_MissingPath={0} (missing path)
\ No newline at end of file
+JSRuntimes_MissingPath={0} (missing path)
+TaskTagLinkText=Task Tags in JavaScript files can be configured <a>here</a>.
+TaskTagLinkAlternateText=Automatic Task Tag detection is available by installing the Eclipse Web JavaScript Developer Tools
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/StandaloneJSPreferencePage.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/StandaloneJSPreferencePage.java
new file mode 100644
index 0000000..7103b29
--- /dev/null
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/StandaloneJSPreferencePage.java
@@ -0,0 +1,54 @@
+/*******************************************************************************

+ * Licensed Materials - Property of IBM

+ * © Copyright IBM Corporation 2020. All Rights Reserved.

+ * U.S. Government Users Restricted Rights - Use, duplication or disclosure

+ * restricted by GSA ADP Schedule Contract with IBM Corp. 

+ *******************************************************************************/

+

+package org.eclipse.wst.jsdt.internal.ui.preferences;

+

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.jface.preference.PreferencePage;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.IWorkbenchPreferencePage;

+import org.eclipse.ui.dialogs.PreferenceLinkArea;

+import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;

+

+public class StandaloneJSPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {

+	/**

+	 * 

+	 */

+	private static final String SCANNER_PROVIDING_BUNDLE = "org.eclipse.wst.jsdt.web.ui"; //$NON-NLS-1$

+	private static final String TASKTAG_PREFERENCE_PAGE_ID = "org.eclipse.wst.sse.ui.preferences.tasktags"; //$NON-NLS-1$

+

+	public StandaloneJSPreferencePage() {

+		super();

+	}

+

+	protected Control createContents(Composite parent) {

+		noDefaultAndApplyButton();

+

+		PreferenceLinkArea link = null;

+		if (hasTaskTagPage()) {

+			link = new PreferenceLinkArea(parent, SWT.NONE, TASKTAG_PREFERENCE_PAGE_ID, PreferencesMessages.TaskTagLinkText, (IWorkbenchPreferenceContainer) getContainer(), null);

+			return link.getControl();

+		}

+		else {

+			Label label = new Label(parent, SWT.WRAP);

+			label.setText(PreferencesMessages.TaskTagLinkAlternateText);

+			return label;

+		}

+	}

+

+	private boolean hasTaskTagPage() {

+		return Platform.getBundle(SCANNER_PROVIDING_BUNDLE) != null;

+	}

+

+	public void init(IWorkbench workbench) {

+		setDescription(PreferencesMessages.StandaloneJavaScriptPreferencePage_description);

+	}

+}

diff --git a/tests/org.eclipse.wst.jsdt.ui.tests/plugin.xml b/tests/org.eclipse.wst.jsdt.ui.tests/plugin.xml
index a9fac30..dfad36d 100644
--- a/tests/org.eclipse.wst.jsdt.ui.tests/plugin.xml
+++ b/tests/org.eclipse.wst.jsdt.ui.tests/plugin.xml
@@ -10,11 +10,442 @@
             icon="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/obj16/jcu_obj.gif"

             contributorClass="org.eclipse.wst.jsdt.internal.ui.javaeditor.CompilationUnitEditorActionContributor"

             class="org.eclipse.wst.jsdt.internal.ui.javaeditor.CompilationUnitEditor"

-            symbolicFontName="org.eclipse.wst.jsdt.ui.editors.textfont"

             id="org.eclipse.wst.jsdt.ui.CompilationUnitEditor"

             extensions="js">

             <contentTypeBinding contentTypeId="org.eclipse.wst.jsdt.core.jsSource" /> 

       </editor>

    </extension>

+   <extension

+         point="org.eclipse.ui.themes">

+        <themeElementCategory label="%javaPresentation.label" id="org.eclipse.wst.jsdt.ui.presentation"/>

+      <fontDefinition

+            label="%javaEditorFontDefiniton.label"

+            defaultsTo="org.eclipse.jface.textfont"

+            categoryId="org.eclipse.wst.jsdt.ui.presentation"

+            id="org.eclipse.wst.jsdt.ui.editors.textfont">

+         <description>

+            %javaEditorFontDefintion.description

+         </description>

+      </fontDefinition>

+      <!--<fontDefinition

+            label="%propertiesFileEditorFontDefiniton.label"

+            defaultsTo="org.eclipse.jface.textfont"

+            categoryId="org.eclipse.wst.jsdt.ui.presentation"

+            id="org.eclipse.wst.jsdt.ui.PropertiesFileEditor.textfont">

+         <description>

+            %propertiesFileEditorFontDefintion.description

+         </description>

+      </fontDefinition>-->

+      <fontDefinition

+            label="%javadocDisplayFontDefiniton.label"

+            defaultsTo="org.eclipse.jface.dialogfont"

+            categoryId="org.eclipse.wst.jsdt.ui.presentation"

+            id="org.eclipse.wst.jsdt.ui.javadocfont">

+         <description>

+            %javadocDisplayFontDefiniton.description

+         </description>

+      </fontDefinition>

+      <colorDefinition

+            label="%JavadocViewBackgroundColor.label"

+            categoryId="org.eclipse.wst.jsdt.ui.presentation"

+            value="COLOR_INFO_BACKGROUND"

+            id="org.eclipse.wst.jsdt.ui.JavadocView.backgroundColor">

+         <description>

+            %JavadocViewBackgroundColor.description

+         </description>

+      </colorDefinition>

+      <colorDefinition

+            label="%DeclarationViewBackgroundColor.label"

+            categoryId="org.eclipse.wst.jsdt.ui.presentation"

+            value="COLOR_INFO_BACKGROUND"

+            id="org.eclipse.wst.jsdt.ui.DeclarationView.backgroundColor">

+         <description>

+            %DeclarationViewBackgroundColor.description

+         </description>

+      </colorDefinition>

+     <colorDefinition

+            label="%coloredLabels.qualifier.label"

+            categoryId="org.eclipse.wst.jsdt.ui.presentation"

+            value="COLOR_DARK_GRAY"

+            id="org.eclipse.wst.jsdt.ui.ColoredLabels.qualifier">

+         <description>

+            %coloredLabels.qualifier.description

+         </description>

+      </colorDefinition>

+      <colorDefinition

+            label="%coloredLabels.decorations.label"

+            categoryId="org.eclipse.wst.jsdt.ui.presentation"

+            value="149,125,71"

+            id="org.eclipse.wst.jsdt.ui.ColoredLabels.decorations">

+         <description>

+            %coloredLabels.decorations.description

+         </description>

+      </colorDefinition>      

+      <colorDefinition

+            label="%coloredLabels.counter.label"

+            categoryId="org.eclipse.wst.jsdt.ui.presentation"

+            value="0,127,174"

+            id="org.eclipse.wst.jsdt.ui.ColoredLabels.counter">

+         <description>

+            %coloredLabels.counter.description

+         </description>

+      </colorDefinition>

+      <colorDefinition

+            label="%coloredLabels.inherited.label"

+            categoryId="org.eclipse.wst.jsdt.ui.presentation"

+            value="COLOR_DARK_BLUE"

+            id="org.eclipse.wst.jsdt.ui.ColoredLabels.inherited">

+         <description>

+            %coloredLabels.inherited.description

+         </description>

+      </colorDefinition>

+    </extension>

+

+   <extension

+         point="org.eclipse.ui.preferencePages">

+      <page

+            name="%editorFoldingPage"

+            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"

+            class="org.eclipse.wst.jsdt.internal.ui.preferences.FoldingPreferencePage"

+            id="org.eclipse.wst.jsdt.ui.preferences.FoldingPreferencePage">

+         <keywordReference id="org.eclipse.wst.jsdt.ui.folding"/>

+      </page>

+      <page

+            name="%editorMarkOccurrencesPage"

+            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"

+            class="org.eclipse.wst.jsdt.internal.ui.preferences.MarkOccurrencesPreferencePage"

+            id="org.eclipse.wst.jsdt.ui.preferences.MarkOccurrencesPreferencePage">

+         <keywordReference id="org.eclipse.wst.jsdt.ui.markoccurrences"/>

+      </page>

+      <page

+            name="%editorTypingPage"

+            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"

+            class="org.eclipse.wst.jsdt.internal.ui.preferences.SmartTypingPreferencePage"

+            id="org.eclipse.wst.jsdt.ui.preferences.SmartTypingPreferencePage">

+         <keywordReference id="org.eclipse.wst.jsdt.ui.smarttyping"/>

+      </page>

+      <page

+            name="%editorSaveParticipants"

+            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"

+            class="org.eclipse.wst.jsdt.internal.ui.preferences.SaveParticipantPreferencePage"

+            id="org.eclipse.wst.jsdt.ui.preferences.SaveParticipantPreferencePage">

+         <keywordReference id="org.eclipse.wst.jsdt.ui.saveparticipant"/>

+      </page>

+      <page

+            name="%contentAssistPageName"

+            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"

+            class="org.eclipse.wst.jsdt.internal.ui.preferences.CodeAssistPreferencePage"

+            id="org.eclipse.wst.jsdt.ui.preferences.CodeAssistPreferencePage">

+            <keywordReference id="org.eclipse.wst.jsdt.ui.contentassist"/>

+      </page>

+      <page

+            name="%contentAssistAdvancedName"

+            category="org.eclipse.wst.jsdt.ui.preferences.CodeAssistPreferencePage"

+            class="org.eclipse.wst.jsdt.internal.ui.preferences.CodeAssistAdvancedPreferencePage"

+            id="org.eclipse.wst.jsdt.ui.preferences.CodeAssistPreferenceAdvanced">

+            <keywordReference id="org.eclipse.wst.jsdt.ui.contentassist"/>

+      </page>

+      <page

+            name="%editorFoldingPage"

+            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"

+            class="org.eclipse.wst.jsdt.internal.ui.preferences.FoldingPreferencePage"

+            id="org.eclipse.wst.jsdt.ui.preferences.FoldingPreferencePage">

+         <keywordReference id="org.eclipse.wst.jsdt.ui.folding"/>

+      </page>

+      <page

+            name="%editorMarkOccurrencesPage"

+            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"

+            class="org.eclipse.wst.jsdt.internal.ui.preferences.MarkOccurrencesPreferencePage"

+            id="org.eclipse.wst.jsdt.ui.preferences.MarkOccurrencesPreferencePage">

+         <keywordReference id="org.eclipse.wst.jsdt.ui.markoccurrences"/>

+      </page>

+      <page

+            name="%editorTypingPage"

+            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"

+            class="org.eclipse.wst.jsdt.internal.ui.preferences.SmartTypingPreferencePage"

+            id="org.eclipse.wst.jsdt.ui.preferences.SmartTypingPreferencePage">

+         <keywordReference id="org.eclipse.wst.jsdt.ui.smarttyping"/>

+      </page>

+      <page

+            name="%editorSaveParticipants"

+            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"

+            class="org.eclipse.wst.jsdt.internal.ui.preferences.SaveParticipantPreferencePage"

+            id="org.eclipse.wst.jsdt.ui.preferences.SaveParticipantPreferencePage">

+         <keywordReference id="org.eclipse.wst.jsdt.ui.saveparticipant"/>

+      </page>

+      <page

+            name="%memberSortPrefName"

+            category="org.eclipse.wst.jsdt.ui.preferences.AppearancePreferencePage"

+            class="org.eclipse.wst.jsdt.internal.ui.preferences.MembersOrderPreferencePage"

+            id="org.eclipse.wst.jsdt.ui.preferences.MembersOrderPreferencePage">

+         <keywordReference id="org.eclipse.wst.jsdt.ui.sortorder"/>

+      </page>

+   </extension>

+

+   <extension

+         point="org.eclipse.ui.actionSets">

+      <actionSet

+            label="%JavaActionSet.label"

+            description="%JavaActionSet.description"

+            visible="false"

+            id="org.eclipse.wst.jsdt.ui.JavaActionSet">

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.navigate.open.type.in.hierarchy"

+               label="%OpenTypeInHierarchyAction.label"

+               helpContextId="org.eclipse.wst.jsdt.ui.open_type_in_hierarchy_action"

+               tooltip="%OpenTypeInHierarchyAction.tooltip"

+               class="org.eclipse.wst.jsdt.internal.ui.actions.OpenTypeInHierarchyAction"

+               menubarPath="navigate/open.ext2"

+               id="openTypeInHierarchy">

+         </action>

+         <action

+               id="openType"

+               toolbarPath="org.eclipse.search.searchActionSet/Search"

+               class="org.eclipse.wst.jsdt.internal.ui.actions.OpenTypeAction"

+               definitionId="org.eclipse.wst.jsdt.ui.navigate.open.type"

+               icon="$nl$/icons/full/etool16/opentype.gif"

+               helpContextId="org.eclipse.wst.jsdt.ui.open_type_action"

+               label="%OpenTypeAction.label"

+               menubarPath="navigate/open.ext2"

+               tooltip="%OpenTypeAction.tooltip">

+         </action>

+      </actionSet>

+   </extension>   

+

+   <extension

+         point="org.eclipse.ui.actionSets">

+      <actionSet

+            label="%CodingActionSet.label"

+            description="%CodingActionSet.description"

+            visible="false"

+            id="org.eclipse.wst.jsdt.ui.CodingActionSet">

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.copy.qualified.name"

+               label="%CopyQualifiedName.label"

+               retarget="true"

+               menubarPath="edit/copy"

+               icon="$nl$/icons/full/elcl16/cpyqual_menu.gif"

+               id="org.eclipse.wst.jsdt.ui.actions.CopyQualifiedName">

+         </action>

+<!-- =========================================================================== -->

+<!-- Navigate Menu                                                               -->

+<!-- =========================================================================== -->

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.open.external.javadoc"

+               label="%OpenExternalJavadocAction.label"

+               retarget="true"

+               menubarPath="navigate/open.ext"

+               id="org.eclipse.wst.jsdt.ui.actions.OpenExternalJavaDoc">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.open.super.implementation"

+               label="%OpenSuperImplementationAction.label"

+               tooltip="%OpenSuperImplementationAction.tooltip"

+               retarget="true"

+               menubarPath="navigate/open.ext"

+               id="org.eclipse.wst.jsdt.ui.actions.OpenSuperImplementation">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.navigate.gotopackage"

+               label="%GoToPackageAction.label"

+               retarget="true"

+               menubarPath="navigate/goTo/"

+               id="org.eclipse.wst.jsdt.ui.actions.GoToPackage">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.navigate.gototype"

+               label="%GoToTypeAction.label"

+               retarget="true"

+               menubarPath="navigate/goTo/"

+               id="org.eclipse.wst.jsdt.ui.actions.GoToType">

+         </action>

+ <!-- =========================================================================== -->

+<!-- Source Menu                                                                 -->

+<!-- =========================================================================== -->

+         <menu

+               label="%SourceMenu.label"

+               path="edit"

+               id="org.eclipse.wst.jsdt.ui.source.menu">

+		    <separator

+                  name="commentGroup">

+            </separator>

+            <separator

+                  name="editGroup">

+            </separator>

+            <separator

+                  name="importGroup">

+            </separator>

+            <separator

+                  name="generateGroup">

+            </separator>

+            <separator

+                  name="codeGroup">

+            </separator>

+            <separator

+                  name="externalizeGroup">

+            </separator>

+            <separator

+                  name="convertGroup">

+            </separator>

+         </menu>

+

+<!-- Code Group -->

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.surround.with.quickMenu"

+               label="%SurroundWithTemplateAction.label"

+               style="pulldown"

+               class="org.eclipse.wst.jsdt.internal.ui.actions.SurroundWithTemplateMenuAction"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/codeGroup"

+               id="org.eclipse.wst.jsdt.internal.ui.actions.SurroundWithTemplateMenuAction">

+         </action>

+<!-- Generate Group -->

+ <!-- UNTIL REFACTORING SUPPORT

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.generate.constructor.using.fields"

+               label="%GenerateConstructorUsingFieldsAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/generateGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.GenerateConstructorUsingFields">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.create.getter.setter"

+               label="%GenerateGetterSetterAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/generateGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.GenerateGetterSetter">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.override.methods"

+               label="%OverrideMethodsAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/generateGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.OverrideMethods">

+         </action>

+-->         

+<!-- Import Group -->

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.clean.up"

+               label="%CleanUpAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/importGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.CleanUp">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.sort.members"

+               label="%SortMembersAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/importGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.SortMembers">

+         </action>

+<!-- edit group -->

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.quick.format"

+               label="%FormatElementAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/editGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.FormatElement">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.format"

+               label="%FormatAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/editGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.Format">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.indent"

+               label="%IndentAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/editGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.Indent">

+         </action>

+         <action

+               definitionId="org.eclipse.ui.edit.text.shiftLeft"

+               label="%ShiftLeftAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/editGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.ShiftLeft">

+         </action>

+         <action

+               definitionId="org.eclipse.ui.edit.text.shiftRight"

+               label="%ShiftRightAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/editGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.ShiftRight">

+         </action>

+<!-- Comment Group -->

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.add.javadoc.comment"

+               label="%AddJavaDocCommentAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/commentGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.AddJavaDocComment">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.uncomment"

+               label="%UncommentAction.label"

+               retarget="true"

+               id="org.eclipse.wst.jsdt.ui.actions.Uncomment">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.comment"

+               label="%CommentAction.label"

+               retarget="true"

+               id="org.eclipse.wst.jsdt.ui.actions.Comment">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.remove.block.comment"

+               label="%RemoveBlockCommentAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/commentGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.RemoveBlockComment">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.add.block.comment"

+               label="%AddBlockCommentAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/commentGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.AddBlockComment">

+         </action>

+         <action

+               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.toggle.comment"

+               label="%ToggleCommentAction.label"

+               retarget="true"

+               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/commentGroup"

+               id="org.eclipse.wst.jsdt.ui.actions.ToggleComment">

+         </action>

+      </actionSet>

+   </extension>

+   <extension

+         point="org.eclipse.ui.actionSetPartAssociations">

+      <actionSetPartAssociation

+            targetID="org.eclipse.wst.jsdt.ui.CodingActionSet">

+         <part

+               id="org.eclipse.wst.jsdt.ui.PackageExplorer">

+         </part>

+         <part

+               id="org.eclipse.wst.jsdt.ui.TypeHierarchy">

+         </part>

+         <part

+               id="org.eclipse.wst.jsdt.ui.CompilationUnitEditor">

+         </part>

+         <part

+               id="org.eclipse.wst.jsdt.ui.ClassFileEditor">

+         </part>

+         <part

+               id="org.eclipse.wst.jsdt.ui.ProjectsView">

+         </part>

+         <part

+               id="org.eclipse.wst.jsdt.ui.PackagesView">

+         </part>

+         <part

+               id="org.eclipse.wst.jsdt.ui.TypesView">

+         </part>

+         <part

+               id="org.eclipse.wst.jsdt.ui.MembersView">

+         </part>

+      </actionSetPartAssociation>

+   </extension>

+

 </plugin>