[112657] Problem with opening wsdl file in wsdl editor the second time
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java
index 7347a09..9907c98 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java
@@ -11,7 +11,6 @@
package org.eclipse.wst.wsdl.ui.internal;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.SWT;
@@ -33,11 +32,8 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.TextSelectionNavigationLocation;
-import org.eclipse.wst.sse.core.internal.model.ModelManagerImpl;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.eclipse.wst.wsdl.Definition;
import org.eclipse.wst.wsdl.WSDLElement;
@@ -156,9 +152,10 @@
public IStructuredModel getStructuredModel()
{
- IDocument doc = textEditor.getDocumentProvider().getDocument(getEditorInput());
- IModelManager modelManager = ModelManagerImpl.getInstance();
- return modelManager.getModelForRead((IStructuredDocument) doc);
+ return textEditor.getModel();
+// IDocument doc = textEditor.getDocumentProvider().getDocument(getEditorInput());
+// IModelManager modelManager = ModelManagerImpl.getInstance();
+// return modelManager.getModelForRead((IStructuredDocument) doc);
}
public Document getXMLDocument()
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java
index f5abd54..32e4c1f 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java
@@ -1,3 +1,4 @@
+
/*******************************************************************************
* Copyright (c) 2001, 2004 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
@@ -42,10 +43,7 @@
import org.eclipse.ui.ide.IGotoMarker;
import org.eclipse.wst.common.ui.provisional.editors.PostMultiPageEditorSite;
import org.eclipse.wst.common.ui.provisional.editors.PostSelectionMultiPageEditorPart;
-import org.eclipse.wst.sse.core.internal.model.ModelManagerImpl;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.eclipse.wst.xml.core.internal.provisional.IXMLPreferenceNames;
import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
@@ -425,9 +423,10 @@
protected IStructuredModel getModel() {
IStructuredModel model = null;
if (fTextEditor != null) {
- IDocument doc = fTextEditor.getDocumentProvider().getDocument(getEditorInput());
- IModelManager modelManager = ModelManagerImpl.getInstance();
- model = modelManager.getModelForRead((IStructuredDocument) doc);
+ model = fTextEditor.getModel();
+// IDocument doc = fTextEditor.getDocumentProvider().getDocument(getEditorInput());
+// IModelManager modelManager = ModelManagerImpl.getInstance();
+// model = modelManager.getModelForRead((IStructuredDocument) doc);
}
return model;
