[581967] Four "wildwebdeveloper" ID errors reported on IDE startup
Change-Id: Idb6db2e29905f1663c30d099d712d1901c45e807
diff --git a/web/bundles/org.eclipse.wst.html.ui/plugin.xml b/web/bundles/org.eclipse.wst.html.ui/plugin.xml
index f365daa..180d710 100755
--- a/web/bundles/org.eclipse.wst.html.ui/plugin.xml
+++ b/web/bundles/org.eclipse.wst.html.ui/plugin.xml
@@ -816,7 +816,7 @@
label="%category.label"
smallicon="icons/full/obj16/tag-html.gif"
id="org.eclipse.wst.html.ui.category0"
- contenttypes="org.eclipse.wst.html.core.htmlsource,org.eclipse.wildwebdeveloper.html">
+ contenttypes="org.eclipse.wst.html.core.htmlsource">
<item
label="%nbsp.label"
id="org.eclipse.wst.html.ui.nbsp">
diff --git a/xml/bundles/org.eclipse.wst.dtd.core/plugin.xml b/xml/bundles/org.eclipse.wst.dtd.core/plugin.xml
index 6f5b23d..812c146 100644
--- a/xml/bundles/org.eclipse.wst.dtd.core/plugin.xml
+++ b/xml/bundles/org.eclipse.wst.dtd.core/plugin.xml
@@ -9,19 +9,12 @@
id="org.eclipse.wst.dtd.core.internal.modelhandler">
</modelHandler>
</extension>
- <extension point="org.eclipse.wst.sse.core.modelHandler">
- <modelHandler
- class="org.eclipse.wst.dtd.core.internal.modelhandler.ModelHandlerForDTD"
- associatedContentTypeId="org.eclipse.wildwebdeveloper.dtd"
- id="org.eclipse.wst.dtd.core.internal.modelhandler">
- </modelHandler>
- </extension>
<extension point="org.eclipse.wst.sse.core.taskscanner">
<scanner
id="org.eclipse.wst.dtd.core.internal.tasks.DTDFileTaskScanner"
class="org.eclipse.wst.dtd.core.internal.tasks.DTDFileTaskScanner:org.eclipse.wst.dtd.core.taskMarker"
- contentTypeIds="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
+ contentTypeIds="org.eclipse.wst.dtd.core.dtdsource" />
</extension>
<extension
id="taskMarker"
@@ -45,9 +38,6 @@
<factory
contentTypeId="org.eclipse.wst.dtd.core.dtdsource"
class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory" />
- <factory
- contentTypeId="org.eclipse.wildwebdeveloper.dtd"
- class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory" />
</extension>
<extension point="org.eclipse.team.core.fileTypes">
@@ -124,7 +114,6 @@
<include>
<rules>
<contentType id="org.eclipse.wst.dtd.core.dtdsource"/>
- <contentType id="org.eclipse.wildwebdeveloper.dtd"/>
<fileext caseSensitive="false" ext="dtd"/>
<fileext caseSensitive="false" ext="ent"/>
<fileext caseSensitive="false" ext="mod"/>
diff --git a/xml/bundles/org.eclipse.wst.dtd.ui/plugin.xml b/xml/bundles/org.eclipse.wst.dtd.ui/plugin.xml
index 1720958..29e51e7 100755
--- a/xml/bundles/org.eclipse.wst.dtd.ui/plugin.xml
+++ b/xml/bundles/org.eclipse.wst.dtd.ui/plugin.xml
@@ -13,30 +13,30 @@
<class class="org.eclipse.wst.dtd.ui.internal.DTDEditor">
<parameter name="org.eclipse.wst.sse.ui.appearancePreferenceScopeName" value="org.eclipse.wst.dtd.ui"/>
</class>
- <contentTypeBinding contentTypeId="org.eclipse.wst.dtd.core.dtdsource" />
- <contentTypeBinding contentTypeId="org.eclipse.wildwebdeveloper.dtd" />
+ <contentTypeBinding
+ contentTypeId="org.eclipse.wst.dtd.core.dtdsource" />
</editor>
</extension>
<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
<contentOutlineConfiguration
class="org.eclipse.wst.dtd.ui.views.contentoutline.DTDContentOutlineConfiguration"
- target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
+ target="org.eclipse.wst.dtd.core.dtdsource" />
<sourceViewerConfiguration
class="org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD"
- target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
+ target="org.eclipse.wst.dtd.core.dtdsource" />
<provisionalConfiguration
type="characterpairmatcher"
class="org.eclipse.wst.dtd.ui.internal.text.DTDDocumentRegionEdgeMatcher"
- target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
+ target="org.eclipse.wst.dtd.core.dtdsource" />
<provisionalConfiguration
type="foldingstrategy"
class="org.eclipse.wst.dtd.ui.internal.projection.DTDFoldingStrategy"
- target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
+ target="org.eclipse.wst.dtd.core.dtdsource" />
<provisionalDefinition
type="preferencepages"
value="org.eclipse.wst.dtd.ui.preferences.dtd, org.eclipse.wst.sse.ui.preferences.dtd.templates, org.eclipse.wst.sse.ui.preferences.dtd.styles, org.eclipse.wst.dtd.ui.preferences.editor"
- target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
+ target="org.eclipse.wst.dtd.core.dtdsource" />
<!-- provide syntax highlighting for DTD subset within XML -->
<provisionalConfiguration
type="linestyleprovider"
@@ -45,11 +45,11 @@
<provisionalDefinition
type="spellingregions"
value="org.eclipse.wst.dtd.core.internal.util.parser.DTDRegionTypes.COMMENT_CONTENT"
- target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
+ target="org.eclipse.wst.dtd.core.dtdsource" />
<provisionalDefinition
type="activecontexts"
value="org.eclipse.wst.sse.hideFormat"
- target="org.eclipse.wst.dtd.core.dtdsource,org.eclipse.wildwebdeveloper.dtd" />
+ target="org.eclipse.wst.dtd.core.dtdsource" />
</extension>
<extension point="org.eclipse.ui.editorActions">
@@ -112,9 +112,6 @@
<factory
contentTypeId="org.eclipse.wst.dtd.core.dtdsource"
class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" />
- <factory
- contentTypeId="org.eclipse.wildwebdeveloper.dtd"
- class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" />
</extension>
<!-- Register the UI adapter factory provider -->
@@ -123,7 +120,6 @@
<adapterFactoryDescription
class="org.eclipse.wst.dtd.ui.internal.registry.AdapterFactoryProviderForDTD">
<contentType id="org.eclipse.wst.dtd.core.dtdsource" />
- <contentType id="org.eclipse.wildwebdeveloper.dtd" />
</adapterFactoryDescription>
</extension>
diff --git a/xml/features/org.eclipse.wst.xml_ui.feature/forceQualifier.txt b/xml/features/org.eclipse.wst.xml_ui.feature/forceQualifier.txt
index 9d4f218..350632c 100644
--- a/xml/features/org.eclipse.wst.xml_ui.feature/forceQualifier.txt
+++ b/xml/features/org.eclipse.wst.xml_ui.feature/forceQualifier.txt
@@ -1 +1 @@
-# To force a version qualifier update add the bug here
+# To force a version qualifier update, add the bug here
