Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavid_williams2005-04-05 05:21:12 +0000
committerdavid_williams2005-04-05 05:21:12 +0000
commit6a8e389476242714f2b71632f8c0e5998782818b (patch)
tree9967bd2186733c30812e3a2358a70eb26cb55e3b /bundles/org.eclipse.wst.css.ui
parent653478cb261a29df9aa3566f022efb0e32e00257 (diff)
downloadwebtools.sourceediting-6a8e389476242714f2b71632f8c0e5998782818b.tar.gz
webtools.sourceediting-6a8e389476242714f2b71632f8c0e5998782818b.tar.xz
webtools.sourceediting-6a8e389476242714f2b71632f8c0e5998782818b.zip
renamed XMLModel to DOMModel
Diffstat (limited to 'bundles/org.eclipse.wst.css.ui')
-rw-r--r--bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistProcessor.java18
-rw-r--r--bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForHTMLTag.java6
-rw-r--r--bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java4
3 files changed, 14 insertions, 14 deletions
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistProcessor.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistProcessor.java
index ca119581b6..fefbe6fe7e 100644
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistProcessor.java
+++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistProcessor.java
@@ -24,7 +24,7 @@ import org.eclipse.wst.sse.core.IndexedRegion;
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.xml.core.document.XMLNode;
+import org.eclipse.wst.xml.core.document.DOMNode;
import org.eclipse.wst.xml.ui.contentassist.XMLContentAssistUtilities;
import org.eclipse.wst.xml.ui.util.SharedXMLEditorPluginImageHelper;
@@ -45,15 +45,15 @@ public class CSSContentAssistProcessor implements IContentAssistProcessor {
public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentPosition) {
IndexedRegion indexedNode = ContentAssistUtils.getNodeAt((StructuredTextViewer) viewer, documentPosition + fDocumentOffset);
- XMLNode xNode = null;
- XMLNode parent = null;
+ DOMNode xNode = null;
+ DOMNode parent = null;
CSSProposalArranger arranger = null;
// bail if we couldn't get an indexed node
// if(indexedNode == null) return new ICompletionProposal[0];
- if (indexedNode instanceof XMLNode) {
- xNode = (XMLNode) indexedNode;
- parent = (XMLNode) xNode.getParentNode();
+ if (indexedNode instanceof DOMNode) {
+ xNode = (DOMNode) indexedNode;
+ parent = (DOMNode) xNode.getParentNode();
}
// need to get in here if there in the no 0 region <style>|</style>
// case
@@ -86,9 +86,9 @@ public class CSSContentAssistProcessor implements IContentAssistProcessor {
arranger = new CSSProposalArranger(pos, (ICSSNode) keyIndexedNode, offset, (char) 0);
}
}
- else if (indexedNode instanceof XMLNode) {
+ else if (indexedNode instanceof DOMNode) {
// get model for node w/ style attribute
- IStructuredModel cssModel = getCSSModel((XMLNode) indexedNode);
+ IStructuredModel cssModel = getCSSModel((DOMNode) indexedNode);
if (cssModel != null) {
IndexedRegion keyIndexedNode = cssModel.getIndexedRegion(documentPosition - fDocumentOffset);
if (keyIndexedNode == null) {
@@ -197,7 +197,7 @@ public class CSSContentAssistProcessor implements IContentAssistProcessor {
* @param element
* @return IStructuredModel
*/
- private IStructuredModel getCSSModel(XMLNode element) {
+ private IStructuredModel getCSSModel(DOMNode element) {
if (element == null)
return null;
INodeAdapter adapter = StyleAdapterFactory.getInstance().adapt(element);
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForHTMLTag.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForHTMLTag.java
index 4c4ce152ad..9d701aea1e 100644
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForHTMLTag.java
+++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForHTMLTag.java
@@ -21,7 +21,7 @@ import org.eclipse.wst.css.core.document.ICSSStyleRule;
import org.eclipse.wst.css.ui.image.CSSImageType;
import org.eclipse.wst.html.core.contentmodel.HTMLCMDocumentFactory;
import org.eclipse.wst.xml.core.contentmodel.CMDocType;
-import org.eclipse.wst.xml.core.document.XMLDocument;
+import org.eclipse.wst.xml.core.document.DOMDocument;
import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
@@ -62,8 +62,8 @@ class CSSProposalGeneratorForHTMLTag extends CSSProposalGenerator {
Node domNode = fContext.getModel().getOwnerDOMNode();
if (domNode != null && !(domNode instanceof Document)) {
domNode = domNode.getOwnerDocument();
- if (domNode instanceof XMLDocument) {
- DocumentTypeAdapter adapter = (DocumentTypeAdapter) ((XMLDocument) domNode).getAdapterFor(DocumentTypeAdapter.class);
+ if (domNode instanceof DOMDocument) {
+ DocumentTypeAdapter adapter = (DocumentTypeAdapter) ((DOMDocument) domNode).getAdapterFor(DocumentTypeAdapter.class);
if (adapter != null)
bLowerCase = (adapter.getTagNameCase() == DocumentTypeAdapter.LOWER_CASE);
}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java
index fa9c1c0712..caa460eb89 100644
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java
+++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java
@@ -29,7 +29,7 @@ import org.eclipse.wst.css.core.document.ICSSNode;
import org.eclipse.wst.css.core.util.CSSPathService;
import org.eclipse.wst.sse.core.IStructuredModel;
import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.document.XMLNode;
+import org.eclipse.wst.xml.core.document.DOMNode;
/**
*/
@@ -70,7 +70,7 @@ public class CSSTextPropertyDescriptor extends TextPropertyDescriptor {
// validateEdit()
IStructuredModel structuredModel = model;
if (model.getStyleSheetType() != ICSSModel.EXTERNAL) {
- structuredModel = ((XMLNode) model.getOwnerDOMNode()).getModel();
+ structuredModel = ((DOMNode) model.getOwnerDOMNode()).getModel();
if (structuredModel == null)
return null;
}

Back to the top