diff --git a/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF
index 678ae16..13e3c50 100755
--- a/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-SymbolicName: org.eclipse.wst.jsdt.ui; singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.100.qualifier
 Bundle-Activator: org.eclipse.wst.jsdt.internal.ui.JavaScriptPlugin
 Import-Package: com.ibm.icu.text,
  com.ibm.icu.util,
diff --git a/bundles/org.eclipse.wst.jsdt.ui/plugin.xml b/bundles/org.eclipse.wst.jsdt.ui/plugin.xml
index 08b2da3..7c974f9 100755
--- a/bundles/org.eclipse.wst.jsdt.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.jsdt.ui/plugin.xml
@@ -1,155 +1,6 @@
 <?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.ui.decorators">
-		<decorator
-			label="%OverrideIndicatorLabelDecorator.label"
-			lightweight="true"
-			location="BOTTOM_RIGHT"		
-			state="true"
-			class="org.eclipse.wst.jsdt.ui.OverrideIndicatorLabelDecorator"
-			id="org.eclipse.wst.jsdt.ui.override.decorator">
-			<description>
-				%OverrideIndicatorLabelDecorator.description
-			</description>
-			<enablement>
-				<objectClass
-					name="org.eclipse.wst.jsdt.core.IFunction">
-				</objectClass>
-			</enablement>
-		</decorator>	
-	</extension>
-
-   <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 -->
 	<!--
@@ -303,127 +154,10 @@
 	</extension>
 
 	<!-- the parameterized content assist action and keybindings for our contributed computers -->
-	<extension
-		point="org.eclipse.ui.commands">
-		<command
-			categoryId="org.eclipse.ui.category.edit"
-			description="%SpecificContentAssist.desc"
-			id="org.eclipse.wst.jsdt.ui.specific_content_assist.command"
-			name="%SpecificContentAssist.name"
-			defaultHandler="org.eclipse.wst.jsdt.internal.ui.text.java.JavaContentAssistHandler">
-			<commandParameter
-				id="org.eclipse.wst.jsdt.ui.specific_content_assist.category_id"
-				name="%SpecificContentAssist.param"
-				optional="false"
-				values="org.eclipse.wst.jsdt.internal.ui.text.java.ContentAssistComputerParameter"/>
-		</command>
-	</extension>
-	
-	<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>
 	
 	<!-- commands to surface JavaScript elements given handle id encoded parameter -->
-	<extension
-		point="org.eclipse.ui.commands">
-		<commandParameterType
-			converter="org.eclipse.wst.jsdt.internal.ui.commands.JavaElementReferenceConverter"
-			id="org.eclipse.wst.jsdt.ui.commands.javaElementReference"
-			type="org.eclipse.wst.jsdt.core.IJavaScriptElement"/>
-		<command
-			categoryId="org.eclipse.ui.category.navigate"
-			defaultHandler="org.eclipse.wst.jsdt.internal.ui.commands.OpenElementInEditorHandler"
-			description="%command.openElementInEditor.desc"
-			id="org.eclipse.wst.jsdt.ui.commands.openElementInEditor"
-			name="%command.openElementInEditor.name">
-			<commandParameter
-				id="elementRef"
-				name="%commandParameter.openElementInEditor.elementRef.name"
-				optional="false"
-				typeId="org.eclipse.wst.jsdt.ui.commands.javaElementReference"/>
-		</command>
-		<command
-			categoryId="org.eclipse.ui.category.navigate"
-			defaultHandler="org.eclipse.wst.jsdt.internal.ui.commands.ShowElementInPackageViewHandler"
-			description="%command.showElementInPackageView.desc"
-			id="org.eclipse.wst.jsdt.ui.commands.showElementInPackageView"
-			name="%command.showElementInPackageView.name">
-			<commandParameter
-				id="elementRef"
-				name="%commandParameter.showElementInPackageView.elementRef.name"
-				optional="false"
-				typeId="org.eclipse.wst.jsdt.ui.commands.javaElementReference"/>
-		</command>
-		<command
-			categoryId="org.eclipse.ui.category.navigate"
-			defaultHandler="org.eclipse.wst.jsdt.internal.ui.commands.ShowElementInTypeHierarchyViewHandler"
-			description="%command.showElementInTypeHierarchyView.desc"
-			id="org.eclipse.wst.jsdt.ui.commands.showElementInTypeHierarchyView"
-			name="%command.showElementInTypeHierarchyView.name">
-			<commandParameter
-				id="elementRef"
-				name="%commandParameter.showElementInTypeHierarchyView.elementRef.name"
-				optional="false"
-				typeId="org.eclipse.wst.jsdt.ui.commands.javaElementReference"/>
-		</command>
-	</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">
@@ -434,27 +168,6 @@
       </image>
    </extension>
    <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="%viewCategoryName"
-            id="org.eclipse.wst.jsdt.ui.java">
-      </category>
-      <view
-            name="%hierarchyViewName"
-            icon="$nl$/icons/full/eview16/class_hi.gif"
-            category="org.eclipse.wst.jsdt.ui.java"
-            class="org.eclipse.wst.jsdt.internal.ui.typehierarchy.TypeHierarchyViewPart"
-            id="org.eclipse.wst.jsdt.ui.TypeHierarchy">
-      </view>
-      <view
-            name="%packagesViewName"
-            icon="$nl$/icons/full/eview16/package.gif"
-            category="org.eclipse.wst.jsdt.ui.java"
-            class="org.eclipse.wst.jsdt.internal.ui.packageview.PackageExplorerPart"
-            id="org.eclipse.wst.jsdt.ui.PackageExplorer">
-      </view>
-   </extension>
-   <extension
          point="org.eclipse.ui.newWizards">
       <category
             name="%newWizardCategoryName"
@@ -469,675 +182,24 @@
 			<description>%wizard.description.0</description>
 			<selection class="org.eclipse.core.resources.IResource" />
 		</wizard>
-<!--      
-      <wizard
-            name="%NewJavaClass.label"
-            icon="$nl$/icons/full/etool16/newclass_wiz.gif"
-            category="org.eclipse.wst.jsdt.ui.java"
-            id="org.eclipse.wst.jsdt.ui.wizards.NewClassCreationWizard">
-         <class class="org.eclipse.wst.jsdt.internal.ui.wizards.NewClassCreationWizard">
-            <parameter name="javatype" value="true"/>
-         </class>
-         <description>
-            %NewJavaClass.description
-         </description>
-      </wizard>
- -->
-   </extension>
-   <extension
-         point="org.eclipse.ui.propertyPages">
- <!--
-      <page
-            objectClass="org.eclipse.core.resources.IProject"
-            name="%javaCategoryPageName"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaCategoryPropertyPage"
-            id="org.eclipse.wst.jsdt.ui.propertyPages.JavaCategoryPropertyPage">
-         <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>
--->
-      <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="%codeStylePageName"
-            category="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.CodeStylePreferencePage"
-            id="org.eclipse.wst.jsdt.ui.propertyPages.CodeStylePreferencePage">
-         <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.codestyle"/>
-      </page>
-      <!--
-      <page
-            name="%importOrganizePageName"
-            category="org.eclipse.wst.jsdt.ui.propertyPages.CodeStylePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.ImportOrganizePreferencePage"
-            id="org.eclipse.wst.jsdt.ui.propertyPages.ImportOrganizePreferencePage">
-         <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.organizeimports"/>
-      </page>
-      -->
-      <page
-            name="%codeFormatterPageName"
-            category="org.eclipse.wst.jsdt.ui.propertyPages.CodeStylePreferencePage"
-            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="%cleanUpPageName"
-            category="org.eclipse.wst.jsdt.ui.propertyPages.CodeStylePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.CleanUpPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.propertyPages.CleanUpPreferencePage">
-         <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.cleanup"/>
-      </page>
-      <page
-            name="%codeTemplatePageName"
-            category="org.eclipse.wst.jsdt.ui.propertyPages.CodeStylePreferencePage"
-            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"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.ProblemSeveritiesPreferencePage"
-            category="org.eclipse.wst.jsdt.ui.propertyPages.CompliancePreferencePage"
-            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"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavadocProblemsPreferencePage"
-            category="org.eclipse.wst.jsdt.ui.propertyPages.CompliancePreferencePage"
-            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="%builderPageName"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaBuildPreferencePage"
-            category="org.eclipse.wst.jsdt.ui.propertyPages.CompliancePreferencePage"
-            id="org.eclipse.wst.jsdt.ui.propertyPages.JavaBuildPreferencePage">
-         <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.building"/>
-      </page>
-      -->
-      <page
-            name="%todoPageName"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.TodoTaskPreferencePage"
-            category="org.eclipse.wst.jsdt.ui.propertyPages.CompliancePreferencePage"
-            id="org.eclipse.wst.jsdt.ui.propertyPages.TodoTaskPreferencePage">
-         <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.todo"/>-->
-      </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 bug 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>
-      <page
-            name="%editorPageName"
-            category="org.eclipse.wst.jsdt.internal.ui.preferences.JavaScriptMainPage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaEditorPropertyPage"
-            id="org.eclipse.wst.jsdt.ui.propertyPages.JavaEditorPropertyPage">
-         <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.javaeditorproperty"/>
-      </page>
-      <page
-            name="%editorSaveParticipants"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.SaveParticipantPreferencePage"
-            category="org.eclipse.wst.jsdt.ui.propertyPages.JavaEditorPropertyPage"
-            id="org.eclipse.wst.jsdt.ui.propertyPages.SaveParticipantPreferencePage">
-         <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.saveparticipant"/>
-      </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.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.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
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.wst.jsdt.ui.error"
-            annotationImageProvider="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaAnnotationImageProvider">
-      </specification>
-      <specification
-            annotationType="org.eclipse.wst.jsdt.ui.warning"
-            annotationImageProvider="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaAnnotationImageProvider">
-      </specification>
-      <specification
-            annotationType="org.eclipse.wst.jsdt.ui.info"
-            annotationImageProvider="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaAnnotationImageProvider">
-      </specification>
-	  <specification
-            annotationType="org.eclipse.wst.jsdt.ui.occurrences"
-            label="%OccurrenceAnnotation.label"
-            icon="$nl$/icons/full/obj16/searchm_obj.gif"
-            textPreferenceKey="javaScriptOccurrenceIndication"
-            textPreferenceValue="false"
-            highlightPreferenceKey="javaScriptOccurrenceHighlighting"
-            highlightPreferenceValue="true"
-            contributesToHeader="false"
-            overviewRulerPreferenceKey="javaScriptOccurrenceIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            verticalRulerPreferenceKey="javaScriptOccurrenceIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="false"
-            colorPreferenceKey="javaScriptOccurrenceIndicationColor"
-            colorPreferenceValue="212,212,212"
-            presentationLayer="4"
-            showInNextPrevDropdownToolbarActionKey="javaScriptShowOccurrenceInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="true"
-            isGoToNextNavigationTargetKey="javaScriptIsOccurrenceGoToNextNavigationTarget"
-	        isGoToNextNavigationTarget="false"
-            isGoToPreviousNavigationTargetKey="javaScriptIsOccurrenceGoToPreviousNavigationTarget"
-	        isGoToPreviousNavigationTarget="false">
-	  </specification>
-	  <specification
-            annotationType="org.eclipse.wst.jsdt.ui.overrideIndicator"
-            label="%OverrideIndicator.label"
-            icon="$nl$/icons/full/ovr16/over_co.gif"
-			annotationImageProvider ="org.eclipse.wst.jsdt.internal.ui.javaeditor.OverrideIndicatorImageProvider"
-            textPreferenceKey="javaScriptOverrideIndicator"
-            textPreferenceValue="false"
-            highlightPreferenceKey="javaScriptOverrideIndicatorHighlighting"
-            highlightPreferenceValue="false"
-            contributesToHeader="false"
-            overviewRulerPreferenceKey="javaScriptOverrideIndicatorInOverviewRuler"
-            overviewRulerPreferenceValue="false"
-            verticalRulerPreferenceKey="javaScriptOverrideIndicatorInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-            colorPreferenceKey="javaScriptOverrideIndicatorColor"
-            colorPreferenceValue="180,207,205"
-            presentationLayer="3"
-            showInNextPrevDropdownToolbarActionKey="javaScriptShowoverrideIndicatorInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            isGoToNextNavigationTargetKey="javaScriptIsOverrideIndicatorGoToNextNavigationTarget"
-	        isGoToNextNavigationTarget="false"
-            isGoToPreviousNavigationTargetKey="javaScriptIsOverrideIndicatorGoToPreviousNavigationTarget"
-	        isGoToPreviousNavigationTarget="false">
-	  </specification>
-
-      <!-- linked annotations -->
-      <!-- these are deprecated as of 3.2, do not use. -->
-	  <specification
-            annotationType="org.eclipse.wst.jsdt.ui.link.master"
-            colorPreferenceValue="70,100,165"
-            colorPreferenceKey="linked.focus.color"
-            isGoToPreviousNavigationTarget="false"
-            isGoToPreviousNavigationTargetKey="linked.focus.navigation.previous"
-            showInNextPrevDropdownToolbarAction="false"
-            showInNextPrevDropdownToolbarActionKey="linked.focus.navigation.dropdown"
-            isGoToNextNavigationTarget="false"
-            isGoToNextNavigationTargetKey="linked.focus.navigation.next"
-            contributesToHeader="false"
-            overviewRulerPreferenceValue="false"
-            presentationLayer="4"
-            label="%linked.focus.label"
-            textPreferenceValue="true"
-            textPreferenceKey="linked.focus.text"
-            highlightPreferenceKey="linked.focus.highlight"
-            highlightPreferenceValue="false"
-            textStylePreferenceKey="linked.focus.text.style"
-            textStylePreferenceValue="BOX"
-            verticalRulerPreferenceKey="linked.focus.verticalruler"
-            verticalRulerPreferenceValue="false"
-            includeOnPreferencePage="false"
-            overviewRulerPreferenceKey="linked.focus.overviewruler">
-      </specification>      
-      <specification
-            annotationType="org.eclipse.wst.jsdt.ui.link.slave"
-            colorPreferenceValue="180,215,255"
-            colorPreferenceKey="linked.slave.color"
-            isGoToPreviousNavigationTarget="false"
-            isGoToPreviousNavigationTargetKey="linked.slave.navigation.previous"
-            showInNextPrevDropdownToolbarAction="false"
-            showInNextPrevDropdownToolbarActionKey="linked.slave.navigation.dropdown"
-            isGoToNextNavigationTarget="false"
-            isGoToNextNavigationTargetKey="linked.slave.navigation.next"
-            contributesToHeader="false"
-            overviewRulerPreferenceValue="false"
-            presentationLayer="4"
-            label="%linked.slave.label"
-            textPreferenceValue="false"
-            textPreferenceKey="linked.slave.text"
-            highlightPreferenceKey="linked.slave.highlight"
-            highlightPreferenceValue="true"
-            textStylePreferenceKey="linked.slave.text.style"
-            textStylePreferenceValue="NONE"
-            verticalRulerPreferenceKey="linked.slave.verticalruler"
-            verticalRulerPreferenceValue="false"
-            includeOnPreferencePage="false"
-            overviewRulerPreferenceKey="linked.slave.overviewruler">
-      </specification>      
-      <specification
-            annotationType="org.eclipse.wst.jsdt.ui.link.target"
-            colorPreferenceValue="70,100,165"
-            colorPreferenceKey="linked.target.color"
-            isGoToPreviousNavigationTarget="false"
-            isGoToPreviousNavigationTargetKey="linked.target.navigation.previous"
-            showInNextPrevDropdownToolbarAction="false"
-            showInNextPrevDropdownToolbarActionKey="linked.target.navigation.dropdown"
-            isGoToNextNavigationTarget="false"
-            isGoToNextNavigationTargetKey="linked.target.navigation.next"
-            contributesToHeader="false"
-            overviewRulerPreferenceValue="false"
-            presentationLayer="4"
-            label="%linked.target.label"
-            textPreferenceValue="true"
-            textPreferenceKey="linked.target.text"
-            highlightPreferenceKey="linked.target.highlight"
-            highlightPreferenceValue="false"
-            textStylePreferenceKey="linked.target.text.style"
-            textStylePreferenceValue="BOX"
-            verticalRulerPreferenceKey="linked.target.verticalruler"
-            verticalRulerPreferenceValue="false"
-            includeOnPreferencePage="false"
-            overviewRulerPreferenceKey="linked.target.overviewruler">
-      </specification>
-      <specification
-            annotationType="org.eclipse.wst.jsdt.ui.link.exit"
-            colorPreferenceValue="0,180,0"
-            colorPreferenceKey="linked.exit.color"
-            isGoToPreviousNavigationTarget="false"
-            isGoToPreviousNavigationTargetKey="linked.exit.navigation.previous"
-            showInNextPrevDropdownToolbarAction="false"
-            showInNextPrevDropdownToolbarActionKey="linked.exit.navigation.dropdown"
-            isGoToNextNavigationTarget="false"
-            isGoToNextNavigationTargetKey="linked.exit.navigation.next"
-            contributesToHeader="false"
-            overviewRulerPreferenceValue="false"
-            presentationLayer="4"
-            label="%linked.exit.label"
-            textPreferenceValue="true"
-            textPreferenceKey="linked.exit.text"
-            highlightPreferenceKey="linked.exit.highlight"
-            highlightPreferenceValue="false"
-            textStylePreferenceKey="linked.exit.text.style"
-            textStylePreferenceValue="IBEAM"
-            verticalRulerPreferenceKey="linked.exit.verticalruler"
-            verticalRulerPreferenceValue="false"
-            includeOnPreferencePage="false"
-            overviewRulerPreferenceKey="linked.exit.overviewruler">
-      </specification>
-	</extension>
-
-   	<extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%javaEditorPresentationActionSet.label"
-            visible="false"
-            id="org.eclipse.wst.jsdt.ui.text.java.actionSet.presentation">
-         <action
-               allowLabelUpdate="true"
-               style="toggle"
-               toolbarPath="org.eclipse.ui.edit.text.actionSet.presentation/Presentation"
-               id="org.eclipse.wst.jsdt.ui.edit.text.java.toggleMarkOccurrences"
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.toggleMarkOccurrences"
-               disabledIcon="$nl$/icons/full/dtool16/mark_occurrences.gif"
-               icon="$nl$/icons/full/etool16/mark_occurrences.gif"
-               helpContextId="toggle_mark_occurrences_action_context"
-               label="%toggleMarkOccurrences.label"
-               retarget="true"
-               tooltip="%toggleMarkOccurrences.tooltip">
-         </action>
-      </actionSet>
-   </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
-         id="PropertiesFileDocumentSetupParticipant"
-         name="%propertiesFileDocumentSetupParticipant"
-         point="org.eclipse.core.filebuffers.documentSetup">
-      <participant
-            contentTypeId="org.eclipse.wst.jsdt.core.javaProperties"
-            class="org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.PropertiesFileDocumentSetupParticipant">
-      </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.NLSKeyHyperlinkDetector"
-            id="org.eclipse.wst.jsdt.internal.ui.javaeditor.NLSKeyHyperlinkDetector"
-            name="%NLSHyperlinkDetector"
-            modifierKeys="M1+M3"
-            targetId="org.eclipse.wst.jsdt.ui.javaCode">
-      </hyperlinkDetector>
--->      
-      <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>
-<!--      
-      <hyperlinkDetector
-            class="org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.PropertyKeyHyperlinkDetector"
-            id="org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.PropertyKeyHyperlinkDetector"
-            name="%PropertyKeyHyperlinkDetector"
-            modifierKeys="M1+M3"
-            targetId="org.eclipse.wst.jsdt.ui.PropertiesFileEditor">
-      </hyperlinkDetector>
--->      
    </extension>
 
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
             name="%javaPrefName"
-            category="org.eclipse.wst.html.ui.preferences.html"
+            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="%appearancePrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.AppearancePreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.AppearancePreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.appearance"/>
-      </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"/>
       </page>
-<!--      
-      <page
-            name="%organizeImportsPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.CodeStylePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.ImportOrganizePreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.ImportOrganizePreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.organizeimports"/>
-      </page>
--->      
-<!--
-      <page
-            name="%typeFilterPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.AppearancePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.TypeFilterPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.TypeFilterPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.typefilter"/>
-      </page>
--->
       <page
             name="%codeFormatterPrefName"
             category="org.eclipse.wst.jsdt.ui.preferences.CodeStylePreferencePage"
@@ -1146,80 +208,6 @@
             <keywordReference id="org.eclipse.wst.jsdt.ui.formatter"/>
       </page>
       <page
-            name="%cleanUpPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.CodeStylePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.CleanUpPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.CleanUpPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.cleanup"/>
-      </page>
-      <page
-            name="%buildPathPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.NewJavaProjectPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.BuildPathPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.buildpathoptions"/>
-      </page>      
-      <page
-            name="%userLibrariesPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.BuildPathPreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.UserLibraryPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.UserLibraryPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.userlibs"/>
-      </page>      
-      <page
-            name="%editorPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaEditorPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.javaeditor"/>
-      </page>
-<!--      
-      <page
-            name="%propertiesFileEditorPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.PropertiesFileEditorPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.PropertiesFileEditorPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.propertieseditor"/>
-      </page>
-      -->
-      <page
-            name="%compliancePrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.CompliancePreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.CompliancePreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.compliance"/>
-      </page>
-      <page
-            name="%runtimesPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.JSRuntimesPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.JSRuntimesPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.runtimes"/>
-      </page>
-      <page
-            name="%problemSeveritiesPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.CompliancePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.ProblemSeveritiesPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.ProblemSeveritiesPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.severities"/>
-      </page>
-            <page
-            name="%javadocProblemsPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.CompliancePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavadocProblemsPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.JavadocProblemsPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.javadocproblems"/>
-      </page>
-<!--      
-      <page
-            name="%javaBuildPrefName"
-            category="org.eclipse.wst.jsdt.ui.preferences.CompliancePreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaBuildPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.JavaBuildPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.building"/>
-      </page>
--->    
-      <page
             name="%todoTaskPrefName"
             category="org.eclipse.wst.jsdt.ui.preferences.CompliancePreferencePage"
             class="org.eclipse.wst.jsdt.internal.ui.preferences.TodoTaskPreferencePage"
@@ -1228,91 +216,25 @@
       </page>
       <page
             name="%templatePageName"
-            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"
+            category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
             class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaTemplatePreferencePage"
             id="org.eclipse.wst.jsdt.ui.preferences.JavaTemplatePreferencePage">
             <keywordReference id="org.eclipse.wst.jsdt.ui.templates"/>
       </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="%contentAssistFavoritesName"
-            category="org.eclipse.wst.jsdt.ui.preferences.CodeAssistPreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.CodeAssistFavoritesPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.CodeAssistPreferenceFavorites">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.contentassist"/>
-      </page>
--->
-      <page
-            name="%editorHoversPageName"
-            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"
-            class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaEditorHoverPreferencePage"
-            id="org.eclipse.wst.jsdt.ui.preferences.JavaEditorHoverPreferencePage">
-            <keywordReference id="org.eclipse.wst.jsdt.ui.hover"/>
-      </page>
-      <page
             name="%editorSyntaxColoringPage"
-            category="org.eclipse.wst.jsdt.ui.preferences.JavaEditorPreferencePage"
+            category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage"
             class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaEditorColoringPreferencePage"
             id="org.eclipse.wst.jsdt.ui.preferences.JavaEditorColoringPreferencePage">
          <keywordReference id="org.eclipse.wst.jsdt.ui.syntaxcoloring"/>
       </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="%codeTemplatePreferencePageName"
             category="org.eclipse.wst.jsdt.ui.preferences.CodeStylePreferencePage"
             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"/>
       </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
@@ -1420,1502 +342,6 @@
 <!-- END Work in Progress                                                        -->
 <!-- =========================================================================== -->
    <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%JavaElementCreationActionSet.label"
-            description="%JavaElementCreationActionSet.description"
-            visible="false"
-            id="org.eclipse.wst.jsdt.ui.JavaElementCreationActionSet">
-         <action
-               label="%wizard.name.0"
-               icon="$nl$/icons/full/etool16/newjscript_wiz.gif"
-               tooltip="%Javascript_UI_Wizard_New_Title"
-               class="org.eclipse.wst.jsdt.internal.ui.wizards.OpenJavaScriptFileWizardToolbarAction"
-               toolbarPath="Normal/JavaWizards"
-               id="org.eclipse.wst.jsdt.ui.actions.OpenFileWizard">
-         </action>
-         <action
-               label="%OpenProjectWizardAction.label"
-               icon="$nl$/icons/full/etool16/newjprj_wiz.gif"
-               tooltip="%OpenProjectWizardAction.tooltip"
-               class="org.eclipse.wst.jsdt.internal.ui.wizards.OpenJavaScriptProjectWizardToolbarAction"
-               toolbarPath="Normal/JavaWizards"
-               id="org.eclipse.wst.jsdt.ui.actions.OpenProjectWizard">
-         </action>
-      </actionSet>
-   </extension>
-<!-- =========================================================================== -->
-<!-- JavaScript Search Page                                                            -->
-<!-- =========================================================================== -->
-   <extension
-         point="org.eclipse.search.searchPages">
-      <page
-            showScopeSection="true"
-            canSearchEnclosingProjects="true"
-            label="%JavaSearchPage.label"
-            icon="$nl$/icons/full/obj16/jsearch_obj.gif"
-            extensions="js:90, jav:90"
-            class="org.eclipse.wst.jsdt.internal.ui.search.JavaSearchPage"
-            sizeHint="460,160"
-            id="org.eclipse.wst.jsdt.ui.JavaSearchPage">
-      </page>
-   </extension>
-   
-   <extension
-    	id="JavaSearchResultPage"
-        point="org.eclipse.search.searchResultViewPages">
-		<viewPage
-			id="org.eclipse.wst.jsdt.ui.JavaSearchResultPage"
-			searchResultClass="org.eclipse.wst.jsdt.internal.ui.search.JavaSearchResult"
-			class="org.eclipse.wst.jsdt.internal.ui.search.JavaSearchResultPage">
-		</viewPage>
-   </extension>
-   <extension
-    	id="OccurrencesSearchResultPage"
-        point="org.eclipse.search.searchResultViewPages">
-		<viewPage
-			id="org.eclipse.wst.jsdt.internal.ui.search.OccurrencesSearchResultPage"
-			searchResultClass="org.eclipse.wst.jsdt.internal.ui.search.OccurrencesSearchResult"
-			class="org.eclipse.wst.jsdt.internal.ui.search.OccurrencesSearchResultPage">
-		</viewPage>
-   </extension>
-   <extension
-    	id="NLSSearchResultPage"
-        point="org.eclipse.search.searchResultViewPages">
-		<viewPage
-			id="org.eclipse.wst.jsdt.internal.ui.refactoring.nls.search.NLSSearchResultPage"
-			searchResultClass="org.eclipse.wst.jsdt.internal.ui.refactoring.nls.search.NLSSearchResult"
-			class="org.eclipse.wst.jsdt.internal.ui.refactoring.nls.search.NLSSearchResultPage">
-		</viewPage>
-   </extension>
-  
-<!-- =========================================================================== -->
-<!-- JavaScript Compare                                                                -->
-<!-- =========================================================================== -->
-   <extension
-         point="org.eclipse.ui.themes">
-      <fontDefinition
-            label="%javaCompareFontDefiniton.label"
-            defaultsTo="org.eclipse.wst.jsdt.ui.editors.textfont"
-            categoryId="org.eclipse.compare.contentmergeviewer.TextMergeViewer"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.JavaMergeViewer">
-         <description>%javaCompareFontDefiniton.description</description>
-      </fontDefinition>
-      <!--<fontDefinition
-            label="%propertiesFileCompareFontDefiniton.label"
-            defaultsTo="org.eclipse.wst.jsdt.ui.PropertiesFileEditor.textfont"
-            categoryId="org.eclipse.compare.contentmergeviewer.TextMergeViewer"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.PropertiesFileMergeViewer">
-         <description>
-            %propertiesFileCompareFontDefiniton.description
-         </description>
-      </fontDefinition>-->
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.wst.jsdt.core.IMember"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.JavaReplaceActions">
-         <menu
-               label="%ReplaceWithMenu.label"
-               path="additions"
-               id="replaceWithMenu">
-            <separator
-                  name="replaceWithGroup">
-            </separator>
-         </menu>
-         <action
-               label="%JavaReplaceFromHistoryAction.label"
-               overrideActionId="replaceFromHistory"
-               tooltip="%JavaReplaceFromHistoryAction.tooltip"
-               class="org.eclipse.wst.jsdt.internal.ui.compare.JavaReplaceWithEditionAction"
-               menubarPath="replaceWithMenu/replaceWithGroup"
-               enablesFor="1"
-               id="javaReplaceFromHistory">
-         </action>
-         <action
-               label="%JavaReplaceWithPreviousFromHistoryAction.label"
-               overrideActionId="replaceWithPreviousFromHistory"
-               tooltip="%JavaReplaceWithPreviousFromHistoryAction.tooltip"
-               class="org.eclipse.wst.jsdt.internal.ui.compare.JavaReplaceWithPreviousEditionAction"
-               menubarPath="replaceWithMenu/replaceWithGroup"
-               enablesFor="1"
-               id="javaReplacePreviousFromHistory">
-         </action>
-         <action
-               label="%JavaAddElementFromHistoryAction.label"
-               overrideActionId="addFromHistoryAction"
-               tooltip="%JavaAddElementFromHistoryAction.tooltip"
-               class="org.eclipse.wst.jsdt.internal.ui.compare.JavaAddElementFromHistory"
-               menubarPath="replaceWithMenu"
-               enablesFor="1"
-               id="javaAddElementFromHistoryAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.wst.jsdt.core.IMember"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.JavaCompareActions">
-         <menu
-               label="%CompareWithMenu.label"
-               path="additions"
-               id="compareWithMenu">
-            <separator
-                  name="compareWithGroup">
-            </separator>
-         </menu>
-         <action
-               label="%JavaCompareFromHistoryAction.label"
-               overrideActionId="compareWithHistory"
-               tooltip="%JavaCompareFromHistoryAction.tooltip"
-               class="org.eclipse.wst.jsdt.internal.ui.compare.JavaCompareWithEditionAction"
-               menubarPath="compareWithMenu/compareWithGroup"
-               enablesFor="1"
-               id="javaCompareFromHistory">
-         </action>
-         <action
-               label="%JavaCompareAction.label"
-               tooltip="%JavaCompareAction.tooltip"
-               class="org.eclipse.wst.jsdt.internal.ui.compare.JavaCompareAction"
-               menubarPath="compareWithMenu/compareWithGroup"
-               enablesFor="1"
-               id="javaCompare">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.wst.jsdt.core.IJavaScriptUnit"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.JavaAddElementFromHistoryAction">
-         <action
-               label="%JavaAddElementFromHistoryAction.label"
-               overrideActionId="addFromHistoryAction"
-               tooltip="%JavaAddElementFromHistoryAction.tooltip"
-               class="org.eclipse.wst.jsdt.internal.ui.compare.JavaAddElementFromHistory"
-               menubarPath="replaceWithMenu"
-               enablesFor="1"
-               id="javaAddElementFromHistoryAction">
-         </action>
-      </objectContribution>
-   </extension>
-   <extension
-         point="org.eclipse.compare.structureCreators">
-      <structureCreator
-            extensions="js"
-            class="org.eclipse.wst.jsdt.internal.ui.compare.JavaStructureCreator"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.JavaStructureCreator">
-      </structureCreator>
-<!--      
-      <structureCreator
-            class="org.eclipse.wst.jsdt.internal.ui.compare.PropertiesStructureCreator"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.PropertiesStructureCreator">
-      </structureCreator>
-      <contentTypeBinding
-			contentTypeId="org.eclipse.wst.jsdt.core.javaProperties"
-            structureCreatorId="org.eclipse.wst.jsdt.internal.ui.compare.PropertiesStructureCreator">
-	  </contentTypeBinding>
--->	  
-   </extension>
-   <extension
-         point="org.eclipse.compare.contentViewers">
-      <viewer
-            extensions="js"
-            class="org.eclipse.wst.jsdt.internal.ui.compare.JavaTextViewerCreator"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.JavaTextViewerCreator">
-      </viewer>
-      <contentTypeBinding
-			contentTypeId="org.eclipse.wst.jsdt.core.jsSource"
-            contentViewerId="org.eclipse.wst.jsdt.internal.ui.compare.JavaTextViewerCreator">
-	  </contentTypeBinding>
-   </extension>
-   
-   <!--
-   <extension
-         point="org.eclipse.compare.contentViewers">
-      <viewer
-            extensions="properties,properties2"
-            class="org.eclipse.wst.jsdt.internal.ui.compare.PropertiesFileViewerCreator"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.PropertiesFileViewerCreator">
-      </viewer>
-      <contentTypeBinding
-			contentTypeId="org.eclipse.wst.jsdt.core.javaProperties"
-            contentViewerId="org.eclipse.wst.jsdt.internal.ui.compare.PropertiesFileViewerCreator">
-	  </contentTypeBinding>
-   </extension>
-   -->
-   
-   <extension
-         point="org.eclipse.compare.contentMergeViewers">
-      <viewer
-            extensions="js"
-            class="org.eclipse.wst.jsdt.internal.ui.compare.JavaContentViewerCreator"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.JavaContentViewerCreator">
-      </viewer>
-      <contentTypeBinding
-			contentTypeId="org.eclipse.wst.jsdt.core.jsSource"
-            contentMergeViewerId="org.eclipse.wst.jsdt.internal.ui.compare.JavaContentViewerCreator">
-	  </contentTypeBinding>
-   </extension>
-   
-   <!--
-   <extension
-         point="org.eclipse.compare.contentMergeViewers">
-      <viewer
-            extensions="properties,properties2"
-            class="org.eclipse.wst.jsdt.internal.ui.compare.PropertiesFileMergeViewerCreator"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.PropertiesFileMergeViewerCreator">
-      </viewer>
-      <contentTypeBinding
-			contentTypeId="org.eclipse.wst.jsdt.core.javaProperties"
-            contentMergeViewerId="org.eclipse.wst.jsdt.internal.ui.compare.PropertiesFileMergeViewerCreator">
-	  </contentTypeBinding>
-   </extension>
-   -->
-   
-   <extension
-         point="org.eclipse.compare.structureMergeViewers">
-      <viewer
-            extensions="js"
-            class="org.eclipse.wst.jsdt.internal.ui.compare.JavaStructureDiffViewerCreator"
-            id="org.eclipse.wst.jsdt.internal.ui.compare.JavaStructureDiffViewerCreator">
-      </viewer>
-   </extension>
-<!-- End JavaScript Compare -->
-<!-- =========================================================================== -->
-<!-- JavaScript Launching and debugging                                                -->
-<!-- =========================================================================== -->
-<!-- =========================================================================== -->
-<!-- Export wizard category                                                      -->
-<!-- =========================================================================== -->
-   <!--<extension
-         point="org.eclipse.ui.exportWizards">
-      <category
-	     name="%importExportWizards.category"
-	     id="org.eclipse.wst.jsdt.ui.Java">
-	  </category>
-   </extension>-->
-   
-<!-- =========================================================================== -->
-<!-- JAR Packager                                                                -->
-<!-- =========================================================================== -->
-<!--
-   <extension
-         point="org.eclipse.ui.exportWizards">
-      <wizard
-            name="%jarExportWizard.label"
-            icon="$nl$/icons/full/etool16/exportjar_wiz.gif"
-            class="org.eclipse.wst.jsdt.internal.ui.jarpackager.JarPackageWizard"
-            category="org.eclipse.wst.jsdt.ui.Java"
-            id="org.eclipse.wst.jsdt.internal.ui.jarpackager.JarPackageWizard">
-         <description>
-            %jarExportWizard.description
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IResource"
-            nameFilter="*.jardesc"
-            id="org.eclipse.wst.jsdt.internal.ui.jarpackager.RunJarPackager">
-         <action
-               label="%createJarAction.label"
-               tooltip="%createJarAction.tooltip"
-               class="org.eclipse.wst.jsdt.internal.ui.jarpackager.CreateJarActionDelegate"
-               menubarPath="additions"
-               enablesFor="+"
-               id="CreateJar">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IResource"
-            nameFilter="*.jardesc"
-            id="org.eclipse.wst.jsdt.internal.ui.jarpackager.RunJarPackager">
-         <action
-               label="%openJarPackager.label"
-               tooltip="%openJarPackager.tooltip"
-               class="org.eclipse.wst.jsdt.internal.ui.jarpackager.OpenJarPackageWizardActionDelegate"
-               menubarPath="additions"
-               enablesFor="1"
-               id="OpenJarPackageWizard">
-         </action>
-      </objectContribution>
-   </extension>
--->
-<!-- =========================================================================== -->
-<!-- Javadoc Export                                                              -->
-<!-- =========================================================================== -->
-  <!-- <extension
-         point="org.eclipse.ui.exportWizards">
-      <wizard
-            name="%JavadocWizard.name"
-            icon="$nl$/icons/full/etool16/javadoc.gif"
-            class="org.eclipse.wst.jsdt.internal.ui.javadocexport.JavadocWizard"
-            category="org.eclipse.wst.jsdt.ui.Java"
-            id="org.eclipse.wst.jsdt.internal.ui.javadocexport.JavadocWizard">
-         <description>%JavadocWizard.description</description>
-         <selection
-               class="org.eclipse.core.resources.IProject">
-         </selection>
-      </wizard>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-       <objectContribution
-	        adaptable="true"
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.xml"
-            id="org.eclipse.wst.jsdt.internal.ui.javadocexport.JavadocWizard">
-         <visibility>
-            <objectState name="contentTypeId" value="org.eclipse.ant.core.antBuildFile"/>
-         </visibility>
-          <action
-               label="%CreateJavadocAction.label"
-               tooltip="%CreateJavadocAction.tooltip"
-               class="org.eclipse.wst.jsdt.internal.ui.javadocexport.CreateJavadocActionDelegate"
-               enablesFor="1"
-               id="LaunchJavadocWizard">
-         </action>
-      </objectContribution>
-   </extension> -->
-   <extension
-         point="org.eclipse.debug.ui.consoleLineTrackers">
-      <consoleLineTracker
-            class="org.eclipse.wst.jsdt.internal.ui.javadocexport.JavadocConsoleLineTracker"
-            processType="org.eclipse.wst.jsdt.ui.javadocProcess"
-            id="org.eclipse.wst.jsdt.ui.javadocexport.JavadocConsoleLineTracker">
-      </consoleLineTracker>
-   </extension>
-   
-<!-- =========================================================================== -->
-<!-- JavaScript Browsing 																 -->
-<!-- =========================================================================== -->
-<!--
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            name="%Browsing.perspectiveName"
-            icon="$nl$/icons/full/eview16/browse_persp.gif"
-            class="org.eclipse.wst.jsdt.internal.ui.browsing.JavaBrowsingPerspectiveFactory"
-            id="org.eclipse.wst.jsdt.ui.JavaBrowsingPerspective">
-         <description>
-            %browsing.perspective.description
-         </description>
-      </perspective>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.ui.resourcePerspective">
-         <perspectiveShortcut
-               id="org.eclipse.wst.jsdt.ui.JavaBrowsingPerspective">
-         </perspectiveShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.wst.jsdt.ui.JavaBrowsingPerspective">
-         <perspectiveShortcut
-               id="org.eclipse.wst.jsdt.ui.JavaBrowsingPerspective">
-         </perspectiveShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.wst.jsdt.ui.JavaPerspective">
-         <perspectiveShortcut
-               id="org.eclipse.wst.jsdt.ui.JavaBrowsingPerspective">
-         </perspectiveShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.wst.jsdt.ui.JavaBrowsingPerspective">
-         <perspectiveShortcut
-               id="org.eclipse.wst.jsdt.ui.JavaPerspective">
-         </perspectiveShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.wst.jsdt.ui.JavaBrowsingPerspective">
-         <perspectiveShortcut
-               id="org.eclipse.debug.ui.DebugPerspective">
-         </perspectiveShortcut>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.debug.ui.DebugPerspective">
-         <perspectiveShortcut
-               id="org.eclipse.wst.jsdt.ui.JavaBrowsingPerspective">
-         </perspectiveShortcut>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="%Browsing.viewCategoryName"
-            id="org.eclipse.wst.jsdt.ui.java.browsing">
-      </category>
-      <view
-            name="%Browsing.projectsViewName"
-            icon="$nl$/icons/full/eview16/projects.gif"
-            category="org.eclipse.wst.jsdt.ui.java.browsing"
-            class="org.eclipse.wst.jsdt.internal.ui.browsing.ProjectsView"
-            id="org.eclipse.wst.jsdt.ui.ProjectsView">
-      </view>
-      <view
-            name="%Browsing.packagesViewName"
-            icon="$nl$/icons/full/eview16/packages.gif"
-            category="org.eclipse.wst.jsdt.ui.java.browsing"
-            class="org.eclipse.wst.jsdt.internal.ui.browsing.PackagesView"
-            id="org.eclipse.wst.jsdt.ui.PackagesView">
-      </view>
-      <view
-            name="%Browsing.typesViewName"
-            icon="$nl$/icons/full/eview16/types.gif"
-            category="org.eclipse.wst.jsdt.ui.java.browsing"
-            class="org.eclipse.wst.jsdt.internal.ui.browsing.TypesView"
-            id="org.eclipse.wst.jsdt.ui.TypesView">
-      </view>
-      <view
-            name="%Browsing.membersViewName"
-            icon="$nl$/icons/full/eview16/members.gif"
-            category="org.eclipse.wst.jsdt.ui.java.browsing"
-            class="org.eclipse.wst.jsdt.internal.ui.browsing.MembersView"
-            id="org.eclipse.wst.jsdt.ui.MembersView">
-      </view>
-   </extension>
--->   
-<!-- =========================================================================== -->
-<!-- JavaScript and Coding Action Set (Adding the source, refactor and navigate menu)  -->
-<!-- =========================================================================== -->
-   <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
-               definitionId="org.eclipse.wst.jsdt.ui.generate.javadoc"
-               label="%GenerateJavadocAction.label"
-               helpContextId="org.eclipse.wst.jsdt.ui.generate_javadoc_action"
-               class="org.eclipse.wst.jsdt.internal.ui.actions.GenerateJavadocAction"
-               icon="$nl$/icons/full/etool16/javadoc.gif"
-               menubarPath="project/additions"
-               id="exportJavadoc">
-         </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>   
-   
-<!-- with an A_                                                                -->
-<!-- the open action set is contributed before the CodeActionSet we prefix it  -->
-<!-- Action sets are contributed after they have been sorted. To enfore that   -->
-<!-- Begin JavaScript Open action contributions  -->
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%OpenActionSet.label"
-            description="%OpenActionSet.description"
-            visible="false"
-            id="org.eclipse.wst.jsdt.ui.A_OpenActionSet">
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.open.call.hierarchy"
-               label="%OpenCallHierarchyAction.label"
-               retarget="true"
-               menubarPath="navigate/open.ext"
-               id="org.eclipse.wst.jsdt.ui.actions.OpenCallHierarchy">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.open.type.hierarchy"
-               label="%OpenTypeHierarchyAction.label"
-               retarget="true"
-               menubarPath="navigate/open.ext"
-               id="org.eclipse.wst.jsdt.ui.actions.OpenTypeHierarchy">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.open.editor"
-               label="%OpenAction.label"
-               tooltip="%OpenAction.tooltip"
-               retarget="true"
-               menubarPath="navigate/open.ext"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.Open">
-         </action>
-      </actionSet>
-   </extension>
-   <extension
-         point="org.eclipse.ui.actionSetPartAssociations">
-      <actionSetPartAssociation
-            targetID="org.eclipse.wst.jsdt.ui.A_OpenActionSet">
-         <part
-               id="org.eclipse.search.SearchResultView">
-         </part>
-         <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.PropertiesFileEditor">
-         </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>
-         <part
-               id="org.eclipse.wst.jsdt.ui.SourceView">
-         </part>
-      </actionSetPartAssociation>
-   </extension>
-<!-- End JavaScript Open action contributions  -->
-   <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>
-<!-- =========================================================================== -->
-<!-- Refactoring Menu                                                            -->
-<!-- =========================================================================== -->
-         <menu
-               label="%Refactoring.menu.label"
-               path="edit"
-               id="org.eclipse.wst.jsdt.ui.refactoring.menu">
-            <separator name="undoRedoGroup"/>
-            <separator name="reorgGroup"/>
-            <separator name="codingGroup"/>
-            <separator name="reorgGroup2"/>
-            <separator name="typeGroup"/>
-            <separator name="codingGroup2"/>
-            <separator name="typeGroup2"/>
-            <separator name="scriptGroup"/>
-         </menu>
-         
-<!-- reorg group  -->
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.move.element"
-               label="%Refactoring.moveAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/reorgGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.Move">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.rename.element"
-               label="%Refactoring.renameAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/reorgGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.Rename">
-         </action>
-         
-<!-- coding group  -->         
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.inline"
-               label="%Refactoring.inlineAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/codingGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.Inline">
-         </action>
-<!-- UNTIL REFACTORING SUPPORT
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.constant"
-               label="%Refactoring.extractConstantAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/codingGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.ExtractConstant">
-         </action>
-  -->         
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.local.variable"
-               label="%Refactoring.extractTempAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/codingGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.ExtractTemp">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.method"
-               label="%Refactoring.extractMethodAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/codingGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.ExtractMethod">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.modify.method.parameters"
-               label="%Refactoring.modifyParametersAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/codingGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.ModifyParameters">
-         </action>
-         
-<!-- reorg group 2 -->
-<!-- UNTIL REFACTORING SUPPORT
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.promote.local.variable"
-               label="%Refactoring.convertLocalToFieldAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/reorgGroup2"
-               id="org.eclipse.wst.jsdt.ui.actions.ConvertLocalToField">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.move.inner.to.top.level"
-               label="%Refactoring.convertNestedToTopAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/reorgGroup2"
-               id="org.eclipse.wst.jsdt.ui.actions.ConvertNestedToTop">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.convert.anonymous.to.nested"
-               label="%Refactoring.convertAnonymousToNestedAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/reorgGroup2"
-               id="org.eclipse.wst.jsdt.ui.actions.ConvertAnonymousToNested">
-         </action>
-  -->         
-         
-         
-         
-<!-- type group  -->
-<!-- UNTIL REFACTORING SUPPORT
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.pull.up"
-               label="%Refactoring.pullUpAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/typeGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.PullUp">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.push.down"
-               label="%Refactoring.pushDownAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/typeGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.PushDown">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.use.supertype"
-               label="%Refactoring.useSupertypeAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/typeGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.UseSupertype">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.interface"
-               label="%Refactoring.extractInterfaceAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/typeGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.ExtractInterface">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.superclass"
-               label="%Refactoring.extractSupertypeAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/typeGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.ExtractSuperclass">
-         </action>
--->         
-           
-<!-- coding group 2  -->
-<!--         
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.replace.invocations"
-               label="%Refactoring.replaceInvocationsAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/codingGroup2"
-               id="org.eclipse.wst.jsdt.ui.actions.ReplaceInvocations">
-         </action>
--->
-<!-- UNTIL REFACTORING SUPPORT
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.self.encapsulate.field"
-               label="%Refactoring.selfEncapsulateFieldAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/codingGroup2"
-               id="org.eclipse.wst.jsdt.ui.actions.SelfEncapsulateField">
-         </action>
--->
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.introduce.parameter"
-               label="%Refactoring.introduceParameterAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/codingGroup2"
-               id="org.eclipse.wst.jsdt.ui.actions.IntroduceParameter">
-         </action>
-<!-- UNTIL REFACTORING SUPPORT
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.introduce.factory"
-               label="%Refactoring.introduceFactoryAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/codingGroup2"
-               id="org.eclipse.wst.jsdt.ui.actions.IntroduceFactory">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.introduce.indirection"
-               label="%Refactoring.introduceIndirectionAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/codingGroup2"
-               id="org.eclipse.wst.jsdt.ui.actions.IntroduceIndirection">
-         </action>
--->
-
-<!-- type group 2 -->
- <!-- UNTIL REFACTORING SUPPORT
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.infer.type.arguments"
-               label="%Refactoring.inferTypeArgumentsAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/typeGroup2"
-               id="org.eclipse.wst.jsdt.ui.actions.InferTypeArguments">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.change.type"
-               label="%Refactoring.changeTypeAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/typeGroup2"
-               id="org.eclipse.wst.jsdt.ui.actions.ChangeType">
-         </action>
--->
-
-<!-- script group  -->
-        <action
-              class="org.eclipse.wst.jsdt.internal.ui.refactoring.actions.ShowRefactoringHistoryAction"
-              definitionId="org.eclipse.wst.jsdt.ui.refactor.show.refactoring.history"
-              id="org.eclipse.ltk.ui.actions.ShowRefactoringHistory"
-              label="%Refactoring.showHistory.label"
-              menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/scriptGroup"/>         
-        <action
-               class="org.eclipse.wst.jsdt.internal.ui.refactoring.actions.ApplyRefactoringScriptAction"
-               definitionId="org.eclipse.wst.jsdt.ui.refactor.apply.refactoring.script"
-               id="org.eclipse.ltk.ui.actions.ApplyRefactoringStript"
-               label="%Refactoring.applyScript.label"
-               menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/scriptGroup"/>
-        <action
-              class="org.eclipse.wst.jsdt.internal.ui.refactoring.actions.CreateRefactoringScriptAction"
-              definitionId="org.eclipse.wst.jsdt.ui.refactor.create.refactoring.script"
-              id="org.eclipse.ltk.ui.actions.CreateRefactoringScript"
-              label="%Refactoring.createScript.label"
-              menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/scriptGroup"/>
- <!-- UNTIL REFACTORING SUPPORT
-        <action
-              class="org.eclipse.wst.jsdt.internal.ui.refactoring.actions.MigrateJarFileAction"
-              definitionId="org.eclipse.wst.jsdt.ui.refactor.migrate.jar"
-              id="org.eclipse.wst.jsdt.ui.actions.MigrateJarFile"
-              label="%Refactoring.migrateJar.label"
-              menubarPath="org.eclipse.wst.jsdt.ui.refactoring.menu/scriptGroup"/>
--->
-         
-<!-- =========================================================================== -->
-<!-- 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>
-<!-- Externalize Group -->
- <!-- UNTIL REFACTORING SUPPORT
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.find.broken.nls.keys"
-               label="%FindNLSProblems.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/externalizeGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.FindNLSProblems">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.externalize.strings"
-               label="%ExternalizeStringsAction.label"
-               retarget="true"
-               menubarPath="org.eclipse.wst.jsdt.ui.source.menu/externalizeGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.ExternalizeStrings">
-         </action>
--->         
-<!-- 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>
-<!-- Begin JavaScript Search action set -->
-<!-- End JavaScript Action Set (Adding the source, refactor and navigate menu -->
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%JavaSearchActionSet.label"
-            description="%JavaSearchActionSet.description"
-            visible="false"
-            id="org.eclipse.wst.jsdt.ui.SearchActionSet">
-<!-- see http://bugs.eclipse.org/bugs/show_bug.cgi?id=15684    -->
-<!-- Note: The menu (re-) definition has to be here due to bug: -->
-<!-- =================================================================== -->
-<!-- Search Menu                                                         -->
-<!-- =================================================================== -->
-         <menu
-               label="%searchMenu.label"
-               path="navigate"
-               id="org.eclipse.search.menu">
-				<groupMarker name="internalDialogGroup"/>   <!-- not to be used by clients  -->
-				<groupMarker name="dialogGroup"/>           <!-- to be used by clients      -->
-				<separator name="fileSearchContextMenuActionsGroup"/> <!-- to be used by clients      -->
-	         	<separator name="contextMenuActionsGroup"/> <!-- to be used by clients -->
-	         	<separator name="occurencesActionsGroup"/> <!-- to be used by clients -->
-	         	<separator name="extraSearchGroup"/> <!-- to be used by clients -->
-         </menu>
-<!-- dialog group  -->
-         <action
-               label="%openJavaSearchPageAction.label"
-               icon="$nl$/icons/full/obj16/jsearch_obj.gif"
-               helpContextId="java_search_action_context"
-               class="org.eclipse.wst.jsdt.internal.ui.search.OpenJavaSearchPageAction"
-               menubarPath="org.eclipse.search.menu/dialogGroup"
-               id="org.eclipse.wst.jsdt.ui.actions.OpenJavaSearchPage">
-         </action>
-<!-- context menu group  -->
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.occurrences.in.file.quickMenu"
-               label="%occurrencesSubMenu.label"
-               style="pulldown"
-               class="org.eclipse.wst.jsdt.internal.ui.actions.OccurrencesSearchMenuAction"
-               menubarPath="org.eclipse.search.menu/occurencesActionsGroup"
-               id="org.eclipse.wst.jsdt.internal.ui.actions.OccurrencesSearchMenuAction">
-         </action>
-         <menu
-               label="%writeAccessSubMenu.label"
-               path="org.eclipse.search.menu/contextMenuActionsGroup"
-               id="writeAccessSubMenu">
-            <separator
-                  name="group1">
-            </separator>
-         </menu>
-<!--         
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implement.occurrences"
-               label="%ImplementOccurrences.label"
-               retarget="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ImplementOccurrences">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.exception.occurrences"
-               label="%ExceptionOccurrences.label"
-               retarget="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ExceptionOccurrences">
-         </action>
--->         
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.occurrences.in.file"
-               label="%OccurrencesInFile.label"
-               retarget="true"
-               id="org.eclipse.wst.jsdt.ui.actions.OccurrencesInFile">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.working.set"
-               label="%InWorkingSet.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/writeAccessSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.WriteAccessInWorkingSet">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.hierarchy"
-               label="%InHierarchy.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/writeAccessSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.WriteAccessInHierarchy">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.project"
-               label="%InProject.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/writeAccessSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.WriteAccessInProject">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.workspace"
-               label="%InWorkspace.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/writeAccessSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.WriteAccessInWorkspace">
-         </action>
-         <menu
-               label="%readAccessSubMenu.label"
-               path="org.eclipse.search.menu/contextMenuActionsGroup"
-               id="readAccessSubMenu">
-            <separator
-                  name="group1">
-            </separator>
-         </menu>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.working.set"
-               label="%InWorkingSet.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/readAccessSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ReadAccessInWorkingSet">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.hierarchy"
-               label="%InHierarchy.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/readAccessSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ReadAccessInHierarchy">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.project"
-               label="%InProject.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/readAccessSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ReadAccessInProject">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.workspace"
-               label="%InWorkspace.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/readAccessSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ReadAccessInWorkspace">
-         </action>
-<!--         
-         <menu
-               label="%implementorsSubMenu.label"
-               path="org.eclipse.search.menu/contextMenuActionsGroup"
-               id="implementorsSubMenu">
-            <separator
-                  name="group1">
-            </separator>
-         </menu>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.working.set"
-               label="%InWorkingSet.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/implementorsSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ImplementorsInWorkingSet">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.project"
-               label="%InProject.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/implementorsSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ImplementorsInProject">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.workspace"
-               label="%InWorkspace.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/implementorsSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ImplementorsInWorkspace">
-         </action>
--->         
-         <menu
-               label="%declarationsSubMenu.label"
-               path="org.eclipse.search.menu/contextMenuActionsGroup"
-               id="declarationsSubMenu">
-            <separator
-                  name="group1">
-            </separator>
-         </menu>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.working.set"
-               label="%InWorkingSet.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/declarationsSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.DeclarationsInWorkingSet">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.hierarchy"
-               label="%InHierarchy.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/declarationsSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.DeclarationsInHierarchy">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.project"
-               label="%InProject.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/declarationsSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.DeclarationsInProject">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.workspace"
-               label="%DeclarationsInWorkspace.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/declarationsSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.DeclarationsInWorkspace">
-         </action>
-         <menu
-               label="%referencesSubMenu.label"
-               path="org.eclipse.search.menu/contextMenuActionsGroup"
-               id="referencesSubMenu">
-            <separator
-                  name="group1">
-            </separator>
-         </menu>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.working.set"
-               label="%InWorkingSet.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/referencesSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ReferencesInWorkingSet">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.hierarchy"
-               label="%InHierarchy.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/referencesSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ReferencesInHierarchy">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.project"
-               label="%InProject.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/referencesSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ReferencesInProject">
-         </action>
-         <action
-               definitionId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.workspace"
-               label="%ReferencesInWorkspace.label"
-               retarget="true"
-               menubarPath="org.eclipse.search.menu/referencesSubMenu/group1"
-               allowLabelUpdate="true"
-               id="org.eclipse.wst.jsdt.ui.actions.ReferencesInWorkspace">
-         </action>
-      </actionSet>
-   </extension>
-   <extension
-         point="org.eclipse.ui.actionSetPartAssociations">
-      <actionSetPartAssociation
-            targetID="org.eclipse.wst.jsdt.ui.SearchActionSet">
-         <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>
-         <part
-               id="org.eclipse.search.SearchResultView">
-         </part>
-      </actionSetPartAssociation>
-   </extension>
-<!-- End JavaScript contributions for Search view -->
-   <extension
-         point="org.eclipse.ui.actionSetPartAssociations">
-      <actionSetPartAssociation
-            targetID="org.eclipse.wst.jsdt.ui.text.java.actionSet.presentation">
-         <part
-               id="org.eclipse.wst.jsdt.ui.CompilationUnitEditor">
-         </part>
-         <part
-               id="org.eclipse.wst.jsdt.ui.ClassFileEditor">
-         </part>
-      </actionSetPartAssociation>
-   </extension>
-   <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>
-<!-- =========================================================================== -->
-<!-- JavaScript Working Set                                                            -->
-<!-- =========================================================================== -->
-   <extension
-         point="org.eclipse.ui.workingSets">
-      <workingSet
-            name="%JavaWorkingSetPage.name"
-            pageClass="org.eclipse.wst.jsdt.internal.ui.workingsets.JavaWorkingSetPage"
-            updaterClass="org.eclipse.wst.jsdt.internal.ui.workingsets.JavaWorkingSetUpdater"
-            elementAdapterClass="org.eclipse.wst.jsdt.internal.ui.workingsets.JavaWorkingSetElementAdapter"
-            icon="$nl$/icons/full/obj16/jworkingSet_obj.gif"
-            id="org.eclipse.wst.jsdt.ui.JavaWorkingSetPage">
-      </workingSet>
-   </extension>
-<!-- =========================================================================== -->
-<!-- Others Working Set                                                          -->
-<!-- =========================================================================== -->
-   <extension point="org.eclipse.ui.workingSets">
-      <workingSet
-            name="%OthersWorkingSetWizardPage.name"
-            icon="$nl$/icons/full/obj16/jworkingSet_obj.gif"
-            updaterClass="org.eclipse.wst.jsdt.internal.ui.workingsets.OthersWorkingSetUpdater"
-            id="org.eclipse.wst.jsdt.internal.ui.OthersWorkingSet">
-      </workingSet>
-   </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 -->
       <category
@@ -3717,1044 +1143,7 @@
             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                                                                   -->
 <!-- =========================================================================== -->
@@ -4816,351 +1205,10 @@
             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
@@ -5649,57 +1697,6 @@
       </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">
@@ -5707,17 +1704,4 @@
          <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/pom.xml b/bundles/org.eclipse.wst.jsdt.ui/pom.xml
index 9ae246d..9d20e14 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/pom.xml
+++ b/bundles/org.eclipse.wst.jsdt.ui/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.webtools.jsdt.bundles</groupId>
   <artifactId>org.eclipse.wst.jsdt.ui</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaBasePreferencePage.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaBasePreferencePage.java
index a04aa0d..cdfad7b 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaBasePreferencePage.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaBasePreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 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
@@ -31,15 +31,13 @@
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.wst.jsdt.internal.ui.IJavaHelpContextIds;
-import org.eclipse.wst.jsdt.internal.ui.IUIConstants;
 import org.eclipse.wst.jsdt.internal.ui.JavaScriptPlugin;
 import org.eclipse.wst.jsdt.internal.ui.dialogs.OptionalMessageDialog;
-import org.eclipse.wst.jsdt.internal.ui.refactoring.RefactoringSavePreferences;
 import org.eclipse.wst.jsdt.internal.ui.util.SWTUtil;
 import org.eclipse.wst.jsdt.ui.PreferenceConstants;
 	
 /*
- * The page for setting general java plugin preferences.
+ * The page for setting general javascript plug-in preferences.
  * See PreferenceConstants to access or change these values through public API.
  */
 public class JavaBasePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
@@ -114,34 +112,6 @@
 		layout.verticalSpacing= convertVerticalDLUsToPixels(10);
 		layout.horizontalSpacing= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
 		result.setLayout(layout);
-
-		Group doubleClickGroup= new Group(result, SWT.NONE);
-		doubleClickGroup.setLayout(new GridLayout());		
-		doubleClickGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		doubleClickGroup.setText(PreferencesMessages.JavaBasePreferencePage_doubleclick_action);  
-		addRadioButton(doubleClickGroup, PreferencesMessages.JavaBasePreferencePage_doubleclick_gointo, DOUBLE_CLICK, DOUBLE_CLICK_GOES_INTO); 
-		addRadioButton(doubleClickGroup, PreferencesMessages.JavaBasePreferencePage_doubleclick_expand, DOUBLE_CLICK, DOUBLE_CLICK_EXPANDS);  
-
-		if ( IUIConstants.SUPPORT_REFACTORING ) {
-			Group refactoringGroup= new Group(result, SWT.NONE);
-			refactoringGroup.setLayout(new GridLayout());		
-			refactoringGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			refactoringGroup.setText(PreferencesMessages.JavaBasePreferencePage_refactoring_title); 
-			addCheckBox(refactoringGroup, 
-					PreferencesMessages.JavaBasePreferencePage_refactoring_auto_save, 
-					RefactoringSavePreferences.PREF_SAVE_ALL_EDITORS);
-			addCheckBox(refactoringGroup, 
-					PreferencesMessages.JavaBasePreferencePage_refactoring_lightweight, 
-					PreferenceConstants.REFACTOR_LIGHTWEIGHT);
-		}
-
-		Group group= new Group(result, SWT.NONE);
-		group.setLayout(new GridLayout());
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		group.setText(PreferencesMessages.JavaBasePreferencePage_search); 
-		
-		addCheckBox(group, PreferencesMessages.JavaBasePreferencePage_search_small_menu, PreferenceConstants.SEARCH_USE_REDUCED_MENU); 
-
 		
 		layout= new GridLayout();
 		layout.numColumns= 2;
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.java
index c5d9df4..3a659c9 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.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
@@ -521,15 +521,15 @@
 		fStrikethroughCheckBox.setSelection(getPreferenceStore().getBoolean(item.getStrikethroughKey()));
 		fUnderlineCheckBox.setSelection(getPreferenceStore().getBoolean(item.getUnderlineKey()));
 		if (item instanceof SemanticHighlightingColorListItem) {
-			fEnableCheckbox.setEnabled(true);
+			fEnableCheckbox.setEnabled(false);
 			boolean enable= getPreferenceStore().getBoolean(((SemanticHighlightingColorListItem) item).getEnableKey());
-			fEnableCheckbox.setSelection(enable);
-			fSyntaxForegroundColorEditor.getButton().setEnabled(enable);
+			fEnableCheckbox.setSelection(false);
+			fSyntaxForegroundColorEditor.getButton().setEnabled(false);
 			fColorEditorLabel.setEnabled(enable);
-			fBoldCheckBox.setEnabled(enable);
-			fItalicCheckBox.setEnabled(enable);
-			fStrikethroughCheckBox.setEnabled(enable);
-			fUnderlineCheckBox.setEnabled(enable);
+			fBoldCheckBox.setEnabled(false);
+			fItalicCheckBox.setEnabled(false);
+			fStrikethroughCheckBox.setEnabled(false);
+			fUnderlineCheckBox.setEnabled(false);
 		} else {
 			fSyntaxForegroundColorEditor.getButton().setEnabled(true);
 			fColorEditorLabel.setEnabled(true);
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 99012a9..16ad7ff 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
@@ -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
@@ -75,7 +75,7 @@
 ImportOrganizeInputDialog_error_entryExists=Entry already exists in list.
 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:
+JavaBasePreferencePage_description=General settings for JavaScript development within web pages:
 
 JavaBasePreferencePage_doubleclick_action=Action on double click in the Script and Project Explorers
 JavaBasePreferencePage_doubleclick_gointo=&Go into the selected element
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/wizards/NewJSFileWizardPage.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/wizards/NewJSFileWizardPage.java
index f7f1d8b..3c1e28e 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/wizards/NewJSFileWizardPage.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/wizards/NewJSFileWizardPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 IBM Corporation and others.
+ * Copyright (c) 2006, 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
@@ -11,9 +11,10 @@
  *******************************************************************************/
 package org.eclipse.wst.jsdt.internal.ui.wizards;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -41,8 +42,8 @@
 
 class NewJSFileWizardPage extends WizardNewFileCreationPage {
 	
-	private IContentType	fContentType;
-	private List			fValidExtensions = null;
+	private IContentType[]	fContentTypes;
+	private Set<String>			fValidExtensions = null;
 	
 	public NewJSFileWizardPage(String pageName, IStructuredSelection selection) {
         super(pageName, selection);
@@ -137,11 +138,11 @@
 	 * 
 	 * @return IContentType
 	 */
-	private IContentType getContentType() {
-		if (fContentType == null)
-//			fContentType = Platform.getContentTypeManager().getContentType(ContentTypeIdForJavaScript.ContentTypeID_JAVASCRIPT);
-			fContentType = Platform.getContentTypeManager().getContentType("org.eclipse.wst.jsdt.core.jsSource"); //$NON-NLS-1$
-		return fContentType;
+	private IContentType[] getContentTypes() {
+		if (fContentTypes == null) {
+			fContentTypes = Platform.getContentTypeManager().findContentTypesFor("filename.js"); //$NON-NLS-1$
+		}
+		return fContentTypes;
 	}
 
 	/**
@@ -149,10 +150,13 @@
 	 * 
 	 * @return
 	 */
-	private List getValidExtensions() {
+	private Collection<String> getValidExtensions() {
 		if (fValidExtensions == null) {
-			IContentType type = getContentType();
-			fValidExtensions = new ArrayList(Arrays.asList(type.getFileSpecs(IContentType.FILE_EXTENSION_SPEC)));
+			IContentType[] types = getContentTypes();
+			fValidExtensions = new HashSet<String>();
+			for (int i = 0; i < types.length; i++) {
+				fValidExtensions.addAll(Arrays.asList(types[i].getFileSpecs(IContentType.FILE_EXTENSION_SPEC)));
+			}
 		}
 		return fValidExtensions;
 	}
@@ -167,19 +171,22 @@
 	private boolean extensionValidForContentType(String fileName) {
 		boolean valid = false;
 
-		IContentType type = getContentType();
+		IContentType[] expectedTypes = getContentTypes();
 		// there is currently an extension
 		if (fileName.lastIndexOf('.') != -1) {
 			// check what content types are associated with current extension
 			IContentType[] types = Platform.getContentTypeManager().findContentTypesFor(fileName);
 			int i = 0;
 			while (i < types.length && !valid) {
-				valid = types[i].isKindOf(type);
-				++i;
+				for (int j = 0; j < expectedTypes.length && !valid; j++) {
+					valid |= types[i].isKindOf(expectedTypes[j]);
+				}
+				i++;
 			}
 		}
-		else
+		else {
 			valid = true; // no extension so valid
+		}
 		return valid;
 	}
 
@@ -194,10 +201,10 @@
 
 //		Preferences preference = JavaScriptCorePlugin.getDefault().getPluginPreferences();
 //		String ext = preference.getString(JavaScriptCorePreferenceNames.DEFAULT_EXTENSION);
+//		newFileName.append(ext);
 
 		newFileName.append("."); //$NON-NLS-1$
-//		newFileName.append(ext);
-newFileName.append("js"); //$NON-NLS-1$
+		newFileName.append("js"); //$NON-NLS-1$
 		return newFileName.toString();
 	}
 	
diff --git a/docs/org.eclipse.wst.jsdt.doc/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.jsdt.doc/META-INF/MANIFEST.MF
index 855b048..625e523 100644
--- a/docs/org.eclipse.wst.jsdt.doc/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.wst.jsdt.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.wst.jsdt.doc; singleton:=true
-Bundle-Version: 2.0.200.qualifier
+Bundle-Version: 2.0.300.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
diff --git a/docs/org.eclipse.wst.jsdt.doc/concepts/features.html b/docs/org.eclipse.wst.jsdt.doc/concepts/features.html
index ca99b51..009764e 100755
--- a/docs/org.eclipse.wst.jsdt.doc/concepts/features.html
+++ b/docs/org.eclipse.wst.jsdt.doc/concepts/features.html
@@ -10,67 +10,16 @@
 <body>
 <h1>JSDT Features</h1>
 
-<h3>JavaScript Source Files</h3>
-<p>
-	<ul>
-		<li>Syntax Highlighting</li>
-		<li>Folding / Line Numbers</li>
-		<li>Full Outlining showing Classes, Functions and Fields</li>
-		<li>Highlight and check of matching bracket / parenthesis</li>
-		<li>Auto-complete of brackets, parentheses and indentation</li>
-		<li>Mark Occurrence</li>
-		<li>Comment Toggle (line and block)</li>
-		<li>Generate Element JSDoc</li>
-		<li>Smart Code Completion based on real-time JavaScript Model</li>
-		<li>Hover Help that display element declaration and JSDoc or Error message</li>
-		<li>Configurable Error/Warning checking includes full language syntax and type/class structure resolution</li>
-		<li>Flow analysis shows unreachable code, unused variables and variable hiding.</li>
-		<li>Quick-fix for unresolved fields and types.</li>
-		<li>Surround with do, for, try/catch, while</li>
-		<li>Completion Templates</li>
-		<li>Extract Function/Change function signature</li>
-		<li>Indentation Correction</li>
-		<li>Open Declaration</li>
-		<li>Open Type Hierarchy</li>
-		<li>Open Call Hierarchy</li>
-		<li>Extensible customizable Code Formatting</li>
-		<li>Full Search</li>
-		<li>Refactor/Rename/Move</li>
-		<li>Breakpoint Support</li>
-		<li>Browser libraries with JSDoc for FireFox, Internet Explorer and ECMA 3</li>
-		<li>Support for user defined libraries using JSDoc + JavaScript prototype structure definitions</li>
-		<li>Full extension support for Library UI and core</li>
-		<li>Library Image Support</li>
-	</ul>
-</p>
-
-<h3>HTML and JSP With Embedded JavaScript (Requires WST Plugins)</h3>
-<p>
-	<ul>
-		<li>Syntax Highlighting</li>
-		<li>Folding / Line Numbers</li>
-		<li>Full Outlining showing Classes, Functions and Fields</li>
-		<li>Highlight and check of matching bracket / parenthesis</li>
-		<li>Auto-complete of brackets, parentheses and indentation</li>
-		<li>Mark Occurrence</li>
-		<li>Generate Element JSDoc (From outline)</li>
-		<li>Smart Code Completion based on real-time JavaScript Model</li>
-		<li>Hover Help that display element declaration and JSDoc or Error message</li>
-		<li>Configurable Error/Warning checking includes full language syntax and type/class structure resolution</li>
-		<li>Flow analysis shows unreachable code, unused variables and variable hiding.</li>
-		<li>Completion Templates</li>
-		<li>Indentation Correction</li>
-		<li>Open Declaration  (From outline)</li>
-		<li>Open Type Hierarchy  (From outline)</li>
-		<li>Open Call Hierarchy  (From outline)</li>
-		<li>Extensible customizable Code Formating</li>
-		<li>Full Search</li>
-		<li>Breakpoint Support</li>
-		<li>Browser libraries with JSDoc for FireFox, Internet Explorer and ECMA 3</li>
-		<li>Support for user defined libraries using JSDoc + JavaScript prototype structure definitions</li>
-		<li>Full extension support for Library UI and core</li>
-		<li>Library Image Support</li>
-	</ul>
-</p>
+<h3>HTML and JSP With Embedded JavaScript (Requires WST and JST JS Support Plug-ins)</h3>
+<ul>
+	<li>Syntax Highlighting</li>
+	<li>Highlight and check of matching bracket / parenthesis</li>
+	<li>Auto-complete of brackets, parentheses and indentation</li>
+	<li>Smart Code Completion based on real-time JavaScript Model</li>
+	<li>Hover Help that display element declaration and JSDoc or Error message</li>
+	<li>Completion Templates</li>
+	<li>Indentation Correction</li>
+	<li>Extensible customizable Code Formatting</li>
+</ul>
 </body>
 </html>
diff --git a/docs/org.eclipse.wst.jsdt.doc/pom.xml b/docs/org.eclipse.wst.jsdt.doc/pom.xml
index 9f76a52..8f24111 100644
--- a/docs/org.eclipse.wst.jsdt.doc/pom.xml
+++ b/docs/org.eclipse.wst.jsdt.doc/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2014 Eclipse Foundation and others.
+  Copyright (c) 2012, 2020 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.webtools.jsdt.docs</groupId>
   <artifactId>org.eclipse.wst.jsdt.doc</artifactId>
-  <version>2.0.200-SNAPSHOT</version>
+  <version>2.0.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <!--  generate java doc -->
    <profiles>
diff --git a/docs/org.eclipse.wst.jsdt.doc/reference/extension-points/index.html b/docs/org.eclipse.wst.jsdt.doc/reference/extension-points/index.html
index c8979fd..23d54cc 100755
--- a/docs/org.eclipse.wst.jsdt.doc/reference/extension-points/index.html
+++ b/docs/org.eclipse.wst.jsdt.doc/reference/extension-points/index.html
@@ -12,7 +12,6 @@
   JSDT infrastructure: </p>
 <h3>JSDT Core</h3>
 <ul>
-  <li><a href="org_eclipse_wst_jsdt_core_codeFormatter.html">org.eclipse.wst.jsdt.core.codeFormatter</a></li>
   <li><a href="org_eclipse_wst_jsdt_core_inferrenceSupport.html">org.eclipse.wst.jsdt.core.inferrenceSupport</a></li>
   <li><a href="org_eclipse_wst_jsdt_core_JsGlobalScopeContainerInitializer.html">org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer</a></li>
   <li><a href="org_eclipse_wst_jsdt_core_JsGlobalScopeVariableInitializer.html">org.eclipse.wst.jsdt.core.JsGlobalScopeVariableInitializer</a></li>
diff --git a/docs/org.eclipse.wst.jsdt.doc/tocreference.xml b/docs/org.eclipse.wst.jsdt.doc/tocreference.xml
index c77304f..63bb629 100644
--- a/docs/org.eclipse.wst.jsdt.doc/tocreference.xml
+++ b/docs/org.eclipse.wst.jsdt.doc/tocreference.xml
@@ -107,8 +107,6 @@
 	 </topic>
  </topic>
  <topic href="reference/extension-points/index.html" label="Extension Points Reference">
-    <topic href="reference/extension-points/org_eclipse_wst_jsdt_core_codeFormatter.html" label="org.eclipse.wst.jsdt.core.codeFormatter">
-    </topic>
     <topic href="reference/extension-points/org_eclipse_wst_jsdt_core_inferrenceSupport.html" label="org.eclipse.wst.jsdt.core.inferrenceSupport">
     </topic>
     <topic href="reference/extension-points/org_eclipse_wst_jsdt_core_JsGlobalScopeContainerInitializer.html" label="org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer">
diff --git a/features/org.eclipse.wst.jsdt.feature/feature.xml b/features/org.eclipse.wst.jsdt.feature/feature.xml
index e0a374a..d3e0dbb 100644
--- a/features/org.eclipse.wst.jsdt.feature/feature.xml
+++ b/features/org.eclipse.wst.jsdt.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.jsdt.feature"
       label="%featureName"
-      version="2.2.0.qualifier"
+      version="2.3.100.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.wst.jsdt.ui"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.wst.jsdt.feature/pom.xml b/features/org.eclipse.wst.jsdt.feature/pom.xml
index a3ea566..533a316 100644
--- a/features/org.eclipse.wst.jsdt.feature/pom.xml
+++ b/features/org.eclipse.wst.jsdt.feature/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.webtools.jsdt.features</groupId>
   <artifactId>org.eclipse.wst.jsdt.feature</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>2.3.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml b/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml
index b574f46..9139386 100644
--- a/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.jsdt_sdk.feature"
       label="%featureName"
-      version="2.3.0.qualifier"
+      version="2.3.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml b/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml
index 8103cde..0c358f2 100644
--- a/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml
+++ b/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.jsdt.features</groupId>
   <artifactId>org.eclipse.wst.jsdt_sdk.feature</artifactId>
-  <version>2.3.0-SNAPSHOT</version>
+  <version>2.3.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/contentassist/ContentAssistTestUtilities.java b/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/contentassist/ContentAssistTestUtilities.java
index 58878dc..68f55f1 100644
--- a/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/contentassist/ContentAssistTestUtilities.java
+++ b/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/contentassist/ContentAssistTestUtilities.java
@@ -276,7 +276,7 @@
 			}
 		}
 		if (negativeTest) {
-			System.out.println(error.length());
+//			System.out.println(error.length());
 		}
 		// if errors report them
 		if(error.length() > 0) {
diff --git a/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/utils/TestProjectSetup.java b/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/utils/TestProjectSetup.java
index 6e90f4d..c546fd4 100644
--- a/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/utils/TestProjectSetup.java
+++ b/tests/org.eclipse.wst.jsdt.ui.tests/src/org/eclipse/wst/jsdt/ui/tests/utils/TestProjectSetup.java
@@ -193,7 +193,7 @@
 				if(editorPart instanceof JavaEditor) {
 					editor = (JavaEditor) editorPart;
 				} else {
-					Assert.fail("Unable to open JS editor");
+					Assert.fail("Unable to open JS editor: " + editorPart.getClass());
 				}
 
 				if(editor != null) {