[87614] Race condition getting model causes UI adapters not to be registered in StructuredTextEditor

1 files changed, 4 insertions, 69 deletions

diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForHTML.java
index b4093f2cc7..36a9b9e3e8 100644
--- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForHTML.java
+++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForHTML.java
@@ -23,24 +23,18 @@ import org.eclipse.wst.sse.ui.internal.util.Assert;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.eclipse.wst.xml.ui.internal.properties.XMLPropertySourceAdapterFactory;
 
-/**
- * 
- */
+
 public class AdapterFactoryProviderForHTML implements AdapterFactoryProvider {
 
-	/*
-	 * @see AdapterFactoryProvider#addAdapterFactories(IStructuredModel)
-	 */
+
 	public void addAdapterFactories(IStructuredModel structuredModel) {
 
-		// these are the normal edit side content based factories		
+		// these are the normal edit side content based factories
 		addContentBasedFactories(structuredModel);
-		// ===
 		// Must update/add to propagating adapter here too
 		if (structuredModel instanceof IDOMModel) {
 			addPropagatingAdapters(structuredModel);
 		}
-		// ===
 	}
 
 	protected void addContentBasedFactories(IStructuredModel structuredModel) {
@@ -48,34 +42,7 @@ public class AdapterFactoryProviderForHTML implements AdapterFactoryProvider {
 		FactoryRegistry factoryRegistry = structuredModel.getFactoryRegistry();
 		Assert.isNotNull(factoryRegistry, "Program Error: client caller must ensure model has factory registry"); //$NON-NLS-1$
 		INodeAdapterFactory factory = null;
-		// == this list came from the previous "HTML only" list
-		//		factory = factoryRegistry.getFactoryFor(ContentAssistAdapter.class);
 
-		//		Doc Partion change: no more adapter factories for edit side functions
-
-		//		if (factory == null) {
-		//			factory = new HTMLContentAssistAdapterFactory();
-		//			factoryRegistry.addFactory(factory);
-		//		}
-
-		//		factory = factoryRegistry.getFactoryFor(DoubleClickAdapter.class);
-		//		if (factory == null) {
-		//			factory = new DoubleClickAdapterFactory(DoubleClickAdapter.class, true);
-		//			factoryRegistry.addFactory(factory);
-		//		}
-		//		// == New adapter factories for tagInfo
-		//		factory = factoryRegistry.getFactoryFor(HoverHelpAdapter.class);
-		//		if (factory == null) {
-		//			factory = new HTMLHoverHelpAdapterFactory(HoverHelpAdapter.class, true);
-		//			factoryRegistry.addFactory(factory);
-		//		}
-		//		factory = factoryRegistry.getFactoryFor(TagInfoProviderAdapter.class);
-		//		if (factory == null) {
-		//			factory = new JSTagInfoProviderAdapterFactory(TagInfoProviderAdapter.class, true);
-		//			factoryRegistry.addFactory(factory);
-		//		}
-		// ==
-		// == this list came from the previous 'for both XML and HTML' list
 		factory = factoryRegistry.getFactoryFor(IPropertySource.class);
 		if (factory == null) {
 			factory = new XMLPropertySourceAdapterFactory();
@@ -86,42 +53,10 @@ public class AdapterFactoryProviderForHTML implements AdapterFactoryProvider {
 			factory = new JFaceNodeAdapterFactoryForHTML();
 			factoryRegistry.addFactory(factory);
 		}
-		//		factory = factoryRegistry.getFactoryFor(com.ibm.sed.edit.adapters.LineStyleProvider.class);
-		//		if (factory == null) {
-		//			factory = new LineStyleProviderFactoryForHTML();
-		//			factoryRegistry.addFactory(factory);
-		//		}
-
-		//		factory = factoryRegistry.getFactoryFor(ReconcilerAdapter.class);
-		//		if (factory == null) {
-		//			// can't use Propagating system since the Node tree is already built by now
-		//			ReconcilerAdapterFactoryForXML reconcilerFactory = new ReconcilerAdapterFactoryForXML();
-		//			factoryRegistry.addFactory(reconcilerFactory);
-		//			reconcilerFactory.adaptAll((XMLModel) structuredModel);
-		//		}
 	}
 
 	protected void addPropagatingAdapters(IStructuredModel structuredModel) {
-//		XMLModel xmlModel = (XMLModel) structuredModel;
-//		XMLDocument document = xmlModel.getDocument();
-//		PropagatingAdapter propagatingAdapter = (PropagatingAdapter) document.getAdapterFor(PropagatingAdapter.class);
-//		if (propagatingAdapter != null) {
-			// no longer needs?			
-			//			factory = new HTMLLineStyeUpdaterFactory();
-			//			propagatingAdapter.addAdaptOnCreateFactory(factory);
-			//			propagatingAdapter.initializeForFactory(factory, document);
-
-			// checking if we should bother adding this factory
-			// if the preference says not to check validity, we don't bother creating this factory
-			// to improve performance...
-			//if(structuredModel.getStructuredPreferenceStore().getPreferenceString(CommonPreferenceNames.EDITOR_VALIDATION_METHOD).equals(CommonPreferenceNames.EDITOR_VALIDATION_CONTENT_MODEL)) {
-			//factory = new ReconcilerAdapterFactoryForXML();
-			//propagatingAdapter.addAdaptOnCreateFactory(factory);
-			// (pa) perf:
-			//propagatingAdapter.initializeForFactory(factory, xmlModel.getDocument());
-			//}
-
-//		}
+		// no propagating to add
 	}
 
 	/*