[174919] exception from JFaceNodeLabelProvider.getText & statusLineLabelProvider.getText

bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF

diff --git a/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
index 1106009..c2e1fd8 100644
--- a/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.xml.ui; singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.301.qualifier
 Bundle-Activator: org.eclipse.wst.xml.ui.internal.XMLUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

bundles/org.eclipse.wst.xml.ui/plugin.xml

diff --git a/bundles/org.eclipse.wst.xml.ui/plugin.xml b/bundles/org.eclipse.wst.xml.ui/plugin.xml
index 5a43a1a..2ee8e44 100644
--- a/bundles/org.eclipse.wst.xml.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xml.ui/plugin.xml
@@ -77,12 +77,16 @@
 		<factory
 			contentTypeId="org.eclipse.core.runtime.xml"
 			class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" />
+		<factory
+			contentTypeId="org.eclipse.wst.xml.core.xmlsource"
+			class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" />
 	</extension>
 	<extension
 		point="org.eclipse.wst.sse.ui.adapterFactoryDescription">
 		<adapterFactoryDescription
 			class="org.eclipse.wst.xml.ui.internal.registry.AdapterFactoryProviderForXML">
 			<contentType id="org.eclipse.core.runtime.xml" />
+			<contentType id="org.eclipse.wst.xml.core.xmlsource" />
 		</adapterFactoryDescription>
 	</extension>
 	<extension point="org.eclipse.ui.preferencePages">
@@ -343,6 +347,10 @@
 				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
 				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
 			</contentTypeIdentifier>
+			<contentTypeIdentifier id="org.eclipse.wst.xml.core.xmlsource">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
+			</contentTypeIdentifier>
 		</validator>
 	</extension>
 	
@@ -355,6 +363,10 @@
 				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
 				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
 			</contentTypeIdentifier>
+			<contentTypeIdentifier id="org.eclipse.wst.xml.core.xmlsource">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
+			</contentTypeIdentifier>
 		</validator>
 	</extension>
 	

bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorPart.java

diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorPart.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorPart.java
index e97e339..9cb29f4 100644
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorPart.java
+++ b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorPart.java
@@ -319,7 +319,9 @@
 					INodeNotifier notifier = (INodeNotifier) node;
 					if (node.getNodeType() != Node.DOCUMENT_NODE) {
 						IJFaceNodeAdapter adapter = (IJFaceNodeAdapter) notifier.getAdapterFor(IJFaceNodeAdapter.class);
-						s.insert(0, adapter.getLabelText(node));
+						if (adapter != null) {
+							s.insert(0, adapter.getLabelText(node));
+						}
 					}
 					node = node.getParentNode();
 					if (node != null && node.getNodeType() != Node.DOCUMENT_NODE)
@@ -417,7 +419,7 @@
 		 */
 		if (fDesignViewer.getSelectionProvider() instanceof IPostSelectionProvider) {
 			((IPostSelectionProvider) fDesignViewer.getSelectionProvider()).addPostSelectionChangedListener(new ISelectionChangedListener() {
-				public void selectionChanged(SelectionChangedEvent event) {
+				public void selectionChanged(final SelectionChangedEvent event) {
 					/*
 					 * Only force selection update if source page is not
 					 * active
@@ -425,8 +427,14 @@
 					if (getActivePage() != fSourcePageIndex) {
 						getTextEditor().getSelectionProvider().setSelection(event.getSelection());
 					}
-					if (fDesignViewer.equals(event.getSource()))
-						updateStatusLine(event.getSelection());
+					if (fDesignViewer.equals(event.getSource())) {
+						try {
+							updateStatusLine(event.getSelection());
+						}
+						catch (Exception exception) {
+							Logger.logException(exception);
+						}						
+					}
 				}
 			});
 		}