diff options
Diffstat (limited to 'bundles/org.eclipse.wst.xsd.ui/src/org/eclipse')
17 files changed, 63 insertions, 63 deletions
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/AbstractXSDModelQueryContributor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/AbstractXSDModelQueryContributor.java index 0edc86ab89..bc8c10872a 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/AbstractXSDModelQueryContributor.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/AbstractXSDModelQueryContributor.java @@ -13,7 +13,7 @@ import java.net.URL; import java.util.Vector; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.xml.core.document.XMLModel; +import org.eclipse.wst.xml.core.document.DOMModel; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; @@ -23,7 +23,7 @@ public abstract class AbstractXSDModelQueryContributor { protected AbstractXSDDataTypeValueExtension xsdDataTypeValueExtension; - public void setModel(XMLModel model) + public void setModel(DOMModel model) { // remove our old DataTypeValueExtension // diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDEditor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDEditor.java index 98e8044351..04d601cae4 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDEditor.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDEditor.java @@ -51,7 +51,7 @@ import org.eclipse.wst.sse.core.exceptions.SourceEditingRuntimeException; import org.eclipse.wst.sse.core.internal.SSECorePlugin; import org.eclipse.wst.sse.core.undo.IStructuredTextUndoManager; import org.eclipse.wst.sse.ui.internal.StructuredTextEditor; -import org.eclipse.wst.xml.core.document.XMLModel; +import org.eclipse.wst.xml.core.document.DOMModel; import org.eclipse.wst.xml.core.internal.document.XMLModelImpl; import org.eclipse.wst.xsd.ui.internal.graph.XSDGraphViewer; //import org.eclipse.wst.xsd.ui.internal.graph.model.XSDModelAdapterFactory; @@ -428,7 +428,7 @@ public class XSDEditor extends XSDMultiPageEditorPart implements ITabbedProperty public void reparseSchema() { - Document document = ((XMLModel)getModel()).getDocument(); + Document document = ((DOMModel)getModel()).getDocument(); createSchema(document.getDocumentElement()); } @@ -768,7 +768,7 @@ public class XSDEditor extends XSDMultiPageEditorPart implements ITabbedProperty */ public void createDefaultSchemaNode() { - Document document = ((XMLModel)getModel()).getDocument(); + Document document = ((DOMModel)getModel()).getDocument(); if (document.getChildNodes().getLength() == 0) { // if it is a completely empty file, then add the encoding and version processing instruction @@ -811,7 +811,7 @@ public class XSDEditor extends XSDMultiPageEditorPart implements ITabbedProperty { try { - Document document = ((XMLModel)getModel()).getDocument(); + Document document = ((DOMModel)getModel()).getDocument(); if (document.getChildNodes().getLength() == 0) { // this is an empty document. Create a default schema tag now @@ -821,7 +821,7 @@ public class XSDEditor extends XSDMultiPageEditorPart implements ITabbedProperty createSchema(document.getDocumentElement()); XSDDocumentAdapter documentAdapter = - new XSDDocumentAdapter(((XMLModel)getModel()).getDocument()); + new XSDDocumentAdapter(((DOMModel)getModel()).getDocument()); } catch (Exception e) { diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java index 40a20bfbb3..fc5b138a62 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java @@ -39,8 +39,8 @@ import org.eclipse.wst.sse.ui.internal.actions.StructuredTextEditorActionConstan import org.eclipse.wst.sse.ui.internal.openon.OpenOnAction; import org.eclipse.wst.sse.ui.view.events.INodeSelectionListener; import org.eclipse.wst.sse.ui.view.events.NodeSelectionChangedEvent; -import org.eclipse.wst.xml.core.document.XMLModel; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMModel; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.ui.StructuredTextEditorXML; import org.eclipse.wst.xsd.ui.internal.properties.section.XSDTabbedPropertySheetPage; @@ -163,7 +163,7 @@ public class XSDTextEditor extends StructuredTextEditorXML implements INodeSelec // the text editor can only accept sed nodes! // - if (!(node instanceof XMLNode)) + if (!(node instanceof DOMNode)) { node = null; } @@ -301,9 +301,9 @@ public class XSDTextEditor extends StructuredTextEditorXML implements INodeSelec public void setModel(IFileEditorInput input) { super.setModel(input); - if (getModel() instanceof XMLModel) + if (getModel() instanceof DOMModel) { - xsdModelQueryContributor.setModel((XMLModel)getModel()); + xsdModelQueryContributor.setModel((DOMModel)getModel()); } file = input.getFile(); } diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/CreateAttributeAndRequired.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/CreateAttributeAndRequired.java index 122da07156..7218e233f9 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/CreateAttributeAndRequired.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/CreateAttributeAndRequired.java @@ -16,8 +16,8 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; -import org.eclipse.wst.xml.core.document.XMLModel; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMModel; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xml.core.format.FormatProcessorXML; import org.eclipse.wst.xml.core.internal.document.DocumentImpl; import org.eclipse.xsd.XSDComplexTypeDefinition; @@ -93,9 +93,9 @@ public class CreateAttributeAndRequired extends Action { protected void formatChild(Element child) { - if (child instanceof XMLNode) + if (child instanceof DOMNode) { - XMLModel model = ((XMLNode)child).getModel(); + DOMModel model = ((DOMNode)child).getModel(); try { // tell the model that we are about to make a big model change diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/CreateElementAction.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/CreateElementAction.java index fb9f00fba3..44719de132 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/CreateElementAction.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/CreateElementAction.java @@ -19,8 +19,8 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.widgets.Display; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; -import org.eclipse.wst.xml.core.document.XMLModel; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMModel; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xml.core.format.FormatProcessorXML; import org.eclipse.wst.xml.core.internal.document.DocumentImpl; import org.eclipse.wst.xsd.ui.internal.graph.editparts.ComplexTypeDefinitionEditPart; @@ -187,9 +187,9 @@ public class CreateElementAction extends Action protected void formatChild(Element child) { - if (child instanceof XMLNode) + if (child instanceof DOMNode) { - XMLModel model = ((XMLNode)child).getModel(); + DOMModel model = ((DOMNode)child).getModel(); try { // tell the model that we are about to make a big model change diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/DeleteAction.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/DeleteAction.java index 097a4a3fae..3bb8f8d116 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/DeleteAction.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/DeleteAction.java @@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.actions.SelectionListenerAction; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xml.core.internal.document.DocumentImpl; import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin; import org.eclipse.wst.xsd.ui.internal.refactor.delete.BaseGlobalCleanup; @@ -110,7 +110,7 @@ public class DeleteAction extends SelectionListenerAction xsdSchema = ((XSDConcreteComponent)obj).getSchema(); node = ((XSDConcreteComponent)obj).getElement(); - if (node instanceof XMLNode) + if (node instanceof DOMNode) { parentXSDComponent = ((XSDConcreteComponent)obj).getContainer(); @@ -124,7 +124,7 @@ public class DeleteAction extends SelectionListenerAction } if (!XSDDOMHelper.inputEquals(node, XSDConstants.SCHEMA_ELEMENT_TAG, false)) { - if (node instanceof XMLNode) + if (node instanceof DOMNode) { if (doc == null) { diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java index 741f7d0dd2..65f6580fbc 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java @@ -14,8 +14,8 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jface.action.Action; -import org.eclipse.wst.xml.core.document.XMLModel; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMModel; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.xsd.XSDConcreteComponent; import org.w3c.dom.Node; import org.w3c.dom.Text; @@ -83,7 +83,7 @@ public class MoveAction extends Action protected void beginRecording() { - XMLModel model = getModel(); + DOMModel model = getModel(); if (model != null) { model.beginRecording(this, "Move"); @@ -92,19 +92,19 @@ public class MoveAction extends Action protected void endRecording() { - XMLModel model = getModel(); + DOMModel model = getModel(); if (model != null) { model.endRecording(this); } } - protected XMLModel getModel() + protected DOMModel getModel() { - XMLModel model = null; - if (parentNode instanceof XMLNode) + DOMModel model = null; + if (parentNode instanceof DOMNode) { - model = ((XMLNode)parentNode).getModel(); + model = ((DOMNode)parentNode).getModel(); } return model; } diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/SetBaseTypeAction.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/SetBaseTypeAction.java index 78ed454a95..9f5c0cc39c 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/SetBaseTypeAction.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/actions/SetBaseTypeAction.java @@ -19,8 +19,8 @@ import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; -import org.eclipse.wst.xml.core.document.XMLModel; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMModel; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xml.core.format.FormatProcessorXML; import org.eclipse.wst.xml.core.internal.document.DocumentImpl; import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin; @@ -345,9 +345,9 @@ public class SetBaseTypeAction extends Action protected void formatChild(Element child) { - if (child instanceof XMLNode) + if (child instanceof DOMNode) { - XMLModel model = ((XMLNode)child).getModel(); + DOMModel model = ((DOMNode)child).getModel(); try { // tell the model that we are about to make a big model change diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/commands/AbstractCommand.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/commands/AbstractCommand.java index 7d0a84e662..d6d1cd4792 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/commands/AbstractCommand.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/commands/AbstractCommand.java @@ -11,8 +11,8 @@ package org.eclipse.wst.xsd.ui.internal.commands; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; -import org.eclipse.wst.xml.core.document.XMLModel; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMModel; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xml.core.format.FormatProcessorXML; import org.eclipse.xsd.XSDConcreteComponent; import org.w3c.dom.Element; @@ -49,9 +49,9 @@ public abstract class AbstractCommand protected void formatChild(Element child) { - if (child instanceof XMLNode) + if (child instanceof DOMNode) { - XMLModel model = ((XMLNode)child).getModel(); + DOMModel model = ((DOMNode)child).getModel(); try { // tell the model that we are about to make a big model change diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/dnd/BaseDragNodesCommand.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/dnd/BaseDragNodesCommand.java index 142d4ed02d..f03f1b1fed 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/dnd/BaseDragNodesCommand.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/dnd/BaseDragNodesCommand.java @@ -13,7 +13,7 @@ package org.eclipse.wst.xsd.ui.internal.dnd; import java.util.Collection; import org.eclipse.wst.common.ui.dnd.DefaultDragAndDropCommand; -import org.eclipse.wst.xml.core.document.XMLModel; +import org.eclipse.wst.xml.core.document.DOMModel; import org.eclipse.wst.xml.core.internal.document.DocumentImpl; import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper; import org.eclipse.xsd.util.XSDConstants; @@ -64,7 +64,7 @@ public abstract class BaseDragNodesCommand extends DefaultDragAndDropCommand { if (target != null) { - XMLModel model = getModel((Node)target); + DOMModel model = getModel((Node)target); if (model != null) { @@ -77,7 +77,7 @@ public abstract class BaseDragNodesCommand extends DefaultDragAndDropCommand { if (target != null) { - XMLModel model = getModel((Node)target); + DOMModel model = getModel((Node)target); if (model != null) { @@ -85,7 +85,7 @@ public abstract class BaseDragNodesCommand extends DefaultDragAndDropCommand } } } - protected XMLModel getModel(Node node) + protected DOMModel getModel(Node node) { Object object = node.getOwnerDocument(); if (object instanceof DocumentImpl) diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/dnd/DragNodesCommand.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/dnd/DragNodesCommand.java index b3692cffb3..6c8aa7b63f 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/dnd/DragNodesCommand.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/dnd/DragNodesCommand.java @@ -13,7 +13,7 @@ package org.eclipse.wst.xsd.ui.internal.dnd; import java.util.Collection; import java.util.Iterator; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xml.core.format.NodeFormatter; import org.w3c.dom.Node; @@ -68,7 +68,7 @@ public class DragNodesCommand extends BaseDragNodesCommand if (isSiblingNodes(referenceNode,node)) { moveNode(referenceNode, node, !isAfter()); - formatProcessor.format((XMLNode)node); + formatProcessor.format((DOMNode)node); } } // formatProcessor.format((XMLNode)referenceNode.getParentNode()); diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/graph/LinkedGraphViewer.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/graph/LinkedGraphViewer.java index 09645a1830..da35f8e40f 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/graph/LinkedGraphViewer.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/graph/LinkedGraphViewer.java @@ -24,7 +24,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xsd.ui.internal.XSDEditor; import org.eclipse.wst.xsd.ui.internal.util.ViewUtility; import org.eclipse.xsd.XSDConcreteComponent; @@ -146,7 +146,7 @@ public class LinkedGraphViewer // this test ensures that we don't attempt to select an element for an external schema // - if (element instanceof XMLNode) + if (element instanceof DOMNode) { // now update the minor viewer based on the selected component in the major viewer minorViewer.setInput((XSDConcreteComponent)model); diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/graph/XSDGraphUtil.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/graph/XSDGraphUtil.java index a19f20b5c4..88946e6cb8 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/graph/XSDGraphUtil.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/graph/XSDGraphUtil.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.xsd.ui.internal.graph; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.xsd.XSDConcreteComponent; import org.w3c.dom.Element; @@ -25,7 +25,7 @@ public class XSDGraphUtil Element element = ((XSDConcreteComponent)model).getElement(); // this test ensures that we don't attempt to select an element for an external schema // - if (element instanceof XMLNode) + if (element instanceof DOMNode) { result = true; } diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AbstractSection.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AbstractSection.java index 8ebd3ac9b4..ecef637d30 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AbstractSection.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AbstractSection.java @@ -37,7 +37,7 @@ import org.eclipse.wst.common.ui.properties.internal.provisional.ISection; import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage; import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory; import org.eclipse.wst.xml.core.NameValidator; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xml.core.internal.document.DocumentImpl; import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin; import org.eclipse.wst.xsd.ui.internal.actions.CreateElementAction; @@ -103,7 +103,7 @@ public class AbstractSection implements ISection, IPropertyChangeListener, Liste xsdSchema = ((XSDConcreteComponent)input).getSchema(); Element element = ((XSDConcreteComponent)input).getElement(); - if (element instanceof XMLNode) + if (element instanceof DOMNode) { isReadOnly = false; } diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/XSDSectionLabelProvider.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/XSDSectionLabelProvider.java index d5c65781b9..ff79198ef0 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/XSDSectionLabelProvider.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/XSDSectionLabelProvider.java @@ -15,7 +15,7 @@ import org.eclipse.jface.util.Assert; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin; import org.eclipse.wst.xsd.ui.internal.XSDTextEditor; import org.eclipse.xsd.XSDAttributeDeclaration; @@ -117,7 +117,7 @@ public class XSDSectionLabelProvider extends LabelProvider sb.append(XSDEditorPlugin.getXSDString("_UI_PAGE_HEADING_REFERENCE")); } - if (!(element instanceof XMLNode)) + if (!(element instanceof DOMNode)) { sb.append(" (" + XSDEditorPlugin.getXSDString("_UI_LABEL_READ_ONLY") + ")"); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/refactor/rename/SchemaPrefixChangeHandler.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/refactor/rename/SchemaPrefixChangeHandler.java index 62b0eb9478..5d803fc9ca 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/refactor/rename/SchemaPrefixChangeHandler.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/refactor/rename/SchemaPrefixChangeHandler.java @@ -13,7 +13,7 @@ package org.eclipse.wst.xsd.ui.internal.refactor.rename; import java.util.Iterator; import java.util.List; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xsd.ui.internal.refactor.XSDVisitor; import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper; import org.eclipse.xsd.XSDAttributeDeclaration; @@ -87,7 +87,7 @@ public class SchemaPrefixChangeHandler if (ns.equals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001)) { Element domElement = element.getElement(); - if (domElement != null && domElement instanceof XMLNode) + if (domElement != null && domElement instanceof DOMNode) { Attr typeAttr = domElement.getAttributeNode(XSDConstants.TYPE_ATTRIBUTE); if (typeAttr != null) @@ -114,7 +114,7 @@ public class SchemaPrefixChangeHandler { XSDDOMHelper domHelper = new XSDDOMHelper(); Element derivedBy = domHelper.getDerivedByElement(simpleType.getElement()); - if (derivedBy != null && derivedBy instanceof XMLNode) + if (derivedBy != null && derivedBy instanceof DOMNode) { Attr typeAttr = derivedBy.getAttributeNode(XSDConstants.BASE_ATTRIBUTE); if (typeAttr != null) @@ -137,7 +137,7 @@ public class SchemaPrefixChangeHandler if (listNode != null && listNode instanceof Element) { Element listElement = (Element)listNode; - if (listElement instanceof XMLNode) + if (listElement instanceof DOMNode) { Attr typeAttr = listElement.getAttributeNode(XSDConstants.ITEMTYPE_ATTRIBUTE); if (typeAttr != null) @@ -157,7 +157,7 @@ public class SchemaPrefixChangeHandler if (unionNode != null && unionNode instanceof Element) { Element unionElement = (Element)unionNode; - if (unionElement instanceof XMLNode) + if (unionElement instanceof DOMNode) { Attr typeAttr = unionElement.getAttributeNode(XSDConstants.MEMBERTYPES_ATTRIBUTE); StringBuffer sb = new StringBuffer(""); @@ -197,7 +197,7 @@ public class SchemaPrefixChangeHandler if (ns.equals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001)) { Element domElement = attr.getElement(); - if (domElement != null && domElement instanceof XMLNode) + if (domElement != null && domElement instanceof DOMNode) { Attr typeAttr = domElement.getAttributeNode(XSDConstants.TYPE_ATTRIBUTE); if (typeAttr != null) diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/util/XSDDOMHelper.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/util/XSDDOMHelper.java index e0835b28f6..0f6aa88741 100644 --- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/util/XSDDOMHelper.java +++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/util/XSDDOMHelper.java @@ -11,8 +11,8 @@ package org.eclipse.wst.xsd.ui.internal.util; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; -import org.eclipse.wst.xml.core.document.XMLModel; -import org.eclipse.wst.xml.core.document.XMLNode; +import org.eclipse.wst.xml.core.document.DOMModel; +import org.eclipse.wst.xml.core.document.DOMNode; import org.eclipse.wst.xml.core.format.FormatProcessorXML; import org.eclipse.xsd.util.XSDConstants; import org.w3c.dom.Document; @@ -825,9 +825,9 @@ public class XSDDOMHelper public static void formatChild(Node child) { - if (child instanceof XMLNode) + if (child instanceof DOMNode) { - XMLModel model = ((XMLNode)child).getModel(); + DOMModel model = ((DOMNode)child).getModel(); try { // tell the model that we are about to make a big model change |