[366240] Semantic Highlighter throws exceptions for unknown contenttypes
diff --git a/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
index 45500ee..01337da 100644
--- a/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.sse.ui; singleton:=true
-Bundle-Version: 1.2.5.qualifier
+Bundle-Version: 1.2.6.qualifier
Bundle-Activator: org.eclipse.wst.sse.ui.internal.SSEUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/style/SemanticHighlightingReconciler.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/style/SemanticHighlightingReconciler.java
index 8318c97..00a99f4 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/style/SemanticHighlightingReconciler.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/style/SemanticHighlightingReconciler.java
@@ -239,8 +239,7 @@
}
public void setDocument(IDocument document) {
- fDocument = document;
-// refresh();
+ fDocument = (document instanceof IStructuredDocument) ? document : null;
}
public void initialReconcile() {
diff --git a/features/org.eclipse.wst.xml_ui.feature.patch/buildnotes_org.eclipse.wst.xml_ui.feature.patch.html b/features/org.eclipse.wst.xml_ui.feature.patch/buildnotes_org.eclipse.wst.xml_ui.feature.patch.html
index ae85f73..e6b20b1 100644
--- a/features/org.eclipse.wst.xml_ui.feature.patch/buildnotes_org.eclipse.wst.xml_ui.feature.patch.html
+++ b/features/org.eclipse.wst.xml_ui.feature.patch/buildnotes_org.eclipse.wst.xml_ui.feature.patch.html
@@ -4,16 +4,16 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Build" content="Build">
-<title>WTP XML 3.2.1 Patches</title>
+<title>WTP XML 3.2.5 Patches</title>
</head>
<body>
-<h1>WTP XML 3.2.1 Patches</h1>
+<h1>WTP XML 3.2.5 Patches</h1>
<h2>org.eclipse.wst.xml_ui.feature.patch</h2>
-<p>Bug <a href='https://bugs.eclipse.org/321529'>321529</a>. NPE when opening any source editor if JSP plugins are not loaded</p>
+<p>Bug <a href='https://bugs.eclipse.org/366240'>366240</a>. Semantic Highlighter throws exceptions for unknown contenttypes</p>
</body>
</html>
diff --git a/features/org.eclipse.wst.xml_ui.feature.patch/feature.properties b/features/org.eclipse.wst.xml_ui.feature.patch/feature.properties
index d944e30..9b30604 100644
--- a/features/org.eclipse.wst.xml_ui.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.xml_ui.feature.patch/feature.properties
@@ -27,7 +27,7 @@
description=\
Contains fixes for the following bugs:\n\
\n\
-Bug https://bugs.eclipse.org/321529 NPE when opening any source editor if JSP plugins are not loaded\n\
+Bug https://bugs.eclipse.org/366240 Semantic Highlighter throws exceptions for unknown contenttypes\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.wst.xml_ui.feature.patch/feature.xml b/features/org.eclipse.wst.xml_ui.feature.patch/feature.xml
index ab5a447..2724146 100644
--- a/features/org.eclipse.wst.xml_ui.feature.patch/feature.xml
+++ b/features/org.eclipse.wst.xml_ui.feature.patch/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.xml_ui.feature.patch"
label="%featureName"
- version="3.2.1.qualifier"
+ version="3.2.5.qualifier"
provider-name="%providerName">
<description>
@@ -18,7 +18,7 @@
</license>
<requires>
- <import feature="org.eclipse.wst.xml_ui.feature" version="3.2.1.v201007132152-7H7AFUMDxumQGOh8tejUU2Uw_Mx0" patch="true"/>
+ <import feature="org.eclipse.wst.xml_ui.feature" version="3.2.5.v201106160200-7H7AFUeDxumQJP58ph_R_6syq38sOANwVz00NyPL" patch="true"/>
</requires>
<plugin
