diff options
| author | david_williams | 2005-04-11 06:21:55 +0000 |
|---|---|---|
| committer | david_williams | 2005-04-11 06:21:55 +0000 |
| commit | 5677702d1e7172f5b9e6d1aeb3fcdf11f5568ecb (patch) | |
| tree | bda98774d41ffb546f6325d99ebfe84a40f11619 | |
| parent | 0d4842cb77bf1e760a7a2846f63dabf4311e5701 (diff) | |
| download | webtools.sourceediting-5677702d1e7172f5b9e6d1aeb3fcdf11f5568ecb.tar.gz webtools.sourceediting-5677702d1e7172f5b9e6d1aeb3fcdf11f5568ecb.tar.xz webtools.sourceediting-5677702d1e7172f5b9e6d1aeb3fcdf11f5568ecb.zip | |
massive renames for the internalization process
473 files changed, 1170 insertions, 1239 deletions
diff --git a/bundles/org.eclipse.jst.jsp.core/plugin.xml b/bundles/org.eclipse.jst.jsp.core/plugin.xml index b0f7817604..8b51dce76d 100644 --- a/bundles/org.eclipse.jst.jsp.core/plugin.xml +++ b/bundles/org.eclipse.jst.jsp.core/plugin.xml @@ -30,9 +30,9 @@ <extension point="org.eclipse.wst.sse.core.modelHandler"> <modelHandler - class="org.eclipse.jst.jsp.core.modelhandler.ModelHandlerForJSP" + class="org.eclipse.jst.jsp.core.internal.modelhandler.ModelHandlerForJSP" associatedContentTypeId="org.eclipse.jst.jsp.core.jspsource" - id="org.eclipse.jst.jsp.core.modelhandler"> + id="org.eclipse.jst.jsp.core.internal.modelhandler"> </modelHandler> </extension> <extension @@ -104,7 +104,7 @@ <extension point="org.eclipse.wst.sse.core.formatProcessors"> <processor - class="org.eclipse.wst.html.core.format.HTMLFormatProcessorImpl" + class="org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl" contentTypeId="org.eclipse.jst.jsp.core.jspsource"> </processor> </extension> diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/CMDocumentWrapperImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/CMDocumentWrapperImpl.java index 543463d798..1ab27a73d4 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/CMDocumentWrapperImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/CMDocumentWrapperImpl.java @@ -15,12 +15,12 @@ package org.eclipse.jst.jsp.core.internal.contentmodel; import java.util.Hashtable; import java.util.Iterator; -import org.eclipse.wst.xml.core.contentmodel.CMNodeWrapper; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper; public class CMDocumentWrapperImpl implements CMDocument, CMNodeWrapper { diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/CMNodeWrapperImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/CMNodeWrapperImpl.java index 1f9e6ae2db..0f117ff438 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/CMNodeWrapperImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/CMNodeWrapperImpl.java @@ -12,8 +12,8 @@ package org.eclipse.jst.jsp.core.internal.contentmodel; -import org.eclipse.wst.xml.core.contentmodel.CMNodeWrapper; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper; public class CMNodeWrapperImpl implements CMNode, CMNodeWrapper { private CMNode fNode = null; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/JSPCMDocumentFactory.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/JSPCMDocumentFactory.java index 3177eb80b0..a75e1cec0a 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/JSPCMDocumentFactory.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/JSPCMDocumentFactory.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.jst.jsp.core.internal.contentmodel; -import org.eclipse.wst.html.core.contentmodel.HTMLCMDocumentFactory; -import org.eclipse.wst.xml.core.contentmodel.CMDocType; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType; /** * CMDocument factory for JSP documents. diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/ProjectDescription.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/ProjectDescription.java index cb81a8e90b..0f6f96ac76 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/ProjectDescription.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/ProjectDescription.java @@ -41,8 +41,8 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP12TLDNames; import org.eclipse.jst.jsp.core.internal.Logger; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP12TLDNames; import org.eclipse.jst.jsp.core.internal.util.DocumentProvider; import org.eclipse.wst.sse.core.util.JarUtilities; import org.eclipse.wst.xml.uriresolver.util.URIHelper; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMAttributeDeclarationImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMAttributeDeclarationImpl.java index fdef4f0850..8ba9d40387 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMAttributeDeclarationImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMAttributeDeclarationImpl.java @@ -14,9 +14,9 @@ package org.eclipse.jst.jsp.core.internal.contentmodel.tld; import java.util.Enumeration; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP12TLDNames; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDAttributeDeclaration; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDDocument; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP12TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDAttributeDeclaration; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMDocumentFactoryTLD.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMDocumentFactoryTLD.java index 14e9a68df6..cb2f52e8dc 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMDocumentFactoryTLD.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMDocumentFactoryTLD.java @@ -18,19 +18,19 @@ import java.net.URL; import java.net.URLConnection; import org.eclipse.core.runtime.Platform; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP11TLDNames; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP12TLDNames; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP20TLDNames; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDDocument; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDFunction; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDInitParam; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDListener; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDValidator; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDVariable; import org.eclipse.jst.jsp.core.internal.contentmodel.ITaglibRecord; import org.eclipse.jst.jsp.core.internal.contentmodel.JarRecord; import org.eclipse.jst.jsp.core.internal.contentmodel.TLDRecord; import org.eclipse.jst.jsp.core.internal.contentmodel.URLRecord; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP11TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP12TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP20TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDFunction; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDInitParam; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDListener; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDValidator; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDVariable; import org.eclipse.jst.jsp.core.internal.util.DocumentProvider; import org.eclipse.wst.sse.core.util.JarUtilities; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMDocumentImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMDocumentImpl.java index 4b816faf65..8592524dff 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMDocumentImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMDocumentImpl.java @@ -18,9 +18,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDDocument; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDValidator; import org.eclipse.jst.jsp.core.internal.Logger; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDValidator; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMElementDeclarationImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMElementDeclarationImpl.java index d128a5fca8..0c018b305f 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMElementDeclarationImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/CMElementDeclarationImpl.java @@ -15,10 +15,10 @@ package org.eclipse.jst.jsp.core.internal.contentmodel.tld; import java.util.ArrayList; import java.util.List; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP11TLDNames; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP12TLDNames; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDDocument; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDElementDeclaration; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP11TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP12TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.xml.core.internal.contentmodel.CMContent; import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDCMDocumentManager.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDCMDocumentManager.java index f5e1b00399..bedc11a2d8 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDCMDocumentManager.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDCMDocumentManager.java @@ -36,19 +36,19 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.content.IContentDescription; import org.eclipse.jst.jsp.core.JSP12Namespace; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP11TLDNames; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP12TLDNames; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP20TLDNames; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDDocument; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDElementDeclaration; import org.eclipse.jst.jsp.core.internal.Logger; import org.eclipse.jst.jsp.core.internal.contentmodel.ITaglibIndexListener; import org.eclipse.jst.jsp.core.internal.contentmodel.ITaglibRecord; import org.eclipse.jst.jsp.core.internal.contentmodel.ITaglibRecordEvent; import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController; import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibIndex; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP11TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP12TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP20TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration; import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.common.uriresolver.URIResolverPlugin; import org.eclipse.wst.sse.core.parser.BlockMarker; import org.eclipse.wst.sse.core.parser.StructuredDocumentRegionHandler; @@ -62,7 +62,7 @@ import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.uriresolver.util.URIHelper; public class TLDCMDocumentManager implements ITaglibIndexListener { @@ -79,7 +79,7 @@ public class TLDCMDocumentManager implements ITaglibIndexListener { if (getParser() == null) return; if (getParser().getBlockMarker(tagnameNS) == null) { - getParser().addBlockMarker(new BlockMarker(tagnameNS, marker, XMLRegionContext.BLOCK_TEXT, true, false)); + getParser().addBlockMarker(new BlockMarker(tagnameNS, marker, DOMRegionContext.BLOCK_TEXT, true, false)); if (_debug) { System.out.println("TLDCMDocumentManager added block marker: " + tagnameNS + "@" + marker.getStartOffset()); //$NON-NLS-2$//$NON-NLS-1$ } @@ -273,7 +273,7 @@ public class TLDCMDocumentManager implements ITaglibIndexListener { try { for (int i = 0; i < regions.size(); i++) { ITextRegion region = regions.get(i); - if (region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { if (textSource.getText(includeStructuredDocumentRegion.getStartOffset(region), region.getTextLength()).equals(JSP12TLDNames.FILE)) { isFilename = true; } @@ -281,7 +281,7 @@ public class TLDCMDocumentManager implements ITaglibIndexListener { isFilename = false; } } - else if (isFilename && region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (isFilename && region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { includedFile = textSource.getText(includeStructuredDocumentRegion.getStartOffset(region), region.getTextLength()); isFilename = false; } @@ -325,7 +325,7 @@ public class TLDCMDocumentManager implements ITaglibIndexListener { try { for (int i = 0; i < regions.size(); i++) { ITextRegion region = regions.get(i); - if (region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { String name = textSource.getText(taglibStructuredDocumentRegion.getStartOffset(region), region.getTextLength()); if (name.startsWith(XMLNS)) { //$NON-NLS-1$ prefix = name.substring(XMLNS_LENGTH); @@ -337,7 +337,7 @@ public class TLDCMDocumentManager implements ITaglibIndexListener { taglib = false; } } - else if (taglib && region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (taglib && region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { uri = textSource.getText(taglibStructuredDocumentRegion.getStartOffset(region), region.getTextLength()); if (uri != null && prefix != null && (StringUtils.strip(uri).length() > 0) && (StringUtils.strip(prefix).length() > 0)) { if (anchorStructuredDocumentRegion == null) @@ -377,7 +377,7 @@ public class TLDCMDocumentManager implements ITaglibIndexListener { // remember attribute name int startOffset = taglibStructuredDocumentRegion.getStartOffset(region); int textLength = region.getTextLength(); - if (region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { // String name = textSource.getText(startOffset, // textLength); if (textSource.regionMatches(startOffset, textLength, JSP11TLDNames.PREFIX)) { @@ -394,7 +394,7 @@ public class TLDCMDocumentManager implements ITaglibIndexListener { } } // process value - else if (region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { if (JSP11TLDNames.PREFIX.equals(attrName)) prefix = textSource.getText(startOffset, textLength); else if (JSP11TLDNames.URI.equals(attrName)) @@ -429,7 +429,7 @@ public class TLDCMDocumentManager implements ITaglibIndexListener { Iterator names = getParser().getBlockMarkers().iterator(); while (names.hasNext()) { BlockMarker marker = (BlockMarker) names.next(); - if (!marker.isGlobal() && marker.getContext() == XMLRegionContext.BLOCK_TEXT) { + if (!marker.isGlobal() && marker.getContext() == DOMRegionContext.BLOCK_TEXT) { if (_debug) { System.out.println("TLDCMDocumentManager removing block tag named: " + marker.getTagName()); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDFunctionImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDFunctionImpl.java index 5a3ef34630..65c7de02ce 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDFunctionImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDFunctionImpl.java @@ -13,7 +13,7 @@ package org.eclipse.jst.jsp.core.internal.contentmodel.tld; import java.util.ArrayList; import java.util.List; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDFunction; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDFunction; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; public class TLDFunctionImpl implements TLDFunction { diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDInitParamImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDInitParamImpl.java index 6bc9fc13c9..01c25c267e 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDInitParamImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDInitParamImpl.java @@ -16,7 +16,7 @@ */ package org.eclipse.jst.jsp.core.internal.contentmodel.tld; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDInitParam; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDInitParam; import org.eclipse.wst.sse.core.util.StringUtils; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDListenerImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDListenerImpl.java index 0fea952eb4..fe562db4c0 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDListenerImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDListenerImpl.java @@ -16,7 +16,7 @@ */ package org.eclipse.jst.jsp.core.internal.contentmodel.tld; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDListener; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDListener; import org.eclipse.wst.sse.core.util.StringUtils; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDValidatorImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDValidatorImpl.java index 7fc7f573b4..ddb4fe4d60 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDValidatorImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDValidatorImpl.java @@ -19,7 +19,7 @@ package org.eclipse.jst.jsp.core.internal.contentmodel.tld; import java.util.ArrayList; import java.util.List; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDValidator; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDValidator; import org.eclipse.wst.sse.core.util.StringUtils; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDVariableImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDVariableImpl.java index 8b75897773..a35ade1d19 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDVariableImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDVariableImpl.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.jst.jsp.core.internal.contentmodel.tld; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP12TLDNames; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDVariable; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP12TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDVariable; import org.eclipse.wst.sse.core.util.StringUtils; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TaglibTracker.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TaglibTracker.java index bcdf95ed40..bc8561f147 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TaglibTracker.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TaglibTracker.java @@ -14,8 +14,8 @@ package org.eclipse.jst.jsp.core.internal.contentmodel.tld; import org.eclipse.jst.jsp.core.internal.contentmodel.CMDocumentWrapperImpl; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; -import org.eclipse.wst.xml.core.contentmodel.CMDocumentTracker; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocumentTracker; /** * TaglibTracker class diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/JSP11TLDNames.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/JSP11TLDNames.java index 8d57dc4655..6a484dc6a7 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/JSP11TLDNames.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/JSP11TLDNames.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ /*nlsXXX*/ -package org.eclipse.jst.jsp.core.contentmodel.tld; +package org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional; public interface JSP11TLDNames { diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/JSP12TLDNames.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/JSP12TLDNames.java index 7bf8b4bdf5..4e8c767b50 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/JSP12TLDNames.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/JSP12TLDNames.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ /*nlsXXX*/ -package org.eclipse.jst.jsp.core.contentmodel.tld; +package org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional; public interface JSP12TLDNames { diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/JSP20TLDNames.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/JSP20TLDNames.java index 7de03c7b32..ea51e195c4 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/JSP20TLDNames.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/JSP20TLDNames.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.contentmodel.tld; +package org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional; /*nlsXXX*/ public interface JSP20TLDNames extends JSP12TLDNames { diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDAttributeDeclaration.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDAttributeDeclaration.java index 5ab62ce76e..05960a3d45 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDAttributeDeclaration.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDAttributeDeclaration.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.contentmodel.tld; +package org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDDocument.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDDocument.java index 8b1acb07b0..7addae47d9 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDDocument.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDDocument.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.contentmodel.tld; +package org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional; import java.util.List; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDElementDeclaration.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDElementDeclaration.java index 6f9360a5b6..f62ed23874 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDElementDeclaration.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDElementDeclaration.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.contentmodel.tld; +package org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional; import java.util.List; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDFunction.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDFunction.java index 4ecde2b5ff..8f2b50ab76 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDFunction.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDFunction.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.contentmodel.tld; +package org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional; import java.util.List; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDInitParam.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDInitParam.java index 19ada7207e..e4d5c50692 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDInitParam.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDInitParam.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.contentmodel.tld; +package org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional; /** diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDListener.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDListener.java index ecbd0f8123..aa9116cfbc 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDListener.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDListener.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.contentmodel.tld; +package org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional; /** diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDValidator.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDValidator.java index 0463bc15f8..ae6e044419 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDValidator.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.contentmodel.tld; +package org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional; import java.util.List; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDVariable.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDVariable.java index ec10a92144..1a01b08ac5 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/contentmodel/tld/TLDVariable.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/provisional/TLDVariable.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.contentmodel.tld; +package org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional; /** * Information on the scripting variables defined by this tag. diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/PageDirectiveAdapter.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapter.java index 24329db762..a5a60f083a 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/PageDirectiveAdapter.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core; +package org.eclipse.jst.jsp.core.internal.document; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapter; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterFactory.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterFactory.java index 5ffd24e266..1f26bb86f5 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterFactory.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterFactory.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.jst.jsp.core.internal.document; -import org.eclipse.jst.jsp.core.PageDirectiveAdapter; import org.eclipse.wst.sse.core.AbstractAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapter; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterImpl.java index b2ed18cdf7..b374826da9 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterImpl.java @@ -23,9 +23,8 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jface.text.IDocumentExtension3; import org.eclipse.jface.text.IDocumentPartitioner; -import org.eclipse.jst.jsp.core.PageDirectiveAdapter; +import org.eclipse.jst.jsp.core.internal.modelhandler.EmbeddedTypeStateData; import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP; -import org.eclipse.jst.jsp.core.modelhandler.EmbeddedTypeStateData; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveWatcherImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveWatcherImpl.java index f93c434e61..5c7f77d13b 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveWatcherImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveWatcherImpl.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.jst.jsp.core.internal.document; -import org.eclipse.jst.jsp.core.PageDirectiveAdapter; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.xml.core.document.IDOMDocument; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/AttrImplForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/AttrImplForJSP.java index 591d2c0a3a..5bcc664aa8 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/AttrImplForJSP.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/AttrImplForJSP.java @@ -12,7 +12,7 @@ package org.eclipse.jst.jsp.core.internal.domdocument; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.xml.core.internal.document.AttrImpl; import org.w3c.dom.Document; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/CommentImplForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/CommentImplForJSP.java index 887b38d024..ef6ea0455e 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/CommentImplForJSP.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/CommentImplForJSP.java @@ -12,7 +12,7 @@ package org.eclipse.jst.jsp.core.internal.domdocument; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.xml.core.internal.document.CommentImpl; import org.w3c.dom.Document; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/DOMDocumentForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/DOMDocumentForJSP.java index 026c940c3a..997caa59cf 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/DOMDocumentForJSP.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/DOMDocumentForJSP.java @@ -12,7 +12,7 @@ package org.eclipse.jst.jsp.core.internal.domdocument; -import org.eclipse.wst.html.core.document.DocumentStyleImpl; +import org.eclipse.wst.html.core.internal.document.DocumentStyleImpl; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.internal.document.DocumentImpl; import org.w3c.dom.Attr; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/DOMModelForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/DOMModelForJSP.java index f6ca49d672..413627fa8c 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/DOMModelForJSP.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/DOMModelForJSP.java @@ -12,12 +12,12 @@ package org.eclipse.jst.jsp.core.internal.domdocument; -import org.eclipse.wst.html.core.document.XMLStyleModelImpl; +import org.eclipse.wst.html.core.internal.document.DOMStyleModelImpl; import org.eclipse.wst.xml.core.internal.document.XMLModelParser; import org.eclipse.wst.xml.core.internal.document.XMLModelUpdater; import org.w3c.dom.Document; -public class DOMModelForJSP extends XMLStyleModelImpl { +public class DOMModelForJSP extends DOMStyleModelImpl { /** * diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/ElementImplForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/ElementImplForJSP.java index 2c88c4c942..9f6bcda3dc 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/ElementImplForJSP.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/ElementImplForJSP.java @@ -12,8 +12,8 @@ package org.eclipse.jst.jsp.core.internal.domdocument; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; -import org.eclipse.wst.html.core.document.ElementStyleImpl; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; +import org.eclipse.wst.html.core.internal.document.ElementStyleImpl; import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/NestDOMModelUpdater.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/NestDOMModelUpdater.java index 29e3fd9ec8..26b71c494a 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/NestDOMModelUpdater.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/NestDOMModelUpdater.java @@ -12,8 +12,8 @@ package org.eclipse.jst.jsp.core.internal.domdocument; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; -import org.eclipse.wst.xml.core.internal.document.XMLModelImpl; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; +import org.eclipse.wst.xml.core.internal.document.DOMModelImpl; import org.eclipse.wst.xml.core.internal.document.XMLModelUpdater; @@ -22,7 +22,7 @@ public class NestDOMModelUpdater extends XMLModelUpdater { /** * @param model */ - public NestDOMModelUpdater(XMLModelImpl model) { + public NestDOMModelUpdater(DOMModelImpl model) { super(model); } diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/NestedDOMModelParser.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/NestedDOMModelParser.java index 41c59c2999..daa32db6ee 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/NestedDOMModelParser.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/NestedDOMModelParser.java @@ -12,11 +12,11 @@ package org.eclipse.jst.jsp.core.internal.domdocument; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.xml.core.internal.document.JSPTag; -import org.eclipse.wst.xml.core.internal.document.XMLModelImpl; +import org.eclipse.wst.xml.core.internal.document.DOMModelImpl; import org.eclipse.wst.xml.core.internal.document.XMLModelParser; public class NestedDOMModelParser extends XMLModelParser { @@ -24,7 +24,7 @@ public class NestedDOMModelParser extends XMLModelParser { /** * @param model */ - public NestedDOMModelParser(XMLModelImpl model) { + public NestedDOMModelParser(DOMModelImpl model) { super(model); } diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/TextImplForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/TextImplForJSP.java index 94d8bad218..da91a239c1 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/TextImplForJSP.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/domdocument/TextImplForJSP.java @@ -12,7 +12,7 @@ package org.eclipse.jst.jsp.core.internal.domdocument; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.xml.core.internal.document.TextImpl; import org.w3c.dom.Document; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/encoding/IJSPHeadContentDetector.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/encoding/IJSPHeadContentDetector.java index 2e59dc8ca1..02b84537a0 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/encoding/IJSPHeadContentDetector.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/encoding/IJSPHeadContentDetector.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.encoding; +package org.eclipse.jst.jsp.core.internal.encoding; import java.io.IOException; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/encoding/JSPDocumentHeadContentDetector.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/encoding/JSPDocumentHeadContentDetector.java index c46ce3660f..5679036d28 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/encoding/JSPDocumentHeadContentDetector.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/encoding/JSPDocumentHeadContentDetector.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.encoding; +package org.eclipse.jst.jsp.core.internal.encoding; import org.eclipse.jface.text.IDocument; import org.eclipse.jst.jsp.core.internal.contenttype.JSPResourceEncodingDetector; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/encoding/JSPDocumentLoader.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/encoding/JSPDocumentLoader.java index f62bc7aadf..014263258e 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/encoding/JSPDocumentLoader.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/encoding/JSPDocumentLoader.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.encoding; +package org.eclipse.jst.jsp.core.internal.encoding; import java.io.IOException; import java.io.InputStream; @@ -22,8 +22,8 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.jst.jsp.core.JSP11Namespace; -import org.eclipse.jst.jsp.core.PageDirectiveAdapter; import org.eclipse.jst.jsp.core.contenttype.ContentTypeIdForJSP; +import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter; import org.eclipse.jst.jsp.core.internal.document.PageDirectiveWatcherFactory; import org.eclipse.jst.jsp.core.internal.parser.JSPReParser; import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPIncludeRegionHelper.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPIncludeRegionHelper.java index 6f64818ced..eebe713ff3 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPIncludeRegionHelper.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPIncludeRegionHelper.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.jst.jsp.core.internal.java; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** @@ -36,7 +36,7 @@ class JSPIncludeRegionHelper extends XMLJSPRegionHelper { */ protected boolean isJSPStartRegion(IStructuredDocumentRegion sdRegion) { String type = sdRegion.getFirstRegion().getType(); - return type == XMLRegionContext.XML_TAG_OPEN || type == DOMJSPRegionContexts.JSP_DECLARATION_OPEN || type == DOMJSPRegionContexts.JSP_EXPRESSION_OPEN || type == DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN || type == DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN || type == DOMJSPRegionContexts.JSP_DIRECTIVE_NAME; + return type == DOMRegionContext.XML_TAG_OPEN || type == DOMJSPRegionContexts.JSP_DECLARATION_OPEN || type == DOMJSPRegionContexts.JSP_EXPRESSION_OPEN || type == DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN || type == DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN || type == DOMJSPRegionContexts.JSP_DIRECTIVE_NAME; } protected boolean isDeclaration(String tagName) { diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java index 395573d1dd..9dbdb29244 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java @@ -29,13 +29,13 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.Position; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP12TLDNames; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDElementDeclaration; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDVariable; import org.eclipse.jst.jsp.core.internal.Logger; import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController; import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP12TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDVariable; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.parser.BlockMarker; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; @@ -45,8 +45,6 @@ import org.eclipse.wst.sse.core.text.ITextRegionContainer; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.sse.core.util.URIResolver; -import org.eclipse.wst.xml.core.contentmodel.CMDocumentTracker; -import org.eclipse.wst.xml.core.contentmodel.CMNodeWrapper; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; @@ -54,7 +52,9 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocumentTracker; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** * Translates a JSP document into a HttpServlet. Keeps two way mapping from @@ -649,7 +649,7 @@ public class JSPTranslator { // intercept HTML comment flat node // also handles UNDEFINED (which is what CDATA comes in as) // basically this part will handle any "embedded" JSP containers - if (getCurrentNode().getType() == XMLRegionContext.XML_COMMENT_TEXT || getCurrentNode().getType() == XMLRegionContext.XML_CDATA_TEXT || getCurrentNode().getType() == XMLRegionContext.UNDEFINED) { + if (getCurrentNode().getType() == DOMRegionContext.XML_COMMENT_TEXT || getCurrentNode().getType() == DOMRegionContext.XML_CDATA_TEXT || getCurrentNode().getType() == DOMRegionContext.UNDEFINED) { translateXMLCommentNode(getCurrentNode()); } else // iterate through each region in the flat node @@ -711,11 +711,11 @@ public class JSPTranslator { ITextRegion r = null; while (it.hasNext()) { r = (ITextRegion) it.next(); - if (r.getType() == DOMJSPRegionContexts.JSP_CONTENT || r.getType() == XMLRegionContext.XML_CONTENT) + if (r.getType() == DOMJSPRegionContexts.JSP_CONTENT || r.getType() == DOMRegionContext.XML_CONTENT) break; else if (r.getType() == DOMJSPRegionContexts.JSP_DIRECTIVE_NAME) break; - else if (r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE && getCurrentNode().getFullText(r).trim().equals("import")) //$NON-NLS-1$ + else if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && getCurrentNode().getFullText(r).trim().equals("import")) //$NON-NLS-1$ break; } } @@ -737,7 +737,7 @@ public class JSPTranslator { // CMVC 241869 // content assist was not showing up in JSP inside a javascript // region - if (type == XMLRegionContext.BLOCK_TEXT) { + if (type == DOMRegionContext.BLOCK_TEXT) { // check if it's nested jsp in a script tag... if (region instanceof ITextRegionContainer) { translateJSPNode(region, regions, type, EMBEDDED_JSP); @@ -756,7 +756,7 @@ public class JSPTranslator { { translateJSPNode(region, regions, type, JSPType); } - else if (type != null && type == XMLRegionContext.XML_TAG_OPEN) { + else if (type != null && type == DOMRegionContext.XML_TAG_OPEN) { translateXMLNode(containerRegion, regions); } } @@ -817,7 +817,7 @@ public class JSPTranslator { * determines if the type is a pure JSP type (not XML) */ protected boolean isJSP(String type) { - return ((type == DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN || type == DOMJSPRegionContexts.JSP_EXPRESSION_OPEN || type == DOMJSPRegionContexts.JSP_DECLARATION_OPEN || type == DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN || type == DOMJSPRegionContexts.JSP_CONTENT) && type != XMLRegionContext.XML_TAG_OPEN); + return ((type == DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN || type == DOMJSPRegionContexts.JSP_EXPRESSION_OPEN || type == DOMJSPRegionContexts.JSP_DECLARATION_OPEN || type == DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN || type == DOMJSPRegionContexts.JSP_CONTENT) && type != DOMRegionContext.XML_TAG_OPEN); // checking XML_TAG_OPEN so <jsp:directive.xxx/> gets treated like // other XML jsp tags } @@ -834,7 +834,7 @@ public class JSPTranslator { ITextRegion r = null; if (regions.hasNext()) { r = (ITextRegion) regions.next(); - if (r.getType() == XMLRegionContext.XML_TAG_NAME || r.getType() == DOMJSPRegionContexts.JSP_DIRECTIVE_NAME) // <jsp:directive.xxx + if (r.getType() == DOMRegionContext.XML_TAG_NAME || r.getType() == DOMJSPRegionContexts.JSP_DIRECTIVE_NAME) // <jsp:directive.xxx // comes // in // as @@ -909,7 +909,7 @@ public class JSPTranslator { // should be safe because // "file" is the only attribute for the // include directive - while (r != null && regions.hasNext() && !r.getType().equals(XMLRegionContext.XML_TAG_ATTRIBUTE_NAME)) { + while (r != null && regions.hasNext() && !r.getType().equals(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)) { r = (ITextRegion) regions.next(); } attrValue = getAttributeValue(r, regions); @@ -940,7 +940,7 @@ public class JSPTranslator { // <jsp:include page="filename") /> while (regions.hasNext()) { r = (ITextRegion) regions.next(); - if (r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME && getCurrentNode().getText(r).equals("page")) { //$NON-NLS-1$ + if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME && getCurrentNode().getText(r).equals("page")) { //$NON-NLS-1$ String filename = getAttributeValue(r, regions); handleIncludeFile(filename); break; @@ -1176,7 +1176,7 @@ public class JSPTranslator { // PMR 18368, B663 // skip to required "file" attribute, should be safe because // "file" is the only attribute for the include directive - while (r != null && regions.hasNext() && !r.getType().equals(XMLRegionContext.XML_TAG_ATTRIBUTE_NAME)) { + while (r != null && regions.hasNext() && !r.getType().equals(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)) { r = (ITextRegion) regions.next(); } fileLocation = getAttributeValue(r, regions); @@ -1251,9 +1251,9 @@ public class JSPTranslator { * @return the value for the attribute name (r), or null if isn't one */ protected String getAttributeValue(ITextRegion r, Iterator remainingRegions) { - if (r.getType().equals(XMLRegionContext.XML_TAG_ATTRIBUTE_NAME)) { - if (remainingRegions.hasNext() && (r = (ITextRegion) remainingRegions.next()) != null && r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { - if (remainingRegions.hasNext() && (r = (ITextRegion) remainingRegions.next()) != null && r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + if (r.getType().equals(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)) { + if (remainingRegions.hasNext() && (r = (ITextRegion) remainingRegions.next()) != null && r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + if (remainingRegions.hasNext() && (r = (ITextRegion) remainingRegions.next()) != null && r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { // handle include for the filename return StringUtils.stripQuotes(getCurrentNode().getText(r)); } @@ -1271,12 +1271,12 @@ public class JSPTranslator { // iterate all attributes while (regions.hasNext() && (r = (ITextRegion) regions.next()) != null && r.getType() != DOMJSPRegionContexts.JSP_CLOSE) { attrName = attrValue = null; - if (r.getType().equals(XMLRegionContext.XML_TAG_ATTRIBUTE_NAME)) { + if (r.getType().equals(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)) { attrName = getCurrentNode().getText(r).trim(); if (attrName.length() > 0) { - if (regions.hasNext() && (r = (ITextRegion) regions.next()) != null && r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { - if (regions.hasNext() && (r = (ITextRegion) regions.next()) != null && r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + if (regions.hasNext() && (r = (ITextRegion) regions.next()) != null && r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + if (regions.hasNext() && (r = (ITextRegion) regions.next()) != null && r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { attrValue = StringUtils.strip(getCurrentNode().getText(r)); } @@ -1523,7 +1523,7 @@ public class JSPTranslator { boolean isUseBean = false; for (int i = 0; i < regions.size(); i++) { r = regions.get(i); - if (r.getType() == XMLRegionContext.XML_TAG_NAME && jspReferenceRegion.getText(r).equals("jsp:useBean")) { //$NON-NLS-1$ + if (r.getType() == DOMRegionContext.XML_TAG_NAME && jspReferenceRegion.getText(r).equals("jsp:useBean")) { //$NON-NLS-1$ isUseBean = true; break; } @@ -1582,12 +1582,12 @@ public class JSPTranslator { ITextRegion r = null; for (int i = 0; i < size; i++) { r = regions.get(i); - if (r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) + if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) if (jspReferenceRegion.getText(r).trim().equals("import")) { //$NON-NLS-1$ // get the attr value region if (size > i + 2) { r = regions.get(i + 2); - if (r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { String jspImportText = jspReferenceRegion.getText(r); @@ -1676,9 +1676,9 @@ public class JSPTranslator { for (int j = 0; j < regions.size(); j++) { r = regions.get(j); - if (r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { attrName = jspReferenceRegion.getText(r); - if (regions.size() >= j + 2 && regions.get(j + 2).getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + if (regions.size() >= j + 2 && regions.get(j + 2).getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { // get attr value r = regions.get(j + 2); attrValue = jspReferenceRegion.getText(r); @@ -1757,7 +1757,7 @@ public class JSPTranslator { int start = stRegion.getStartOffset(); int end = stRegion.getEndOffset(); // adjustment necessary for embedded region containers - if (stRegion instanceof ITextRegionContainer && stRegion.getType() == XMLRegionContext.BLOCK_TEXT) { + if (stRegion instanceof ITextRegionContainer && stRegion.getType() == DOMRegionContext.BLOCK_TEXT) { if (stRegion.getRegions() != null && stRegion.getRegions().size() > 1) { ITextRegion jspContent = stRegion.getRegions().get(1); // should // be @@ -1769,13 +1769,13 @@ public class JSPTranslator { } int CDATAOffset = 0; // number of characters lost in conversion int bufferSize = 0; - if (stRegion.getType() == DOMJSPRegionContexts.JSP_CONTENT || stRegion.getType() == XMLRegionContext.BLOCK_TEXT // need + if (stRegion.getType() == DOMJSPRegionContexts.JSP_CONTENT || stRegion.getType() == DOMRegionContext.BLOCK_TEXT // need // this // for // embedded // JSP // regions - || stRegion.getType() == XMLRegionContext.XML_TAG_NAME) // need + || stRegion.getType() == DOMRegionContext.XML_TAG_NAME) // need // this // in // case @@ -1816,7 +1816,7 @@ public class JSPTranslator { // iterate XMLCONTENT and CDATA regions // loop fCurrentNode until you hit </jsp:scriptlet> (or other closing // tag name) - while (getCurrentNode() != null && getCurrentNode().getType() != XMLRegionContext.XML_TAG_NAME) // need + while (getCurrentNode() != null && getCurrentNode().getType() != DOMRegionContext.XML_TAG_NAME) // need // to // stop // on @@ -1865,13 +1865,13 @@ public class JSPTranslator { protected int unescapeRegion(ITextRegion r, StringBuffer sb) { String s = ""; //$NON-NLS-1$ int lengthBefore = 0, lengthAfter = 0, cdata_tags_length = 0; - if (r != null && (r.getType() == XMLRegionContext.XML_CONTENT || r.getType() == XMLRegionContext.XML_ENTITY_REFERENCE)) { + if (r != null && (r.getType() == DOMRegionContext.XML_CONTENT || r.getType() == DOMRegionContext.XML_ENTITY_REFERENCE)) { lengthBefore = (getCurrentNode() != r) ? getCurrentNode().getFullText(r).length() : getCurrentNode().getFullText().length(); s = EscapedTextUtil.getUnescapedText(getCurrentNode(), r); lengthAfter = s.length(); sb.append(s); } - else if (r != null && r.getType() == XMLRegionContext.XML_CDATA_TEXT) { + else if (r != null && r.getType() == DOMRegionContext.XML_CDATA_TEXT) { if (r instanceof ITextRegionContainer) // only interested in // contents { @@ -1881,10 +1881,10 @@ public class JSPTranslator { ITextRegion temp = null; while (it.hasNext()) { temp = (ITextRegion) it.next(); - if (temp instanceof ITextRegionContainer || temp.getType() == XMLRegionContext.XML_CDATA_TEXT) { + if (temp instanceof ITextRegionContainer || temp.getType() == DOMRegionContext.XML_CDATA_TEXT) { sb.append(getCurrentNode().getFullText(temp)); } - else if (temp.getType() == XMLRegionContext.XML_CDATA_OPEN || temp.getType() == XMLRegionContext.XML_CDATA_CLOSE) { + else if (temp.getType() == DOMRegionContext.XML_CDATA_OPEN || temp.getType() == DOMRegionContext.XML_CDATA_CLOSE) { cdata_tags_length += temp.getLength(); } } @@ -1904,13 +1904,13 @@ public class JSPTranslator { String className = null; Iterator regions = container.getRegions().iterator(); - while (regions.hasNext() && (r = (ITextRegion) regions.next()) != null && (r.getType() != XMLRegionContext.XML_TAG_CLOSE || r.getType() != XMLRegionContext.XML_EMPTY_TAG_CLOSE)) { + while (regions.hasNext() && (r = (ITextRegion) regions.next()) != null && (r.getType() != DOMRegionContext.XML_TAG_CLOSE || r.getType() != DOMRegionContext.XML_EMPTY_TAG_CLOSE)) { attrName = attrValue = null; - if (r.getType().equals(XMLRegionContext.XML_TAG_ATTRIBUTE_NAME)) { + if (r.getType().equals(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)) { attrName = container.getText(r).trim(); - if (regions.hasNext() && (r = (ITextRegion) regions.next()) != null && r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { - if (regions.hasNext() && (r = (ITextRegion) regions.next()) != null && r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + if (regions.hasNext() && (r = (ITextRegion) regions.next()) != null && r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + if (regions.hasNext() && (r = (ITextRegion) regions.next()) != null && r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { attrValue = StringUtils.stripQuotes(container.getText(r)); } // has equals, but no value? diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java index f879963112..608e21d44c 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jst.jsp.core.internal.Logger; import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.parser.BlockMarker; import org.eclipse.wst.sse.core.parser.StructuredDocumentRegionHandler; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; @@ -30,7 +30,7 @@ import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** @@ -155,7 +155,7 @@ class XMLJSPRegionHelper implements StructuredDocumentRegionHandler { } } } - else if (sdRegion.getFirstRegion().getType() == XMLRegionContext.XML_CONTENT) { + else if (sdRegion.getFirstRegion().getType() == DOMRegionContext.XML_CONTENT) { if (fTagname != null) { processUseBean(sdRegion); processOtherRegions(sdRegion); @@ -263,7 +263,7 @@ class XMLJSPRegionHelper implements StructuredDocumentRegionHandler { protected void processIncludeDirective(IStructuredDocumentRegion sdRegion) { if (isIncludeDirective(fTagname)) { // the directive name region itself contains the attrs... - if (sdRegion.getRegions().get(0).getType() == XMLRegionContext.XML_CONTENT) + if (sdRegion.getRegions().get(0).getType() == DOMRegionContext.XML_CONTENT) sdRegion = sdRegion.getPrevious(); String fileLocation = getAttributeValue("file", sdRegion); //$NON-NLS-1$ this.fTranslator.handleIncludeFile(fileLocation); @@ -325,12 +325,12 @@ class XMLJSPRegionHelper implements StructuredDocumentRegionHandler { ITextRegion nameRegion, valueRegion = null; while (it.hasNext()) { nameRegion = (ITextRegion) it.next(); - if (nameRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (nameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { textRegionText = sdRegionText.substring(nameRegion.getStart(), nameRegion.getEnd()); if (textRegionText.equalsIgnoreCase(attrName)) { while (it.hasNext()) { valueRegion = (ITextRegion) it.next(); - if (valueRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + if (valueRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { attrValue = sdRegionText.substring(valueRegion.getStart(), valueRegion.getEnd()); break; // inner } @@ -347,7 +347,7 @@ class XMLJSPRegionHelper implements StructuredDocumentRegionHandler { * return true for elements whose contents we might want to add to the java file we are building */ protected boolean isJSPStartRegion(IStructuredDocumentRegion sdRegion) { - return (sdRegion.getFirstRegion().getType() == XMLRegionContext.XML_TAG_OPEN || sdRegion.getFirstRegion().getType() == DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN); + return (sdRegion.getFirstRegion().getType() == DOMRegionContext.XML_TAG_OPEN || sdRegion.getFirstRegion().getType() == DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN); } protected boolean isJSPRegion(String tagName) { diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelhandler/EmbeddedTypeStateData.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/EmbeddedTypeStateData.java index e197116be4..9148c4192b 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelhandler/EmbeddedTypeStateData.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/EmbeddedTypeStateData.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.modelhandler; +package org.eclipse.jst.jsp.core.internal.modelhandler; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelhandler/JSPModelLoader.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/JSPModelLoader.java index 130da0efd5..7393221d1e 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelhandler/JSPModelLoader.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/JSPModelLoader.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.modelhandler; +package org.eclipse.jst.jsp.core.internal.modelhandler; import java.io.BufferedInputStream; import java.io.IOException; @@ -17,17 +17,17 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jface.text.IDocumentPartitioner; -import org.eclipse.jst.jsp.core.PageDirectiveAdapter; -import org.eclipse.jst.jsp.core.encoding.IJSPHeadContentDetector; -import org.eclipse.jst.jsp.core.encoding.JSPDocumentHeadContentDetector; -import org.eclipse.jst.jsp.core.encoding.JSPDocumentLoader; +import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter; import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapterFactory; import org.eclipse.jst.jsp.core.internal.document.PageDirectiveWatcherFactory; import org.eclipse.jst.jsp.core.internal.domdocument.DOMModelForJSP; +import org.eclipse.jst.jsp.core.internal.encoding.IJSPHeadContentDetector; +import org.eclipse.jst.jsp.core.internal.encoding.JSPDocumentHeadContentDetector; +import org.eclipse.jst.jsp.core.internal.encoding.JSPDocumentLoader; +import org.eclipse.jst.jsp.core.internal.modelquery.ModelQueryAdapterFactoryForJSP; import org.eclipse.jst.jsp.core.internal.parser.JSPReParser; import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser; import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP; -import org.eclipse.jst.jsp.core.modelquery.ModelQueryAdapterFactoryForJSP; import org.eclipse.wst.html.core.contenttype.ContentTypeIdForHTML; import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML; import org.eclipse.wst.sse.core.INodeAdapterFactory; @@ -51,7 +51,7 @@ import org.eclipse.wst.xml.core.contenttype.ContentTypeIdForXML; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.internal.DebugAdapterFactory; -import org.eclipse.wst.xml.core.internal.document.XMLModelImpl; +import org.eclipse.wst.xml.core.internal.document.DOMModelImpl; import org.eclipse.wst.xml.core.internal.propagate.PropagatingAdapterFactoryImpl; import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter; import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML; @@ -391,7 +391,7 @@ public class JSPModelLoader extends AbstractModelLoader { // need to null out or else ModelParserAdapter // won't get reinitialized - ((XMLModelImpl)model).setModelParser(null); + ((DOMModelImpl)model).setModelParser(null); newEmbeddedContentType.initializeFactoryRegistry(model.getFactoryRegistry()); newEmbeddedContentType.initializeParser((JSPCapableParser) structuredDocument.getParser()); diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelhandler/ModelHandlerForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/ModelHandlerForJSP.java index 55da6f84be..95edfd5c01 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelhandler/ModelHandlerForJSP.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/ModelHandlerForJSP.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.modelhandler; +package org.eclipse.jst.jsp.core.internal.modelhandler; import org.eclipse.core.runtime.Preferences; -import org.eclipse.jst.jsp.core.encoding.JSPDocumentHeadContentDetector; -import org.eclipse.jst.jsp.core.encoding.JSPDocumentLoader; import org.eclipse.jst.jsp.core.internal.JSPCorePlugin; +import org.eclipse.jst.jsp.core.internal.encoding.JSPDocumentHeadContentDetector; +import org.eclipse.jst.jsp.core.internal.encoding.JSPDocumentLoader; import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.IModelLoader; import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector; import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelquery/JSPModelQueryAdapterImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryAdapterImpl.java index 80e1dc255d..17f3f7a6a9 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelquery/JSPModelQueryAdapterImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryAdapterImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.modelquery; +package org.eclipse.jst.jsp.core.internal.modelquery; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelquery/JSPModelQueryAssociationProvider.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryAssociationProvider.java index 6f37181f54..b7b1273d7e 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelquery/JSPModelQueryAssociationProvider.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryAssociationProvider.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.modelquery; +package org.eclipse.jst.jsp.core.internal.modelquery; import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.SimpleAssociationProvider; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelquery/JSPModelQueryCMProvider.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryCMProvider.java index 45ab3cbd21..199f9399a2 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelquery/JSPModelQueryCMProvider.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryCMProvider.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.modelquery; +package org.eclipse.jst.jsp.core.internal.modelquery; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelquery/JSPModelQueryImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryImpl.java index 3ad3eb52b5..57da016db5 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelquery/JSPModelQueryImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/JSPModelQueryImpl.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.modelquery; +package org.eclipse.jst.jsp.core.internal.modelquery; import java.util.HashMap; import java.util.List; -import org.eclipse.jst.jsp.core.PageDirectiveAdapter; +import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelquery/ModelQueryAdapterFactoryForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/ModelQueryAdapterFactoryForJSP.java index 5a3eacafc5..4aba06f078 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/modelquery/ModelQueryAdapterFactoryForJSP.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelquery/ModelQueryAdapterFactoryForJSP.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsp.core.modelquery; +package org.eclipse.jst.jsp.core.internal.modelquery; import java.io.File; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/JSPReParser.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/JSPReParser.java index c949f88eda..173400b628 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/JSPReParser.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/JSPReParser.java @@ -14,8 +14,8 @@ package org.eclipse.jst.jsp.core.internal.parser; import java.util.Iterator; import org.eclipse.jst.jsp.core.JSP12Namespace; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP11TLDNames; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP11TLDNames; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.events.StructuredDocumentEvent; import org.eclipse.wst.sse.core.exceptions.SourceEditingRuntimeException; import org.eclipse.wst.sse.core.internal.text.CoreNodeList; @@ -29,7 +29,7 @@ import org.eclipse.wst.sse.core.text.ITextRegionContainer; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.xml.core.internal.parser.XMLStructuredDocumentReParser; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class JSPReParser extends XMLStructuredDocumentReParser { @@ -187,25 +187,25 @@ public class JSPReParser extends XMLStructuredDocumentReParser { IStructuredDocumentRegion previous = parent.getPrevious(); // case 1 test - if (parent.getRegions().size() == 1 && region.getType() == XMLRegionContext.XML_TAG_OPEN && (previous == null || (!previous.isEnded() || previous.getType() == XMLRegionContext.XML_CONTENT))) { + if (parent.getRegions().size() == 1 && region.getType() == DOMRegionContext.XML_TAG_OPEN && (previous == null || (!previous.isEnded() || previous.getType() == DOMRegionContext.XML_CONTENT))) { result = true; } //case 2 test if (region instanceof ITextRegionContainer) { ITextRegionContainer container = (ITextRegionContainer) region; ITextRegion internal = container.getRegions().get(container.getRegions().size() - 1); - if (internal.getType() == XMLRegionContext.WHITE_SPACE && container.getRegions().size() >= 2) + if (internal.getType() == DOMRegionContext.WHITE_SPACE && container.getRegions().size() >= 2) internal = container.getRegions().get(container.getRegions().size() - 2); - if (internal.getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE) { + if (internal.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) { result = true; } } //case 3 test - if (changesIncludeA_lt && (region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME || region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { + if (changesIncludeA_lt && (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { result = true; } //case 4 test - if (delsIncludeA_gt && region.getType() == XMLRegionContext.XML_TAG_CLOSE) { + if (delsIncludeA_gt && region.getType() == DOMRegionContext.XML_TAG_CLOSE) { result = true; } return result; @@ -216,7 +216,7 @@ public class JSPReParser extends XMLStructuredDocumentReParser { * IStructuredDocumentRegion, includes a jsp:root tag */ private boolean isJspRoot(ITextRegionList regions) { - return regions.size() > 1 && regions.get(0).getType() == XMLRegionContext.XML_TAG_OPEN && regions.get(1).getType() == DOMJSPRegionContexts.JSP_ROOT_TAG_NAME; + return regions.size() > 1 && regions.get(0).getType() == DOMRegionContext.XML_TAG_OPEN && regions.get(1).getType() == DOMJSPRegionContexts.JSP_ROOT_TAG_NAME; } /** @@ -226,7 +226,7 @@ public class JSPReParser extends XMLStructuredDocumentReParser { */ private boolean isTaglibOrInclude(IStructuredDocumentRegion node, ITextRegionList regions) { boolean sizeAndTypesMatch = (regions.size() > 1) && (regions.get(1).getType() == DOMJSPRegionContexts.JSP_DIRECTIVE_NAME) - && (regions.get(0).getType() == DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN || regions.get(0).getType() == XMLRegionContext.XML_TAG_OPEN); + && (regions.get(0).getType() == DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN || regions.get(0).getType() == DOMRegionContext.XML_TAG_OPEN); if (!sizeAndTypesMatch) return false; ITextRegion region = regions.get(1); diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/JSPSourceParser.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/JSPSourceParser.java index 805c94a055..de8e1af295 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/JSPSourceParser.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/JSPSourceParser.java @@ -14,9 +14,9 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jst.jsp.core.JSP12Namespace; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP12TLDNames; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP12TLDNames; import org.eclipse.jst.jsp.core.internal.parser.internal.JSPTokenizer; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.internal.text.IRegionComparible; import org.eclipse.wst.sse.core.parser.BlockTokenizer; import org.eclipse.wst.sse.core.parser.JSPCapableParser; @@ -33,7 +33,7 @@ import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** * Takes input from the JSPTokenizer and creates a tag list @@ -108,7 +108,7 @@ public class JSPSourceParser extends XMLSourceParser implements JSPCapableParser try { for (int i = 0; i < regions.size(); i++) { ITextRegion region = regions.get(i); - if (region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { int offset = taglibFlatNode.getStartOffset(region); int length = region.getTextLength(); @@ -122,7 +122,7 @@ public class JSPSourceParser extends XMLSourceParser implements JSPCapableParser taglib = false; } } - else if (taglib && region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (taglib && region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { prefix = StringUtils.strip(prefix); if (prefix != null && prefix.length() > 0) { enableForTaglib(prefix, taglibFlatNode); @@ -148,7 +148,7 @@ public class JSPSourceParser extends XMLSourceParser implements JSPCapableParser try { for (int i = 0; i < regions.size(); i++) { ITextRegion region = regions.get(i); - if (region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { if (fCharSequenceSource != null && fCharSequenceSource instanceof IRegionComparible) { int offset = taglibFlatNode.getStartOffset(region); int length = region.getTextLength(); @@ -159,7 +159,7 @@ public class JSPSourceParser extends XMLSourceParser implements JSPCapableParser prefixname = (getText(taglibFlatNode.getStartOffset(region), region.getTextLength()).equals(JSP12TLDNames.PREFIX)); } } - else if (prefixname && region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (prefixname && region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { prefix = getText(taglibFlatNode.getStartOffset(region), region.getTextLength()); } } @@ -245,8 +245,8 @@ public class JSPSourceParser extends XMLSourceParser implements JSPCapableParser type = region.getType(); // these types (might) demand a IStructuredDocumentRegion for each // of them - if (type == XMLRegionContext.BLOCK_TEXT) { - if (currentNode != null && currentNode.getLastRegion().getType() == XMLRegionContext.BLOCK_TEXT) { + if (type == DOMRegionContext.BLOCK_TEXT) { + if (currentNode != null && currentNode.getLastRegion().getType() == DOMRegionContext.BLOCK_TEXT) { // multiple block texts indicated embedded containers; no // new IStructuredDocumentRegion currentNode.addRegion(region); @@ -290,9 +290,9 @@ public class JSPSourceParser extends XMLSourceParser implements JSPCapableParser } } // the following contexts OPEN new StructuredDocumentRegions - else if ((currentNode != null && currentNode.isEnded()) || (type == XMLRegionContext.XML_CONTENT) || (type == XMLRegionContext.XML_CHAR_REFERENCE) || (type == XMLRegionContext.XML_ENTITY_REFERENCE) - || (type == XMLRegionContext.XML_PI_OPEN) || (type == XMLRegionContext.XML_TAG_OPEN) || (type == XMLRegionContext.XML_END_TAG_OPEN) || (type == XMLRegionContext.XML_COMMENT_OPEN) || (type == XMLRegionContext.XML_CDATA_OPEN) - || (type == XMLRegionContext.XML_DECLARATION_OPEN) || (type == DOMJSPRegionContexts.JSP_COMMENT_OPEN) || (type == DOMJSPRegionContexts.JSP_DECLARATION_OPEN) || (type == DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN) + else if ((currentNode != null && currentNode.isEnded()) || (type == DOMRegionContext.XML_CONTENT) || (type == DOMRegionContext.XML_CHAR_REFERENCE) || (type == DOMRegionContext.XML_ENTITY_REFERENCE) + || (type == DOMRegionContext.XML_PI_OPEN) || (type == DOMRegionContext.XML_TAG_OPEN) || (type == DOMRegionContext.XML_END_TAG_OPEN) || (type == DOMRegionContext.XML_COMMENT_OPEN) || (type == DOMRegionContext.XML_CDATA_OPEN) + || (type == DOMRegionContext.XML_DECLARATION_OPEN) || (type == DOMJSPRegionContexts.JSP_COMMENT_OPEN) || (type == DOMJSPRegionContexts.JSP_DECLARATION_OPEN) || (type == DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN) || (type == DOMJSPRegionContexts.JSP_EXPRESSION_OPEN) || (type == DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN) || (type == DOMJSPRegionContexts.JSP_CLOSE) || type == DOMJSPRegionContexts.JSP_EL_OPEN) { if (currentNode != null) { // ensure that any existing node is at least terminated @@ -322,8 +322,8 @@ public class JSPSourceParser extends XMLSourceParser implements JSPCapableParser } // the following contexts NEITHER open nor close // StructuredDocumentRegions; just add to them - else if ((type == XMLRegionContext.XML_TAG_NAME) || (type == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) || (type == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) || (type == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) - || (type == XMLRegionContext.XML_COMMENT_TEXT) || (type == XMLRegionContext.XML_PI_CONTENT) || (type == XMLRegionContext.XML_DOCTYPE_INTERNAL_SUBSET) || (type == DOMJSPRegionContexts.JSP_COMMENT_TEXT) + else if ((type == DOMRegionContext.XML_TAG_NAME) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) + || (type == DOMRegionContext.XML_COMMENT_TEXT) || (type == DOMRegionContext.XML_PI_CONTENT) || (type == DOMRegionContext.XML_DOCTYPE_INTERNAL_SUBSET) || (type == DOMJSPRegionContexts.JSP_COMMENT_TEXT) || (type == DOMJSPRegionContexts.JSP_ROOT_TAG_NAME) || (type == DOMJSPRegionContexts.JSP_DIRECTIVE_NAME) || type == DOMJSPRegionContexts.JSP_EL_CONTENT) { currentNode.addRegion(region); currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart()); @@ -336,8 +336,8 @@ public class JSPSourceParser extends XMLSourceParser implements JSPCapableParser } // the following contexts close off StructuredDocumentRegions // cleanly - else if ((type == XMLRegionContext.XML_PI_CLOSE) || (type == XMLRegionContext.XML_TAG_CLOSE) || (type == XMLRegionContext.XML_EMPTY_TAG_CLOSE) || (type == XMLRegionContext.XML_COMMENT_CLOSE) || (type == XMLRegionContext.XML_CDATA_CLOSE) - || (type == DOMJSPRegionContexts.JSP_CLOSE) || (type == DOMJSPRegionContexts.JSP_COMMENT_CLOSE) || (type == DOMJSPRegionContexts.JSP_DIRECTIVE_CLOSE) || (type == XMLRegionContext.XML_DECLARATION_CLOSE) + else if ((type == DOMRegionContext.XML_PI_CLOSE) || (type == DOMRegionContext.XML_TAG_CLOSE) || (type == DOMRegionContext.XML_EMPTY_TAG_CLOSE) || (type == DOMRegionContext.XML_COMMENT_CLOSE) || (type == DOMRegionContext.XML_CDATA_CLOSE) + || (type == DOMJSPRegionContexts.JSP_CLOSE) || (type == DOMJSPRegionContexts.JSP_COMMENT_CLOSE) || (type == DOMJSPRegionContexts.JSP_DIRECTIVE_CLOSE) || (type == DOMRegionContext.XML_DECLARATION_CLOSE) || type == DOMJSPRegionContexts.JSP_EL_CLOSE) { currentNode.setEnded(true); currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart()); @@ -350,7 +350,7 @@ public class JSPSourceParser extends XMLSourceParser implements JSPCapableParser } } // this is extremely rare, but valid - else if (type == XMLRegionContext.WHITE_SPACE) { + else if (type == DOMRegionContext.WHITE_SPACE) { ITextRegion lastRegion = currentNode.getLastRegion(); // pack the embedded container with this region if (lastRegion instanceof ITextRegionContainer) { @@ -367,11 +367,11 @@ public class JSPSourceParser extends XMLSourceParser implements JSPCapableParser currentNode.getLastRegion().adjustLength(region.getLength()); currentNode.adjustLength(region.getLength()); } - else if (type == XMLRegionContext.UNDEFINED && currentNode != null) { + else if (type == DOMRegionContext.UNDEFINED && currentNode != null) { // skip on a very-first region situation as the default // behavior is good enough // combine with previous if also undefined - if (currentNode.getLastRegion() != null && currentNode.getLastRegion().getType() == XMLRegionContext.UNDEFINED) { + if (currentNode.getLastRegion() != null && currentNode.getLastRegion().getType() == DOMRegionContext.UNDEFINED) { currentNode.getLastRegion().adjustLength(region.getLength()); currentNode.adjustLength(region.getLength()); } @@ -412,7 +412,7 @@ public class JSPSourceParser extends XMLSourceParser implements JSPCapableParser // be more readable if that is handled here as well, but the // current layout // ensures that they open StructuredDocumentRegions the same way - if ((type == XMLRegionContext.XML_CONTENT) || (type == XMLRegionContext.XML_CHAR_REFERENCE) || (type == XMLRegionContext.XML_ENTITY_REFERENCE) || (type == DOMJSPRegionContexts.JSP_DECLARATION_OPEN) + if ((type == DOMRegionContext.XML_CONTENT) || (type == DOMRegionContext.XML_CHAR_REFERENCE) || (type == DOMRegionContext.XML_ENTITY_REFERENCE) || (type == DOMJSPRegionContexts.JSP_DECLARATION_OPEN) || (type == DOMJSPRegionContexts.JSP_EXPRESSION_OPEN) || (type == DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN) || (type == DOMJSPRegionContexts.JSP_CONTENT) || (type == DOMJSPRegionContexts.JSP_CLOSE)) { currentNode.setEnded(true); } diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPParserRegionFactory.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPParserRegionFactory.java index 8958242514..79b202f87e 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPParserRegionFactory.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPParserRegionFactory.java @@ -11,7 +11,7 @@ package org.eclipse.jst.jsp.core.internal.parser.internal; import org.eclipse.jst.jsp.core.internal.parser.JSPCodeRegion; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.xml.core.internal.parser.regions.XMLParserRegionFactory; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.java index f48d31ef1a..37e95c8e57 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.java @@ -20,7 +20,7 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jst.jsp.core.internal.Logger; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.parser.BlockMarker; import org.eclipse.wst.sse.core.parser.BlockTokenizer; import org.eclipse.wst.sse.core.parser.TagMarker; @@ -873,7 +873,7 @@ public class JSPTokenizer implements BlockTokenizer, DOMJSPRegionContexts { private JSPParserRegionFactory fRegionFactory = new JSPParserRegionFactory(); - private static final String rcsver = "$Id: JSPTokenizer.java,v 1.6 2005/03/15 17:34:05 david_williams Exp $";//$NON-NLS-1$ + private static final String rcsver = "$Id: JSPTokenizer.java,v 1.7 2005/04/11 06:21:03 david_williams Exp $";//$NON-NLS-1$ /** * user method diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/model/parser/DOMJSPRegionContexts.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/regions/DOMJSPRegionContexts.java index bece37264a..f0aa201fa2 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/model/parser/DOMJSPRegionContexts.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/regions/DOMJSPRegionContexts.java @@ -10,16 +10,16 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.jst.jsp.core.model.parser; +package org.eclipse.jst.jsp.core.internal.regions; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** * */ -public interface DOMJSPRegionContexts extends XMLRegionContext { +public interface DOMJSPRegionContexts extends DOMRegionContext { public static final String JSP_CLOSE = "JSP_CLOSE"; //$NON-NLS-1$ public static final String JSP_COMMENT_CLOSE = "JSP_COMMENT_CLOSE"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/tasks/JSPTaskTagSeeker.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/tasks/JSPTaskTagSeeker.java index cfef658187..52613839af 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/tasks/JSPTaskTagSeeker.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/tasks/JSPTaskTagSeeker.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.jst.jsp.core.internal.tasks; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.xml.core.builder.delegates.XMLTaskTagSeeker; +import org.eclipse.wst.xml.core.internal.builder.delegates.XMLTaskTagSeeker; public class JSPTaskTagSeeker extends XMLTaskTagSeeker { protected boolean isCommentRegion(IStructuredDocumentRegion region, ITextRegion textRegion) { diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/text/StructuredTextPartitionerForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/text/StructuredTextPartitionerForJSP.java index 4ed08706bc..6f7a4a10a3 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/text/StructuredTextPartitionerForJSP.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/text/StructuredTextPartitionerForJSP.java @@ -20,10 +20,10 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.jst.jsp.core.JSP11Namespace; import org.eclipse.jst.jsp.core.JSP12Namespace; -import org.eclipse.jst.jsp.core.contentmodel.tld.JSP12TLDNames; -import org.eclipse.jst.jsp.core.encoding.JSPDocumentHeadContentDetector; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.JSP12TLDNames; +import org.eclipse.jst.jsp.core.internal.encoding.JSPDocumentHeadContentDetector; import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.jst.jsp.core.text.IJSPPartitionTypes; import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML; import org.eclipse.wst.sse.core.internal.parser.ForeignRegion; @@ -37,8 +37,8 @@ import org.eclipse.wst.sse.core.text.IStructuredTextPartitioner; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.core.util.StringUtils; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; public class StructuredTextPartitionerForJSP extends StructuredTextPartitioner { @@ -100,14 +100,14 @@ public class StructuredTextPartitionerForJSP extends StructuredTextPartitioner { ITextRegion region = regions.get(i); int startOffset = taglibStructuredDocumentRegion.getStartOffset(region); int textLength = region.getTextLength(); - if (region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { prefixnameDetected = getTextSource().regionMatches(startOffset, textLength, JSP12TLDNames.PREFIX); //String regionText = // fTextSource.getText(startOffset, textLength); //prefixname = // regionText.equals(JSP12TLDNames.PREFIX); } - else if (prefixnameDetected && region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (prefixnameDetected && region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { prefixValue = getTextSource().getText(startOffset, textLength); } } @@ -341,7 +341,7 @@ public class StructuredTextPartitionerForJSP extends StructuredTextPartitioner { // only find parent names from a start tag if (regions.size() > 1) { ITextRegion r = regions.get(1); - if (regions.get(0).getType().equals(XMLRegionContext.XML_TAG_OPEN) && r.getType().equals(XMLRegionContext.XML_TAG_NAME)) { + if (regions.get(0).getType().equals(DOMRegionContext.XML_TAG_OPEN) && r.getType().equals(DOMRegionContext.XML_TAG_NAME)) { result = sdRegion.getText(r); } } @@ -373,7 +373,7 @@ public class StructuredTextPartitionerForJSP extends StructuredTextPartitioner { else if (region_type == DOMJSPRegionContexts.JSP_EL_OPEN || region_type == DOMJSPRegionContexts.JSP_EL_CONTENT || region_type == DOMJSPRegionContexts.JSP_EL_CLOSE || region_type == DOMJSPRegionContexts.JSP_EL_DQUOTE || region_type == DOMJSPRegionContexts.JSP_EL_SQUOTE || region_type == DOMJSPRegionContexts.JSP_EL_QUOTED_CONTENT) result = IJSPPartitionTypes.JSP_DEFAULT_EL; - else if (region_type == XMLRegionContext.XML_CONTENT) { + else if (region_type == DOMRegionContext.XML_CONTENT) { // possibly between <jsp:scriptlet>, <jsp:expression>, // <jsp:declaration> IStructuredDocumentRegion sdRegion = this.structuredDocument.getRegionAtCharacterOffset(offset); @@ -423,7 +423,7 @@ public class StructuredTextPartitionerForJSP extends StructuredTextPartitioner { * @return */ private boolean isAction(IStructuredDocumentRegion sdRegion, int offset) { - if (!sdRegion.getType().equals(XMLRegionContext.XML_TAG_NAME)) + if (!sdRegion.getType().equals(DOMRegionContext.XML_TAG_NAME)) return false; // shouldn't get a tag name region type unless a tag name region // exists @@ -469,7 +469,7 @@ public class StructuredTextPartitionerForJSP extends StructuredTextPartitioner { private boolean isValidJspActionRegionType(String type) { // true for anything that can be within <jsp:scriptlet>, // <jsp:expression>, <jsp:declaration> - return type == XMLRegionContext.XML_CONTENT || type == XMLRegionContext.BLOCK_TEXT || type == XMLRegionContext.XML_CDATA_OPEN || type == XMLRegionContext.XML_CDATA_TEXT || type == XMLRegionContext.XML_CDATA_CLOSE; + return type == DOMRegionContext.XML_CONTENT || type == DOMRegionContext.BLOCK_TEXT || type == DOMRegionContext.XML_CDATA_OPEN || type == DOMRegionContext.XML_CDATA_TEXT || type == DOMRegionContext.XML_CDATA_CLOSE; } public IDocumentPartitioner newInstance() { diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/StructuredTextViewerConfigurationJSP.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/StructuredTextViewerConfigurationJSP.java index 57439e70d2..5d76396910 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/StructuredTextViewerConfigurationJSP.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/StructuredTextViewerConfigurationJSP.java @@ -57,7 +57,7 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.wst.css.core.text.ICSSPartitionTypes; import org.eclipse.wst.css.ui.contentassist.CSSContentAssistProcessor; import org.eclipse.wst.css.ui.style.LineStyleProviderForEmbeddedCSS; -import org.eclipse.wst.html.core.format.HTMLFormatProcessorImpl; +import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl; import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML; import org.eclipse.wst.html.core.text.IHTMLPartitionTypes; import org.eclipse.wst.html.ui.internal.contentassist.HTMLContentAssistProcessor; diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/AbstractBreakpointProvider.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/AbstractBreakpointProvider.java index fc1f8a3a24..3619cda9c9 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/AbstractBreakpointProvider.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/breakpointproviders/AbstractBreakpointProvider.java @@ -15,8 +15,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jst.jsp.core.JSP12Namespace; -import org.eclipse.jst.jsp.core.contentmodel.tld.TLDElementDeclaration; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.ui.IEditorInput; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.IndexedRegion; @@ -26,13 +26,13 @@ import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionCollection; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.ui.extensions.breakpoint.IBreakpointProvider; -import org.eclipse.wst.xml.core.contentmodel.CMNodeWrapper; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -148,7 +148,7 @@ public abstract class AbstractBreakpointProvider implements IBreakpointProvider // } } // a custom tag, jsp:useBean, getproperty or setproperty statement is also a valid breakpoint location - else if (region.getType().equals(XMLRegionContext.XML_TAG_NAME) && (isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY))) { + else if (region.getType().equals(DOMRegionContext.XML_TAG_NAME) && (isCustomTagRegion(model.getIndexedRegion(regionStartOffset)) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.USEBEAN) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.GETPROPERTY) || regionContainer.getText(region).equals(JSP12Namespace.ElementName.SETPROPERTY))) { if (regionStartOffset > startOffset) return regionStartOffset; diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java index 83432205ae..0a1a73a453 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPContentAssistProcessor.java @@ -30,12 +30,12 @@ import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.contentassist.IContextInformationValidator; import org.eclipse.jst.jsp.core.JSP11Namespace; import org.eclipse.jst.jsp.core.JSP12Namespace; -import org.eclipse.jst.jsp.core.PageDirectiveAdapter; import org.eclipse.jst.jsp.core.contenttype.ContentTypeIdForJSP; import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController; import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager; +import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter; import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapterFactory; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.jst.jsp.core.text.IJSPPartitionTypes; import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin; import org.eclipse.jst.jsp.ui.internal.Logger; @@ -45,9 +45,9 @@ import org.eclipse.jst.jsp.ui.internal.preferences.JSPUIPreferenceNames; import org.eclipse.jst.jsp.ui.internal.templates.TemplateContextTypeIdsJSP; import org.eclipse.wst.css.ui.contentassist.CSSContentAssistProcessor; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.contentmodel.HTMLCMDocumentFactory; -import org.eclipse.wst.html.core.contentmodel.HTMLElementDeclaration; -import org.eclipse.wst.html.core.contentmodel.JSPCMDocument; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.JSPCMDocument; import org.eclipse.wst.html.core.text.IHTMLPartitionTypes; import org.eclipse.wst.html.ui.internal.contentassist.HTMLContentAssistProcessor; import org.eclipse.wst.javascript.common.ui.internal.contentassist.JavaScriptContentAssistProcessor; @@ -73,9 +73,6 @@ import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceConstants; import org.eclipse.wst.sse.ui.internal.contentassist.IResourceDependentProcessor; import org.eclipse.wst.sse.ui.registry.AdapterFactoryProvider; import org.eclipse.wst.sse.ui.registry.AdapterFactoryRegistry; -import org.eclipse.wst.xml.core.contentmodel.CMDocType; -import org.eclipse.wst.xml.core.contentmodel.CMDocumentTracker; -import org.eclipse.wst.xml.core.contentmodel.CMNodeWrapper; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; @@ -85,8 +82,11 @@ import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAction; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocumentTracker; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; import org.eclipse.wst.xml.core.text.IXMLPartitions; import org.eclipse.wst.xml.ui.contentassist.AbstractContentAssistProcessor; import org.eclipse.wst.xml.ui.contentassist.ContentAssistRequest; @@ -251,7 +251,7 @@ public class JSPContentAssistProcessor extends AbstractContentAssistProcessor im ITextRegion nameRegion = null; while (i >= 0) { nameRegion = openRegions.get(i--); - if (nameRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) + if (nameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) break; } @@ -263,7 +263,7 @@ public class JSPContentAssistProcessor extends AbstractContentAssistProcessor im currentValue = node.getAttributes().getNamedItem(attributeName).getNodeValue(); // on an empty value, add all the JSP and taglib tags - if ((contentAssistRequest.getRegion().getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS && contentAssistRequest.getReplacementLength() == 0) || (contentAssistRequest.getRegion().getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE && (currentValue == null || currentValue.length() == 0))) { + if ((contentAssistRequest.getRegion().getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS && contentAssistRequest.getReplacementLength() == 0) || (contentAssistRequest.getRegion().getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && (currentValue == null || currentValue.length() == 0))) { List rejectElements = new ArrayList(); rejectElements.add(JSP12Namespace.ElementName.SCRIPTLET); rejectElements.add(JSP12Namespace.ElementName.EXPRESSION); @@ -296,7 +296,7 @@ public class JSPContentAssistProcessor extends AbstractContentAssistProcessor im } } - else if (contentAssistRequest.getRegion().getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (contentAssistRequest.getRegion().getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { try { // Create a new model for Content Assist to operate on. This // will simulate @@ -614,14 +614,14 @@ public class JSPContentAssistProcessor extends AbstractContentAssistProcessor im // check for xml-jsp tags... // CMVC 243657 if (partitionType == IJSPPartitionTypes.JSP_DIRECTIVE && fn != null) { - IStructuredDocumentRegion possibleXMLJSP = ((fn.getType() == XMLRegionContext.XML_CONTENT) && fn.getPrevious() != null) ? fn.getPrevious() : fn; + IStructuredDocumentRegion possibleXMLJSP = ((fn.getType() == DOMRegionContext.XML_CONTENT) && fn.getPrevious() != null) ? fn.getPrevious() : fn; ITextRegionList regions = possibleXMLJSP.getRegions(); if (regions.size() > 1) { // check bounds cases ITextRegion xmlOpenOrClose = regions.get(0); - if (xmlOpenOrClose.getType() == XMLRegionContext.XML_TAG_OPEN && documentPosition == possibleXMLJSP.getStartOffset()) { + if (xmlOpenOrClose.getType() == DOMRegionContext.XML_TAG_OPEN && documentPosition == possibleXMLJSP.getStartOffset()) { // do regular jsp content assist - } else if (xmlOpenOrClose.getType() == XMLRegionContext.XML_END_TAG_OPEN && documentPosition > possibleXMLJSP.getStartOffset()) { + } else if (xmlOpenOrClose.getType() == DOMRegionContext.XML_END_TAG_OPEN && documentPosition > possibleXMLJSP.getStartOffset()) { // do regular jsp content assist } else { // possible xml-jsp @@ -655,14 +655,14 @@ public class JSPContentAssistProcessor extends AbstractContentAssistProcessor im if (documentPosition >= fn.getStartOffset() + sdr.getStartOffset() && documentPosition <= fn.getStartOffset() + sdr.getEndOffset()) { return getJSPJavaCompletionProposals(viewer, documentPosition); } - } else if (sdr.getType() == XMLRegionContext.XML_TAG_NAME) { + } else if (sdr.getType() == DOMRegionContext.XML_TAG_NAME) { if (documentPosition > fn.getStartOffset() + sdr.getStartOffset() && documentPosition < fn.getStartOffset() + sdr.getEndOffset()) { return EMPTY_PROPOSAL_SET; } else if (documentPosition == fn.getStartOffset() + sdr.getEndOffset() && sdr.getNext() != null && sdr.getNext().getType() == DOMJSPRegionContexts.JSP_CONTENT) { // the end of an open tag <script> // <jsp:scriptlet>| blah </jsp:scriptlet> return getJSPJavaCompletionProposals(viewer, documentPosition); - } else if (documentPosition == fn.getStartOffset() + sdr.getStartOffset() && sdr.getPrevious() != null && sdr.getPrevious().getType() == XMLRegionContext.XML_TAG_NAME) { + } else if (documentPosition == fn.getStartOffset() + sdr.getStartOffset() && sdr.getPrevious() != null && sdr.getPrevious().getType() == DOMRegionContext.XML_TAG_NAME) { return getJSPJavaCompletionProposals(viewer, documentPosition); } } @@ -717,13 +717,13 @@ public class JSPContentAssistProcessor extends AbstractContentAssistProcessor im if (XMLContentAssistUtilities.isXMLJSPDelimiter(fnDelim)) { // since it's a delimiter, we know it's a ITextRegionContainer ITextRegion firstRegion = fnDelim.getRegions().get(0); - if (fnDelim.getStartOffset() == documentPosition && (firstRegion.getType() == XMLRegionContext.XML_TAG_OPEN)) { + if (fnDelim.getStartOffset() == documentPosition && (firstRegion.getType() == DOMRegionContext.XML_TAG_OPEN)) { // |<jsp:scriptlet> </jsp:scriptlet> // (pa) commented out so that we get regular behavior JSP // macros etc... // return getHTMLCompletionProposals(viewer, // documentPosition); - } else if (fnDelim.getStartOffset() == documentPosition && (firstRegion.getType() == XMLRegionContext.XML_END_TAG_OPEN)) { + } else if (fnDelim.getStartOffset() == documentPosition && (firstRegion.getType() == DOMRegionContext.XML_END_TAG_OPEN)) { // <jsp:scriptlet> |</jsp:scriptlet> // check previous partition type to see if it's JAVASCRIPT // if it is, we're just gonna let the embedded JAVASCRIPT @@ -744,7 +744,7 @@ public class JSPContentAssistProcessor extends AbstractContentAssistProcessor im } partitionType = IJSPPartitionTypes.JSP_CONTENT_JAVASCRIPT; } - } else if ((firstRegion.getType() == XMLRegionContext.XML_TAG_OPEN) && documentPosition >= fnDelim.getEndOffset()) { + } else if ((firstRegion.getType() == DOMRegionContext.XML_TAG_OPEN) && documentPosition >= fnDelim.getEndOffset()) { // anything else inbetween return getJSPJavaCompletionProposals(viewer, documentPosition); } @@ -781,7 +781,7 @@ public class JSPContentAssistProcessor extends AbstractContentAssistProcessor im // <![CDATA[ <%|%> ]]> // or a comment region // <!-- <% |%> --> - if (fn != null && (fn.getType() == XMLRegionContext.XML_CDATA_TEXT || fn.getType() == XMLRegionContext.XML_COMMENT_TEXT)) { + if (fn != null && (fn.getType() == DOMRegionContext.XML_CDATA_TEXT || fn.getType() == DOMRegionContext.XML_COMMENT_TEXT)) { if (fn instanceof ITextRegionContainer) { Object[] cdataRegions = fn.getRegions().toArray(); ITextRegion r = null; @@ -808,7 +808,7 @@ public class JSPContentAssistProcessor extends AbstractContentAssistProcessor im // proposal ITextRegion attrContainer = (fn != null) ? fn.getRegionAtCharacterOffset(documentPosition) : null; if (attrContainer != null && attrContainer instanceof ITextRegionContainer) { - if (attrContainer.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + if (attrContainer.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { // test location of the cursor // return null if it's in the middle of an open/close // delimeter @@ -1130,7 +1130,7 @@ public class JSPContentAssistProcessor extends AbstractContentAssistProcessor im } String[] directiveNames = {"page", "include", "taglib"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // suggest JSP Expression inside of XML comments - if (completionRegion.getType() == XMLRegionContext.XML_COMMENT_TEXT && !isXMLFormat(doc)) { + if (completionRegion.getType() == DOMRegionContext.XML_COMMENT_TEXT && !isXMLFormat(doc)) { if (request == null) request = newContentAssistRequest(treeNode, xmlnode, sdRegion, completionRegion, documentPosition, 0, ""); //$NON-NLS-1$ request.addProposal(new CustomCompletionProposal("<%= %>", documentPosition, 0, 4, JSPEditorPluginImageHelper.getInstance().getImage(JSPEditorPluginImages.IMG_OBJ_TAG_GENERIC), "jsp:expression", null, "<%= %>", XMLRelevanceConstants.R_JSP)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaContentAssistProcessor.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaContentAssistProcessor.java index 2282f93542..5be7fdf8c0 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaContentAssistProcessor.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPJavaContentAssistProcessor.java @@ -20,7 +20,7 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.contentassist.IContextInformationValidator; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.jst.jsp.core.text.IJSPPartitionTypes; import org.eclipse.jst.jsp.ui.internal.JSPUIMessages; import org.eclipse.wst.sse.core.IndexedRegion; @@ -34,7 +34,7 @@ import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; import org.eclipse.wst.sse.ui.internal.contentassist.IResourceDependentProcessor; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.contentassist.XMLRelevanceConstants; import org.eclipse.wst.xml.ui.util.SharedXMLEditorPluginImageHelper; @@ -97,7 +97,7 @@ public class JSPJavaContentAssistProcessor implements IContentAssistProcessor, I } // ADD CDATA PROPOSAL IF IT'S AN XML-JSP TAG - if (flat != null && flat.getType() != DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN && flat.getType() != DOMJSPRegionContexts.JSP_DECLARATION_OPEN && flat.getType() != DOMJSPRegionContexts.JSP_EXPRESSION_OPEN && flat.getType() != XMLRegionContext.BLOCK_TEXT && (openRegion != null && openRegion.getType() != DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN) && !inAttributeRegion(flat, documentPosition)) { + if (flat != null && flat.getType() != DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN && flat.getType() != DOMJSPRegionContexts.JSP_DECLARATION_OPEN && flat.getType() != DOMJSPRegionContexts.JSP_EXPRESSION_OPEN && flat.getType() != DOMRegionContext.BLOCK_TEXT && (openRegion != null && openRegion.getType() != DOMJSPRegionContexts.JSP_DIRECTIVE_OPEN) && !inAttributeRegion(flat, documentPosition)) { // determine if cursor is before or after selected range int adjustedDocPosition = documentPosition; @@ -144,7 +144,7 @@ public class JSPJavaContentAssistProcessor implements IContentAssistProcessor, I private boolean inAttributeRegion(IStructuredDocumentRegion flat, int documentPosition) { ITextRegion attrContainer = flat.getRegionAtCharacterOffset(documentPosition); if (attrContainer != null && attrContainer instanceof ITextRegionContainer) { - if (attrContainer.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + if (attrContainer.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { return true; } } diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPPropertyContentAssistProcessor.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPPropertyContentAssistProcessor.java index 302ff374e6..8426ee60cf 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPPropertyContentAssistProcessor.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPPropertyContentAssistProcessor.java @@ -24,7 +24,7 @@ import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.contentassist.ContentAssistRequest; import org.eclipse.wst.xml.ui.contentassist.XMLRelevanceConstants; import org.eclipse.wst.xml.ui.util.SharedXMLEditorPluginImageHelper; @@ -59,7 +59,7 @@ public class JSPPropertyContentAssistProcessor extends JSPDummyContentAssistProc String attributeName = null; while (i >= 0) { attrNameRegion = openRegions.get(i--); - if (attrNameRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) + if (attrNameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) break; } if (attrNameRegion != null) @@ -70,14 +70,14 @@ public class JSPPropertyContentAssistProcessor extends JSPDummyContentAssistProc boolean isGetProperty = true; for (int j = 0; j < openRegions.size(); j++) { tagNameRegion = openRegions.get(j); - if (tagNameRegion.getType() == XMLRegionContext.XML_TAG_NAME && open.getText(tagNameRegion).trim().equals("jsp:setProperty")) { //$NON-NLS-1$ + if (tagNameRegion.getType() == DOMRegionContext.XML_TAG_NAME && open.getText(tagNameRegion).trim().equals("jsp:setProperty")) { //$NON-NLS-1$ isGetProperty = false; break; } } String currentValue = null; - if (contentAssistRequest.getRegion().getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) + if (contentAssistRequest.getRegion().getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) currentValue = contentAssistRequest.getText(); else currentValue = ""; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPUseBeanContentAssistProcessor.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPUseBeanContentAssistProcessor.java index f4538f041c..bf0cc94560 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPUseBeanContentAssistProcessor.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPUseBeanContentAssistProcessor.java @@ -21,7 +21,7 @@ import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.contentassist.ContentAssistRequest; /** @@ -46,7 +46,7 @@ public class JSPUseBeanContentAssistProcessor extends JSPDummyContentAssistProce ITextRegion nameRegion = null; while (i >= 0) { nameRegion = openRegions.get(i--); - if (nameRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) + if (nameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) break; } @@ -55,7 +55,7 @@ public class JSPUseBeanContentAssistProcessor extends JSPDummyContentAssistProce attributeName = open.getText(nameRegion); String currentValue = null; - if (contentAssistRequest.getRegion().getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) + if (contentAssistRequest.getRegion().getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) currentValue = contentAssistRequest.getText(); else currentValue = ""; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JavaTypeCompletionProposal.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JavaTypeCompletionProposal.java index b23864c90f..dc03e41c0a 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JavaTypeCompletionProposal.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JavaTypeCompletionProposal.java @@ -22,7 +22,7 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jst.jsp.core.JSP11Namespace; import org.eclipse.jst.jsp.core.JSP12Namespace; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.swt.graphics.Image; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; @@ -31,7 +31,7 @@ import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceCompletionProposal; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** * An implementation of ICompletionProposal whose values can be @@ -98,7 +98,7 @@ public class JavaTypeCompletionProposal extends CustomCompletionProposal impleme boolean isImport = false; for (int i = 0; i < regions.size(); i++) { ITextRegion region = regions.get(i); - if (region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { if (flatNode.getText(region).equals(JSP11Namespace.ATTR_NAME_IMPORT)) { isImport = true; } @@ -106,7 +106,7 @@ public class JavaTypeCompletionProposal extends CustomCompletionProposal impleme isImport = false; } } - else if (isImport && region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (isImport && region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { importSpec = flatNode.getText(region); } } diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/NoRegionContentAssistProcessorForJSP.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/NoRegionContentAssistProcessorForJSP.java index e3f26af6c5..90aa7fa107 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/NoRegionContentAssistProcessorForJSP.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/NoRegionContentAssistProcessorForJSP.java @@ -13,7 +13,7 @@ package org.eclipse.jst.jsp.ui.internal.contentassist; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jst.jsp.core.JSP11Namespace; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.jst.jsp.core.text.IJSPPartitionTypes; import org.eclipse.wst.html.core.text.IHTMLPartitionTypes; import org.eclipse.wst.html.ui.internal.contentassist.NoRegionContentAssistProcessorForHTML; diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/JSPSourceEditingTextTools.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/JSPSourceEditingTextTools.java index 179d265aa1..ad919c3caf 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/JSPSourceEditingTextTools.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/editor/JSPSourceEditingTextTools.java @@ -14,7 +14,7 @@ package org.eclipse.jst.jsp.ui.internal.editor; import org.eclipse.jst.jsp.core.JSP11Namespace; import org.eclipse.jst.jsp.core.JSP12Namespace; -import org.eclipse.jst.jsp.core.PageDirectiveAdapter; +import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.ui.extensions.XMLSourceEditingTextTools; import org.w3c.dom.Document; diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/JSPFindOccurrencesAction.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/JSPFindOccurrencesAction.java index 6da50f4cbf..badd257688 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/JSPFindOccurrencesAction.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/java/search/JSPFindOccurrencesAction.java @@ -18,7 +18,7 @@ import org.eclipse.jdt.core.search.IJavaSearchConstants; import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation; import org.eclipse.jst.jsp.core.internal.java.JSPTranslation; import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.jst.jsp.core.text.IJSPPartitionTypes; import org.eclipse.search.ui.ISearchQuery; import org.eclipse.swt.graphics.Point; @@ -28,7 +28,7 @@ import org.eclipse.wst.sse.ui.internal.StructuredTextEditor; import org.eclipse.wst.sse.ui.internal.search.BasicFindOccurrencesAction; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMModel; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** * <p> @@ -103,7 +103,7 @@ public class JSPFindOccurrencesAction extends BasicFindOccurrencesAction impleme * @see com.ibm.sse.editor.internal.search.BasicFindOccurrencesAction#getRegionTypes() */ public String[] getRegionTypes() { - return new String[]{XMLRegionContext.BLOCK_TEXT, DOMJSPRegionContexts.JSP_CONTENT}; + return new String[]{DOMRegionContext.BLOCK_TEXT, DOMJSPRegionContexts.JSP_CONTENT}; } private IFile getJspFile() { diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPColorPage.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPColorPage.java index 7c55b6abec..748a4641d0 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPColorPage.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPColorPage.java @@ -17,7 +17,7 @@ import java.util.Iterator; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jst.jsp.core.contenttype.ContentTypeIdForJSP; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.jst.jsp.ui.internal.JSPUIMessages; import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin; import org.eclipse.jst.jsp.ui.internal.editor.IHelpContextIds; @@ -30,7 +30,7 @@ import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore; import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.OverlayKey; import org.eclipse.wst.sse.ui.preferences.ui.StyledTextColorPicker; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.preferences.XMLColorPage; import org.eclipse.wst.xml.ui.style.IStyleConstantsXML; @@ -61,11 +61,11 @@ public class JSPColorPage extends XMLColorPage { protected void initContextStyleMap(Dictionary contextStyleMap) { initCommonContextStyleMap(contextStyleMap); - contextStyleMap.remove(XMLRegionContext.XML_CONTENT); // leave content between tags alone - contextStyleMap.remove(XMLRegionContext.XML_DECLARATION_OPEN); // xml/html specific - contextStyleMap.remove(XMLRegionContext.XML_DECLARATION_CLOSE); // xml/html specific - contextStyleMap.remove(XMLRegionContext.XML_ELEMENT_DECLARATION); // xml/html specific - contextStyleMap.remove(XMLRegionContext.XML_ELEMENT_DECL_CLOSE); // xml/html specific + contextStyleMap.remove(DOMRegionContext.XML_CONTENT); // leave content between tags alone + contextStyleMap.remove(DOMRegionContext.XML_DECLARATION_OPEN); // xml/html specific + contextStyleMap.remove(DOMRegionContext.XML_DECLARATION_CLOSE); // xml/html specific + contextStyleMap.remove(DOMRegionContext.XML_ELEMENT_DECLARATION); // xml/html specific + contextStyleMap.remove(DOMRegionContext.XML_ELEMENT_DECL_CLOSE); // xml/html specific // contextStyleMap.put(XMLJSPRegionContexts.JSP_CONTENT, HTMLColorManager.SCRIPT_AREA); // contextStyleMap.put(XMLJSPRegionContexts.BLOCK_TEXT, HTMLColorManager.SCRIPT_AREA); diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/reconcile/ReconcileStepForJspTranslation.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/reconcile/ReconcileStepForJspTranslation.java index 5cea8942b6..105928c00a 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/reconcile/ReconcileStepForJspTranslation.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/reconcile/ReconcileStepForJspTranslation.java @@ -23,7 +23,7 @@ import org.eclipse.jface.text.reconciler.IReconcileStep; import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation; import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter; import org.eclipse.jst.jsp.core.internal.java.JSPTranslationExtension; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.text.IStructuredDocument; @@ -36,7 +36,7 @@ import org.eclipse.wst.sse.ui.internal.reconcile.StructuredReconcileStep; import org.eclipse.wst.sse.ui.internal.reconcile.TemporaryAnnotation; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMModel; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** * Creates a JSPTranslation for use w/ the JavaReconcileStep. Adapts Java @@ -204,7 +204,7 @@ public class ReconcileStepForJspTranslation extends StructuredReconcileStep { regions = sdRegion.getRegions(); for (int i = 0; i < regions.size(); i++) { r = regions.get(i); - if (r.getType() == DOMJSPRegionContexts.JSP_DIRECTIVE_NAME || r.getType() == XMLRegionContext.XML_TAG_NAME) { + if (r.getType() == DOMJSPRegionContexts.JSP_DIRECTIVE_NAME || r.getType() == DOMRegionContext.XML_TAG_NAME) { tagName = sdRegion.getText(r).trim(); if (tagName.equals("include")) { //$NON-NLS-1$ adjustForInclude(annotation, pos, sdRegion, regions, i); @@ -238,10 +238,10 @@ public class ReconcileStepForJspTranslation extends StructuredReconcileStep { String noQuotes; for (int j = startingRegionNumber; j < regions.size(); j++) { r = regions.get(j); - if (r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME && !sdRegion.getText(r).trim().equals("file")) //$NON-NLS-1$ + if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME && !sdRegion.getText(r).trim().equals("file")) //$NON-NLS-1$ // there's only one attribute allowed for <@include break; - else if (r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { tagName = sdRegion.getText(r).trim(); noQuotes = StringUtils.strip(tagName); pos.offset = sdRegion.getStartOffset(r) + ((tagName.length() - noQuotes.length()) == 2 ? 1 : 0); @@ -259,10 +259,10 @@ public class ReconcileStepForJspTranslation extends StructuredReconcileStep { for (int j = startingRegionNumber; j < size; j++) { r = regions.get(j); - if (r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME && sdRegion.getText(r).trim().equals("import")) { //$NON-NLS-1$ + if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME && sdRegion.getText(r).trim().equals("import")) { //$NON-NLS-1$ if (size > j + 2) { r = regions.get(j + 2); - if (r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { value = sdRegion.getText(r); pos.offset = sdRegion.getStartOffset(r); pos.length = value.trim().length(); diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/registry/AdapterFactoryProviderForJSP.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/registry/AdapterFactoryProviderForJSP.java index f618012d2b..445dd98908 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/registry/AdapterFactoryProviderForJSP.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/registry/AdapterFactoryProviderForJSP.java @@ -12,10 +12,10 @@ package org.eclipse.jst.jsp.ui.internal.registry; import java.util.Iterator; -import org.eclipse.jst.jsp.core.PageDirectiveAdapter; +import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter; import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation; import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapterFactory; -import org.eclipse.jst.jsp.core.modelhandler.ModelHandlerForJSP; +import org.eclipse.jst.jsp.core.internal.modelhandler.ModelHandlerForJSP; import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterFactoryForHTML; diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/LineStyleProviderForJSP.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/LineStyleProviderForJSP.java index b9506c16e5..99f93ef901 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/LineStyleProviderForJSP.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/style/LineStyleProviderForJSP.java @@ -13,13 +13,13 @@ package org.eclipse.jst.jsp.ui.internal.style; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.TextAttribute; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin; import org.eclipse.wst.html.ui.style.IStyleConstantsHTML; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.ui.style.AbstractLineStyleProvider; import org.eclipse.wst.sse.ui.style.LineStyleProvider; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.style.IStyleConstantsXML; public class LineStyleProviderForJSP extends AbstractLineStyleProvider implements LineStyleProvider{ @@ -77,34 +77,34 @@ public class LineStyleProviderForJSP extends AbstractLineStyleProvider implement // seem worth it, since if adpaters factories are working // right, // then wouldn't be needed. - else if (type == XMLRegionContext.XML_TAG_NAME) { + else if (type == DOMRegionContext.XML_TAG_NAME) { result = (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_NAME); } - else if ((type == XMLRegionContext.XML_TAG_OPEN) || (type == XMLRegionContext.XML_END_TAG_OPEN) || (type == XMLRegionContext.XML_TAG_CLOSE) || (type == XMLRegionContext.XML_EMPTY_TAG_CLOSE)) { + else if ((type == DOMRegionContext.XML_TAG_OPEN) || (type == DOMRegionContext.XML_END_TAG_OPEN) || (type == DOMRegionContext.XML_TAG_CLOSE) || (type == DOMRegionContext.XML_EMPTY_TAG_CLOSE)) { result = (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_BORDER); } - else if (type == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + else if (type == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { result = (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_ATTRIBUTE_NAME); } - else if ((type == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) || (type == DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE) || (type == DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE)) { + else if ((type == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) || (type == DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE) || (type == DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE)) { result = (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE); } - else if (type == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + else if (type == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { result = (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS); } // DMW: added 9/1/2002 Undefined color may need addjustment :) - else if (type == XMLRegionContext.UNDEFINED) + else if (type == DOMRegionContext.UNDEFINED) result = (TextAttribute) getTextAttributes().get(IStyleConstantsXML.XML_CONTENT); - else if (type == XMLRegionContext.WHITE_SPACE) + else if (type == DOMRegionContext.WHITE_SPACE) result = (TextAttribute) getTextAttributes().get(IStyleConstantsXML.XML_CONTENT); // DMW added 8/30/2002 -- should provide JSP specific // preference for "custom tag content" (both tag dependent, // BLOCKED_TEXT, and not, XML CONTENT) - else if (type == XMLRegionContext.XML_CONTENT) + else if (type == DOMRegionContext.XML_CONTENT) result = (TextAttribute) getTextAttributes().get(IStyleConstantsXML.XML_CONTENT); - else if (type == XMLRegionContext.BLOCK_TEXT) + else if (type == DOMRegionContext.BLOCK_TEXT) result = (TextAttribute) getTextAttributes().get(IStyleConstantsXML.CDATA_TEXT); } } diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/taginfo/JSPTagInfoHoverProcessor.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/taginfo/JSPTagInfoHoverProcessor.java index 6bafefa8b6..8516ba4a5a 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/taginfo/JSPTagInfoHoverProcessor.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/taginfo/JSPTagInfoHoverProcessor.java @@ -12,7 +12,7 @@ package org.eclipse.jst.jsp.ui.internal.taginfo; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.html.ui.taginfo.HTMLTagInfoHoverProcessor; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/text/JSPDocumentRegionEdgeMatcher.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/text/JSPDocumentRegionEdgeMatcher.java index 240e4fce1b..43fd74f71e 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/text/JSPDocumentRegionEdgeMatcher.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/text/JSPDocumentRegionEdgeMatcher.java @@ -11,9 +11,9 @@ package org.eclipse.jst.jsp.ui.internal.text; import org.eclipse.jdt.internal.ui.text.JavaPairMatcher; -import org.eclipse.jst.jsp.core.model.parser.DOMJSPRegionContexts; +import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.ui.text.DocumentRegionEdgeMatcher; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class JSPDocumentRegionEdgeMatcher extends DocumentRegionEdgeMatcher { @@ -24,6 +24,6 @@ public class JSPDocumentRegionEdgeMatcher extends DocumentRegionEdgeMatcher { * @param nextMatcher */ public JSPDocumentRegionEdgeMatcher() { - super(new String[]{XMLRegionContext.XML_TAG_NAME, XMLRegionContext.XML_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMJSPRegionContexts.JSP_ROOT_TAG_NAME, XMLRegionContext.XML_CDATA_TEXT, XMLRegionContext.XML_PI_OPEN, XMLRegionContext.XML_PI_CONTENT}, new JavaPairMatcher(BRACKETS)); + super(new String[]{DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMJSPRegionContexts.JSP_ROOT_TAG_NAME, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_PI_CONTENT}, new JavaPairMatcher(BRACKETS)); } } 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 ee81dd5fd2..8b82d4a51e 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 @@ -19,14 +19,14 @@ import java.util.Vector; import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; import org.eclipse.wst.css.core.internal.provisional.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.html.core.internal.contentmodel.HTMLCMDocumentFactory; import org.eclipse.wst.xml.core.document.IDOMDocument; 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; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentCharsetDetector.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentCharsetDetector.java index f884a37f79..fcf04abbb0 100644 --- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentCharsetDetector.java +++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentCharsetDetector.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.eclipse.jface.text.IDocument; import org.eclipse.wst.sse.core.internal.document.DocumentReader; import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector; -import org.eclipse.wst.xml.core.encoding.XMLDocumentCharsetDetector; +import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentCharsetDetector; /** diff --git a/bundles/org.eclipse.wst.html.core/plugin.xml b/bundles/org.eclipse.wst.html.core/plugin.xml index 310c44a5de..ddfb64c60f 100644 --- a/bundles/org.eclipse.wst.html.core/plugin.xml +++ b/bundles/org.eclipse.wst.html.core/plugin.xml @@ -27,22 +27,22 @@ point="org.eclipse.wst.sse.core.modelHandler"> <modelHandler default="no" - class="org.eclipse.wst.html.core.modelhandler.ModelHandlerForHTML" + class="org.eclipse.wst.html.core.internal.modelhandler.ModelHandlerForHTML" associatedContentTypeId="org.eclipse.wst.html.core.htmlsource" - id="org.eclipse.wst.html.core.modelhandler"> + id="org.eclipse.wst.html.core.internal.modelhandler"> </modelHandler> </extension> <extension point="org.eclipse.wst.sse.core.embeddedTypeHandler"> <embeddedTypeHandler - class="org.eclipse.wst.html.core.modelhandler.EmbeddedHTML"> + class="org.eclipse.wst.html.core.internal.modelhandler.EmbeddedHTML"> </embeddedTypeHandler> </extension> <extension id="org.eclipse.wst.sse.html.core.builderdelegate.todo" point="org.eclipse.wst.sse.core.builderdelegate"> <participant - class="org.eclipse.wst.xml.core.builder.delegates.XMLTaskTagSeeker" + class="org.eclipse.wst.xml.core.internal.builder.delegates.XMLTaskTagSeeker" contentType="org.eclipse.wst.html.core.htmlsource"> </participant> </extension> @@ -57,7 +57,7 @@ point="org.eclipse.wst.sse.core.commentElementHandler"> <handler-custom commenttype="xml" - class="org.eclipse.wst.html.core.commentelement.handlers.CommentElementHandlerForSSI"> + class="org.eclipse.wst.html.core.internal.commentelement.handlers.CommentElementHandlerForSSI"> <startwith prefix="#"> </startwith> @@ -97,7 +97,7 @@ <extension point="org.eclipse.wst.sse.core.formatProcessors"> <processor - class="org.eclipse.wst.html.core.format.HTMLFormatProcessorImpl" + class="org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl" contentTypeId="org.eclipse.wst.html.core.htmlsource"> </processor> </extension> diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLDocumentAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLDocumentAdapter.java index 6658964e28..b0b5fe3aeb 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLDocumentAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLDocumentAdapter.java @@ -27,7 +27,7 @@ import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.css.core.internal.util.CSSClassTraverser; import org.eclipse.wst.css.core.internal.util.ImportRuleCollector; import org.eclipse.wst.html.core.HTML40Namespace; -import org.eclipse.wst.html.core.contentmodel.JSP11Namespace; +import org.eclipse.wst.html.core.internal.contentmodel.JSP11Namespace; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.xml.core.document.IDOMElement; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/URLModelProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/URLModelProvider.java index c533df597d..3470e07b4d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/URLModelProvider.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/URLModelProvider.java @@ -28,7 +28,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.wst.html.core.document.HTMLDocumentTypeConstants; +import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeConstants; import org.eclipse.wst.sse.core.IModelManager; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.StructuredModelManager; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java index 84a8587d66..36e6d2a2f8 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java @@ -37,15 +37,15 @@ import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.xml.core.document.IDOMAttr; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMElement; -import org.eclipse.wst.xml.core.document.ISourceGenerator; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; +import org.eclipse.wst.xml.core.document.ISourceGenerator; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -383,7 +383,7 @@ public class ElementNodeCleanupHandler extends AbstractNodeCleanupHandler { IStructuredDocumentRegion endTagStructuredDocumentRegion = newNode.getEndStructuredDocumentRegion(); ITextRegionList regionList = startTagStructuredDocumentRegion.getRegions(); - if (startTagStructuredDocumentRegion != null && regionList != null && regionList.get(regionList.size() - 1).getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE) { + if (startTagStructuredDocumentRegion != null && regionList != null && regionList.get(regionList.size() - 1).getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) { } else { @@ -428,7 +428,7 @@ public class ElementNodeCleanupHandler extends AbstractNodeCleanupHandler { ITextRegion lastRegion = regionList.get(regionList.size() - 1); if (lastRegion != null) { String regionType = lastRegion.getType(); - if ((regionType != XMLRegionContext.XML_EMPTY_TAG_CLOSE) && (regionType != XMLRegionContext.XML_TAG_CLOSE)) { + if ((regionType != DOMRegionContext.XML_EMPTY_TAG_CLOSE) && (regionType != DOMRegionContext.XML_TAG_CLOSE)) { IStructuredDocument structuredDocument = structuredModel.getStructuredDocument(); // insert ">" after lastRegion of flatNode @@ -563,11 +563,11 @@ public class ElementNodeCleanupHandler extends AbstractNodeCleanupHandler { IStructuredDocumentRegion startStructuredDocumentRegion = newNode.getStartStructuredDocumentRegion(); int index = startStructuredDocumentRegion.getEndOffset(); ITextRegion lastRegion = startStructuredDocumentRegion.getLastRegion(); - if (lastRegion.getType() == XMLRegionContext.XML_TAG_CLOSE) { + if (lastRegion.getType() == DOMRegionContext.XML_TAG_CLOSE) { index--; lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1); } - else if (lastRegion.getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE) { + else if (lastRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) { index = index - 2; lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1); } diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupHandlerFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupHandlerFactory.java index 03356c9c78..dd87fe893f 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupHandlerFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupHandlerFactory.java @@ -16,7 +16,7 @@ import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler; import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Node; // nakamori_TODO: check and remove CSS formatting @@ -127,7 +127,7 @@ class HTMLCleanupHandlerFactory { IStructuredDocumentRegion flatNode = ((IDOMNode) node).getFirstStructuredDocumentRegion(); if (flatNode == null) return false; - if (flatNode.getType() != XMLRegionContext.BLOCK_TEXT) + if (flatNode.getType() != DOMRegionContext.BLOCK_TEXT) return false; // check if the parent is STYLE element diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupProcessorImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupProcessorImpl.java index ea6a01d816..04502a97c9 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupProcessorImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupProcessorImpl.java @@ -12,8 +12,8 @@ package org.eclipse.wst.html.core.internal.cleanup; import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.html.core.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.html.core.format.HTMLFormatProcessorImpl; import org.eclipse.wst.html.core.internal.HTMLCorePlugin; +import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl; import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/commentelement/handlers/CommentElementHandlerForSSI.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/commentelement/handlers/CommentElementHandlerForSSI.java index cbfebbe777..321d0c46dc 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/commentelement/handlers/CommentElementHandlerForSSI.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/commentelement/handlers/CommentElementHandlerForSSI.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.commentelement.handlers; +package org.eclipse.wst.html.core.internal.commentelement.handlers; -import org.eclipse.wst.xml.core.commentelement.CommentElementHandler; -import org.eclipse.wst.xml.core.commentelement.util.CommentElementFactory; -import org.eclipse.wst.xml.core.commentelement.util.TagScanner; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.ISourceGenerator; +import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler; +import org.eclipse.wst.xml.core.internal.commentelement.util.CommentElementFactory; +import org.eclipse.wst.xml.core.internal.commentelement.util.TagScanner; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/AttributeCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/AttributeCollection.java index 20b38b4702..d1c5a06546 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/AttributeCollection.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/AttributeCollection.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMContentImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMContentImpl.java index d2392f456f..dac7c81524 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMContentImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMContentImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.xml.core.internal.contentmodel.CMContent; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CMGroupImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMGroupImpl.java index 5c7781eaac..a8ab34c9c1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CMGroupImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMGroupImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMNamedNodeMapImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNamedNodeMapImpl.java index 51a2a7ae3b..21ce1b23a2 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMNamedNodeMapImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNamedNodeMapImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMNamespaceImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNamespaceImpl.java index 8e8a7c9219..20f4c283a7 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMNamespaceImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNamespaceImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMNodeImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeImpl.java index fc5db10457..bb9d68e5bc 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMNodeImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.html.core.HTMLCMProperties; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMNodeListImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeListImpl.java index d5c9463561..33ceec8f56 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMNodeListImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeListImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/ComplexTypeDefinition.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ComplexTypeDefinition.java index d2270bcfdd..79a286c1b5 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/ComplexTypeDefinition.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ComplexTypeDefinition.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/ComplexTypeDefinitionFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ComplexTypeDefinitionFactory.java index ecf6f04002..59552a32ae 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/ComplexTypeDefinitionFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ComplexTypeDefinitionFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdAddress.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdAddress.java index 6d6236ec30..c79f788eaa 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdAddress.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdAddress.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdColumnGroup.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdColumnGroup.java index 3c91a1a5d5..b0b2e59aa3 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdColumnGroup.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdColumnGroup.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdDl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdDl.java index 3ad83ea000..561b2142d6 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdDl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdDl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdEmbed.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdEmbed.java index 9168fc1bf1..a96fcc616a 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdEmbed.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdEmbed.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdFieldset.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFieldset.java index f86b4d4fe0..61713a377f 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdFieldset.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFieldset.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdFlowContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFlowContainer.java index 9655c56020..3bdad70d20 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdFlowContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFlowContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdFrameset.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFrameset.java index 9db1a9c8cf..42b79bdc59 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdFrameset.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFrameset.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdHead.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHead.java index 2773a0cff1..e0e321c499 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdHead.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHead.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdHtml.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHtml.java index 0af5a3f55d..7949e14282 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdHtml.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHtml.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdInlineContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdInlineContainer.java index 66fb072646..6a4cb93821 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdInlineContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdInlineContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdLiContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdLiContainer.java index 750dc91c32..edc4b6929d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdLiContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdLiContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdMap.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdMap.java index fb3ec8add9..9e08bb3839 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdMap.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdMap.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdNoframesContent.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdNoframesContent.java index 09ef2c23c0..f9a30c1123 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdNoframesContent.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdNoframesContent.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdOptionContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdOptionContainer.java index e2f8ea77a2..e3f4fde2e3 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdOptionContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdOptionContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdParamContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdParamContainer.java index 492b239831..e2aa03ccd5 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdParamContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdParamContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdSelect.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdSelect.java index b14ecefc9b..50659d06bc 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdSelect.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdSelect.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdTable.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTable.java index 7dc5c4c823..6357a3bb18 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdTable.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTable.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdTableCellContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTableCellContainer.java index d6e69c02c0..24a6ad61c8 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdTableCellContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTableCellContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdTrContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTrContainer.java index 37c0844dba..2f8b5ef696 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CtdTrContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTrContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/DeclCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/DeclCollection.java index 959fc19cce..4b0d55840d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/DeclCollection.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/DeclCollection.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/ElementCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ElementCollection.java index 57f37db3bf..db0c9888d2 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/ElementCollection.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ElementCollection.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/EntityCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/EntityCollection.java index f55d60b6d0..8343a9256c 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/EntityCollection.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/EntityCollection.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HCMDocImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HCMDocImpl.java index 9221ee91ef..2fb191c230 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HCMDocImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HCMDocImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLAttrDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttrDeclImpl.java index 0d724070ed..f044ef6571 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLAttrDeclImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttrDeclImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLAttributeDeclaration.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttributeDeclaration.java index f7b889663d..1bff6f675a 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLAttributeDeclaration.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttributeDeclaration.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLCMDataType.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDataType.java index 995f7996bc..34361dd96b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLCMDataType.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDataType.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLCMDataTypeImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDataTypeImpl.java index 82a6c80b27..fe6e6881b7 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLCMDataTypeImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDataTypeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLCMDocument.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocument.java index bb6d62e58e..8a5a1ecaf0 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLCMDocument.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocument.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLCMDocumentFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocumentFactory.java index 681a6722bb..00650f5720 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLCMDocumentFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocumentFactory.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import java.util.Hashtable; import org.eclipse.wst.html.core.HTML40Namespace; -import org.eclipse.wst.html.core.contentmodel.chtml.CHCMDocImpl; -import org.eclipse.wst.xml.core.contentmodel.CMDocType; +import org.eclipse.wst.html.core.internal.contentmodel.chtml.CHCMDocImpl; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType; /** * INodeAdapter factory for HTML and JSP documents. diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HTMLCMNode.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMNode.java index 2d92a371de..8538731aef 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HTMLCMNode.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMNode.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel; /** diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLElemDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElemDeclImpl.java index 7f3a10a695..4ef99ba35f 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLElemDeclImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElemDeclImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLElementDeclaration.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElementDeclaration.java index 87ab97b0d3..12a2ceb393 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLElementDeclaration.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElementDeclaration.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLEntityDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclImpl.java index 6fc257d747..61f4eaf2f0 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLEntityDeclImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.html.core.HTMLCMProperties; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLEntityDeclaration.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclaration.java index 6257a88372..2663e23fcb 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLEntityDeclaration.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclaration.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLPropertyDeclaration.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLPropertyDeclaration.java index e2caabcd0d..d3a4b266d5 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLPropertyDeclaration.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLPropertyDeclaration.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.xml.core.internal.contentmodel.CMContent; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedA.java index 706f1b56ef..b4890041a5 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedA.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedA.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedADDRESS.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedADDRESS.java index ae4469b10d..8210a00fcc 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedADDRESS.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedADDRESS.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedAPPLET.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAPPLET.java index 48c420ef1f..7365806f4a 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedAPPLET.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAPPLET.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedAREA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAREA.java index 7014b587ad..69d951a0a1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedAREA.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAREA.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBASE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASE.java index 4b388cc7d8..2c001719bd 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBASE.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASE.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBASEFONT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASEFONT.java index 00e9a50172..c2bd5e9f32 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBASEFONT.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASEFONT.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBDO.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBDO.java index fe302afb9c..d8365bf4d3 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBDO.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBDO.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBGSOUND.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBGSOUND.java index 29aedaf6ac..e85ee5af47 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBGSOUND.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBGSOUND.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.html.core.HTML40Namespace; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBLOCKQUOTE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBLOCKQUOTE.java index 0ba5c96e04..75dfe539b0 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBLOCKQUOTE.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBLOCKQUOTE.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBODY.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBODY.java index 363a8374be..4cfd615559 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBODY.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBODY.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBR.java index d6adcb067a..6232117b58 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBR.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBR.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.html.core.HTML40Namespace; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBUTTON.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBUTTON.java index 0b6d01d853..568fb476aa 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedBUTTON.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBUTTON.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedCAPTION.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCAPTION.java index dbab319f4c..7f409280bb 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedCAPTION.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCAPTION.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.html.core.HTML40Namespace; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedCENTER.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCENTER.java index 5bf6f56aba..029e3656a2 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedCENTER.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCENTER.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedCOL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOL.java index 4c55372584..2e2214a7f0 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedCOL.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOL.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedCOLGROUP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOLGROUP.java index e4d259997e..2903b7e8db 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedCOLGROUP.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOLGROUP.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedDD.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDD.java index cdb4f6f603..06676e76f2 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedDD.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDD.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedDIV.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDIV.java index adf6178889..401399ed7a 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedDIV.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDIV.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedDL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDL.java index 6415aaf8a4..c6535a553e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedDL.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDL.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedDT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDT.java index 6c7bd4856a..4fa23ab9a7 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedDT.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDT.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedEMBED.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEMBED.java index d0cef7fc5a..89b4c6a796 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedEMBED.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEMBED.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedEmpty.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEmpty.java index 656d0f8c5d..8f5898a5fe 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedEmpty.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEmpty.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFIELDSET.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFIELDSET.java index cf01cab930..1d76bff525 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFIELDSET.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFIELDSET.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFONT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFONT.java index 7cdad805f6..21da885a3c 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFONT.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFONT.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFORM.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFORM.java index 19be0c723f..561610ed23 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFORM.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFORM.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFRAME.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAME.java index bb7d37305b..6c91365f10 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFRAME.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAME.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFRAMESET.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAMESET.java index 6984d51911..a3be42bb97 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFRAMESET.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAMESET.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFlowContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFlowContainer.java index 6324dee7ca..96d47e2055 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFlowContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFlowContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFontStyle.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFontStyle.java index 2059119728..c02371e9fc 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedFontStyle.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFontStyle.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedHEAD.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHEAD.java index df4a36565f..c9323dad86 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedHEAD.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHEAD.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedHR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHR.java index 9afde13eca..d7a5f6dd99 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedHR.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHR.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHTML.java index bb0dfb2d5c..d4934c3296 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedHTML.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHTML.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedHeading.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHeading.java index 79d9f44ecb..d6b644e34e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedHeading.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHeading.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedIFRAME.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIFRAME.java index 14ff4edef1..cc9290c474 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedIFRAME.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIFRAME.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedIMG.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIMG.java index 454dedfe26..c73fcc9079 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedIMG.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIMG.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedINPUT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedINPUT.java index 065aa98efe..deca6e6328 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedINPUT.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedINPUT.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedISINDEX.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedISINDEX.java index 9cdf8fdbbf..2a7df91a79 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedISINDEX.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedISINDEX.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedInlineContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedInlineContainer.java index eb97a66570..08812aa8ad 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedInlineContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedInlineContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedLABEL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLABEL.java index 5044678989..f172b46591 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedLABEL.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLABEL.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedLEGEND.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLEGEND.java index 138f7303a9..888c5656b4 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedLEGEND.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLEGEND.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedLI.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLI.java index bb762e958b..5dacdfb167 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedLI.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLI.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedLINK.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLINK.java index 7818a39dcc..b7779c3b4d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedLINK.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLINK.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedListItemContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedListItemContainer.java index 96343ea914..ca497170be 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedListItemContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedListItemContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedMAP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMAP.java index bf2622b6ab..13ce8b61ec 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedMAP.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMAP.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.html.core.HTML40Namespace; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedMARQUEE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMARQUEE.java index 7c233c9dbe..4dd399f612 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedMARQUEE.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMARQUEE.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedMENU.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMENU.java index ad9715ee4f..d6bb4642d5 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedMENU.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMENU.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedMETA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMETA.java index d790a373a8..e9cbdea413 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedMETA.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMETA.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedMarkChanges.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMarkChanges.java index e8bcc195ae..0e97abd4fc 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedMarkChanges.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMarkChanges.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedNOBR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOBR.java index 2b18887e9f..e1041258f8 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedNOBR.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOBR.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.html.core.HTML40Namespace; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedNOEMBED.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOEMBED.java index 821a3e542c..6be05205de 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedNOEMBED.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOEMBED.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.html.core.HTML40Namespace; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedNOFRAMES.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOFRAMES.java index a56b1ead57..83940650a9 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedNOFRAMES.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOFRAMES.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedNOSCRIPT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOSCRIPT.java index c58c4ec265..2f29dd8bf9 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedNOSCRIPT.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOSCRIPT.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedOBJECT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOBJECT.java index bbc7ac2050..8d9f98ddae 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedOBJECT.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOBJECT.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedOL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOL.java index c73c7e676b..6c0fbf21c1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedOL.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOL.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedOPTGROUP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTGROUP.java index 2a465f10b7..be680cb9f6 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedOPTGROUP.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTGROUP.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedOPTION.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTION.java index 9657f5ab9e..2de188e0e3 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedOPTION.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTION.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedP.java index 763c0ace3b..9bf079f06d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedP.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedP.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedPARAM.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPARAM.java index 85101da348..ba9879cee3 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedPARAM.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPARAM.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedPRE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPRE.java index f206b8b456..6df4ec2eed 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedPRE.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPRE.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedPcdata.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPcdata.java index 809992d446..7e14c31104 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedPcdata.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPcdata.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedPhrase.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPhrase.java index e8e6cc1eb7..7471184794 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedPhrase.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPhrase.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedQ.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedQ.java index 11bd04d484..b8a0de29df 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedQ.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedQ.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSCRIPT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSCRIPT.java index 95970b2caf..b66b0f32f1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSCRIPT.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSCRIPT.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSELECT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSELECT.java index d25f9c39a6..e3155f6dd2 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSELECT.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSELECT.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSPAN.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSPAN.java index b1fc4f5818..1ab6079d95 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSPAN.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSPAN.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.html.core.HTML40Namespace; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIBase.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIBase.java index 7a0bee45b5..71330951bc 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIBase.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIBase.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.html.core.HTMLCMProperties; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIConfig.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIConfig.java index af32153a04..f8117bff96 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIConfig.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIConfig.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIEcho.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIEcho.java index 3e958d1d97..4a18ea576b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIEcho.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIEcho.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIExec.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIExec.java index 6d18d97464..7d2e0cd68d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIExec.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIExec.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIFlastmod.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFlastmod.java index e2092e088f..7c4b124d81 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIFlastmod.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFlastmod.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIFsize.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFsize.java index bcb7cb4b02..a60a47e77f 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIFsize.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFsize.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIInclude.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIInclude.java index a14459f702..2b73be4327 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIInclude.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIInclude.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIPrintenv.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIPrintenv.java index a03ad4bcd3..351942a286 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSIPrintenv.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIPrintenv.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSISet.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSISet.java index 2ac31d4f64..50faca1513 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSSISet.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSISet.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSTYLE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSTYLE.java index e3cd11eca3..ad9c3a67d1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedSTYLE.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSTYLE.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedScripts.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedScripts.java index a6f2c38ee9..d921ada949 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedScripts.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedScripts.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTABLE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTABLE.java index dce29245d2..e0e0139762 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTABLE.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTABLE.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTEXTAREA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTEXTAREA.java index cfcb20dd45..576538cd34 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTEXTAREA.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTEXTAREA.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTITLE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTITLE.java index c92bb29c89..19eefc9b3e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTITLE.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTITLE.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTR.java index c66423633f..1c3eddd278 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTR.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTR.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTableBody.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableBody.java index 3360016f7f..4aaa8d053d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTableBody.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableBody.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTableCell.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableCell.java index 1e641938e6..2ff0d3099a 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedTableCell.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableCell.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedUL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedUL.java index 660e7f2ac3..14f8dacfe4 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedUL.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedUL.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedWBR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedWBR.java index 51bedf0a47..f7b08d6c10 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedWBR.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedWBR.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import org.eclipse.wst.html.core.HTML40Namespace; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/JCMDocImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JCMDocImpl.java index 751028a241..89d76e4d14 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/JCMDocImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JCMDocImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/JSP11Namespace.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSP11Namespace.java index 893c034e77..acfff3b016 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/JSP11Namespace.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSP11Namespace.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; /** diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/JSPCMDocument.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPCMDocument.java index 7bf5b36bda..959063d13c 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/JSPCMDocument.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPCMDocument.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/JSPElementCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPElementCollection.java index b938c016a0..cc8acf6b45 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/JSPElementCollection.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPElementCollection.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/PropertyProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProvider.java index ebe5e0c7cb..09cba4b407 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/PropertyProvider.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProvider.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; /** diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/PropertyProviderFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProviderFactory.java index 5227bd7c61..3ffb396e50 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/PropertyProviderFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProviderFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel; import java.util.Hashtable; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/AttributeCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/AttributeCollection.java index 3e03546ee8..ab8d2eac1b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/AttributeCollection.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/AttributeCollection.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; import java.util.Iterator; -import org.eclipse.wst.html.core.contentmodel.HTMLAttributeDeclaration; -import org.eclipse.wst.html.core.contentmodel.HTMLCMDataType; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDataType; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CHCMDocImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHCMDocImpl.java index f916204193..6627ae8ac8 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CHCMDocImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHCMDocImpl.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; -import org.eclipse.wst.html.core.contentmodel.HTMLCMDocument; -import org.eclipse.wst.html.core.contentmodel.HTMLElementDeclaration; -import org.eclipse.wst.html.core.contentmodel.HTMLEntityDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocument; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLEntityDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CHTMLNamespace.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHTMLNamespace.java index d2d2d8e2fd..3aa8424ac2 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CHTMLNamespace.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHTMLNamespace.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; import org.eclipse.wst.html.core.HTML40Namespace; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CMContentImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMContentImpl.java index a8c4d9c79b..28b7966b9d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CMContentImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMContentImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMGroupImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMGroupImpl.java index 8239e13abc..812b3ed3dc 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/CMGroupImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMGroupImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CMNamedNodeMapImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNamedNodeMapImpl.java index e5433b99d4..a32cdfdba6 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CMNamedNodeMapImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNamedNodeMapImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CMNodeImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeImpl.java index 3e14a37856..fb242d68e5 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CMNodeImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; import org.eclipse.wst.html.core.HTMLCMProperties; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CMNodeListImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeListImpl.java index f6755fa800..80581b0149 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CMNodeListImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeListImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/ComplexTypeDefinition.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ComplexTypeDefinition.java index ab3ff2c4ec..a5ce36c636 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/ComplexTypeDefinition.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ComplexTypeDefinition.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; -import org.eclipse.wst.html.core.contentmodel.HTMLElementDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup; /** diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/ComplexTypeDefinitionFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ComplexTypeDefinitionFactory.java index 4d66fb5f30..02e1081879 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/ComplexTypeDefinitionFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ComplexTypeDefinitionFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdAddress.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdAddress.java index 9c3324efff..84796f4af4 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdAddress.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdAddress.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdDl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdDl.java index e5c7c70a8f..dcfb159a3d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdDl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdDl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdFlowContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdFlowContainer.java index c37642d418..99e4bf99a1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdFlowContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdFlowContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdHead.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdHead.java index 8b2c531f7b..c54ae883ac 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdHead.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdHead.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdHtml.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdHtml.java index accf01f2eb..5887c64928 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdHtml.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdHtml.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdInlineContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdInlineContainer.java index f6663f5a94..92293d4603 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdInlineContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdInlineContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdLiContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdLiContainer.java index 9ffd3f6207..8e4716a019 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdLiContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdLiContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdOptionContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdOptionContainer.java index f793592dcc..b1e0a5496c 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdOptionContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdOptionContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdSelect.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdSelect.java index 987dd19ce8..cc0d61ed69 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/CtdSelect.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CtdSelect.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/DeclCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/DeclCollection.java index efed35ee57..30b6beaa58 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/DeclCollection.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/DeclCollection.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/ElementCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ElementCollection.java index 7e2536ebbc..826be12f3b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/ElementCollection.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ElementCollection.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/EntityCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/EntityCollection.java index a92e3347f1..fe0ae2803c 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/EntityCollection.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/EntityCollection.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HTMLAttrDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLAttrDeclImpl.java index bd1e31f824..d5aa9b5e66 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HTMLAttrDeclImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLAttrDeclImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; @@ -17,7 +17,7 @@ import java.util.Enumeration; import java.util.Vector; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.contentmodel.HTMLAttributeDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HTMLCMDataTypeImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLCMDataTypeImpl.java index 33f7f54014..64931b6dbf 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HTMLCMDataTypeImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLCMDataTypeImpl.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; -import org.eclipse.wst.html.core.contentmodel.HTMLCMDataType; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDataType; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLCMNode.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLCMNode.java index ffc4dc89bf..a1e555acf9 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HTMLCMNode.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLCMNode.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; /** diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HTMLElemDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLElemDeclImpl.java index 6393fedbee..a75268b8cc 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HTMLElemDeclImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLElemDeclImpl.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; import java.util.Iterator; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.contentmodel.HTMLAttributeDeclaration; -import org.eclipse.wst.html.core.contentmodel.HTMLElementDeclaration; -import org.eclipse.wst.html.core.contentmodel.HTMLPropertyDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLPropertyDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMContent; import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HTMLEntityDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLEntityDeclImpl.java index 8b2eb707c4..496e93a7c6 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HTMLEntityDeclImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLEntityDeclImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.contentmodel.HTMLEntityDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLEntityDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedA.java index e8c95a0f2f..1957ee951c 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedA.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedA.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedADDRESS.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedADDRESS.java index cf9f2003a0..55579d8b87 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedADDRESS.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedADDRESS.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedBASE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBASE.java index a8564f192d..ab2c8161be 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedBASE.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBASE.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedBLOCKQUOTE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBLOCKQUOTE.java index 2ec09f40a0..818156e29b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedBLOCKQUOTE.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBLOCKQUOTE.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedBODY.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBODY.java index 7b0b2fde86..992288f2cf 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedBODY.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBODY.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedBR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBR.java index 62d1e6400d..30ef48ba45 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedBR.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedBR.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; -import org.eclipse.wst.html.core.contentmodel.HTMLAttributeDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedCENTER.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedCENTER.java index 3f58d2d3ed..c2c60d69ab 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedCENTER.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedCENTER.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedDD.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDD.java index d27bd32da5..a5da292dd3 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedDD.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDD.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedDIV.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDIV.java index f156ed18bf..adb56c2df7 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedDIV.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDIV.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedDL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDL.java index eb01b508ad..c09c9ac095 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedDL.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDL.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedDT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDT.java index 6dca71ec97..e12c4c4c07 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedDT.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedDT.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedEmpty.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedEmpty.java index c79674d96d..92c30da559 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedEmpty.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedEmpty.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedFORM.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedFORM.java index e30e5bdc82..751acd8e0b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedFORM.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedFORM.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedFlowContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedFlowContainer.java index 9820507b01..99f307b1d7 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedFlowContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedFlowContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedHEAD.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHEAD.java index f22d4f0f57..2366dce8d1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedHEAD.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHEAD.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedHR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHR.java index 6303e227fd..ed65ab335b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedHR.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHR.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHTML.java index c39f6661d6..f0d59262e9 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedHTML.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHTML.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; import java.util.Arrays; import java.util.Iterator; -import org.eclipse.wst.html.core.contentmodel.HTMLAttributeDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration; /** diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedHeading.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHeading.java index 08a2802a19..5a89a58c4d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedHeading.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedHeading.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedIMG.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedIMG.java index 177137662c..f7f30c603f 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedIMG.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedIMG.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedINPUT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedINPUT.java index ac43975f8d..bf0951ccce 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedINPUT.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedINPUT.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedInlineContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedInlineContainer.java index ba04b6673b..99f14c90a6 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedInlineContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedInlineContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedLI.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedLI.java index bfdb17c610..6a3a344f4d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedLI.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedLI.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedListItemContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedListItemContainer.java index 875bb606c5..9e457c7963 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedListItemContainer.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedListItemContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedMENU.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedMENU.java index 005ab0d50b..50e020ff1e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedMENU.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedMENU.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedMETA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedMETA.java index 5c153750a6..882eca9843 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedMETA.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedMETA.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; import java.util.Arrays; -import org.eclipse.wst.html.core.contentmodel.HTMLCMDataType; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDataType; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedOL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedOL.java index 59d90d43e1..b2583d0a20 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedOL.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedOL.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedOPTION.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedOPTION.java index 6cb7cfbfe7..84a081d473 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedOPTION.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedOPTION.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedP.java index bbc182d302..9619c28997 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedP.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedP.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedPRE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedPRE.java index 4c625a3cea..649d1473d6 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedPRE.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedPRE.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedPcdata.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedPcdata.java index 0ed8777ce5..15b13c334e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/HedPcdata.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedPcdata.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSELECT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSELECT.java index c4ee64e6df..cbd0bb80a2 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSELECT.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSELECT.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIBase.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIBase.java index fd64d4a315..6ffdbe5940 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIBase.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIBase.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.contentmodel.HTMLElementDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIConfig.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIConfig.java index a98fb71bf6..d5e92e341d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIConfig.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIConfig.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIEcho.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIEcho.java index 5e58a49256..3cf3f7c2bf 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIEcho.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIEcho.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIExec.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIExec.java index 7ddc7c6d00..e97cb5d6b7 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIExec.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIExec.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIFlastmod.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIFlastmod.java index 1e5eac975a..75eaf9d1c1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIFlastmod.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIFlastmod.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIFsize.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIFsize.java index b3acb6d5e9..3fbf3c11fd 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIFsize.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIFsize.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIInclude.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIInclude.java index 0a06ca7815..4788b5e161 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIInclude.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIInclude.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIPrintenv.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIPrintenv.java index 2524a2dd4b..0064a4f0cd 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSIPrintenv.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIPrintenv.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSISet.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSISet.java index 30210913c8..e1a8e1d627 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedSSISet.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSISet.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedTEXTAREA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedTEXTAREA.java index 229e52b71a..bef9535cf1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedTEXTAREA.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedTEXTAREA.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedTITLE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedTITLE.java index 18bd2e83c4..ad6a7429e4 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedTITLE.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedTITLE.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedUL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedUL.java index b02b5954d5..15ddbc1451 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/HedUL.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedUL.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/PropertyProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProvider.java index db31375b90..6ed567daaf 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/PropertyProvider.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProvider.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; -import org.eclipse.wst.html.core.contentmodel.HTMLElementDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/PropertyProviderFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProviderFactory.java index 3eca87d544..847610309d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/chtml/PropertyProviderFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProviderFactory.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.chtml; +package org.eclipse.wst.html.core.internal.contentmodel.chtml; import java.util.Hashtable; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.contentmodel.HTMLElementDeclaration; -import org.eclipse.wst.html.core.contentmodel.HTMLPropertyDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLPropertyDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.annotation.AnnotationMap; /** diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/ssi/SSICMDocumentFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ssi/SSICMDocumentFactory.java index 42ae673224..7de746b01c 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/contentmodel/ssi/SSICMDocumentFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ssi/SSICMDocumentFactory.java @@ -8,19 +8,19 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.contentmodel.ssi; +package org.eclipse.wst.html.core.internal.contentmodel.ssi; import java.util.Hashtable; import java.util.Iterator; import org.eclipse.wst.html.core.HTML40Namespace; -import org.eclipse.wst.html.core.contentmodel.HTMLCMDocumentFactory; -import org.eclipse.wst.xml.core.contentmodel.CMDocType; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType; /** * CMDocument factory for SSI documents. diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/XMLStyleModelImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DOMStyleModelImpl.java index 62ea67e7ad..7dbc200de0 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/XMLStyleModelImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DOMStyleModelImpl.java @@ -14,9 +14,9 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; -import org.eclipse.wst.xml.core.internal.document.XMLModelImpl; +import org.eclipse.wst.xml.core.internal.document.DOMModelImpl; import org.w3c.dom.Document; /** @@ -25,8 +25,8 @@ import org.w3c.dom.Document; * To change the template for this generated type comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ -public class XMLStyleModelImpl extends XMLModelImpl { - public XMLStyleModelImpl() { +public class DOMStyleModelImpl extends DOMModelImpl { + public DOMStyleModelImpl() { // remember, the document is created in super constructor, // via internalCreateDocument super(); diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/DocumentStyleImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DocumentStyleImpl.java index 9e9269569f..e464beeb5a 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/DocumentStyleImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DocumentStyleImpl.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter; import org.eclipse.wst.sse.core.INodeAdapter; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/ElementStyleImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/ElementStyleImpl.java index 729c5982d8..2198b24145 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/ElementStyleImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/ElementStyleImpl.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter; import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLConverter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java index 73753fb851..9d9e9da409 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLConverter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapter.java index edafd89e6d..49d80e53bd 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java index 547bf9a9c9..0ad0c6bfca 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeAdapterFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeConstants.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeConstants.java index e44e5ec2fc..abc328444d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeConstants.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeConstants.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; public interface HTMLDocumentTypeConstants { diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeEntry.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeEntry.java index 958c11a639..c8a51b3d5b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeEntry.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeEntry.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeRegistry.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistry.java index 9b18366831..6f9cd0cd4a 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeRegistry.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistry.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeRegistryReader.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistryReader.java index 4102e8a498..2dbf6ed764 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLDocumentTypeRegistryReader.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistryReader.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLModelParserAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapter.java index 72c6f5437e..203fea0a87 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLModelParserAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapter.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; import org.eclipse.wst.html.core.HTML40Namespace; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.contentmodel.HTMLElementDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.IDOMText; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLModelParserAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapterFactory.java index 45af597a8d..08f03f9f44 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/HTMLModelParserAdapterFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/MetaData.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaData.java index 31e732edcb..132e18b995 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/MetaData.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaData.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/MetaDataAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaDataAdapter.java index f334cdba60..5fa2103f73 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/MetaDataAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaDataAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; @@ -22,7 +22,7 @@ import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.internal.document.TagAdapter; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** */ @@ -108,7 +108,7 @@ public class MetaDataAdapter implements TagAdapter, MetaData { } private boolean isDOMComment(String regionType) { - return regionType == XMLRegionContext.XML_COMMENT_TEXT; + return regionType == DOMRegionContext.XML_COMMENT_TEXT; } public String getData() { diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/TagScanner.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/TagScanner.java index b099e55f3a..17e0bb1436 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/TagScanner.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/TagScanner.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/UnknownTagAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/UnknownTagAdapter.java index b65434a9a9..94cd5e8030 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/document/UnknownTagAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/UnknownTagAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.document; +package org.eclipse.wst.html.core.internal.document; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/encoding/HTMLDocumentCharsetDetector.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentCharsetDetector.java index 8e002b63eb..a0242c9e3c 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/encoding/HTMLDocumentCharsetDetector.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentCharsetDetector.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.encoding; +package org.eclipse.wst.html.core.internal.encoding; import org.eclipse.jface.text.IDocument; import org.eclipse.wst.html.core.internal.contenttype.HTMLResourceEncodingDetector; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/encoding/HTMLDocumentLoader.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java index f50ae06d1a..d6bc40e467 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/encoding/HTMLDocumentLoader.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java @@ -8,20 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.encoding; +package org.eclipse.wst.html.core.internal.encoding; import java.util.ArrayList; import java.util.List; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.wst.html.core.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.html.core.document.HTMLDocumentTypeAdapterFactory; -import org.eclipse.wst.html.core.document.HTMLModelParserAdapterFactory; import org.eclipse.wst.html.core.htmlcss.HTMLStyleSelectorAdapterFactory; import org.eclipse.wst.html.core.htmlcss.StyleAdapterFactory; import org.eclipse.wst.html.core.internal.contenttype.EncodingGuesser; +import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeAdapterFactory; +import org.eclipse.wst.html.core.internal.document.HTMLModelParserAdapterFactory; +import org.eclipse.wst.html.core.internal.modelquery.ModelQueryAdapterFactoryForHTML; import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML; -import org.eclipse.wst.html.core.modelquery.ModelQueryAdapterFactoryForHTML; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IStructuredModel; @@ -40,7 +40,7 @@ import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser; import org.eclipse.wst.xml.core.internal.parser.XMLStructuredDocumentReParser; import org.eclipse.wst.xml.core.internal.propagate.PropagatingAdapterFactoryImpl; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class HTMLDocumentLoader extends AbstractDocumentLoader { @@ -52,7 +52,7 @@ public class HTMLDocumentLoader extends AbstractDocumentLoader { * Convenience method to add tag names using BlockMarker object */ protected void addHTMLishTag(XMLSourceParser parser, String tagname) { - BlockMarker bm = new BlockMarker(tagname, null, XMLRegionContext.BLOCK_TEXT, false); + BlockMarker bm = new BlockMarker(tagname, null, DOMRegionContext.BLOCK_TEXT, false); parser.addBlockMarker(bm); } diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/encoding/HTMLModelLoader.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLModelLoader.java index 63c5b2c27a..708855402f 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/encoding/HTMLModelLoader.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLModelLoader.java @@ -8,17 +8,17 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.encoding; +package org.eclipse.wst.html.core.internal.encoding; import java.util.ArrayList; import java.util.List; -import org.eclipse.wst.html.core.document.HTMLDocumentTypeAdapterFactory; -import org.eclipse.wst.html.core.document.HTMLModelParserAdapterFactory; -import org.eclipse.wst.html.core.document.XMLStyleModelImpl; import org.eclipse.wst.html.core.htmlcss.HTMLStyleSelectorAdapterFactory; import org.eclipse.wst.html.core.htmlcss.StyleAdapterFactory; -import org.eclipse.wst.html.core.modelquery.ModelQueryAdapterFactoryForHTML; +import org.eclipse.wst.html.core.internal.document.DOMStyleModelImpl; +import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeAdapterFactory; +import org.eclipse.wst.html.core.internal.document.HTMLModelParserAdapterFactory; +import org.eclipse.wst.html.core.internal.modelquery.ModelQueryAdapterFactoryForHTML; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IStructuredModel; @@ -32,7 +32,7 @@ import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.internal.DebugAdapterFactory; import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser; import org.eclipse.wst.xml.core.internal.propagate.PropagatingAdapterFactoryImpl; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class HTMLModelLoader extends AbstractModelLoader { @@ -45,12 +45,12 @@ public class HTMLModelLoader extends AbstractModelLoader { * Convenience method to add tag names using BlockMarker object */ protected void addHTMLishTag(XMLSourceParser parser, String tagname) { - BlockMarker bm = new BlockMarker(tagname, null, XMLRegionContext.BLOCK_TEXT, false); + BlockMarker bm = new BlockMarker(tagname, null, DOMRegionContext.BLOCK_TEXT, false); parser.addBlockMarker(bm); } public IStructuredModel newModel() { - XMLStyleModelImpl model = new XMLStyleModelImpl(); + DOMStyleModelImpl model = new DOMStyleModelImpl(); return model; } diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/EmbeddedCSSFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/EmbeddedCSSFormatter.java index 71fa18638f..c7438f8d0c 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/EmbeddedCSSFormatter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/EmbeddedCSSFormatter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.format; +package org.eclipse.wst.html.core.internal.format; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLElementFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLElementFormatter.java index 5d36f6d6fb..6667d85933 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLElementFormatter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLElementFormatter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.format; +package org.eclipse.wst.html.core.internal.format; import java.util.Iterator; @@ -24,14 +24,14 @@ import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.format.IStructuredFormatPreferencesXML; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Attr; import org.w3c.dom.NamedNodeMap; // nakamori_TODO: check and remove CSS formatting -public class HTMLElementFormatter extends HTMLFormatter implements XMLRegionContext { +public class HTMLElementFormatter extends HTMLFormatter { /** */ @@ -78,19 +78,19 @@ public class HTMLElementFormatter extends HTMLFormatter implements XMLRegionCont if (region == null) continue; String regionType = region.getType(); - if (regionType == XML_TAG_NAME || isNestedTag(regionType)) { - if (prevRegion != null && prevRegion.getType() == XML_END_TAG_OPEN) { + if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTag(regionType)) { + if (prevRegion != null && prevRegion.getType() == DOMRegionContext.XML_END_TAG_OPEN) { removeTailingSpaces(endStructuredDocumentRegion, prevRegion); } } - else if (regionType == XML_TAG_CLOSE) { - if (prevRegion != null && (prevRegion.getType() == XML_TAG_NAME || isNestedRootTag(prevRegion.getType()))) { + else if (regionType == DOMRegionContext.XML_TAG_CLOSE) { + if (prevRegion != null && (prevRegion.getType() == DOMRegionContext.XML_TAG_NAME || isNestedRootTag(prevRegion.getType()))) { removeTailingSpaces(endStructuredDocumentRegion, prevRegion); } } prevRegion = region; } - if (prevRegion != null && (prevRegion.getType() == XML_TAG_NAME || isNestedRootTag(prevRegion.getType()))) { + if (prevRegion != null && (prevRegion.getType() == DOMRegionContext.XML_TAG_NAME || isNestedRootTag(prevRegion.getType()))) { removeTailingSpaces(endStructuredDocumentRegion, prevRegion); } @@ -163,31 +163,31 @@ public class HTMLElementFormatter extends HTMLFormatter implements XMLRegionCont ITextRegion breakRegion = null; String regionType = region.getType(); - if (regionType == XML_TAG_NAME || isNestedTag(regionType)) { - if (prevRegion != null && prevRegion.getType() == XML_TAG_OPEN) { + if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTag(regionType)) { + if (prevRegion != null && prevRegion.getType() == DOMRegionContext.XML_TAG_OPEN) { removeTailingSpaces(startStructuredDocumentRegion, prevRegion); } breakRegion = region; } - else if (regionType == XML_TAG_ATTRIBUTE_NAME) { - if (prevRegion != null && (prevRegion.getType() == XML_TAG_ATTRIBUTE_NAME || prevRegion.getType() == XML_TAG_ATTRIBUTE_EQUALS)) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (prevRegion != null && (prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS)) { // attribute name without value breakRegion = prevRegion; } } - else if (regionType == XML_TAG_ATTRIBUTE_EQUALS) { - if (prevRegion != null && prevRegion.getType() == XML_TAG_ATTRIBUTE_NAME) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + if (prevRegion != null && prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { removeTailingSpaces(startStructuredDocumentRegion, prevRegion); } } - else if (regionType == XML_TAG_ATTRIBUTE_VALUE) { - if (prevRegion != null && prevRegion.getType() == XML_TAG_ATTRIBUTE_EQUALS) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + if (prevRegion != null && prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { removeTailingSpaces(startStructuredDocumentRegion, prevRegion); } breakRegion = region; } - else if (regionType == XML_TAG_CLOSE || regionType == XML_EMPTY_TAG_CLOSE) { - if (prevRegion != null && (prevRegion.getType() == XML_TAG_ATTRIBUTE_NAME || prevRegion.getType() == XML_TAG_ATTRIBUTE_EQUALS)) { + else if (regionType == DOMRegionContext.XML_TAG_CLOSE || regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE) { + if (prevRegion != null && (prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS)) { // attribute name without value breakRegion = prevRegion; } @@ -216,7 +216,7 @@ public class HTMLElementFormatter extends HTMLFormatter implements XMLRegionCont prevRegion = region; } - if (prevRegion != null && (prevRegion.getType() == XML_TAG_ATTRIBUTE_NAME || prevRegion.getType() == XML_TAG_ATTRIBUTE_EQUALS)) { + if (prevRegion != null && (prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS)) { // attribute name without value int end = prevRegion.getTextEnd(); if (lastBreakRegion != null) { @@ -241,7 +241,7 @@ public class HTMLElementFormatter extends HTMLFormatter implements XMLRegionCont if (lastBreakRegion != null) { int offset = lastBreakRegion.getTextEnd(); int count = startStructuredDocumentRegion.getLength() - offset; - if (prevRegion != null && prevRegion.getType() == XML_EMPTY_TAG_CLOSE) { + if (prevRegion != null && prevRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) { compressTailingSpaces(startStructuredDocumentRegion, lastBreakRegion); count++; } diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLFormatContraintsImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatContraintsImpl.java index 5d5103e4aa..d0e4f46007 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLFormatContraintsImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatContraintsImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.format; +package org.eclipse.wst.html.core.internal.format; import org.eclipse.wst.html.core.HTMLFormatContraints; import org.eclipse.wst.sse.core.internal.format.StructuredFormatContraints; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLFormatProcessorImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatProcessorImpl.java index f34d415dbe..4bf8bebfe8 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLFormatProcessorImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatProcessorImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.format; +package org.eclipse.wst.html.core.internal.format; import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.html.core.internal.HTMLCorePlugin; @@ -16,9 +16,9 @@ import org.eclipse.wst.sse.core.internal.SSECorePlugin; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter; import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; -import org.eclipse.wst.xml.core.format.FormatProcessorXML; -import org.eclipse.wst.xml.core.format.IStructuredFormatPreferencesXML; -import org.eclipse.wst.xml.core.format.StructuredFormatPreferencesXML; +import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; +import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML; +import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML; import org.w3c.dom.Node; public class HTMLFormatProcessorImpl extends FormatProcessorXML { diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java index 6821820ce1..0ecca81ed7 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLFormatter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.format; +package org.eclipse.wst.html.core.internal.format; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Preferences; @@ -26,11 +26,11 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.format.IStructuredFormatPreferencesXML; -import org.eclipse.wst.xml.core.format.StructuredFormatPreferencesXML; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; +import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML; +import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLFormatterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatterFactory.java index 857394274d..b4146dffb4 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLFormatterFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.format; +package org.eclipse.wst.html.core.internal.format; import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.html.core.internal.HTMLCorePlugin; @@ -16,8 +16,8 @@ import org.eclipse.wst.sse.core.internal.SSECorePlugin; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter; import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; -import org.eclipse.wst.xml.core.format.IStructuredFormatPreferencesXML; -import org.eclipse.wst.xml.core.format.StructuredFormatPreferencesXML; +import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML; +import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML; import org.w3c.dom.Node; // nakamori_TODO: check and remove CSS formatting diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLTextFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLTextFormatter.java index 0c1c5a6608..2d9fbd2464 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/HTMLTextFormatter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLTextFormatter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.format; +package org.eclipse.wst.html.core.internal.format; @@ -19,7 +19,7 @@ import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.IDOMNode; import org.eclipse.wst.xml.core.document.IDOMText; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -64,7 +64,7 @@ public class HTMLTextFormatter extends HTMLFormatter { } private boolean isBlockScannedRegion(String type) { - return type == XMLRegionContext.BLOCK_TEXT; + return type == DOMRegionContext.BLOCK_TEXT; } /** diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/SpaceConverter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/SpaceConverter.java index 08b3016bd1..a7b6f66bf9 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/format/SpaceConverter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/SpaceConverter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.format; +package org.eclipse.wst.html.core.internal.format; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelhandler/EmbeddedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java index ff837f5373..2125e74b59 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelhandler/EmbeddedHTML.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelhandler; +package org.eclipse.wst.html.core.internal.modelhandler; import java.util.ArrayList; import java.util.HashSet; @@ -16,11 +16,11 @@ import java.util.Iterator; import java.util.List; import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSelectorAdapter; -import org.eclipse.wst.html.core.document.HTMLDocumentTypeAdapterFactory; -import org.eclipse.wst.html.core.document.HTMLModelParserAdapterFactory; import org.eclipse.wst.html.core.htmlcss.HTMLStyleSelectorAdapterFactory; import org.eclipse.wst.html.core.htmlcss.StyleAdapterFactory; -import org.eclipse.wst.html.core.modelquery.ModelQueryAdapterFactoryForEmbeddedHTML; +import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeAdapterFactory; +import org.eclipse.wst.html.core.internal.document.HTMLModelParserAdapterFactory; +import org.eclipse.wst.html.core.internal.modelquery.ModelQueryAdapterFactoryForEmbeddedHTML; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; @@ -30,7 +30,7 @@ import org.eclipse.wst.sse.core.parser.JSPCapableParser; import org.eclipse.wst.sse.core.util.Assert; import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter; import org.eclipse.wst.xml.core.internal.document.ModelParserAdapter; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class EmbeddedHTML implements EmbeddedTypeHandler { public String ContentTypeID_EmbeddedHTML = "org.eclipse.wst.html.core.internal.contenttype.EmbeddedHTML"; //$NON-NLS-1$ @@ -51,7 +51,7 @@ public class EmbeddedHTML implements EmbeddedTypeHandler { * Convenience method to add tag names using BlockMarker object */ protected void addHTMLishTag(BlockTagParser parser, String tagname) { - BlockMarker bm = new BlockMarker(tagname, null, XMLRegionContext.BLOCK_TEXT, false); + BlockMarker bm = new BlockMarker(tagname, null, DOMRegionContext.BLOCK_TEXT, false); parser.addBlockMarker(bm); } diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelhandler/ModelHandlerForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java index ed32294ac0..2a88f14129 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelhandler/ModelHandlerForHTML.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelhandler; +package org.eclipse.wst.html.core.internal.modelhandler; -import org.eclipse.wst.html.core.encoding.HTMLDocumentCharsetDetector; -import org.eclipse.wst.html.core.encoding.HTMLDocumentLoader; -import org.eclipse.wst.html.core.encoding.HTMLModelLoader; +import org.eclipse.wst.html.core.internal.encoding.HTMLDocumentCharsetDetector; +import org.eclipse.wst.html.core.internal.encoding.HTMLDocumentLoader; +import org.eclipse.wst.html.core.internal.encoding.HTMLModelLoader; import org.eclipse.wst.sse.core.IModelLoader; import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector; import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/CMAttributeDeclarationBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMAttributeDeclarationBuddySystem.java index 84daa942df..ae41f91851 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/CMAttributeDeclarationBuddySystem.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMAttributeDeclarationBuddySystem.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; import java.util.Enumeration; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/CMDocumentForBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMDocumentForBuddySystem.java index e7bf8588cf..0f8f13e8b4 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/CMDocumentForBuddySystem.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMDocumentForBuddySystem.java @@ -8,18 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; import java.util.Iterator; -import org.eclipse.wst.html.core.contentmodel.HTMLCMDocumentFactory; -import org.eclipse.wst.html.core.contentmodel.ssi.SSICMDocumentFactory; -import org.eclipse.wst.xml.core.contentmodel.CMDocType; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory; +import org.eclipse.wst.html.core.internal.contentmodel.ssi.SSICMDocumentFactory; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType; /** */ diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/CMElementDeclarationBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMElementDeclarationBuddySystem.java index 1bc65ad2c0..5e70f549b8 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/CMElementDeclarationBuddySystem.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMElementDeclarationBuddySystem.java @@ -8,12 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.contentmodel.HTMLCMDocumentFactory; -import org.eclipse.wst.xml.core.contentmodel.CMDocType; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMContent; import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType; @@ -21,6 +20,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType; /** */ diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/CMNamedNodeMapForBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNamedNodeMapForBuddySystem.java index 35917359de..643daa65ee 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/CMNamedNodeMapForBuddySystem.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNamedNodeMapForBuddySystem.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; import java.util.Hashtable; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/CMNodeBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNodeBuddySystem.java index 26f41ae5d9..3e508733cd 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/CMNodeBuddySystem.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNodeBuddySystem.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; import org.eclipse.wst.html.core.HTMLCMProperties; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/DocumentQuery.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/DocumentQuery.java index 4613395cff..e72c2632c8 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/DocumentQuery.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/DocumentQuery.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/ElementDeclarationAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapter.java index 4a9c773f8a..8ca043c68d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/ElementDeclarationAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/ElementDeclarationAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapterFactory.java index bcba086ea0..46d3abf7b9 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/ElementDeclarationAdapterFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/HMQUtil.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HMQUtil.java index 6c961e4646..b8dea12ead 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/HMQUtil.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HMQUtil.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; import java.util.Collection; import java.util.Hashtable; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/HTMLElementDeclarationAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLElementDeclarationAdapter.java index 2db98e9d7b..856d5d6d7e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/HTMLElementDeclarationAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLElementDeclarationAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/HTMLModelQueryAssociationProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryAssociationProvider.java index 003b4ee596..97627d02e1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/HTMLModelQueryAssociationProvider.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryAssociationProvider.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/HTMLModelQueryCMProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java index fbb4c78ccc..97792ffc13 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/HTMLModelQueryCMProvider.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java @@ -8,19 +8,19 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; import java.util.Hashtable; -import org.eclipse.wst.html.core.contentmodel.HTMLCMDocumentFactory; -import org.eclipse.wst.html.core.document.HTMLDocumentTypeEntry; -import org.eclipse.wst.html.core.document.HTMLDocumentTypeRegistry; -import org.eclipse.wst.xml.core.contentmodel.CMDocType; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory; +import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry; +import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryCMProvider; import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache; +import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType; import org.eclipse.wst.xml.uriresolver.util.IdResolver; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/HTMLModelQueryImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java index 52e0388e64..14f94e003e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/HTMLModelQueryImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; import java.util.List; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/ModelQueryAdapterFactoryForEmbeddedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedHTML.java index 8935eb0565..be38bcb988 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/ModelQueryAdapterFactoryForEmbeddedHTML.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedHTML.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/ModelQueryAdapterFactoryForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java index 0912aadf59..90df589860 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/ModelQueryAdapterFactoryForHTML.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/XHTMLAssociationProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java index 07e72b4877..9aac42d15a 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/modelquery/XHTMLAssociationProvider.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/XHTMLAssociationProvider.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.modelquery; +package org.eclipse.wst.html.core.internal.modelquery; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/text/StructuredTextPartitionerForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/text/StructuredTextPartitionerForHTML.java index cea0c8f221..f33525a4a9 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/text/StructuredTextPartitionerForHTML.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/text/StructuredTextPartitionerForHTML.java @@ -24,8 +24,8 @@ import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.core.util.ScriptLanguageKeys; import org.eclipse.wst.sse.core.util.StringUtils; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; /** * Document partitioner for HTML. Client-side scripts of type JavaScript are @@ -76,16 +76,16 @@ public class StructuredTextPartitionerForHTML extends StructuredTextPartitionerF } ITextRegionList regions = node.getRegions(); - if (regions.size() > 4 && regions.get(1).getType() == XMLRegionContext.XML_TAG_NAME) { + if (regions.size() > 4 && regions.get(1).getType() == DOMRegionContext.XML_TAG_NAME) { ITextRegion potentialLanguageRegion = regions.get(1); String potentialLanguageString = node.getText(potentialLanguageRegion); if (potentialLanguageString.equalsIgnoreCase(HTML40Namespace.ElementName.SCRIPT)) { for (int i = 0; i < regions.size(); i++) { ITextRegion region = regions.get(i); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) + if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) attrNameRegion = region; - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { String attrName = node.getText(attrNameRegion); if (attrName.equalsIgnoreCase(HTML40Namespace.ATTR_NAME_LANGUAGE)) language = StringUtils.strip(node.getText(region)); @@ -106,7 +106,7 @@ public class StructuredTextPartitionerForHTML extends StructuredTextPartitionerF } private boolean isValidScriptingRegionType(String type) { - return type == XMLRegionContext.BLOCK_TEXT || type == XMLRegionContext.XML_CDATA_OPEN || type == XMLRegionContext.XML_CDATA_TEXT || type == XMLRegionContext.XML_CDATA_CLOSE; + return type == DOMRegionContext.BLOCK_TEXT || type == DOMRegionContext.XML_CDATA_OPEN || type == DOMRegionContext.XML_CDATA_TEXT || type == DOMRegionContext.XML_CDATA_CLOSE; } protected void initLegalContentTypes() { @@ -129,9 +129,9 @@ public class StructuredTextPartitionerForHTML extends StructuredTextPartitionerF public String getPartitionType(ITextRegion region, int offset) { String result = null; - if (region.getType() == XMLRegionContext.XML_COMMENT_TEXT || region.getType() == XMLRegionContext.XML_COMMENT_OPEN) + if (region.getType() == DOMRegionContext.XML_COMMENT_TEXT || region.getType() == DOMRegionContext.XML_COMMENT_OPEN) result = IHTMLPartitionTypes.HTML_COMMENT; - else if (region.getType() == XMLRegionContext.XML_DOCTYPE_DECLARATION || region.getType() == XMLRegionContext.XML_DECLARATION_OPEN) + else if (region.getType() == DOMRegionContext.XML_DOCTYPE_DECLARATION || region.getType() == DOMRegionContext.XML_DECLARATION_OPEN) result = IHTMLPartitionTypes.HTML_DECLARATION; else result = super.getPartitionType(region, offset); @@ -145,14 +145,14 @@ public class StructuredTextPartitionerForHTML extends StructuredTextPartitionerF ITextRegion[] regions = previousNode.getRegions().toArray(); for (int i = 0; i < regions.length; i++) { - if(regions[i].getType() == XMLRegionContext.XML_TAG_NAME) { + if(regions[i].getType() == DOMRegionContext.XML_TAG_NAME) { previousStartTagNameRegion = regions[i]; break; } } regions = nextNode.getRegions().toArray(); for (int i = 0; i < regions.length; i++) { - if(regions[i].getType() == XMLRegionContext.XML_TAG_NAME) { + if(regions[i].getType() == DOMRegionContext.XML_TAG_NAME) { nextEndTagNameRegion = regions[i]; break; } diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/AbstractErrorInfo.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/AbstractErrorInfo.java index 5e6ee85f30..b9b4d93d19 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/AbstractErrorInfo.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/AbstractErrorInfo.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; abstract class AbstractErrorInfo implements ErrorInfo, ErrorState { diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/CMUtil.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CMUtil.java index fb81805a22..e84216dfce 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/CMUtil.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CMUtil.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import java.util.Iterator; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.modelquery.HMQUtil; +import org.eclipse.wst.html.core.internal.modelquery.HMQUtil; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMContent; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/CompositeValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CompositeValidator.java index 1c5a6017e5..0dbc052f1b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/CompositeValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CompositeValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import java.util.Iterator; import java.util.Vector; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/DocumentPropagatingValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/DocumentPropagatingValidator.java index 51edfcda31..2fab110fae 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/DocumentPropagatingValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/DocumentPropagatingValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import org.eclipse.wst.sse.core.IndexedRegion; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/ElementPropagatingValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ElementPropagatingValidator.java index bd10b279a2..140d90f9ae 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/ElementPropagatingValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ElementPropagatingValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import org.eclipse.wst.sse.core.validate.ValidationAdapter; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/ErrorInfo.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorInfo.java index 01ce2c0799..34b430e71b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/ErrorInfo.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorInfo.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/ErrorInfoImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorInfoImpl.java index f10294e99f..6026c2c4c9 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/ErrorInfoImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorInfoImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/ErrorState.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorState.java index 2c0eb26eba..f7259400e9 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/ErrorState.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/ErrorState.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/FMUtil.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/FMUtil.java index 5e443ab73b..960199def1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/FMUtil.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/FMUtil.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLAttributeValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java index 41bb9bee47..c80856ce31 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLAttributeValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; @@ -25,7 +25,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -227,7 +227,7 @@ public class HTMLAttributeValidator extends PrimeValidator { if (region == null) continue; String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_OPEN || (isNextedTagName(regionType))) + if (regionType == DOMRegionContext.XML_TAG_OPEN || (isNextedTagName(regionType))) return true; } return false; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLDocumentContentValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLDocumentContentValidator.java index 4a74ec6c94..cf1f24db81 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLDocumentContentValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLDocumentContentValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import java.util.Iterator; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLElementAncestorValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementAncestorValidator.java index 83365a9ee4..725314a2b3 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLElementAncestorValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementAncestorValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLElementContentValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementContentValidator.java index a8f9651bcc..828ffb1f1e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLElementContentValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementContentValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.xml.core.document.IDOMNode; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLSimpleDocumentValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLSimpleDocumentValidator.java index d3630a3626..f9a93924d2 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLSimpleDocumentValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLSimpleDocumentValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import org.eclipse.wst.xml.core.internal.validate.ValidationComponent; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLSimpleValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLSimpleValidator.java index 47b6ff8f3e..ff2a5e188f 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLSimpleValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLSimpleValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import org.eclipse.wst.xml.core.internal.validate.ValidationComponent; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLValidationAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLValidationAdapterFactory.java index fdafa42a09..88cdc39d72 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/HTMLValidationAdapterFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLValidationAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/MessageFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/MessageFactory.java index 32461dfadc..fb9b91bc5b 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/MessageFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/MessageFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import java.text.MessageFormat; import java.util.Hashtable; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/NamespaceValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NamespaceValidator.java index 3dbff3acff..d82487f91e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/NamespaceValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NamespaceValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.ITextRegion; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/NullValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NullValidator.java index 1a9cbc0e7a..28cd512ca1 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/NullValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NullValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.validate.ValidationReporter; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/PrimeValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/PrimeValidator.java index 6278a3ab23..b44f258b87 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/PrimeValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/PrimeValidator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/SMUtil.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SMUtil.java index 97adcf80fc..6bf6fede41 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/SMUtil.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SMUtil.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/Segment.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/Segment.java index 2e5db726e5..109ce0088e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/Segment.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/Segment.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/SyntaxValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java index 05d7df4c60..26437db6b2 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/validate/SyntaxValidator.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.html.core.validate; +package org.eclipse.wst.html.core.internal.validate; import java.util.Iterator; -import org.eclipse.wst.html.core.document.HTMLDocumentTypeEntry; -import org.eclipse.wst.html.core.document.HTMLDocumentTypeRegistry; +import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry; +import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; @@ -24,7 +24,7 @@ import org.eclipse.wst.xml.core.document.IDOMNode; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException; import org.eclipse.wst.xml.core.internal.document.SourceValidator; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -36,7 +36,7 @@ class SyntaxValidator extends PrimeValidator implements ErrorState { String type = rgn.getType(); if (type == null) return false; // no type is invalid. - if (type == XMLRegionContext.XML_END_TAG_OPEN || type == XMLRegionContext.XML_TAG_NAME || type == XMLRegionContext.XML_TAG_CLOSE) { + if (type == DOMRegionContext.XML_END_TAG_OPEN || type == DOMRegionContext.XML_TAG_NAME || type == DOMRegionContext.XML_TAG_CLOSE) { return true; } return false; @@ -47,7 +47,7 @@ class SyntaxValidator extends PrimeValidator implements ErrorState { Iterator iter = regions.iterator(); while (iter.hasNext()) { ITextRegion rgn = (ITextRegion) iter.next(); - if (rgn.getType() == XMLRegionContext.XML_TAG_NAME) + if (rgn.getType() == DOMRegionContext.XML_TAG_NAME) return tag.getText(rgn); } return "";//$NON-NLS-1$ @@ -160,7 +160,7 @@ class SyntaxValidator extends PrimeValidator implements ErrorState { String type = rgn.getType(); if (type == null) continue; - if (type == XMLRegionContext.XML_END_TAG_OPEN || type == XMLRegionContext.XML_TAG_CLOSE) + if (type == DOMRegionContext.XML_END_TAG_OPEN || type == DOMRegionContext.XML_TAG_CLOSE) continue; hint += info.endTag.getFullText(rgn); } diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/preferences/HTMLContentBuilder.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/preferences/HTMLContentBuilder.java index 7968b41fe5..14e9db7ef9 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/preferences/HTMLContentBuilder.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/preferences/HTMLContentBuilder.java @@ -17,10 +17,11 @@ import org.eclipse.wst.html.core.HTMLCMProperties; import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; +import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl; import org.w3c.dom.Document; import org.w3c.dom.Node; -public class HTMLContentBuilder extends org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl { +public class HTMLContentBuilder extends DOMContentBuilderImpl { private int fTagCase; private int fAttrCase; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/text/IHTMLPartitionTypes.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/text/IHTMLPartitionTypes.java index d003c4e2b6..519dc98056 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/text/IHTMLPartitionTypes.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/text/IHTMLPartitionTypes.java @@ -2,9 +2,9 @@ package org.eclipse.wst.html.core.text; /** - * This interface is not intended to be implemented. - * It defines the partition types for HTML. - * Clients should reference the partition type Strings defined here directly. + * This interface is not intended to be implemented. It defines the partition + * types for HTML. Clients should reference the partition type Strings defined + * here directly. * * @since 1.0 */ @@ -15,4 +15,7 @@ public interface IHTMLPartitionTypes { String HTML_COMMENT = "org.eclipse.wst.html.HTML_COMMENT"; //$NON-NLS-1$ String SCRIPT = "org.eclipse.wst.html.SCRIPT"; //$NON-NLS-1$ + String STYLE = "org.eclipse.wst.html.STYLE"; //$NON-NLS-1$ + + // ISSUE: I think meta tag areas are here too? } diff --git a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/validation/HTMLValidator.java b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/validation/HTMLValidator.java index c7675dcbfd..f357f2d070 100644 --- a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/validation/HTMLValidator.java +++ b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/validation/HTMLValidator.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Path; -import org.eclipse.wst.html.core.validate.HTMLValidationAdapterFactory; +import org.eclipse.wst.html.core.internal.validate.HTMLValidationAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.IModelManager; import org.eclipse.wst.sse.core.IStructuredModel; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java index 5c03f78823..a51aa781ad 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java @@ -38,7 +38,7 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.wst.css.core.text.ICSSPartitionTypes; import org.eclipse.wst.css.ui.contentassist.CSSContentAssistProcessor; import org.eclipse.wst.css.ui.style.LineStyleProviderForEmbeddedCSS; -import org.eclipse.wst.html.core.format.HTMLFormatProcessorImpl; +import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl; import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML; import org.eclipse.wst.html.core.text.IHTMLPartitionTypes; import org.eclipse.wst.html.ui.internal.contentassist.HTMLContentAssistProcessor; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ContentSettingsRegistry.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ContentSettingsRegistry.java index 1d4a40a942..f607ee9d05 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ContentSettingsRegistry.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ContentSettingsRegistry.java @@ -15,8 +15,8 @@ import java.util.Iterator; import org.eclipse.wst.css.core.internal.metamodel.CSSProfile; import org.eclipse.wst.css.core.internal.metamodel.CSSProfileRegistry; -import org.eclipse.wst.html.core.document.HTMLDocumentTypeEntry; -import org.eclipse.wst.html.core.document.HTMLDocumentTypeRegistry; +import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry; +import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry; import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames; import org.eclipse.wst.sse.ui.contentproperties.ui.ComboList; import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLContentAssistProcessor.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLContentAssistProcessor.java index 81f0613915..6557cfed44 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLContentAssistProcessor.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLContentAssistProcessor.java @@ -23,7 +23,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.wst.css.ui.contentassist.CSSContentAssistProcessor; import org.eclipse.wst.html.core.HTML40Namespace; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.contentmodel.HTMLCMDocument; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocument; import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImageHelper; import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImages; @@ -50,8 +50,8 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; import org.eclipse.wst.xml.ui.contentassist.AbstractContentAssistProcessor; import org.eclipse.wst.xml.ui.contentassist.ContentAssistRequest; import org.eclipse.wst.xml.ui.contentassist.XMLContentModelGenerator; @@ -176,17 +176,17 @@ public class HTMLContentAssistProcessor extends AbstractContentAssistProcessor i // check if it's in a comment node IStructuredDocument structuredDocument = (IStructuredDocument) textViewer.getDocument(); IStructuredDocumentRegion fn = structuredDocument.getRegionAtCharacterOffset(documentPosition); - if (fn != null && fn.getType() == XMLRegionContext.XML_COMMENT_TEXT && documentPosition != fn.getStartOffset()) { + if (fn != null && fn.getType() == DOMRegionContext.XML_COMMENT_TEXT && documentPosition != fn.getStartOffset()) { return new ICompletionProposal[0]; } // CMVC 242695 // if it's a </script> tag, bounce back to JS ca processor... - if (fn != null && fn.getType() == XMLRegionContext.XML_TAG_NAME && documentPosition == fn.getStartOffset()) { + if (fn != null && fn.getType() == DOMRegionContext.XML_TAG_NAME && documentPosition == fn.getStartOffset()) { ITextRegionList v = fn.getRegions(); if (v.size() > 1) { // determine that it's a close tag - if ((v.get(0)).getType() == XMLRegionContext.XML_END_TAG_OPEN) { + if ((v.get(0)).getType() == DOMRegionContext.XML_END_TAG_OPEN) { Iterator it = v.iterator(); ITextRegion region = null; // search for script tag name @@ -247,7 +247,7 @@ public class HTMLContentAssistProcessor extends AbstractContentAssistProcessor i ITextRegion styleValueRegion = null; while (regions.hasNext()) { styleNameRegion = (ITextRegion) regions.next(); - if (styleNameRegion.getType().equals(XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) && sdRegion.getText(styleNameRegion).equalsIgnoreCase(HTML40Namespace.ATTR_NAME_STYLE)) { //$NON-NLS-1$ + if (styleNameRegion.getType().equals(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) && sdRegion.getText(styleNameRegion).equalsIgnoreCase(HTML40Namespace.ATTR_NAME_STYLE)) { //$NON-NLS-1$ // the next region should be "=" if (regions.hasNext()) { regions.next(); // skip the "=" diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLMinimalContentModelGenerator.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLMinimalContentModelGenerator.java index 443c1618fe..92917111b7 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLMinimalContentModelGenerator.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLMinimalContentModelGenerator.java @@ -12,8 +12,8 @@ package org.eclipse.wst.html.ui.internal.contentassist; import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.contentmodel.HTMLElementDeclaration; import org.eclipse.wst.html.core.internal.HTMLCorePlugin; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/XHTMLMinimalContentModelGenerator.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/XHTMLMinimalContentModelGenerator.java index 702811f677..5ff5b6bc84 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/XHTMLMinimalContentModelGenerator.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/XHTMLMinimalContentModelGenerator.java @@ -13,7 +13,7 @@ package org.eclipse.wst.html.ui.internal.contentassist; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.contentmodel.HTMLElementDeclaration; +import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.ui.contentassist.XMLContentModelGenerator; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/HTMLNodeActionManager.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/HTMLNodeActionManager.java index fef5dc5df2..530a5f8233 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/HTMLNodeActionManager.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/HTMLNodeActionManager.java @@ -14,8 +14,8 @@ import org.eclipse.core.runtime.Preferences; import org.eclipse.jface.viewers.Viewer; import org.eclipse.wst.html.core.HTMLCMProperties; import org.eclipse.wst.html.core.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.html.core.format.HTMLFormatProcessorImpl; import org.eclipse.wst.html.core.internal.HTMLCorePlugin; +import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl; import org.eclipse.wst.html.core.preferences.HTMLContentBuilder; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/search/HTMLFindOccurrencesAction.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/search/HTMLFindOccurrencesAction.java index 30ea5e4d0c..079359a679 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/search/HTMLFindOccurrencesAction.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/search/HTMLFindOccurrencesAction.java @@ -15,7 +15,7 @@ import java.util.ResourceBundle; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.wst.html.core.text.IHTMLPartitionTypes; import org.eclipse.wst.sse.ui.internal.search.BasicFindOccurrencesAction; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.core.text.IXMLPartitions; @@ -43,7 +43,7 @@ public class HTMLFindOccurrencesAction extends BasicFindOccurrencesAction { */ public String[] getRegionTypes() { - return new String[]{XMLRegionContext.XML_TAG_NAME, XMLRegionContext.XML_TAG_ATTRIBUTE_NAME, XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE}; + return new String[]{DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE}; } }
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/registry/AdapterFactoryProviderForEmbeddedHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/registry/AdapterFactoryProviderForEmbeddedHTML.java index 910c2e2071..1c0b8f3223 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/registry/AdapterFactoryProviderForEmbeddedHTML.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/registry/AdapterFactoryProviderForEmbeddedHTML.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.registry; -import org.eclipse.wst.html.core.modelhandler.EmbeddedHTML; +import org.eclipse.wst.html.core.internal.modelhandler.EmbeddedHTML; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.ui.registry.embedded.EmbeddedAdapterFactoryProvider; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/registry/AdapterFactoryProviderForHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/registry/AdapterFactoryProviderForHTML.java index 9dc8a91953..9891ce85a1 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/registry/AdapterFactoryProviderForHTML.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/registry/AdapterFactoryProviderForHTML.java @@ -11,7 +11,7 @@ package org.eclipse.wst.html.ui.registry; import org.eclipse.ui.views.properties.IPropertySource; -import org.eclipse.wst.html.core.modelhandler.ModelHandlerForHTML; +import org.eclipse.wst.html.core.internal.modelhandler.ModelHandlerForHTML; import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterFactoryForHTML; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.IStructuredModel; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/style/LineStyleProviderForHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/style/LineStyleProviderForHTML.java index 9e593a13c9..a3f3882286 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/style/LineStyleProviderForHTML.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/style/LineStyleProviderForHTML.java @@ -16,7 +16,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.ui.style.LineStyleProvider; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.style.IStyleConstantsXML; import org.eclipse.wst.xml.ui.style.LineStyleProviderForXML; @@ -36,7 +36,7 @@ public class LineStyleProviderForHTML extends LineStyleProviderForXML implements if (region == null) { return (TextAttribute)getTextAttributes().get(IStyleConstantsXML.XML_CONTENT); } - if (region.getType() == XMLRegionContext.BLOCK_TEXT) { + if (region.getType() == DOMRegionContext.BLOCK_TEXT) { return (TextAttribute)getTextAttributes().get(IStyleConstantsXML.XML_CONTENT); } // first try "standard" tag attributes from super class diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/text/HTMLDocumentRegionEdgeMatcher.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/text/HTMLDocumentRegionEdgeMatcher.java index 4507f4304d..a85c4bc63a 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/text/HTMLDocumentRegionEdgeMatcher.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/text/HTMLDocumentRegionEdgeMatcher.java @@ -12,7 +12,7 @@ package org.eclipse.wst.html.ui.text; import org.eclipse.jdt.internal.ui.text.JavaPairMatcher; import org.eclipse.wst.sse.ui.text.DocumentRegionEdgeMatcher; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class HTMLDocumentRegionEdgeMatcher extends DocumentRegionEdgeMatcher { @@ -23,6 +23,6 @@ public class HTMLDocumentRegionEdgeMatcher extends DocumentRegionEdgeMatcher { * @param nextMatcher */ public HTMLDocumentRegionEdgeMatcher() { - super(new String[]{XMLRegionContext.XML_TAG_NAME, XMLRegionContext.XML_COMMENT_TEXT, XMLRegionContext.XML_CDATA_TEXT, XMLRegionContext.XML_PI_OPEN, XMLRegionContext.XML_PI_CONTENT}, new JavaPairMatcher(BRACKETS)); + super(new String[]{DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_PI_CONTENT}, new JavaPairMatcher(BRACKETS)); } }
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.xml.core/plugin.xml b/bundles/org.eclipse.wst.xml.core/plugin.xml index 5d83554fa2..b95eb94325 100644 --- a/bundles/org.eclipse.wst.xml.core/plugin.xml +++ b/bundles/org.eclipse.wst.xml.core/plugin.xml @@ -26,15 +26,15 @@ point="org.eclipse.wst.sse.core.modelHandler"> <modelHandler default="true" - class="org.eclipse.wst.xml.core.modelhandler.ModelHandlerForXML" + class="org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML" associatedContentTypeId="org.eclipse.core.runtime.xml" - id="org.eclipse.wst.xml.core.modelhandler"> + id="org.eclipse.wst.xml.core.internal.modelhandler"> </modelHandler> </extension> <extension point="org.eclipse.wst.sse.core.embeddedTypeHandler"> <embeddedTypeHandler - class="org.eclipse.wst.xml.core.modelhandler.EmbeddedXML"> + class="org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML"> </embeddedTypeHandler> </extension> @@ -42,7 +42,7 @@ id="org.eclipse.wst.xml.core.builderdelegate.todo" point="org.eclipse.wst.sse.core.builderdelegate"> <participant - class="org.eclipse.wst.xml.core.builder.delegates.XMLTaskTagSeeker" + class="org.eclipse.wst.xml.core.internal.builder.delegates.XMLTaskTagSeeker" contentType="org.eclipse.core.runtime.xml,org.eclipse.wst.xml.core.xmlsource"> </participant> </extension> @@ -89,7 +89,7 @@ <extension point="org.eclipse.wst.sse.core.formatProcessors"> <processor - class="org.eclipse.wst.xml.core.format.FormatProcessorXML" + class="org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML" contentTypeId="org.eclipse.core.runtime.xml"> </processor> </extension> diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contenttype/ContentTypeIdForXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contenttype/ContentTypeIdForXML.java index 9a5b250921..0e3f77bab9 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contenttype/ContentTypeIdForXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contenttype/ContentTypeIdForXML.java @@ -13,13 +13,12 @@ package org.eclipse.wst.xml.core.contenttype; /** - * This class, with its one field, is a convience to provide compile-time + * This class, with its few field, is a convience to provide compile-time * safety when refering to a contentType ID. The value of the contenttype id * field must match what is specified in plugin.xml file. * * @since 1.0 */ - public class ContentTypeIdForXML { /** * This content type is actually supplied by base Eclipse. Its given here diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMAttr.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMAttr.java index 6126c5e1de..1cc7ef6f6f 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMAttr.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMAttr.java @@ -31,6 +31,10 @@ public interface IDOMAttr extends IDOMNode, Attr { * Get's the region in attribute representing the '=' sign. May or may not * have whitespace surrounding it. * + * @deprecated - + * ISSUE: need to change/remove to avoid exposing 'ITextRegion' + * change to offset pattern, as others. + * * @return ITextRegion - the region representing the equals sign, or null * if their is no equals sign. */ diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMDocument.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMDocument.java index 52b6eb1049..c6042cf515 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMDocument.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMDocument.java @@ -70,9 +70,10 @@ public interface IDOMDocument extends IDOMNode, Document, DocumentRange, Documen * * ISSUE: need to specify * - * @return true if is JSPDocument * @deprecated * + * @return true if is JSPDocument + * */ boolean isJSPDocument(); @@ -87,11 +88,11 @@ public interface IDOMDocument extends IDOMNode, Document, DocumentRange, Documen boolean isJSPType(); /** - * NOT API ... needs to be removed/changed + * NOT API ... may removed/changed * - * ISSUE: need to specify + * ISSUE: need to specify -- currently used to denote an HTML DOM document + * is XHTML * - * @deprecated * */ boolean isXMLType(); diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMElement.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMElement.java index 1d40e3d45a..0e2c943b75 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMElement.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMElement.java @@ -78,10 +78,9 @@ public interface IDOMElement extends IDOMNode, Element { boolean isEmptyTag(); /** - * NOT CLIENT API - * + * Returns true if floating end tag. * - * @deprecated - I believe this can be cleaned out. + * @return true if floating end tag. */ boolean isEndTag(); diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMModel.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMModel.java index 2ad6f1f0d7..18c17e4b9f 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMModel.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/IDOMModel.java @@ -31,6 +31,7 @@ public interface IDOMModel extends IStructuredModel { IDOMDocument getDocument(); /** + * * Returns an source generator appropriate for this model. * * @return the source generator diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/ISourceGenerator.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/ISourceGenerator.java index 6c310276fa..d4e0b64172 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/ISourceGenerator.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/document/ISourceGenerator.java @@ -12,8 +12,6 @@ *******************************************************************************/ package org.eclipse.wst.xml.core.document; - - import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; @@ -29,141 +27,175 @@ import org.w3c.dom.Text; * ISourceGenerator allows DOM models to generate source appropriate for their * parameter, relative to the model that provides the source generator. * - * ISSUE: This should be part of "ltk" level. */ public interface ISourceGenerator { /** * Generate attribute name. + * + * @param attr - + * the Attr + * @return String - the string generated */ String generateAttrName(Attr attr); /** * generateAttrValue + * + * @param attr - + * the Attr + * @return String - the string generated */ String generateAttrValue(Attr attr); /** * generateAttrValue + * + * @param attr - + * the Attr + * @param char - + * the type of quote desired (' or "). + * @return String - the string generated */ String generateAttrValue(Attr attr, char quote); /** * generateAttrValue + * + * @param value + * the String value + * @param char - + * the type of quote desired (' or "). + * @return String - the string generated */ String generateAttrValue(String value, char quote); /** * generateCDATASection method * - * @return java.lang.String * @param comment - * org.w3c.dom.CDATASection + * CDATASection + * @return String - the string generated */ String generateCDATASection(CDATASection cdata); /** * generateChild method * - * @return java.lang.String - * @param org.w3c.dom.Node + * @return String + * @param Node + * @return String - the string generated */ String generateChild(Node parentNode); /** * generateCloseTag + * + * @param node - + * the Node + * @return String - the string generated */ String generateCloseTag(Node node); /** * generateComment method * - * @return java.lang.String * @param comment * org.w3c.dom.Comment + * @return String - the string generated */ String generateComment(Comment comment); /** * generateDoctype method * - * @return java.lang.String * @param docType - * org.w3c.dom.DocumentType + * DocumentType + * @return String - the string generated */ String generateDoctype(DocumentType docType); /** * generateElement method * - * @return java.lang.String - * @param element + * @param element - * Element + * @return String - the string generated */ String generateElement(Element element); /** * generateEndTag method * - * @return java.lang.String - * @param element - * org.w3c.dom.Element + * @param element - + * Element + * @return String - the string generated */ String generateEndTag(Element element); /** * generateEntityRef method * - * @return java.lang.String * @param entityRef - * org.w3c.dom.EntityReference + * EntityReference + * @return String - the string generated */ String generateEntityRef(EntityReference entityRef); /** * generatePI method * - * @return java.lang.String - * @param pi - * org.w3c.dom.ProcessingInstruction + * @param pi - + * ProcessingInstruction + * @return String - the string generated */ String generatePI(ProcessingInstruction pi); /** * generateSource method * - * @return java.lang.String - * @param node - * org.w3c.dom.Node + * @param node - + * the Node + * @return String - the string generated */ String generateSource(Node node); /** * generateStartTag method * - * @return java.lang.String * @param element * Element + * @return String - the string generated */ String generateStartTag(Element element); /** * Generate tag name. + * + * @param element - + * element + * @return String - the string generated */ String generateTagName(Element element); /** * generateText method * - * @return java.lang.String - * @param text - * org.w3c.dom.Text + * @param text - + * the Text + * @return String - the string generated */ String generateText(Text text); /** * generate text data + * + * @param text - + * the Text + * @param data - + * the data + * @return String - the string generated */ String generateTextData(Text text, String data); } diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/builder/delegates/XMLTaskTagSeeker.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/builder/delegates/XMLTaskTagSeeker.java index a9bba3b35f..bcea163cb1 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/builder/delegates/XMLTaskTagSeeker.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/builder/delegates/XMLTaskTagSeeker.java @@ -10,12 +10,12 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.builder.delegates; +package org.eclipse.wst.xml.core.internal.builder.delegates; import org.eclipse.wst.sse.core.participants.TaskTagSeeker; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class XMLTaskTagSeeker extends TaskTagSeeker { @@ -34,7 +34,7 @@ public class XMLTaskTagSeeker extends TaskTagSeeker { * org.eclipse.wst.sse.core.text.ITextRegion) */ protected boolean isCommentRegion(IStructuredDocumentRegion region, ITextRegion textRegion) { - return textRegion.getType().equals(XMLRegionContext.XML_COMMENT_TEXT); + return textRegion.getType().equals(DOMRegionContext.XML_COMMENT_TEXT); } diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/CleanupProcessorXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/CleanupProcessorXML.java index 51b206aa50..d3c5f46a7e 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/CleanupProcessorXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/CleanupProcessorXML.java @@ -20,8 +20,8 @@ import org.eclipse.wst.sse.core.internal.cleanup.StructuredCleanupPreferences; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.contenttype.ContentTypeIdForXML; -import org.eclipse.wst.xml.core.format.FormatProcessorXML; import org.eclipse.wst.xml.core.internal.XMLCorePlugin; +import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/ElementNodeCleanupHandler.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/ElementNodeCleanupHandler.java index 16d578ae31..a76148bd8b 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/ElementNodeCleanupHandler.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/ElementNodeCleanupHandler.java @@ -29,15 +29,15 @@ import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.xml.core.document.IDOMAttr; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMElement; -import org.eclipse.wst.xml.core.document.ISourceGenerator; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; +import org.eclipse.wst.xml.core.document.ISourceGenerator; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -139,7 +139,7 @@ public class ElementNodeCleanupHandler extends NodeCleanupHandler { ITextRegionList regions = startTagStructuredDocumentRegion.getRegions(); ITextRegion lastRegion = regions.get(regions.size() - 1); // format children and end tag if not empty element tag - if (lastRegion.getType() != XMLRegionContext.XML_EMPTY_TAG_CLOSE) { + if (lastRegion.getType() != DOMRegionContext.XML_EMPTY_TAG_CLOSE) { NodeList childNodes = newNode.getChildNodes(); if (childNodes == null || childNodes.getLength() == 0 || (childNodes.getLength() == 1 && (childNodes.item(0)).getNodeType() == Node.TEXT_NODE && ((childNodes.item(0)).getNodeValue().trim().length() == 0))) { IDOMModel structuredModel = newNode.getModel(); @@ -279,7 +279,7 @@ public class ElementNodeCleanupHandler extends NodeCleanupHandler { IStructuredDocumentRegion endTagStructuredDocumentRegion = newNode.getEndStructuredDocumentRegion(); ITextRegionList startStructuredDocumentRegionRegions = startTagStructuredDocumentRegion.getRegions(); - if (startTagStructuredDocumentRegion != null && startStructuredDocumentRegionRegions != null && (startStructuredDocumentRegionRegions.get(startStructuredDocumentRegionRegions.size() - 1)).getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE) { + if (startTagStructuredDocumentRegion != null && startStructuredDocumentRegionRegions != null && (startStructuredDocumentRegionRegions.get(startStructuredDocumentRegionRegions.size() - 1)).getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) { } else { if (startTagStructuredDocumentRegion == null) { @@ -327,10 +327,10 @@ public class ElementNodeCleanupHandler extends NodeCleanupHandler { IStructuredDocumentRegion startStructuredDocumentRegion = newNode.getStartStructuredDocumentRegion(); int index = startStructuredDocumentRegion.getEndOffset(); ITextRegion lastRegion = startStructuredDocumentRegion.getLastRegion(); - if (lastRegion.getType() == XMLRegionContext.XML_TAG_CLOSE) { + if (lastRegion.getType() == DOMRegionContext.XML_TAG_CLOSE) { index--; lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1); - } else if (lastRegion.getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE) { + } else if (lastRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) { index = index - 2; lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1); } @@ -393,7 +393,7 @@ public class ElementNodeCleanupHandler extends NodeCleanupHandler { ITextRegion lastRegion = flatnodeRegions.get(flatnodeRegions.size() - 1); if (lastRegion != null) { String regionType = lastRegion.getType(); - if ((regionType != XMLRegionContext.XML_EMPTY_TAG_CLOSE) && (regionType != XMLRegionContext.XML_TAG_CLOSE)) { + if ((regionType != DOMRegionContext.XML_EMPTY_TAG_CLOSE) && (regionType != DOMRegionContext.XML_TAG_CLOSE)) { IStructuredDocument structuredDocument = structuredModel.getStructuredDocument(); // insert ">" after lastRegion of flatNode diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/CommentElementAdapter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/CommentElementAdapter.java index 255d67f5fa..7c34df8a68 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/CommentElementAdapter.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/CommentElementAdapter.java @@ -10,14 +10,14 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.commentelement; +package org.eclipse.wst.xml.core.internal.commentelement; import org.eclipse.core.runtime.IPluginDescriptor; import org.eclipse.wst.sse.core.INodeNotifier; -import org.eclipse.wst.xml.core.commentelement.impl.CommentElementConfiguration; import org.eclipse.wst.xml.core.document.IDOMElement; +import org.eclipse.wst.xml.core.internal.commentelement.impl.CommentElementConfiguration; import org.eclipse.wst.xml.core.internal.document.TagAdapter; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/CommentElementHandler.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/CommentElementHandler.java index 9f3039aa6a..25f9812a30 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/CommentElementHandler.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/CommentElementHandler.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.commentelement; +package org.eclipse.wst.xml.core.internal.commentelement; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/impl/BasicCommentElementHandler.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/BasicCommentElementHandler.java index 66476d018d..e2f1e04e24 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/impl/BasicCommentElementHandler.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/BasicCommentElementHandler.java @@ -10,16 +10,16 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.commentelement.impl; +package org.eclipse.wst.xml.core.internal.commentelement.impl; -import org.eclipse.wst.xml.core.commentelement.CommentElementHandler; -import org.eclipse.wst.xml.core.commentelement.util.CommentElementFactory; -import org.eclipse.wst.xml.core.commentelement.util.TagScanner; import org.eclipse.wst.xml.core.document.IDOMAttr; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.ISourceGenerator; +import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler; +import org.eclipse.wst.xml.core.internal.commentelement.util.CommentElementFactory; +import org.eclipse.wst.xml.core.internal.commentelement.util.TagScanner; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/impl/CommentElementConfiguration.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/CommentElementConfiguration.java index 5520184632..694deceaea 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/impl/CommentElementConfiguration.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/CommentElementConfiguration.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.commentelement.impl; +package org.eclipse.wst.xml.core.internal.commentelement.impl; @@ -19,10 +19,10 @@ import java.util.Map; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IPluginDescriptor; -import org.eclipse.wst.xml.core.commentelement.CommentElementAdapter; -import org.eclipse.wst.xml.core.commentelement.CommentElementHandler; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.internal.Logger; +import org.eclipse.wst.xml.core.internal.commentelement.CommentElementAdapter; +import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/impl/CommentElementRegistry.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/CommentElementRegistry.java index d20029c3c5..d55928d104 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/impl/CommentElementRegistry.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/impl/CommentElementRegistry.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.commentelement.impl; +package org.eclipse.wst.xml.core.internal.commentelement.impl; @@ -18,8 +18,8 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.xml.core.commentelement.CommentElementHandler; import org.eclipse.wst.xml.core.document.IDOMElement; +import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler; /** diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/util/CommentElementFactory.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/util/CommentElementFactory.java index c5156b89f8..d3bce8292a 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/util/CommentElementFactory.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/util/CommentElementFactory.java @@ -10,13 +10,13 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.commentelement.util; +package org.eclipse.wst.xml.core.internal.commentelement.util; -import org.eclipse.wst.xml.core.commentelement.CommentElementAdapter; -import org.eclipse.wst.xml.core.commentelement.CommentElementHandler; import org.eclipse.wst.xml.core.document.IDOMElement; +import org.eclipse.wst.xml.core.internal.commentelement.CommentElementAdapter; +import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/util/TagScanner.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/util/TagScanner.java index a74fe0bb77..33d9cb102f 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/commentelement/util/TagScanner.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/commentelement/util/TagScanner.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.commentelement.util; +package org.eclipse.wst.xml.core.internal.commentelement.util; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/AttrImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/AttrImpl.java index ee6753ca95..2129bc689c 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/AttrImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/AttrImpl.java @@ -27,7 +27,7 @@ import org.eclipse.wst.xml.core.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.Element; @@ -478,7 +478,7 @@ public boolean hasNestedValue() { if (region == null) continue; String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_OPEN || isNestedLanguageOpening(regionType)) + if (regionType == DOMRegionContext.XML_TAG_OPEN || isNestedLanguageOpening(regionType)) return true; } return false; @@ -577,7 +577,7 @@ public boolean hasNestedValue() { DocumentImpl document = (DocumentImpl) this.ownerElement.getContainerDocument(); if (document == null) return; - XMLModelImpl model = (XMLModelImpl) document.getModel(); + DOMModelImpl model = (DOMModelImpl) document.getModel(); if (model == null) return; model.nameChanged(this); @@ -592,7 +592,7 @@ public boolean hasNestedValue() { DocumentImpl document = (DocumentImpl) this.ownerElement.getContainerDocument(); if (document == null) return; - XMLModelImpl model = (XMLModelImpl) document.getModel(); + DOMModelImpl model = (DOMModelImpl) document.getModel(); if (model == null) return; model.valueChanged(this); diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CDATASectionImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CDATASectionImpl.java index 3954ca2d40..9d0b293949 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CDATASectionImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CDATASectionImpl.java @@ -19,7 +19,7 @@ import java.util.Iterator; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.CDATASection; import org.w3c.dom.DOMException; import org.w3c.dom.Node; @@ -90,7 +90,7 @@ public class CDATASectionImpl extends TextImpl implements CDATASection { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_CDATA_OPEN || regionType == XMLRegionContext.XML_CDATA_CLOSE) { + if (regionType == DOMRegionContext.XML_CDATA_OPEN || regionType == DOMRegionContext.XML_CDATA_CLOSE) { continue; } if (contentRegion == null) { // first content @@ -135,6 +135,6 @@ public class CDATASectionImpl extends TextImpl implements CDATASection { if (flatNode == null) return true; // will be generated String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode); - return (regionType == XMLRegionContext.XML_CDATA_CLOSE); + return (regionType == DOMRegionContext.XML_CDATA_CLOSE); } } diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CommentImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CommentImpl.java index 81779defb3..8e6ddaf0a3 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CommentImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/CommentImpl.java @@ -19,7 +19,7 @@ import java.util.Iterator; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Comment; import org.w3c.dom.DOMException; import org.w3c.dom.Node; @@ -95,7 +95,7 @@ public class CommentImpl extends CharacterDataImpl implements Comment { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_COMMENT_OPEN || regionType == XMLRegionContext.XML_COMMENT_CLOSE || isNestedCommentOpenClose(regionType)) { + if (regionType == DOMRegionContext.XML_COMMENT_OPEN || regionType == DOMRegionContext.XML_COMMENT_CLOSE || isNestedCommentOpenClose(regionType)) { continue; } if (contentRegion == null) { // first content @@ -141,7 +141,7 @@ public class CommentImpl extends CharacterDataImpl implements Comment { if (flatNode == null) return true; // will be generated String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode); - return (regionType == XMLRegionContext.XML_COMMENT_CLOSE || isNestedCommentClose(regionType)); + return (regionType == DOMRegionContext.XML_COMMENT_CLOSE || isNestedCommentClose(regionType)); } /** diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DOMModelImpl.java index de19c9417b..95e3ef10dd 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DOMModelImpl.java @@ -26,9 +26,9 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegionList; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.xml.core.document.IDOMDocument; -import org.eclipse.wst.xml.core.document.ISourceGenerator; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; +import org.eclipse.wst.xml.core.document.ISourceGenerator; import org.eclipse.wst.xml.core.internal.Logger; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; @@ -42,7 +42,7 @@ import org.w3c.dom.Node; /** * XMLModelImpl class */ -public class XMLModelImpl extends AbstractStructuredModel implements IStructuredDocumentListener, IDOMModel, DOMImplementation { +public class DOMModelImpl extends AbstractStructuredModel implements IStructuredDocumentListener, IDOMModel, DOMImplementation { private static String TRACE_PARSER_MANAGEMENT_EXCEPTION = "parserManagement"; //$NON-NLS-1$ private Object active = null; private DocumentImpl document = null; @@ -55,7 +55,7 @@ public class XMLModelImpl extends AbstractStructuredModel implements IStructured /** * XMLModelImpl constructor */ - public XMLModelImpl() { + public DOMModelImpl() { super(); this.document = (DocumentImpl) internalCreateDocument(); } diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java index f6710d61ea..f8708243ef 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java @@ -23,10 +23,10 @@ import java.util.Map; import org.eclipse.wst.sse.core.modelhandler.IModelHandler; import org.eclipse.wst.xml.core.NameValidator; import org.eclipse.wst.xml.core.IXMLCharEntity; -import org.eclipse.wst.xml.core.commentelement.impl.CommentElementRegistry; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.IDOMModel; +import org.eclipse.wst.xml.core.internal.commentelement.impl.CommentElementRegistry; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMEntityDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; @@ -114,7 +114,7 @@ public class DocumentImpl extends NodeContainer implements IDOMDocument { private static final boolean usetagnamecache = true; private DocumentTypeAdapter documentTypeAdapter = null; - private XMLModelImpl model = null; + private DOMModelImpl model = null; private TagNameCache tagNameCache; /** @@ -1019,7 +1019,7 @@ public class DocumentImpl extends NodeContainer implements IDOMDocument { */ protected void setModel(IDOMModel model) { - this.model = (XMLModelImpl) model; + this.model = (DOMModelImpl) model; } /** diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeAdapterImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeAdapterImpl.java index aefe9b0b01..faaccf9bf1 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeAdapterImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeAdapterImpl.java @@ -102,7 +102,7 @@ public class DocumentTypeAdapterImpl implements DocumentTypeAdapter { IDOMModel model = this.document.getModel(); if (model == null) return; - ((XMLModelImpl) model).documentTypeChanged(); + ((DOMModelImpl) model).documentTypeChanged(); } /** diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeImpl.java index 27081ad5b4..301f4319eb 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentTypeImpl.java @@ -16,7 +16,7 @@ package org.eclipse.wst.xml.core.internal.document; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.xml.core.document.IDOMDocumentType; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.DOMException; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; @@ -143,7 +143,7 @@ public class DocumentTypeImpl extends NodeImpl implements IDOMDocumentType { if (flatNode == null) return true; // will be generated String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode); - return (regionType == XMLRegionContext.XML_DOCTYPE_DECLARATION_CLOSE || regionType == XMLRegionContext.XML_DECLARATION_CLOSE); + return (regionType == DOMRegionContext.XML_DOCTYPE_DECLARATION_CLOSE || regionType == DOMRegionContext.XML_DECLARATION_CLOSE); } /** diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ElementImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ElementImpl.java index 9a1638429c..c9cbf0e355 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ElementImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ElementImpl.java @@ -23,15 +23,15 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.xml.core.IXMLNamespace; -import org.eclipse.wst.xml.core.commentelement.CommentElementAdapter; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; +import org.eclipse.wst.xml.core.internal.commentelement.CommentElementAdapter; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.Document; @@ -439,7 +439,7 @@ public class ElementImpl extends NodeContainer implements IDOMElement { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_NAME || isNestedEndTag(regionType)) { + if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedEndTag(regionType)) { return this.endStructuredDocumentRegion.getText(region); } } @@ -736,12 +736,12 @@ public class ElementImpl extends NodeContainer implements IDOMElement { } String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode); if (isCommentTag()) { - return (isNestedClosedComment(regionType) || regionType == XMLRegionContext.XML_COMMENT_CLOSE); + return (isNestedClosedComment(regionType) || regionType == DOMRegionContext.XML_COMMENT_CLOSE); } if (isJSPTag()) { return isNestedClosed(regionType); } - return (regionType == XMLRegionContext.XML_TAG_CLOSE || regionType == XMLRegionContext.XML_EMPTY_TAG_CLOSE || regionType == XMLRegionContext.XML_DECLARATION_CLOSE); + return (regionType == DOMRegionContext.XML_TAG_CLOSE || regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE || regionType == DOMRegionContext.XML_DECLARATION_CLOSE); } protected boolean isNestedClosed(String regionType) { @@ -846,14 +846,14 @@ public class ElementImpl extends NodeContainer implements IDOMElement { return true; // will be generated String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode); if (isCommentTag()) { - return (isNestedClosedComment(regionType) || regionType == XMLRegionContext.XML_COMMENT_CLOSE); + return (isNestedClosedComment(regionType) || regionType == DOMRegionContext.XML_COMMENT_CLOSE); } if (isJSPTag()) { if (isContainer()) return true; // start tag always has a single region return isClosedNestedDirective(regionType); } - return (regionType == XMLRegionContext.XML_TAG_CLOSE || regionType == XMLRegionContext.XML_EMPTY_TAG_CLOSE || regionType == XMLRegionContext.XML_DECLARATION_CLOSE); + return (regionType == DOMRegionContext.XML_TAG_CLOSE || regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE || regionType == DOMRegionContext.XML_DECLARATION_CLOSE); } protected boolean isClosedNestedDirective(String regionType) { @@ -917,7 +917,7 @@ public class ElementImpl extends NodeContainer implements IDOMElement { DocumentImpl document = (DocumentImpl) getContainerDocument(); if (document == null) return; - XMLModelImpl model = (XMLModelImpl) document.getModel(); + DOMModelImpl model = (DOMModelImpl) document.getModel(); if (model == null) return; model.attrReplaced(this, newAttr, oldAttr); @@ -930,7 +930,7 @@ public class ElementImpl extends NodeContainer implements IDOMElement { DocumentImpl document = (DocumentImpl) getContainerDocument(); if (document == null) return; - XMLModelImpl model = (XMLModelImpl) document.getModel(); + DOMModelImpl model = (DOMModelImpl) document.getModel(); if (model == null) return; model.endTagChanged(this); @@ -942,7 +942,7 @@ public class ElementImpl extends NodeContainer implements IDOMElement { DocumentImpl document = (DocumentImpl) getContainerDocument(); if (document == null) return; - XMLModelImpl model = (XMLModelImpl) document.getModel(); + DOMModelImpl model = (DOMModelImpl) document.getModel(); if (model == null) return; model.startTagChanged(this); diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeContainer.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeContainer.java index 05a6c3bdd0..b9030aa787 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeContainer.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeContainer.java @@ -302,7 +302,7 @@ public abstract class NodeContainer extends NodeImpl implements Node, NodeList { public boolean isChildEditable() { if (!fChildEditable) { - XMLModelImpl model = (XMLModelImpl) getModel(); + DOMModelImpl model = (DOMModelImpl) getModel(); if (model != null && model.isReparsing()) { return true; } @@ -351,7 +351,7 @@ public abstract class NodeContainer extends NodeImpl implements Node, NodeList { syncChildEditableState(newChild); - XMLModelImpl model = (XMLModelImpl) document.getModel(); + DOMModelImpl model = (DOMModelImpl) document.getModel(); if (model == null) return; model.childReplaced(this, newChild, oldChild); diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeImpl.java index c77f7c49b6..377496b822 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/NodeImpl.java @@ -523,7 +523,7 @@ public abstract class NodeImpl extends AbstractNotifier implements IDOMNode { public boolean isDataEditable() { if (!fDataEditable) { - XMLModelImpl model = (XMLModelImpl) getModel(); + DOMModelImpl model = (DOMModelImpl) getModel(); if (model != null && model.isReparsing()) { return true; } @@ -596,7 +596,7 @@ public abstract class NodeImpl extends AbstractNotifier implements IDOMNode { DocumentImpl document = (DocumentImpl) getContainerDocument(); if (document == null) return; - XMLModelImpl model = (XMLModelImpl) document.getModel(); + DOMModelImpl model = (DOMModelImpl) document.getModel(); if (model == null) return; model.editableChanged(this); @@ -612,7 +612,7 @@ public abstract class NodeImpl extends AbstractNotifier implements IDOMNode { syncDataEditableState(); - XMLModelImpl model = (XMLModelImpl) document.getModel(); + DOMModelImpl model = (DOMModelImpl) document.getModel(); if (model == null) return; model.valueChanged(this); diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ProcessingInstructionImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ProcessingInstructionImpl.java index 9378ca6b6b..b68f088d0a 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ProcessingInstructionImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ProcessingInstructionImpl.java @@ -19,7 +19,7 @@ import java.util.Iterator; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.DOMException; import org.w3c.dom.Node; import org.w3c.dom.ProcessingInstruction; @@ -90,9 +90,9 @@ public class ProcessingInstructionImpl extends NodeImpl implements ProcessingIns while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_PI_OPEN) + if (regionType == DOMRegionContext.XML_PI_OPEN) continue; - if (regionType == XMLRegionContext.XML_PI_CLOSE) { + if (regionType == DOMRegionContext.XML_PI_CLOSE) { closeRegion = region; } else { @@ -157,7 +157,7 @@ public class ProcessingInstructionImpl extends NodeImpl implements ProcessingIns if (flatNode == null) return true; // will be generated String regionType = StructuredDocumentRegionUtil.getLastRegionType(flatNode); - return (regionType == XMLRegionContext.XML_PI_CLOSE); + return (regionType == DOMRegionContext.XML_PI_CLOSE); } /** diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ReadOnlyController.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ReadOnlyController.java index 56f81522d0..17076be12e 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ReadOnlyController.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/ReadOnlyController.java @@ -21,7 +21,7 @@ import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.IDOMNode; import org.eclipse.wst.xml.core.document.IDOMText; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Node; @@ -104,11 +104,11 @@ class ReadOnlyController { String startType; String endType; if (node.isCommentTag()) { - startType = XMLRegionContext.XML_COMMENT_OPEN; - endType = XMLRegionContext.XML_COMMENT_CLOSE; + startType = DOMRegionContext.XML_COMMENT_OPEN; + endType = DOMRegionContext.XML_COMMENT_CLOSE; } else { - startType = XMLRegionContext.XML_TAG_NAME; - endType = XMLRegionContext.XML_TAG_CLOSE; + startType = DOMRegionContext.XML_TAG_NAME; + endType = DOMRegionContext.XML_TAG_CLOSE; } int startOffset = -1; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionUtil.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionUtil.java index 81d2a63fbc..4c242854ea 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionUtil.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/StructuredDocumentRegionUtil.java @@ -17,7 +17,7 @@ package org.eclipse.wst.xml.core.internal.document; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** @@ -88,10 +88,10 @@ class StructuredDocumentRegionUtil { */ static String getFirstRegionType(IStructuredDocumentRegion flatNode) { if (flatNode == null) - return XMLRegionContext.UNDEFINED; + return DOMRegionContext.UNDEFINED; ITextRegionList regions = flatNode.getRegions(); if (regions == null || regions.size() == 0) - return XMLRegionContext.UNDEFINED; + return DOMRegionContext.UNDEFINED; ITextRegion region = regions.get(0); return region.getType(); } @@ -127,10 +127,10 @@ class StructuredDocumentRegionUtil { */ static String getLastRegionType(IStructuredDocumentRegion flatNode) { if (flatNode == null) - return XMLRegionContext.UNDEFINED; + return DOMRegionContext.UNDEFINED; ITextRegionList regions = flatNode.getRegions(); if (regions == null || regions.size() == 0) - return XMLRegionContext.UNDEFINED; + return DOMRegionContext.UNDEFINED; ITextRegion region = regions.get(regions.size() - 1); return region.getType(); } diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/TextImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/TextImpl.java index 30b0f4e693..2f057988c0 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/TextImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/TextImpl.java @@ -16,10 +16,10 @@ package org.eclipse.wst.xml.core.internal.document; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.xml.core.document.ISourceGenerator; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMText; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.document.ISourceGenerator; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -246,7 +246,7 @@ public class TextImpl extends CharacterDataImpl implements IDOMText { ITextRegion region = StructuredDocumentRegionUtil.getFirstRegion(flatNode); if (region != null) { String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_ENTITY_REFERENCE || regionType == XMLRegionContext.XML_CHAR_REFERENCE) { + if (regionType == DOMRegionContext.XML_ENTITY_REFERENCE || regionType == DOMRegionContext.XML_CHAR_REFERENCE) { String name = StructuredDocumentRegionUtil.getEntityRefName(flatNode, region); if (name != null) { DocumentImpl document = (DocumentImpl) getOwnerDocument(); @@ -582,7 +582,7 @@ public class TextImpl extends CharacterDataImpl implements IDOMText { } String regionType = StructuredDocumentRegionUtil.getFirstRegionType(flatNode); - if (regionType != XMLRegionContext.XML_CONTENT && isNotNestedContent(regionType) && regionType != XMLRegionContext.XML_ENTITY_REFERENCE && regionType != XMLRegionContext.XML_CHAR_REFERENCE && regionType != XMLRegionContext.BLOCK_TEXT && regionType != XMLRegionContext.WHITE_SPACE) { + if (regionType != DOMRegionContext.XML_CONTENT && isNotNestedContent(regionType) && regionType != DOMRegionContext.XML_ENTITY_REFERENCE && regionType != DOMRegionContext.XML_CHAR_REFERENCE && regionType != DOMRegionContext.BLOCK_TEXT && regionType != DOMRegionContext.WHITE_SPACE) { return true; } diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLGeneratorImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLGeneratorImpl.java index f998b15734..24d1ff138c 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLGeneratorImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLGeneratorImpl.java @@ -15,12 +15,12 @@ package org.eclipse.wst.xml.core.internal.document; import org.eclipse.wst.xml.core.IXMLCharEntity; -import org.eclipse.wst.xml.core.commentelement.impl.CommentElementRegistry; import org.eclipse.wst.xml.core.document.IDOMAttr; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMElement; -import org.eclipse.wst.xml.core.document.ISourceGenerator; import org.eclipse.wst.xml.core.document.IDOMNode; +import org.eclipse.wst.xml.core.document.ISourceGenerator; +import org.eclipse.wst.xml.core.internal.commentelement.impl.CommentElementRegistry; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType; import org.w3c.dom.Attr; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelParser.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelParser.java index 793b3d00f9..00665eb897 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelParser.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelParser.java @@ -22,12 +22,12 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegionList; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; -import org.eclipse.wst.xml.core.commentelement.impl.CommentElementConfiguration; -import org.eclipse.wst.xml.core.commentelement.impl.CommentElementRegistry; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.IDOMModel; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.commentelement.impl.CommentElementConfiguration; +import org.eclipse.wst.xml.core.internal.commentelement.impl.CommentElementRegistry; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.Element; @@ -44,11 +44,11 @@ public class XMLModelParser { private XMLModelContext context = null; private DocumentImpl document = null; - private XMLModelImpl model = null; + private DOMModelImpl model = null; /** */ - protected XMLModelParser(XMLModelImpl model) { + protected XMLModelParser(DOMModelImpl model) { super(); if (model != null) { @@ -283,7 +283,7 @@ public class XMLModelParser { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_CLOSE) + if (regionType == DOMRegionContext.XML_TAG_CLOSE) continue; // other region has changed @@ -296,7 +296,7 @@ public class XMLModelParser { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_CLOSE) + if (regionType == DOMRegionContext.XML_TAG_CLOSE) continue; // other region has changed @@ -326,19 +326,19 @@ public class XMLModelParser { // optimize typical cases String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_CONTENT || regionType == XMLRegionContext.XML_COMMENT_TEXT || regionType == XMLRegionContext.XML_CDATA_TEXT || regionType == XMLRegionContext.BLOCK_TEXT || isNestedContent(regionType)) { + if (regionType == DOMRegionContext.XML_CONTENT || regionType == DOMRegionContext.XML_COMMENT_TEXT || regionType == DOMRegionContext.XML_CDATA_TEXT || regionType == DOMRegionContext.BLOCK_TEXT || isNestedContent(regionType)) { changeData(flatNode, region); } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { changeAttrName(flatNode, region); } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { changeAttrValue(flatNode, region); } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { changeAttrEqual(flatNode, region); } - else if (regionType == XMLRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) { + else if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) { changeTagName(flatNode, region); } else { @@ -374,14 +374,14 @@ public class XMLModelParser { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME || regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS || regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) + if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS || regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) continue; - if (regionType == XMLRegionContext.XML_TAG_CLOSE) { + if (regionType == DOMRegionContext.XML_TAG_CLOSE) { // change from empty tag may have impact on structure if (!element.isEmptyTag()) continue; } - else if (regionType == XMLRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) { + else if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) { String oldTagName = element.getTagName(); String newTagName = flatNode.getText(region); if (oldTagName != null && newTagName != null && oldTagName.equals(newTagName)) { @@ -401,14 +401,14 @@ public class XMLModelParser { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME || regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS || regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) + if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS || regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) continue; - if (regionType == XMLRegionContext.XML_TAG_CLOSE) { + if (regionType == DOMRegionContext.XML_TAG_CLOSE) { // change from empty tag may have impact on structure if (!element.isEmptyTag()) continue; } - else if (regionType == XMLRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) { + else if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) { // if new tag name is unchanged, it's OK if (tagNameUnchanged) continue; @@ -468,7 +468,7 @@ public class XMLModelParser { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { if (newAttr != null) { // insert deferred new attribute element.insertAttributeNode(newAttr, attrIndex++); @@ -498,12 +498,12 @@ public class XMLModelParser { newAttr = attr; } } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { if (attr != null) { attr.setEqualRegion(region); } } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { if (attr != null) { attr.setValueRegion(region); if (attr != newAttr && oldValueRegion != region) { @@ -582,7 +582,7 @@ public class XMLModelParser { // if it's not a change in the end tag of an element with the start // tag, // and case has been changed, set to element and notify - if (!element.hasStartTag() || StructuredDocumentRegionUtil.getFirstRegionType(flatNode) != XMLRegionContext.XML_END_TAG_OPEN) { + if (!element.hasStartTag() || StructuredDocumentRegionUtil.getFirstRegionType(flatNode) != DOMRegionContext.XML_END_TAG_OPEN) { String tagName = element.getTagName(); if (tagName == null || !tagName.equals(newTagName)) { element.setTagName(newTagName); @@ -927,7 +927,7 @@ public class XMLModelParser { if (isNestedCommentOpen(regionType)) { isJSPTag = true; } - else if (regionType == XMLRegionContext.XML_COMMENT_TEXT || isNestedCommentText(regionType)) { + else if (regionType == DOMRegionContext.XML_COMMENT_TEXT || isNestedCommentText(regionType)) { if (data == null) { data = flatNode.getText(region); } @@ -989,18 +989,18 @@ public class XMLModelParser { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_DOCTYPE_DECLARATION) { + if (regionType == DOMRegionContext.XML_DOCTYPE_DECLARATION) { isDocType = true; } - else if (regionType == XMLRegionContext.XML_DOCTYPE_NAME) { + else if (regionType == DOMRegionContext.XML_DOCTYPE_NAME) { if (name == null) name = flatNode.getText(region); } - else if (regionType == XMLRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF) { + else if (regionType == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF) { if (publicId == null) publicId = StructuredDocumentRegionUtil.getAttrValue(flatNode, region); } - else if (regionType == XMLRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF) { + else if (regionType == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF) { if (systemId == null) systemId = StructuredDocumentRegionUtil.getAttrValue(flatNode, region); } @@ -1080,7 +1080,7 @@ public class XMLModelParser { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) { + if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) { if (tagName == null) tagName = flatNode.getText(region); } @@ -1130,7 +1130,7 @@ public class XMLModelParser { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_ENTITY_REFERENCE || regionType == XMLRegionContext.XML_CHAR_REFERENCE) { + if (regionType == DOMRegionContext.XML_ENTITY_REFERENCE || regionType == DOMRegionContext.XML_CHAR_REFERENCE) { if (name == null) name = StructuredDocumentRegionUtil.getEntityRefName(flatNode, region); } @@ -1228,7 +1228,7 @@ public class XMLModelParser { else if (isNestedTagClose(regionType)) { isCloseTag = true; } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { String name = flatNode.getText(region); attr = (AttrImpl) this.document.createAttribute(name); if (attr != null) { @@ -1238,12 +1238,12 @@ public class XMLModelParser { attrNodes.addElement(attr); } } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { if (attr != null) { attr.setEqualRegion(region); } } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { if (attr != null) { attr.setValueRegion(region); attr = null; @@ -1419,7 +1419,7 @@ public class XMLModelParser { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_PI_OPEN || regionType == XMLRegionContext.XML_PI_CLOSE) + if (regionType == DOMRegionContext.XML_PI_OPEN || regionType == DOMRegionContext.XML_PI_CLOSE) continue; if (target == null) target = flatNode.getText(region); @@ -1484,14 +1484,14 @@ public class XMLModelParser { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) { + if (regionType == DOMRegionContext.XML_TAG_NAME || isNestedTagName(regionType)) { if (tagName == null) tagName = flatNode.getText(region); } - else if (regionType == XMLRegionContext.XML_EMPTY_TAG_CLOSE) { + else if (regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE) { isEmptyTag = true; } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { String name = flatNode.getText(region); attr = (AttrImpl) this.document.createAttribute(name); if (attr != null) { @@ -1501,12 +1501,12 @@ public class XMLModelParser { attrNodes.addElement(attr); } } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { if (attr != null) { attr.setEqualRegion(region); } } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { if (attr != null) { attr.setValueRegion(region); attr = null; @@ -1553,25 +1553,25 @@ public class XMLModelParser { */ protected void insertStructuredDocumentRegion(IStructuredDocumentRegion flatNode) { String regionType = StructuredDocumentRegionUtil.getFirstRegionType(flatNode); - if (regionType == XMLRegionContext.XML_TAG_OPEN) { + if (regionType == DOMRegionContext.XML_TAG_OPEN) { insertStartTag(flatNode); } - else if (regionType == XMLRegionContext.XML_END_TAG_OPEN) { + else if (regionType == DOMRegionContext.XML_END_TAG_OPEN) { insertEndTag(flatNode); } - else if (regionType == XMLRegionContext.XML_COMMENT_OPEN || isNestedCommentOpen(regionType)) { + else if (regionType == DOMRegionContext.XML_COMMENT_OPEN || isNestedCommentOpen(regionType)) { insertComment(flatNode); } - else if (regionType == XMLRegionContext.XML_ENTITY_REFERENCE || regionType == XMLRegionContext.XML_CHAR_REFERENCE) { + else if (regionType == DOMRegionContext.XML_ENTITY_REFERENCE || regionType == DOMRegionContext.XML_CHAR_REFERENCE) { insertEntityRef(flatNode); } - else if (regionType == XMLRegionContext.XML_DECLARATION_OPEN) { + else if (regionType == DOMRegionContext.XML_DECLARATION_OPEN) { insertDecl(flatNode); } - else if (regionType == XMLRegionContext.XML_PI_OPEN) { + else if (regionType == DOMRegionContext.XML_PI_OPEN) { insertPI(flatNode); } - else if (regionType == XMLRegionContext.XML_CDATA_OPEN) { + else if (regionType == DOMRegionContext.XML_CDATA_OPEN) { insertCDATASection(flatNode); } else if (isNestedTag(regionType)) { @@ -2349,10 +2349,10 @@ public class XMLModelParser { // optimize typical cases String regionType = StructuredDocumentRegionUtil.getFirstRegionType(flatNode); - if (regionType == XMLRegionContext.XML_TAG_OPEN) { + if (regionType == DOMRegionContext.XML_TAG_OPEN) { changeStartTag(flatNode, newRegions, oldRegions); } - else if (regionType == XMLRegionContext.XML_END_TAG_OPEN) { + else if (regionType == DOMRegionContext.XML_END_TAG_OPEN) { changeEndTag(flatNode, newRegions, oldRegions); } else { diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelUpdater.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelUpdater.java index af5b67dbac..bbdb368752 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelUpdater.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/XMLModelUpdater.java @@ -23,9 +23,9 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegionList; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.xml.core.document.IDOMElement; -import org.eclipse.wst.xml.core.document.ISourceGenerator; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.document.ISourceGenerator; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -42,11 +42,11 @@ public class XMLModelUpdater { private int gapOffset = 0; private IStructuredDocumentRegion gapStructuredDocumentRegion = null; private ISourceGenerator generator = null; - private XMLModelImpl model = null; + private DOMModelImpl model = null; private NodeImpl nextNode = null; private NodeImpl parentNode = null; - protected XMLModelUpdater(XMLModelImpl model) { + protected XMLModelUpdater(DOMModelImpl model) { super(); if (model != null) { @@ -629,7 +629,7 @@ public class XMLModelUpdater { if (flatNode == null) return null; ITextRegion region = StructuredDocumentRegionUtil.getLastRegion(flatNode); - if (region == null || region.getType() != XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) + if (region == null || region.getType() != DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) return null; String value = flatNode.getText(region); if (value == null) @@ -1270,7 +1270,7 @@ public class XMLModelUpdater { boolean isLastAttr = false; if (nextRegion != null) { String regionType = nextRegion.getType(); - if (regionType == XMLRegionContext.XML_TAG_CLOSE || regionType == XMLRegionContext.XML_EMPTY_TAG_CLOSE || isNestedTagClose(regionType)) { + if (regionType == DOMRegionContext.XML_TAG_CLOSE || regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE || isNestedTagClose(regionType)) { isLastAttr = true; } } @@ -1303,7 +1303,7 @@ public class XMLModelUpdater { for (int i = regions.size() - 1; i >= 0; i--) { ITextRegion region = regions.get(i); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_CLOSE || regionType == XMLRegionContext.XML_EMPTY_TAG_CLOSE || isNestedTagClose(regionType)) + if (regionType == DOMRegionContext.XML_TAG_CLOSE || regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE || isNestedTagClose(regionType)) continue; int regionEnd = region.getEnd(); if (regionEnd == region.getTextEnd()) @@ -1676,7 +1676,7 @@ public class XMLModelUpdater { while (e.hasNext()) { ITextRegion region = (ITextRegion) e.next(); String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { attr = (AttrImpl) attributes.item(++index); if (attr != null) { attr.setNameRegion(region); @@ -1685,11 +1685,11 @@ public class XMLModelUpdater { attr.setValueRegion(null); } } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { if (attr != null) attr.setEqualRegion(region); } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { if (attr != null) { attr.setValueRegion(region); attr = null; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/encoding/XMLDocumentCharsetDetector.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/encoding/XMLDocumentCharsetDetector.java index f7abbf5f84..cf328de918 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/encoding/XMLDocumentCharsetDetector.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/encoding/XMLDocumentCharsetDetector.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.encoding; +package org.eclipse.wst.xml.core.internal.encoding; import org.eclipse.jface.text.IDocument; import org.eclipse.wst.sse.core.internal.document.DocumentReader; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/encoding/XMLDocumentLoader.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/encoding/XMLDocumentLoader.java index 2024186c8e..1ea24b880b 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/encoding/XMLDocumentLoader.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/encoding/XMLDocumentLoader.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.encoding; +package org.eclipse.wst.xml.core.internal.encoding; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.wst.sse.core.document.IEncodedDocument; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/modelhandler/EmbeddedXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java index 69df5cd66c..3da04e2edf 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/modelhandler/EmbeddedXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.modelhandler; +package org.eclipse.wst.xml.core.internal.modelhandler; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/modelhandler/ModelHandlerForXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/ModelHandlerForXML.java index 9274e0b872..af3753b321 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/modelhandler/ModelHandlerForXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/ModelHandlerForXML.java @@ -10,15 +10,15 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.modelhandler; +package org.eclipse.wst.xml.core.internal.modelhandler; import org.eclipse.wst.sse.core.IModelLoader; import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector; import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; import org.eclipse.wst.sse.core.modelhandler.AbstractModelHandler; import org.eclipse.wst.sse.core.modelhandler.IModelHandler; -import org.eclipse.wst.xml.core.encoding.XMLDocumentCharsetDetector; -import org.eclipse.wst.xml.core.encoding.XMLDocumentLoader; +import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentCharsetDetector; +import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader; /** diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/modelhandler/XMLModelLoader.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/XMLModelLoader.java index 4691cd90d2..c871d551c8 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/modelhandler/XMLModelLoader.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/XMLModelLoader.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.modelhandler; +package org.eclipse.wst.xml.core.internal.modelhandler; import java.util.ArrayList; import java.util.List; @@ -24,9 +24,9 @@ import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; import org.eclipse.wst.sse.core.internal.model.AbstractModelLoader; import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.xml.core.document.IDOMModel; -import org.eclipse.wst.xml.core.encoding.XMLDocumentLoader; import org.eclipse.wst.xml.core.internal.DebugAdapterFactory; -import org.eclipse.wst.xml.core.internal.document.XMLModelImpl; +import org.eclipse.wst.xml.core.internal.document.DOMModelImpl; +import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryAdapterFactoryForXML; import org.eclipse.wst.xml.core.internal.propagate.PropagatingAdapterFactoryImpl; @@ -69,7 +69,7 @@ public class XMLModelLoader extends AbstractModelLoader { } public IStructuredModel newModel() { - return new XMLModelImpl(); + return new DOMModelImpl(); } protected void preLoadAdapt(IStructuredModel structuredModel) { diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLSourceParser.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLSourceParser.java index b02d63aadf..22ea931cdd 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLSourceParser.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLSourceParser.java @@ -36,7 +36,7 @@ import org.eclipse.wst.sse.core.text.ITextRegionContainer; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.xml.core.internal.Logger; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** @@ -104,7 +104,7 @@ public class XMLSourceParser implements RegionParser, BlockTagParser, Structured */ protected IStructuredDocumentRegion createStructuredDocumentRegion(String type) { IStructuredDocumentRegion newNode = null; - if (type == XMLRegionContext.BLOCK_TEXT) + if (type == DOMRegionContext.BLOCK_TEXT) newNode = XMLStructuredRegionFactory.createRegion(XMLStructuredRegionFactory.XML_BLOCK); else newNode = XMLStructuredRegionFactory.createRegion(XMLStructuredRegionFactory.XML); @@ -287,8 +287,8 @@ public class XMLSourceParser implements RegionParser, BlockTagParser, Structured type = region.getType(); // these types (might) demand a IStructuredDocumentRegion for each // of them - if (type == XMLRegionContext.BLOCK_TEXT) { - if (currentNode != null && currentNode.getLastRegion().getType() == XMLRegionContext.BLOCK_TEXT) { + if (type == DOMRegionContext.BLOCK_TEXT) { + if (currentNode != null && currentNode.getLastRegion().getType() == DOMRegionContext.BLOCK_TEXT) { // multiple block texts indicated embedded containers; no // new IStructuredDocumentRegion currentNode.addRegion(region); @@ -324,7 +324,7 @@ public class XMLSourceParser implements RegionParser, BlockTagParser, Structured } } // the following contexts OPEN new StructuredDocumentRegions - else if ((currentNode != null && currentNode.isEnded()) || (type == XMLRegionContext.XML_CONTENT) || (type == XMLRegionContext.XML_CHAR_REFERENCE) || (type == XMLRegionContext.XML_ENTITY_REFERENCE) || (type == XMLRegionContext.XML_PI_OPEN) || (type == XMLRegionContext.XML_TAG_OPEN) || (type == XMLRegionContext.XML_END_TAG_OPEN) || (type == XMLRegionContext.XML_COMMENT_OPEN) || (type == XMLRegionContext.XML_CDATA_OPEN) || (type == XMLRegionContext.XML_DECLARATION_OPEN)) { + else if ((currentNode != null && currentNode.isEnded()) || (type == DOMRegionContext.XML_CONTENT) || (type == DOMRegionContext.XML_CHAR_REFERENCE) || (type == DOMRegionContext.XML_ENTITY_REFERENCE) || (type == DOMRegionContext.XML_PI_OPEN) || (type == DOMRegionContext.XML_TAG_OPEN) || (type == DOMRegionContext.XML_END_TAG_OPEN) || (type == DOMRegionContext.XML_COMMENT_OPEN) || (type == DOMRegionContext.XML_CDATA_OPEN) || (type == DOMRegionContext.XML_DECLARATION_OPEN)) { if (currentNode != null) { // ensure that any existing node is at least terminated if (!currentNode.isEnded()) { @@ -349,7 +349,7 @@ public class XMLSourceParser implements RegionParser, BlockTagParser, Structured } // the following contexts neither open nor close // StructuredDocumentRegions; just add to them - else if ((type == XMLRegionContext.XML_TAG_NAME) || (type == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) || (type == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) || (type == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) || (type == XMLRegionContext.XML_COMMENT_TEXT) || (type == XMLRegionContext.XML_PI_CONTENT) || (type == XMLRegionContext.XML_DOCTYPE_INTERNAL_SUBSET)) { + else if ((type == DOMRegionContext.XML_TAG_NAME) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) || (type == DOMRegionContext.XML_COMMENT_TEXT) || (type == DOMRegionContext.XML_PI_CONTENT) || (type == DOMRegionContext.XML_DOCTYPE_INTERNAL_SUBSET)) { currentNode.addRegion(region); currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart()); region.adjustStart(-currentNode.getStart()); @@ -358,7 +358,7 @@ public class XMLSourceParser implements RegionParser, BlockTagParser, Structured } // the following contexts close off StructuredDocumentRegions // cleanly - else if ((type == XMLRegionContext.XML_PI_CLOSE) || (type == XMLRegionContext.XML_TAG_CLOSE) || (type == XMLRegionContext.XML_EMPTY_TAG_CLOSE) || (type == XMLRegionContext.XML_COMMENT_CLOSE) || (type == XMLRegionContext.XML_DECLARATION_CLOSE) || (type == XMLRegionContext.XML_CDATA_CLOSE)) { + else if ((type == DOMRegionContext.XML_PI_CLOSE) || (type == DOMRegionContext.XML_TAG_CLOSE) || (type == DOMRegionContext.XML_EMPTY_TAG_CLOSE) || (type == DOMRegionContext.XML_COMMENT_CLOSE) || (type == DOMRegionContext.XML_DECLARATION_CLOSE) || (type == DOMRegionContext.XML_CDATA_CLOSE)) { currentNode.setEnded(true); currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart()); currentNode.addRegion(region); @@ -367,7 +367,7 @@ public class XMLSourceParser implements RegionParser, BlockTagParser, Structured //region.setParent(currentNode); } // this is extremely rare, but valid - else if (type == XMLRegionContext.WHITE_SPACE) { + else if (type == DOMRegionContext.WHITE_SPACE) { ITextRegion lastRegion = currentNode.getLastRegion(); // pack the embedded container with this region if (lastRegion instanceof ITextRegionContainer) { @@ -383,11 +383,11 @@ public class XMLSourceParser implements RegionParser, BlockTagParser, Structured } currentNode.getLastRegion().adjustLength(region.getLength()); currentNode.adjustLength(region.getLength()); - } else if (type == XMLRegionContext.UNDEFINED && currentNode != null) { + } else if (type == DOMRegionContext.UNDEFINED && currentNode != null) { // skip on a very-first region situation as the default // behavior is good enough // combine with previous if also undefined - if (currentNode.getLastRegion() != null && currentNode.getLastRegion().getType() == XMLRegionContext.UNDEFINED) { + if (currentNode.getLastRegion() != null && currentNode.getLastRegion().getType() == DOMRegionContext.UNDEFINED) { currentNode.getLastRegion().adjustLength(region.getLength()); currentNode.adjustLength(region.getLength()); } @@ -420,7 +420,7 @@ public class XMLSourceParser implements RegionParser, BlockTagParser, Structured // be more readable if that is handled here as well, but the // current layout // ensures that they open StructuredDocumentRegions the same way - if ((type == XMLRegionContext.XML_CONTENT) || (type == XMLRegionContext.XML_CHAR_REFERENCE) || (type == XMLRegionContext.XML_ENTITY_REFERENCE)) { + if ((type == DOMRegionContext.XML_CONTENT) || (type == DOMRegionContext.XML_CHAR_REFERENCE) || (type == DOMRegionContext.XML_ENTITY_REFERENCE)) { currentNode.setEnded(true); } if (headNode == null && currentNode != null) { diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLStructuredDocumentReParser.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLStructuredDocumentReParser.java index 8442a89ede..b5c9f5978d 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLStructuredDocumentReParser.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLStructuredDocumentReParser.java @@ -15,7 +15,7 @@ package org.eclipse.wst.xml.core.internal.parser; import org.eclipse.wst.sse.core.internal.text.StructuredDocumentReParser; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.IStructuredTextReParser; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class XMLStructuredDocumentReParser extends StructuredDocumentReParser { @@ -97,14 +97,14 @@ public class XMLStructuredDocumentReParser extends StructuredDocumentReParser { protected boolean isLoneOpenFollowedByContent(IStructuredDocumentRegion flatNode) { boolean result = false; String type = flatNode.getType(); - if (type == XMLRegionContext.XML_CONTENT) { + if (type == DOMRegionContext.XML_CONTENT) { IStructuredDocumentRegion previous = flatNode.getPrevious(); String previousType = null; if (previous != null) { previousType = previous.getType(); } if (previousType != null) { - result = (previousType == XMLRegionContext.XML_TAG_OPEN); + result = (previousType == DOMRegionContext.XML_TAG_OPEN); } } return result; @@ -113,7 +113,7 @@ public class XMLStructuredDocumentReParser extends StructuredDocumentReParser { protected boolean isPartOfBlockRegion(IStructuredDocumentRegion flatNode) { boolean result = false; String type = flatNode.getType(); - result = (type == XMLRegionContext.BLOCK_TEXT); + result = (type == DOMRegionContext.BLOCK_TEXT); return result; } diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLTokenizer.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLTokenizer.java index 0943d20f91..74466e45d5 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLTokenizer.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/XMLTokenizer.java @@ -26,7 +26,7 @@ import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.xml.core.internal.Logger; import org.eclipse.wst.xml.core.internal.parser.regions.XMLParserRegionFactory; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** @@ -35,7 +35,7 @@ import org.eclipse.wst.xml.core.parser.XMLRegionContext; * on 1/27/05 4:48 PM from the specification file * <tt>file:/D:/eclipse.wtp/workspace/org.eclipse.wst.sse.core/DevTimeSupport/SedModel/HTMLTokenizer/devel/XMLTokenizer.jflex</tt> */ -public class XMLTokenizer implements BlockTokenizer, XMLRegionContext { +public class XMLTokenizer implements BlockTokenizer, DOMRegionContext { /** this character denotes the end of file */ final public static int YYEOF = -1; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeEqualsRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeEqualsRegion.java index 3642ab9a02..47fe7df9b2 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeEqualsRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeEqualsRegion.java @@ -15,13 +15,13 @@ package org.eclipse.wst.xml.core.internal.parser.regions; import org.eclipse.wst.sse.core.events.StructuredDocumentEvent; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class AttributeEqualsRegion implements ITextRegion { static private final byte fTextLength = 1; - static private final String fType = XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS; + static private final String fType = DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS; private short fLength; private int fStart; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeNameRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeNameRegion.java index 6a472b51bc..8ae81be259 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeNameRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeNameRegion.java @@ -18,12 +18,12 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.sse.core.util.Utilities; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class AttributeNameRegion implements ITextRegion { // specify correct type - static private final String fType = XMLRegionContext.XML_TAG_ATTRIBUTE_NAME; + static private final String fType = DOMRegionContext.XML_TAG_ATTRIBUTE_NAME; private int fLength; private int fStart; private int fTextLength; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeValueRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeValueRegion.java index 6129501462..7e995b5813 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeValueRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/AttributeValueRegion.java @@ -18,12 +18,12 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.sse.core.util.Utilities; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class AttributeValueRegion implements ITextRegion { // specify correct type - static private final String fType = XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE; + static private final String fType = DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE; private int fLength; private int fStart; private int fTextLength; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/GenericTemplateRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/GenericTemplateRegion.java index c63eb6cead..155f9dc025 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/GenericTemplateRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/GenericTemplateRegion.java @@ -15,7 +15,7 @@ package org.eclipse.wst.xml.core.internal.parser.regions; import org.eclipse.wst.sse.core.events.StructuredDocumentEvent; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** @@ -26,7 +26,7 @@ import org.eclipse.wst.xml.core.parser.XMLRegionContext; public class GenericTemplateRegion implements ITextRegion { // specify correct type - static private final String fType = XMLRegionContext.UNDEFINED; + static private final String fType = DOMRegionContext.UNDEFINED; private int fLength; private int fStart; private int fTextLength; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagCloseRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagCloseRegion.java index 68eae2d271..2a2a007b58 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagCloseRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagCloseRegion.java @@ -16,13 +16,13 @@ import org.eclipse.wst.sse.core.events.StructuredDocumentEvent; import org.eclipse.wst.sse.core.exceptions.SourceEditingRuntimeException; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class TagCloseRegion implements ITextRegion { static private final byte fLength = 1; static private final byte fTextLength = 1; - static private final String fType = XMLRegionContext.XML_TAG_CLOSE; + static private final String fType = DOMRegionContext.XML_TAG_CLOSE; private int fStart; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagNameRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagNameRegion.java index 32adf894c4..152040f11c 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagNameRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagNameRegion.java @@ -15,11 +15,11 @@ package org.eclipse.wst.xml.core.internal.parser.regions; import org.eclipse.wst.sse.core.events.StructuredDocumentEvent; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class TagNameRegion implements ITextRegion { - static private final String fType = XMLRegionContext.XML_TAG_NAME; + static private final String fType = DOMRegionContext.XML_TAG_NAME; private short fLength; private int fStart; private short fTextLength; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagOpenRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagOpenRegion.java index 3a7992d631..9fc2aa0c36 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagOpenRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/TagOpenRegion.java @@ -15,11 +15,11 @@ package org.eclipse.wst.xml.core.internal.parser.regions; import org.eclipse.wst.sse.core.events.StructuredDocumentEvent; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class TagOpenRegion implements ITextRegion { - static private final String fType = XMLRegionContext.XML_TAG_OPEN; + static private final String fType = DOMRegionContext.XML_TAG_OPEN; private int fLength; private int fStart; private int fTextLength; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/WhiteSpaceOnlyRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/WhiteSpaceOnlyRegion.java index be43fbf979..dd2471f852 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/WhiteSpaceOnlyRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/WhiteSpaceOnlyRegion.java @@ -21,13 +21,13 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.sse.core.util.Utilities; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class WhiteSpaceOnlyRegion implements ITextRegion { static private final byte fTextLength = 0; - static private final String fType = XMLRegionContext.WHITE_SPACE; + static private final String fType = DOMRegionContext.WHITE_SPACE; protected int fLength; protected int fStart; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLCDataTextRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLCDataTextRegion.java index 6a84c4d8d1..3961c5ce38 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLCDataTextRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLCDataTextRegion.java @@ -18,11 +18,11 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.sse.core.util.Utilities; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class XMLCDataTextRegion implements ITextRegion { - static private final String fType = XMLRegionContext.XML_CDATA_TEXT; + static private final String fType = DOMRegionContext.XML_CDATA_TEXT; private int fLength; private int fStart; private int fTextLength; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLContentRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLContentRegion.java index c55d023ca9..fc1d02200c 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLContentRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLContentRegion.java @@ -18,12 +18,12 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.util.Debug; import org.eclipse.wst.sse.core.util.Utilities; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class XMLContentRegion implements ITextRegion { - static private final String fType = XMLRegionContext.XML_CONTENT; + static private final String fType = DOMRegionContext.XML_CONTENT; // length and textLength are always the same for content region //private int fTextLength; private int fLength; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLHeadParserRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLHeadParserRegion.java index 50c9436be9..976042b234 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLHeadParserRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLHeadParserRegion.java @@ -15,7 +15,7 @@ package org.eclipse.wst.xml.core.internal.parser.regions; import org.eclipse.wst.sse.core.events.StructuredDocumentEvent; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** @@ -30,7 +30,7 @@ public class XMLHeadParserRegion implements ITextRegion { private String fText; private int fTextLength; // specify correct type - private String fType = XMLRegionContext.UNDEFINED; + private String fType = DOMRegionContext.UNDEFINED; public XMLHeadParserRegion() { super(); diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLParserRegionFactory.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLParserRegionFactory.java index 6b03796502..1e6d294405 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLParserRegionFactory.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/parser/regions/XMLParserRegionFactory.java @@ -17,7 +17,7 @@ package org.eclipse.wst.xml.core.internal.parser.regions; import org.eclipse.wst.sse.core.internal.parser.ContextRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionContainer; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** @@ -49,23 +49,23 @@ public class XMLParserRegionFactory { public ITextRegion createToken(String context, int start, int textLength, int length, String lang, String surroundingTag) { ITextRegion newRegion = null; - if (context == XMLRegionContext.XML_CDATA_TEXT) { + if (context == DOMRegionContext.XML_CDATA_TEXT) { newRegion = new XMLCDataTextRegion(start, textLength, length); - } else if (context == XMLRegionContext.XML_CONTENT) { + } else if (context == DOMRegionContext.XML_CONTENT) { newRegion = new XMLContentRegion(start, length); - } else if (context == XMLRegionContext.XML_TAG_NAME) { + } else if (context == DOMRegionContext.XML_TAG_NAME) { newRegion = new TagNameRegion(start, textLength, length); - } else if (context == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + } else if (context == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { newRegion = new AttributeNameRegion(start, textLength, length); - } else if (context == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + } else if (context == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { newRegion = new AttributeEqualsRegion(start, textLength, length); - } else if (context == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + } else if (context == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { newRegion = new AttributeValueRegion(start, textLength, length); - } else if (context == XMLRegionContext.XML_TAG_OPEN) { + } else if (context == DOMRegionContext.XML_TAG_OPEN) { newRegion = new TagOpenRegion(start, textLength, length); - } else if (context == XMLRegionContext.XML_TAG_CLOSE) { + } else if (context == DOMRegionContext.XML_TAG_CLOSE) { newRegion = new TagCloseRegion(start); - } else if (context == XMLRegionContext.WHITE_SPACE) { + } else if (context == DOMRegionContext.WHITE_SPACE) { newRegion = new WhiteSpaceOnlyRegion(start, length); } else // removed this condition during transition, and implemented in @@ -73,7 +73,7 @@ public class XMLParserRegionFactory { // if (context == XMLJSPRegionContexts.JSP_CONTENT) { // newRegion = new JSPCodeRegion(context, start, textLength, length); // } else - if (context == XMLRegionContext.BLOCK_TEXT) { + if (context == DOMRegionContext.BLOCK_TEXT) { newRegion = new BlockTextRegion(context, start, textLength, length); ((BlockTextRegion) newRegion).setSurroundingTag(surroundingTag); } else { diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contentmodel/CMDocType.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMDocType.java index ad3f67905f..d47f940558 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contentmodel/CMDocType.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMDocType.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.contentmodel; +package org.eclipse.wst.xml.core.internal.provisional.contentmodel; public interface CMDocType { diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contentmodel/CMDocumentTracker.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMDocumentTracker.java index 8f8f83c008..600d32bf48 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contentmodel/CMDocumentTracker.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMDocumentTracker.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.contentmodel; +package org.eclipse.wst.xml.core.internal.provisional.contentmodel; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contentmodel/CMNodeWrapper.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMNodeWrapper.java index 43f0661423..1c905c1ea1 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contentmodel/CMNodeWrapper.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/CMNodeWrapper.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.contentmodel; +package org.eclipse.wst.xml.core.internal.provisional.contentmodel; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contentmodel/ContentModelAdapter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/ContentModelAdapter.java index 5443ab3613..a8474b9379 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contentmodel/ContentModelAdapter.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/ContentModelAdapter.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.contentmodel; +package org.eclipse.wst.xml.core.internal.provisional.contentmodel; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contentmodel/NullContentModel.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/NullContentModel.java index c393c6e95c..51e77fbdbf 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/contentmodel/NullContentModel.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/contentmodel/NullContentModel.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.contentmodel; +package org.eclipse.wst.xml.core.internal.provisional.contentmodel; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/CommentNodeFormatter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/CommentNodeFormatter.java index 8026b959a7..9f6e9e9c97 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/CommentNodeFormatter.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/CommentNodeFormatter.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.format; +package org.eclipse.wst.xml.core.internal.provisional.format; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints; import org.eclipse.wst.sse.core.util.StringUtils; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/DocumentNodeFormatter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/DocumentNodeFormatter.java index e9a70bfa0e..2e93a21a2a 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/DocumentNodeFormatter.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/DocumentNodeFormatter.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.format; +package org.eclipse.wst.xml.core.internal.provisional.format; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/ElementNodeFormatter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/ElementNodeFormatter.java index ac761eb505..2988f08014 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/ElementNodeFormatter.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/ElementNodeFormatter.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.format; +package org.eclipse.wst.xml.core.internal.provisional.format; import org.eclipse.jface.text.BadLocationException; import org.eclipse.wst.sse.core.exceptions.SourceEditingRuntimeException; @@ -21,14 +21,14 @@ import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.sse.core.util.StringUtils; import org.eclipse.wst.xml.core.document.IDOMDocument; -import org.eclipse.wst.xml.core.document.ISourceGenerator; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; +import org.eclipse.wst.xml.core.document.ISourceGenerator; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.document.AttrImpl; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; @@ -110,7 +110,7 @@ public class ElementNodeFormatter extends DocumentNodeFormatter { ITextRegionList regions = flatNode.getRegions(); ITextRegion lastRegion = regions.get(regions.size() - 1); // format children and end tag if not empty start tag - if (lastRegion.getType() != XMLRegionContext.XML_EMPTY_TAG_CLOSE) { + if (lastRegion.getType() != DOMRegionContext.XML_EMPTY_TAG_CLOSE) { // format children formatChildren(newNode, formatContraints); @@ -244,7 +244,7 @@ public class ElementNodeFormatter extends DocumentNodeFormatter { if (flatNode != null) { ITextRegionList regions = flatNode.getRegions(); ITextRegion lastRegion = regions.get(regions.size() - 1); - if (lastRegion.getType() != XMLRegionContext.XML_EMPTY_TAG_CLOSE) + if (lastRegion.getType() != DOMRegionContext.XML_EMPTY_TAG_CLOSE) // 3 is for " />" textLength += 3; else @@ -315,14 +315,14 @@ public class ElementNodeFormatter extends DocumentNodeFormatter { ITextRegion firstRegion = regions.get(0); ITextRegion lastRegion = regions.get(regions.size() - 1); - if (firstRegion.getType() == XMLRegionContext.XML_END_TAG_OPEN) + if (firstRegion.getType() == DOMRegionContext.XML_END_TAG_OPEN) // skip formatting for end tags in this format: </tagName> return; else { - if (lastRegion.getType() == XMLRegionContext.XML_TAG_CLOSE || lastRegion.getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE) + if (lastRegion.getType() == DOMRegionContext.XML_TAG_CLOSE || lastRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) length = length - lastRegion.getLength(); - if (lastRegion.getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE) + if (lastRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) // leave space before XML_EMPTY_TAG_CLOSE: <tagName /> stringBuffer.append(SPACE_CHAR); } @@ -342,7 +342,7 @@ public class ElementNodeFormatter extends DocumentNodeFormatter { String regionType = region.getType(); int regionStartOffset = flatNode.getStartOffset(region); - if (regionType.compareTo(XMLRegionContext.UNDEFINED) == 0 && regionStartOffset >= startOffset && regionStartOffset < startOffset + length) + if (regionType.compareTo(DOMRegionContext.UNDEFINED) == 0 && regionStartOffset >= startOffset && regionStartOffset < startOffset + length) result = result + flatNode.getFullText(region); } diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/FormatProcessorXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/FormatProcessorXML.java index fd1e453206..324bdc3fbe 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/FormatProcessorXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/FormatProcessorXML.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.format; +package org.eclipse.wst.xml.core.internal.provisional.format; import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.sse.core.internal.SSECorePlugin; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/IStructuredFormatPreferencesXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/IStructuredFormatPreferencesXML.java index e5cd452f3e..5af233806d 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/IStructuredFormatPreferencesXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/IStructuredFormatPreferencesXML.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.format; +package org.eclipse.wst.xml.core.internal.provisional.format; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/NodeFormatter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/NodeFormatter.java index 7776865d56..10e4977e15 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/NodeFormatter.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/NodeFormatter.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.format; +package org.eclipse.wst.xml.core.internal.provisional.format; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Preferences; @@ -35,7 +35,7 @@ import org.eclipse.wst.xml.core.internal.document.CDATASectionImpl; import org.eclipse.wst.xml.core.internal.document.CharacterDataImpl; import org.eclipse.wst.xml.core.internal.document.CommentImpl; import org.eclipse.wst.xml.core.internal.parser.regions.TagNameRegion; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Node; public class NodeFormatter implements IStructuredFormatter { @@ -555,7 +555,7 @@ public class NodeFormatter implements IStructuredFormatter { result = parentNode; else { ITextRegion region = parentNode.getLastStructuredDocumentRegion().getFirstRegion(); - if (region.getType() == XMLRegionContext.XML_END_TAG_OPEN) + if (region.getType() == DOMRegionContext.XML_END_TAG_OPEN) result = parentNode; else result = getParentIndentNode(parentNode); @@ -668,7 +668,7 @@ public class NodeFormatter implements IStructuredFormatter { endTagNameRegion = endTagStructuredDocumentRegion.getRegions().get(1); ITextRegionList startTagRegions = startTagStructuredDocumentRegion.getRegions(); - if (startTagNameRegion == endTagNameRegion && startTagNameRegion != null && (startTagRegions.get(0)).getType() != XMLRegionContext.XML_END_TAG_OPEN && (startTagRegions.get(startTagRegions.size() - 1).getType()) != XMLRegionContext.XML_EMPTY_TAG_CLOSE) + if (startTagNameRegion == endTagNameRegion && startTagNameRegion != null && (startTagRegions.get(0)).getType() != DOMRegionContext.XML_END_TAG_OPEN && (startTagRegions.get(startTagRegions.size() - 1).getType()) != DOMRegionContext.XML_EMPTY_TAG_CLOSE) // end tag missing result = true; } diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/StructuredFormatPreferencesXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/StructuredFormatPreferencesXML.java index 77a293a105..084c689208 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/StructuredFormatPreferencesXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/StructuredFormatPreferencesXML.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.format; +package org.eclipse.wst.xml.core.internal.provisional.format; import org.eclipse.wst.sse.core.internal.format.StructuredFormatPreferences; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/TextNodeFormatter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/TextNodeFormatter.java index ac635a959a..288c765f7e 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/format/TextNodeFormatter.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/TextNodeFormatter.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.format; +package org.eclipse.wst.xml.core.internal.provisional.format; import java.util.List; import java.util.Vector; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/parser/XMLRegionContext.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/regions/DOMRegionContext.java index d0b42040e2..e37989419d 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/parser/XMLRegionContext.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/regions/DOMRegionContext.java @@ -10,9 +10,9 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.xml.core.parser; +package org.eclipse.wst.xml.core.internal.regions; -public interface XMLRegionContext { +public interface DOMRegionContext { public static final String BLOCK_TEXT = "BLOCK_TEXT"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/XMLStructuredDocumentRegion.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/XMLStructuredDocumentRegion.java index 77de14a4e7..f6a5e768ce 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/XMLStructuredDocumentRegion.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/XMLStructuredDocumentRegion.java @@ -14,7 +14,7 @@ package org.eclipse.wst.xml.core.internal.text; import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class XMLStructuredDocumentRegion extends BasicStructuredDocumentRegion implements IStructuredDocumentRegion { @@ -28,7 +28,7 @@ public class XMLStructuredDocumentRegion extends BasicStructuredDocumentRegion i // normally, we want the second region as the flatnode type ... since // the // first one is usually just "open tag". - if ((result != XMLRegionContext.XML_PI_OPEN) && (getRegions().size() > 1)) { + if ((result != DOMRegionContext.XML_PI_OPEN) && (getRegions().size() > 1)) { result = getRegions().get(1).getType(); } return result; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/rules/StructuredTextPartitionerForXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/rules/StructuredTextPartitionerForXML.java index e74f4f00de..206f67da72 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/rules/StructuredTextPartitionerForXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/text/rules/StructuredTextPartitionerForXML.java @@ -19,7 +19,7 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.IStructuredTextPartitioner; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.xml.core.internal.parser.regions.BlockTextRegion; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.core.text.IXMLPartitions; public class StructuredTextPartitionerForXML extends StructuredTextPartitioner implements IStructuredTextPartitioner { @@ -43,15 +43,15 @@ public class StructuredTextPartitionerForXML extends StructuredTextPartitioner i */ public String getPartitionType(ITextRegion region, int offset) { String result = null; - if (region.getType() == XMLRegionContext.XML_COMMENT_TEXT) + if (region.getType() == DOMRegionContext.XML_COMMENT_TEXT) result = IXMLPartitions.XML_COMMENT; - else if (region.getType() == XMLRegionContext.XML_CDATA_TEXT) + else if (region.getType() == DOMRegionContext.XML_CDATA_TEXT) result = IXMLPartitions.XML_CDATA; - else if (region.getType() == XMLRegionContext.XML_PI_OPEN) + else if (region.getType() == DOMRegionContext.XML_PI_OPEN) result = IXMLPartitions.XML_PI; - else if (region.getType() == XMLRegionContext.XML_DOCTYPE_DECLARATION) + else if (region.getType() == DOMRegionContext.XML_DOCTYPE_DECLARATION) result = IXMLPartitions.XML_DECLARATION; - else if (region.getType() == XMLRegionContext.XML_DOCTYPE_INTERNAL_SUBSET) + else if (region.getType() == DOMRegionContext.XML_DOCTYPE_INTERNAL_SUBSET) result = IXMLPartitions.DTD_SUBSET; else result = super.getPartitionType(region, offset); @@ -89,7 +89,7 @@ public class StructuredTextPartitionerForXML extends StructuredTextPartitioner i // nsd_TODO: David and I need to discuss, design, and implement this // for all block tags and comments // and make sure is part of "extensible" design of block tags - if (region.getType() == XMLRegionContext.BLOCK_TEXT) { + if (region.getType() == DOMRegionContext.BLOCK_TEXT) { // for code safety, we'll always check instanceof, but I think // always true. if (region instanceof BlockTextRegion) { @@ -108,10 +108,10 @@ public class StructuredTextPartitionerForXML extends StructuredTextPartitioner i // this was moved down to subclass of StructuredTextPartioner // for quick fix to transition problems. Heirarchy needs lots of // cleanup. - if (previousStart != null && previousStart.getType() == XMLRegionContext.XML_TAG_OPEN && next.getType() == XMLRegionContext.XML_END_TAG_OPEN) { + if (previousStart != null && previousStart.getType() == DOMRegionContext.XML_TAG_OPEN && next.getType() == DOMRegionContext.XML_END_TAG_OPEN) { ITextRegion previousName = previousStructuredDocumentRegion.getRegionAtCharacterOffset(previousStructuredDocumentRegion.getEndOffset(previousStart)); ITextRegion nextName = sdRegion.getRegionAtCharacterOffset(sdRegion.getEndOffset(next)); - if (previousName != null && nextName != null && previousName.getType() == XMLRegionContext.XML_TAG_NAME && nextName.getType() == XMLRegionContext.XML_TAG_NAME) { + if (previousName != null && nextName != null && previousName.getType() == DOMRegionContext.XML_TAG_NAME && nextName.getType() == DOMRegionContext.XML_TAG_NAME) { setInternalPartition(offset, 0, getPartitionTypeBetween(previousStructuredDocumentRegion, sdRegion)); partitionFound = true; } diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/util/DebugDocument.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/util/DebugDocument.java deleted file mode 100644 index 785a0051cf..0000000000 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/util/DebugDocument.java +++ /dev/null @@ -1,104 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * Jens Lukowski/Innoopract - initial renaming/restructuring - * - *******************************************************************************/ -package org.eclipse.wst.xml.core.internal.util; - -import java.io.PrintStream; - -import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; -import org.eclipse.wst.xml.core.document.IDOMNode; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - - -public class DebugDocument { - - public static void dump(Document document) { - if (document == null) - return; - System.out.println("Dump of DOM"); //$NON-NLS-1$ - - dump(document, System.out); - - // - System.out.println(); - System.out.println("= = = = = ="); //$NON-NLS-1$ - System.out.println(); - - } - - public static void dump(Document document, PrintStream out) { - Node node = document.getFirstChild(); - while (node != null) { - dump(node, out); - node = node.getNextSibling(); - } - - } - - public static void dump(Node topNode) { - dump(topNode, System.out); - } - - public static void dump(Node topNode, PrintStream out) { - if (topNode == null) - return; - // print out this node - // - printNode(topNode, out); - - // now print out its children - //NodeList nodes = topNode.getChildNodes(); - //int len = nodes.getLength(); - //for (int i = 0; i < len; i++) { - - //Node node = nodes.item(i); - //dump(node, out); - //} - } - - public static void printNode(Node topNode) { - printNode(topNode, System.out); - - } - - public static void printNode(Node topNode, PrintStream out) { - // print out this node - // - IStructuredDocumentRegion firstStructuredDocumentRegion = ((IDOMNode) topNode).getFirstStructuredDocumentRegion(); - IStructuredDocumentRegion lastStructuredDocumentRegion = ((IDOMNode) topNode).getLastStructuredDocumentRegion(); - if ((firstStructuredDocumentRegion == null) || (lastStructuredDocumentRegion == null)) { - // no text to output - } else { - int start = firstStructuredDocumentRegion.getStart(); - int end = lastStructuredDocumentRegion.getEnd(); - - String outString = topNode.toString(); - outString = org.eclipse.wst.sse.core.util.StringUtils.escape(outString); - out.println("[" + start + ", " + end + "]" + outString); //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$ - } - // now do its children - NodeList nodes = topNode.getChildNodes(); - int len = nodes.getLength(); - for (int i = 0; i < len; i++) { - Node childNode = nodes.item(i); - printNode(childNode, out); - } - - } - - public DebugDocument() { - super(); - } - -} diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/StructuredTextViewerConfigurationXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/StructuredTextViewerConfigurationXML.java index 443c3141fc..86afb19da1 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/StructuredTextViewerConfigurationXML.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/StructuredTextViewerConfigurationXML.java @@ -48,7 +48,7 @@ import org.eclipse.wst.sse.ui.taginfo.AnnotationHoverProcessor; import org.eclipse.wst.sse.ui.taginfo.ProblemAnnotationHoverProcessor; import org.eclipse.wst.sse.ui.taginfo.TextHoverManager; import org.eclipse.wst.sse.ui.util.EditorUtility; -import org.eclipse.wst.xml.core.format.FormatProcessorXML; +import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML; import org.eclipse.wst.xml.core.text.IXMLPartitions; import org.eclipse.wst.xml.ui.contentassist.NoRegionContentAssistProcessor; diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AbstractContentAssistProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AbstractContentAssistProcessor.java index 8392597bb1..e03c753687 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AbstractContentAssistProcessor.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AbstractContentAssistProcessor.java @@ -60,7 +60,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryActio import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper; import org.eclipse.wst.xml.core.internal.document.AttrImpl; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.internal.Logger; import org.eclipse.wst.xml.ui.internal.editor.CMImageUtil; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; @@ -222,7 +222,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr ITextRegion nameRegion = null; while (i >= 0) { nameRegion = openRegions.get(i--); - if (nameRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) + if (nameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) break; } @@ -416,7 +416,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr if (image == null) { image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC); } - if (contentAssistRequest.getRegion().getType() == XMLRegionContext.XML_TAG_NAME) { + if (contentAssistRequest.getRegion().getType() == DOMRegionContext.XML_TAG_NAME) { proposal = new CustomCompletionProposal(proposedText, contentAssistRequest.getStartOffset(), contentAssistRequest.getRegion().getTextLength(), proposedText.length(), image, proposedText, null, proposedInfo, XMLRelevanceConstants.R_END_TAG_NAME); } else { @@ -472,7 +472,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr // skip backward to "<", "</", or the (unclosed) start tag, null // if not found String type = ""; //$NON-NLS-1$ - while (xmlEndTagOpen != null && (type = xmlEndTagOpen.getType()) != XMLRegionContext.XML_END_TAG_OPEN && type != XMLRegionContext.XML_TAG_CLOSE && !needsEndTag(xmlEndTagOpen) && type != XMLRegionContext.XML_TAG_OPEN) { + while (xmlEndTagOpen != null && (type = xmlEndTagOpen.getType()) != DOMRegionContext.XML_END_TAG_OPEN && type != DOMRegionContext.XML_TAG_CLOSE && !needsEndTag(xmlEndTagOpen) && type != DOMRegionContext.XML_TAG_OPEN) { xmlEndTagOpen = xmlEndTagOpen.getPrevious(); } @@ -500,7 +500,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr addProposal = true; } } - else if (type == XMLRegionContext.XML_END_TAG_OPEN) { + else if (type == DOMRegionContext.XML_END_TAG_OPEN) { // this is the case for: <tag> </ | // possibly <tag> </ |<anotherTag> // should only be replacing white space... @@ -511,7 +511,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr displayString = SSEUIPlugin.getResourceString("%15concat", (new Object[]{node.getNodeName()})); //$NON-NLS-1$ addProposal = true; } - else if (type == XMLRegionContext.XML_TAG_OPEN) { + else if (type == DOMRegionContext.XML_TAG_OPEN) { // this is the case for: <tag> < | replaceText = "/" + node.getNodeName() + ">"; //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$ cursorOffset = replaceText.length(); @@ -1121,19 +1121,19 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr // Handle the most common and best supported cases if (xmlnode.getNodeType() == Node.ELEMENT_NODE || xmlnode.getNodeType() == Node.DOCUMENT_NODE) { - if (regionType == XMLRegionContext.XML_TAG_OPEN) { + if (regionType == DOMRegionContext.XML_TAG_OPEN) { contentAssistRequest = computeTagOpenProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); } - else if (regionType == XMLRegionContext.XML_TAG_NAME) { + else if (regionType == DOMRegionContext.XML_TAG_NAME) { contentAssistRequest = computeTagNameProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { contentAssistRequest = computeAttributeProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { contentAssistRequest = computeEqualsProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE && documentPosition == sdRegion.getTextEndOffset() && (sdRegion.getText(completionRegion).endsWith("\"") || sdRegion.getText(completionRegion).endsWith("\'"))) //$NON-NLS-1$ //$NON-NLS-2$ + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && documentPosition == sdRegion.getTextEndOffset() && (sdRegion.getText(completionRegion).endsWith("\"") || sdRegion.getText(completionRegion).endsWith("\'"))) //$NON-NLS-1$ //$NON-NLS-2$ { // this is for when the cursor is at the end of the closing // quote for an attribute.. @@ -1141,23 +1141,23 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr contentAssistRequest = newContentAssistRequest(actualNode, actualNode, sdRegion, completionRegion, documentPosition, 0, matchString); addTagCloseProposals(contentAssistRequest); } - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { contentAssistRequest = computeAttributeValueProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); } - else if ((regionType == XMLRegionContext.XML_TAG_CLOSE) || (regionType == XMLRegionContext.XML_EMPTY_TAG_CLOSE) || (regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_CLOSE))) { + else if ((regionType == DOMRegionContext.XML_TAG_CLOSE) || (regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE) || (regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_CLOSE))) { contentAssistRequest = computeTagCloseProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); } - else if (regionType == XMLRegionContext.XML_END_TAG_OPEN) { + else if (regionType == DOMRegionContext.XML_END_TAG_OPEN) { contentAssistRequest = computeEndTagOpenProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); } - else if (regionType == XMLRegionContext.XML_CONTENT || regionType == XMLRegionContext.XML_CHAR_REFERENCE || regionType == XMLRegionContext.XML_ENTITY_REFERENCE || regionType == XMLRegionContext.XML_PE_REFERENCE) { + else if (regionType == DOMRegionContext.XML_CONTENT || regionType == DOMRegionContext.XML_CHAR_REFERENCE || regionType == DOMRegionContext.XML_ENTITY_REFERENCE || regionType == DOMRegionContext.XML_PE_REFERENCE) { contentAssistRequest = computeContentProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode); } // These ITextRegion types begin DOM Elements as well and although // internally harder to assist, // text insertions directly before them can be made - else if (documentPosition == sdRegion.getStartOffset(completionRegion) && (regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_COMMENT_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DECLARATION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_EXPRESSION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_SCRIPTLET_OPEN) || regionType == XMLRegionContext.XML_DECLARATION_OPEN || regionType == XMLRegionContext.XML_PI_OPEN || regionType == XMLRegionContext.XML_COMMENT_OPEN || regionType == XMLRegionContext.XML_CDATA_OPEN)) { + else if (documentPosition == sdRegion.getStartOffset(completionRegion) && (regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_COMMENT_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DECLARATION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_EXPRESSION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_SCRIPTLET_OPEN) || regionType == DOMRegionContext.XML_DECLARATION_OPEN || regionType == DOMRegionContext.XML_PI_OPEN || regionType == DOMRegionContext.XML_COMMENT_OPEN || regionType == DOMRegionContext.XML_CDATA_OPEN)) { contentAssistRequest = newContentAssistRequest(treeNode, xmlnode.getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString); addTagInsertionProposals(contentAssistRequest, getElementPositionForModelQuery(treeNode)); addStartDocumentProposals(contentAssistRequest); @@ -1170,7 +1170,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr if (documentPosition >= sdRegion.getTextEndOffset(completionRegion)) addTagInsertionProposals(contentAssistRequest, getElementPositionForModelQuery(treeNode) + 1); } - else if (documentPosition == sdRegion.getStartOffset(completionRegion) && (regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_COMMENT_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DECLARATION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_EXPRESSION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_SCRIPTLET_OPEN) || regionType == XMLRegionContext.XML_DECLARATION_OPEN || regionType == XMLRegionContext.XML_PI_OPEN || regionType == XMLRegionContext.XML_COMMENT_OPEN || regionType == XMLRegionContext.XML_CDATA_OPEN)) { + else if (documentPosition == sdRegion.getStartOffset(completionRegion) && (regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_COMMENT_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DECLARATION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_EXPRESSION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_SCRIPTLET_OPEN) || regionType == DOMRegionContext.XML_DECLARATION_OPEN || regionType == DOMRegionContext.XML_PI_OPEN || regionType == DOMRegionContext.XML_COMMENT_OPEN || regionType == DOMRegionContext.XML_CDATA_OPEN)) { contentAssistRequest = newContentAssistRequest(treeNode, xmlnode.getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString); addTagInsertionProposals(contentAssistRequest, getElementPositionForModelQuery(treeNode)); addStartDocumentProposals(contentAssistRequest); @@ -1298,7 +1298,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr IStructuredDocumentRegion sdRegionAtCompletionOffset = node.getStructuredDocument().getRegionAtCharacterOffset(completionRegionStart + completionRegionLength); ITextRegion regionAtEndOfCompletion = sdRegionAtCompletionOffset.getRegionAtCharacterOffset(completionRegionStart + completionRegionLength); - if (documentPosition != completionRegionStart && regionAtEndOfCompletion != null && regionAtEndOfCompletion.getType() == XMLRegionContext.XML_TAG_NAME) { + if (documentPosition != completionRegionStart && regionAtEndOfCompletion != null && regionAtEndOfCompletion.getType() == DOMRegionContext.XML_TAG_NAME) { ITextRegion nameRegion = regionAtEndOfCompletion; contentAssistRequest = newContentAssistRequest(nodeAtOffset, nodeAtOffset.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(nameRegion), nameRegion.getTextLength(), matchString); } @@ -1331,7 +1331,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr // only handle XML content for now Vector proposals = new Vector(); // ICompletionProposals IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition); - if (completionRegion != null && completionRegion.getType() == XMLRegionContext.XML_CONTENT) { + if (completionRegion != null && completionRegion.getType() == DOMRegionContext.XML_CONTENT) { int nodeOffset = documentPosition - sdRegion.getStartOffset(completionRegion); String regionText = sdRegion.getFullText(completionRegion); @@ -1386,7 +1386,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr ContentAssistRequest contentAssistRequest = null; IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition); ITextRegion valueRegion = node.getStartStructuredDocumentRegion().getRegionAtCharacterOffset(sdRegion.getStartOffset(completionRegion) + completionRegion.getLength()); - if (valueRegion != null && valueRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE && sdRegion.getStartOffset(valueRegion) <= documentPosition) { + if (valueRegion != null && valueRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && sdRegion.getStartOffset(valueRegion) <= documentPosition) { // replace the adjacent attribute value contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, sdRegion, valueRegion, sdRegion.getStartOffset(valueRegion), valueRegion.getTextLength(), matchString); } @@ -1455,7 +1455,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr if (documentPosition > sdRegion.getStartOffset(completionRegion) + completionRegion.getLength()) { // it's attributes contentAssistRequest = newContentAssistRequest(actualNode, actualNode, sdRegion, completionRegion, documentPosition - matchString.length(), matchString.length(), matchString); - if (node.getStructuredDocument().getRegionAtCharacterOffset(sdRegion.getStartOffset(completionRegion) - 1).getRegionAtCharacterOffset(sdRegion.getStartOffset(completionRegion) - 1).getType() == XMLRegionContext.XML_TAG_OPEN) + if (node.getStructuredDocument().getRegionAtCharacterOffset(sdRegion.getStartOffset(completionRegion) - 1).getRegionAtCharacterOffset(sdRegion.getStartOffset(completionRegion) - 1).getType() == DOMRegionContext.XML_TAG_OPEN) addAttributeNameProposals(contentAssistRequest); addTagCloseProposals(contentAssistRequest); } @@ -1487,7 +1487,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr addTagCloseProposals(contentAssistRequest); } else { - if (sdRegion.getRegions().get(0).getType() != XMLRegionContext.XML_END_TAG_OPEN) { + if (sdRegion.getRegions().get(0).getType() != DOMRegionContext.XML_END_TAG_OPEN) { contentAssistRequest = newContentAssistRequest(node, node.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(completionRegion), completionRegion.getTextLength(), matchString); addTagNameProposals(contentAssistRequest, getElementPositionForModelQuery(nodeAtOffset)); } @@ -1730,7 +1730,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr } // valid WHITE_SPACE region handler (#179924) - if (region != null && region.getType() == XMLRegionContext.WHITE_SPACE) { + if (region != null && region.getType() == DOMRegionContext.WHITE_SPACE) { ITextRegion previousRegion = sdRegion.getRegionAtCharacterOffset(sdRegion.getStartOffset(region) - 1); if (previousRegion != null) region = previousRegion; @@ -1792,7 +1792,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr // IStructuredDocumentRegion if the current // IStructuredDocumentRegion isn't plain content or if it's // preceded by an orphan '<' - if ((offset == flatNode.getStartOffset()) && (flatNode.getPrevious() != null) && (flatNode.getRegionAtCharacterOffset(documentPosition) != null && flatNode.getRegionAtCharacterOffset(documentPosition).getType() != XMLRegionContext.XML_CONTENT || flatNode.getPrevious().getLastRegion().getType() == XMLRegionContext.XML_TAG_OPEN || flatNode.getPrevious().getLastRegion().getType() == XMLRegionContext.XML_END_TAG_OPEN)) { + if ((offset == flatNode.getStartOffset()) && (flatNode.getPrevious() != null) && (flatNode.getRegionAtCharacterOffset(documentPosition) != null && flatNode.getRegionAtCharacterOffset(documentPosition).getType() != DOMRegionContext.XML_CONTENT || flatNode.getPrevious().getLastRegion().getType() == DOMRegionContext.XML_TAG_OPEN || flatNode.getPrevious().getLastRegion().getType() == DOMRegionContext.XML_END_TAG_OPEN)) { // Is the region also the start of the node? If so, the // previous IStructuredDocumentRegion is // where to look for a useful region. @@ -1910,10 +1910,10 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr return ""; //$NON-NLS-1$ String matchString = null; String regionType = aRegion.getType(); - if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS || regionType == XMLRegionContext.XML_TAG_OPEN || (offset > parent.getStartOffset(aRegion) + aRegion.getTextLength())) { + if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS || regionType == DOMRegionContext.XML_TAG_OPEN || (offset > parent.getStartOffset(aRegion) + aRegion.getTextLength())) { matchString = ""; //$NON-NLS-1$ } - else if (regionType == XMLRegionContext.XML_CONTENT) { + else if (regionType == DOMRegionContext.XML_CONTENT) { matchString = ""; //$NON-NLS-1$ } else { @@ -2021,7 +2021,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr String name = ""; //$NON-NLS-1$ for (int i = 0; i < regions.size(); i++) { region = regions.get(i); - if (region.getType() == XMLRegionContext.XML_TAG_NAME) { + if (region.getType() == DOMRegionContext.XML_TAG_NAME) { name = sdRegion.getText(region); break; } @@ -2067,7 +2067,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr protected boolean isCloseRegion(ITextRegion region) { String type = region.getType(); - return ((type == XMLRegionContext.XML_PI_CLOSE) || (type == XMLRegionContext.XML_TAG_CLOSE) || (type == XMLRegionContext.XML_EMPTY_TAG_CLOSE) || (type == XMLRegionContext.XML_CDATA_CLOSE) || (type == XMLRegionContext.XML_COMMENT_CLOSE) || (type == XMLRegionContext.XML_ATTLIST_DECL_CLOSE) || (type == XMLRegionContext.XML_ELEMENT_DECL_CLOSE) || (type == XMLRegionContext.XML_DOCTYPE_DECLARATION_CLOSE) || (type == DOMJSPRegionContextsPrivateCopy.JSP_CLOSE) || (type == DOMJSPRegionContextsPrivateCopy.JSP_COMMENT_CLOSE) || (type.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_CLOSE)) || (type == XMLRegionContext.XML_DECLARATION_CLOSE)); + return ((type == DOMRegionContext.XML_PI_CLOSE) || (type == DOMRegionContext.XML_TAG_CLOSE) || (type == DOMRegionContext.XML_EMPTY_TAG_CLOSE) || (type == DOMRegionContext.XML_CDATA_CLOSE) || (type == DOMRegionContext.XML_COMMENT_CLOSE) || (type == DOMRegionContext.XML_ATTLIST_DECL_CLOSE) || (type == DOMRegionContext.XML_ELEMENT_DECL_CLOSE) || (type == DOMRegionContext.XML_DOCTYPE_DECLARATION_CLOSE) || (type == DOMJSPRegionContextsPrivateCopy.JSP_CLOSE) || (type == DOMJSPRegionContextsPrivateCopy.JSP_COMMENT_CLOSE) || (type.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_CLOSE)) || (type == DOMRegionContext.XML_DECLARATION_CLOSE)); } /* @@ -2137,7 +2137,7 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr protected boolean isNameRegion(ITextRegion region) { String type = region.getType(); - return ((type == XMLRegionContext.XML_TAG_NAME) || (type == DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_NAME) || (type == XMLRegionContext.XML_ELEMENT_DECL_NAME) || (type == XMLRegionContext.XML_DOCTYPE_NAME) || (type == XMLRegionContext.XML_ATTLIST_DECL_NAME) || (type == DOMJSPRegionContextsPrivateCopy.JSP_ROOT_TAG_NAME) || type.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_NAME)); + return ((type == DOMRegionContext.XML_TAG_NAME) || (type == DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_NAME) || (type == DOMRegionContext.XML_ELEMENT_DECL_NAME) || (type == DOMRegionContext.XML_DOCTYPE_NAME) || (type == DOMRegionContext.XML_ATTLIST_DECL_NAME) || (type == DOMJSPRegionContextsPrivateCopy.JSP_ROOT_TAG_NAME) || type.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_NAME)); } protected boolean isQuote(String string) { @@ -2150,14 +2150,14 @@ abstract public class AbstractContentAssistProcessor implements IContentAssistPr private boolean isSelfClosed(IStructuredDocumentRegion startTag) { ITextRegionList regions = startTag.getRegions(); - return regions.get(regions.size() - 1).getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE; + return regions.get(regions.size() - 1).getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE; } private boolean isStartTag(IStructuredDocumentRegion sdRegion) { boolean result = false; if (sdRegion.getRegions().size() > 0) { ITextRegion r = sdRegion.getRegions().get(0); - result = r.getType() == XMLRegionContext.XML_TAG_OPEN && sdRegion.isEnded(); + result = r.getType() == DOMRegionContext.XML_TAG_OPEN && sdRegion.isEnded(); } return result; } diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AttributeContextInformationPresenter.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AttributeContextInformationPresenter.java index a4762550d4..16e4f40ec4 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AttributeContextInformationPresenter.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AttributeContextInformationPresenter.java @@ -27,7 +27,7 @@ import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.core.text.ITextRegionList; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; /** @@ -91,7 +91,7 @@ public class AttributeContextInformationPresenter implements IContextInformation StyleRange[] sorted = new StyleRange[fInfo.getInformationDisplayString().length()]; for (int i = 0; i < regions.size(); i++) { r = regions.get(i); - if (r.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { attrName = sdRegion.getText(r); temp = map.get(attrName); if (temp != null) { diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AttributeContextInformationProvider.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AttributeContextInformationProvider.java index d1542e9a0f..ae09a649d4 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AttributeContextInformationProvider.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/AttributeContextInformationProvider.java @@ -32,7 +32,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -203,6 +203,6 @@ class AttributeContextInformationProvider { */ private boolean isEndTag(IStructuredDocumentRegion sdRegion) { ITextRegionList regions = sdRegion.getRegions(); - return regions.get(0).getType() == XMLRegionContext.XML_END_TAG_OPEN; + return regions.get(0).getType() == DOMRegionContext.XML_END_TAG_OPEN; } } diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/NoRegionContentAssistProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/NoRegionContentAssistProcessor.java index cbaf2c9669..f3fb8c999d 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/NoRegionContentAssistProcessor.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/NoRegionContentAssistProcessor.java @@ -31,7 +31,7 @@ import org.eclipse.wst.sse.ui.internal.IReleasable; import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.eclipse.wst.sse.ui.internal.contentassist.IResourceDependentProcessor; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.core.text.IXMLPartitions; @@ -168,7 +168,7 @@ public class NoRegionContentAssistProcessor implements IContentAssistProcessor, String currentRegionType = sdRegion.getType(); //System.out.println("current region type is >> " + // currentRegionType); - if (currentRegionType == XMLRegionContext.UNDEFINED) { + if (currentRegionType == DOMRegionContext.UNDEFINED) { IStructuredDocumentRegion sdPrev = sdRegion.getPrevious(); if (sdPrev != null) { String prevRegionType = sdPrev.getType(); diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/XMLContentAssistUtilities.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/XMLContentAssistUtilities.java index 26ef4f122e..cbaf959914 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/XMLContentAssistUtilities.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/contentassist/XMLContentAssistUtilities.java @@ -27,7 +27,7 @@ import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -390,7 +390,7 @@ public class XMLContentAssistUtilities extends ContentAssistUtils { public static boolean isJSPCloseDelimiter(String type) { if (type == null) return false; - return (type.equals(DOMJSPRegionContextsPrivateCopy.JSP_CLOSE) || type.equals(XMLRegionContext.XML_TAG_CLOSE)); + return (type.equals(DOMJSPRegionContextsPrivateCopy.JSP_CLOSE) || type.equals(DOMRegionContext.XML_TAG_CLOSE)); } /** @@ -458,7 +458,7 @@ public class XMLContentAssistUtilities extends ContentAssistUtils { String regionText = ""; //$NON-NLS-1$ for (int i = 0; i < regions.length; i++) { temp = (ITextRegion) regions[i]; - if (temp.getType() == XMLRegionContext.XML_TAG_NAME) { + if (temp.getType() == DOMRegionContext.XML_TAG_NAME) { regionText = fn.getText(temp); if (regionText.equalsIgnoreCase("jsp:scriptlet") || regionText.equalsIgnoreCase("jsp:expression") || regionText.equalsIgnoreCase("jsp:declaration")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ isDelimiter = true; diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/doubleclick/XMLDoubleClickStrategy.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/doubleclick/XMLDoubleClickStrategy.java index 66432a3fb6..2bbac05afd 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/doubleclick/XMLDoubleClickStrategy.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/doubleclick/XMLDoubleClickStrategy.java @@ -20,7 +20,7 @@ import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Node; @@ -124,7 +124,7 @@ public class XMLDoubleClickStrategy extends DefaultTextDoubleClickStrategy { int nextRegionOffset = fStructuredDocumentRegion.getEndOffset(fTextRegion); ITextRegion nextRegion = fStructuredDocumentRegion.getRegionAtCharacterOffset(nextRegionOffset); - if ((prevRegion != null) && (prevRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) && (nextRegion != null) && (nextRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { + if ((prevRegion != null) && (prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) && (nextRegion != null) && (nextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(prevRegion), nextRegion.getTextEnd() - prevRegion.getStart()); } } @@ -136,7 +136,7 @@ public class XMLDoubleClickStrategy extends DefaultTextDoubleClickStrategy { if (nextRegion != null) { nextRegionOffset = fStructuredDocumentRegion.getEndOffset(nextRegion); nextRegion = fStructuredDocumentRegion.getRegionAtCharacterOffset(nextRegionOffset); - if ((nextRegion != null) && (nextRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { + if ((nextRegion != null) && (nextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(fTextRegion), nextRegion.getTextEnd() - fTextRegion.getStart()); } else { // attribute has no value @@ -183,23 +183,23 @@ public class XMLDoubleClickStrategy extends DefaultTextDoubleClickStrategy { if (prevRegion != null) { prevRegionOffset = fStructuredDocumentRegion.getStartOffset(prevRegion) - 1; prevRegion = fStructuredDocumentRegion.getRegionAtCharacterOffset(prevRegionOffset); - if ((prevRegion != null) && (prevRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME)) { + if ((prevRegion != null) && (prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)) { fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(prevRegion), fTextRegion.getTextEnd() - prevRegion.getStart()); } } } protected void processElementDoubleClicked() { - if (fTextRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) + if (fTextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) processElementAttrValueDoubleClicked(); // special handling for // XML_TAG_ATTRIBUTE_VALUE else { if (fDoubleClickCount == 1) { fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart() + fTextRegion.getStart(), fTextRegion.getTextLength()); } else if (fDoubleClickCount == 2) { - if (fTextRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) + if (fTextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) processElementAttrNameDoubleClicked2Times(); - else if (fTextRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) + else if (fTextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) processElementAttrEqualsDoubleClicked2Times(); else { fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart(), fStructuredDocumentRegion.getLength()); @@ -222,7 +222,7 @@ public class XMLDoubleClickStrategy extends DefaultTextDoubleClickStrategy { // selection fDoubleClickCount++; } else if (fDoubleClickCount == 2) { - if (fTextRegion.getType() == XMLRegionContext.UNDEFINED) { + if (fTextRegion.getType() == DOMRegionContext.UNDEFINED) { fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart(), fStructuredDocumentRegion.getLength()); fDoubleClickCount = 0; } else { diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/XMLNodeActionManager.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/XMLNodeActionManager.java index dea8ad1151..9626c19b57 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/XMLNodeActionManager.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/XMLNodeActionManager.java @@ -15,9 +15,9 @@ package org.eclipse.wst.xml.ui.internal.contentoutline; import org.eclipse.jface.viewers.Viewer; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; -import org.eclipse.wst.xml.core.format.FormatProcessorXML; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; +import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.eclipse.wst.xml.ui.actions.AbstractNodeActionManager; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/InsertRequiredAttrsQuickAssistProposal.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/InsertRequiredAttrsQuickAssistProposal.java index bc41306854..f8e3560930 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/InsertRequiredAttrsQuickAssistProposal.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/InsertRequiredAttrsQuickAssistProposal.java @@ -32,7 +32,7 @@ import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.eclipse.wst.xml.core.document.IDOMNode; import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.internal.XMLUIPlugin; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages; @@ -66,10 +66,10 @@ public class InsertRequiredAttrsQuickAssistProposal implements ICompletionPropos IStructuredDocumentRegion startStructuredDocumentRegion = node.getStartStructuredDocumentRegion(); int index = startStructuredDocumentRegion.getEndOffset(); ITextRegion lastRegion = startStructuredDocumentRegion.getLastRegion(); - if (lastRegion.getType() == XMLRegionContext.XML_TAG_CLOSE) { + if (lastRegion.getType() == DOMRegionContext.XML_TAG_CLOSE) { index--; lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1); - } else if (lastRegion.getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE) { + } else if (lastRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) { index = index - 2; lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1); } diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/QuickAssistProcessorXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/QuickAssistProcessorXML.java index 4742a2a5e7..e93c2e7fd3 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/QuickAssistProcessorXML.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/QuickAssistProcessorXML.java @@ -29,7 +29,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -106,7 +106,7 @@ public class QuickAssistProcessorXML implements IQuickAssistProcessor { regionTextEndOffset = endStructuredDocumentRegion.getTextEndOffset(region); } - if (region != null && (region.getType() == XMLRegionContext.XML_TAG_NAME || region.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) && offset <= regionTextEndOffset) + if (region != null && (region.getType() == DOMRegionContext.XML_TAG_NAME || region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) && offset <= regionTextEndOffset) proposals.add(new RenameInFileQuickAssistProposal()); } diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/RenameInFileQuickAssistProposal.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/RenameInFileQuickAssistProposal.java index e3182e5214..01d09ca2a6 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/RenameInFileQuickAssistProposal.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/RenameInFileQuickAssistProposal.java @@ -33,7 +33,7 @@ import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.internal.XMLUIPlugin; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages; @@ -66,7 +66,7 @@ public class RenameInFileQuickAssistProposal implements ICompletionProposal, ICo if (region != null) { group.addPosition(new LinkedPosition(document, startStructuredDocumentRegion.getStartOffset() + region.getStart(), region.getTextLength(), 0)); - if (region.getType() == XMLRegionContext.XML_TAG_NAME && node.getEndStructuredDocumentRegion() != null) { + if (region.getType() == DOMRegionContext.XML_TAG_NAME && node.getEndStructuredDocumentRegion() != null) { region = node.getEndStructuredDocumentRegion().getRegions().get(1); if (region != null) group.addPosition(new LinkedPosition(document, node.getEndStructuredDocumentRegion().getStartOffset() + region.getStart(), region.getTextLength(), 1)); @@ -75,7 +75,7 @@ public class RenameInFileQuickAssistProposal implements ICompletionProposal, ICo IStructuredDocumentRegion endStructuredDocumentRegion = node.getEndStructuredDocumentRegion(); region = (endStructuredDocumentRegion == null) ? null : endStructuredDocumentRegion.getRegionAtCharacterOffset(offset); if (region != null) { - if (region.getType() == XMLRegionContext.XML_TAG_NAME && node.getStartStructuredDocumentRegion() != null) { + if (region.getType() == DOMRegionContext.XML_TAG_NAME && node.getStartStructuredDocumentRegion() != null) { ITextRegion startTagNameRegion = node.getStartStructuredDocumentRegion().getRegions().get(1); if (region != null) { group.addPosition(new LinkedPosition(document, node.getStartStructuredDocumentRegion().getStartOffset() + startTagNameRegion.getStart(), startTagNameRegion.getTextLength(), 0)); diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/SurroundWithNewElementQuickAssistProposal.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/SurroundWithNewElementQuickAssistProposal.java index 7d8b4f804e..5384479548 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/SurroundWithNewElementQuickAssistProposal.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/SurroundWithNewElementQuickAssistProposal.java @@ -23,7 +23,7 @@ import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.format.FormatProcessorXML; +import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.eclipse.wst.xml.ui.internal.XMLUIPlugin; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages; diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/search/XMLFindOccurrencesAction.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/search/XMLFindOccurrencesAction.java index 04a7428fd6..fefe761e78 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/search/XMLFindOccurrencesAction.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/search/XMLFindOccurrencesAction.java @@ -16,7 +16,7 @@ import java.util.ResourceBundle; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.wst.sse.ui.internal.search.BasicFindOccurrencesAction; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.core.text.IXMLPartitions; @@ -45,7 +45,7 @@ public class XMLFindOccurrencesAction extends BasicFindOccurrencesAction { public String[] getRegionTypes() { - return new String[]{XMLRegionContext.XML_TAG_NAME, XMLRegionContext.XML_TAG_ATTRIBUTE_NAME, XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE}; + return new String[]{DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE}; } } diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/preferences/XMLColorPage.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/preferences/XMLColorPage.java index 204137f01f..932e5f02c3 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/preferences/XMLColorPage.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/preferences/XMLColorPage.java @@ -30,7 +30,7 @@ import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.Overla import org.eclipse.wst.sse.ui.preferences.ui.AbstractColorPage; import org.eclipse.wst.sse.ui.preferences.ui.StyledTextColorPicker; import org.eclipse.wst.xml.core.contenttype.ContentTypeIdForXML; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.internal.XMLUIPlugin; import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds; import org.eclipse.wst.xml.ui.style.IStyleConstantsXML; @@ -74,24 +74,24 @@ public class XMLColorPage extends AbstractColorPage { protected void initCommonContextStyleMap(Dictionary contextStyleMap) { - contextStyleMap.put(XMLRegionContext.XML_COMMENT_OPEN, IStyleConstantsXML.COMMENT_BORDER); - contextStyleMap.put(XMLRegionContext.XML_COMMENT_TEXT, IStyleConstantsXML.COMMENT_TEXT); - contextStyleMap.put(XMLRegionContext.XML_COMMENT_CLOSE, IStyleConstantsXML.COMMENT_BORDER); + contextStyleMap.put(DOMRegionContext.XML_COMMENT_OPEN, IStyleConstantsXML.COMMENT_BORDER); + contextStyleMap.put(DOMRegionContext.XML_COMMENT_TEXT, IStyleConstantsXML.COMMENT_TEXT); + contextStyleMap.put(DOMRegionContext.XML_COMMENT_CLOSE, IStyleConstantsXML.COMMENT_BORDER); - contextStyleMap.put(XMLRegionContext.XML_TAG_OPEN, IStyleConstantsXML.TAG_BORDER); - contextStyleMap.put(XMLRegionContext.XML_END_TAG_OPEN, IStyleConstantsXML.TAG_BORDER); - contextStyleMap.put(XMLRegionContext.XML_TAG_NAME, IStyleConstantsXML.TAG_NAME); - contextStyleMap.put(XMLRegionContext.XML_TAG_ATTRIBUTE_NAME, IStyleConstantsXML.TAG_ATTRIBUTE_NAME); - contextStyleMap.put(XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE, IStyleConstantsXML.TAG_ATTRIBUTE_VALUE); - contextStyleMap.put(XMLRegionContext.XML_TAG_CLOSE, IStyleConstantsXML.TAG_BORDER); - contextStyleMap.put(XMLRegionContext.XML_EMPTY_TAG_CLOSE, IStyleConstantsXML.TAG_BORDER); + contextStyleMap.put(DOMRegionContext.XML_TAG_OPEN, IStyleConstantsXML.TAG_BORDER); + contextStyleMap.put(DOMRegionContext.XML_END_TAG_OPEN, IStyleConstantsXML.TAG_BORDER); + contextStyleMap.put(DOMRegionContext.XML_TAG_NAME, IStyleConstantsXML.TAG_NAME); + contextStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, IStyleConstantsXML.TAG_ATTRIBUTE_NAME); + contextStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, IStyleConstantsXML.TAG_ATTRIBUTE_VALUE); + contextStyleMap.put(DOMRegionContext.XML_TAG_CLOSE, IStyleConstantsXML.TAG_BORDER); + contextStyleMap.put(DOMRegionContext.XML_EMPTY_TAG_CLOSE, IStyleConstantsXML.TAG_BORDER); - contextStyleMap.put(XMLRegionContext.XML_DECLARATION_OPEN, IStyleConstantsXML.DECL_BORDER); - contextStyleMap.put(XMLRegionContext.XML_DECLARATION_CLOSE, IStyleConstantsXML.DECL_BORDER); - contextStyleMap.put(XMLRegionContext.XML_ELEMENT_DECLARATION, IStyleConstantsXML.DECL_BORDER); - contextStyleMap.put(XMLRegionContext.XML_ELEMENT_DECL_CLOSE, IStyleConstantsXML.DECL_BORDER); + contextStyleMap.put(DOMRegionContext.XML_DECLARATION_OPEN, IStyleConstantsXML.DECL_BORDER); + contextStyleMap.put(DOMRegionContext.XML_DECLARATION_CLOSE, IStyleConstantsXML.DECL_BORDER); + contextStyleMap.put(DOMRegionContext.XML_ELEMENT_DECLARATION, IStyleConstantsXML.DECL_BORDER); + contextStyleMap.put(DOMRegionContext.XML_ELEMENT_DECL_CLOSE, IStyleConstantsXML.DECL_BORDER); - contextStyleMap.put(XMLRegionContext.XML_CONTENT, IStyleConstantsXML.XML_CONTENT); + contextStyleMap.put(DOMRegionContext.XML_CONTENT, IStyleConstantsXML.XML_CONTENT); } protected void initCommonDescriptions(Dictionary descriptions) { @@ -128,13 +128,13 @@ public class XMLColorPage extends AbstractColorPage { initCommonContextStyleMap(contextStyleMap); initDocTypeContextStyleMap(contextStyleMap); - contextStyleMap.put(XMLRegionContext.XML_CDATA_OPEN, IStyleConstantsXML.CDATA_BORDER); - contextStyleMap.put(XMLRegionContext.XML_CDATA_TEXT, IStyleConstantsXML.CDATA_TEXT); - contextStyleMap.put(XMLRegionContext.XML_CDATA_CLOSE, IStyleConstantsXML.CDATA_BORDER); + contextStyleMap.put(DOMRegionContext.XML_CDATA_OPEN, IStyleConstantsXML.CDATA_BORDER); + contextStyleMap.put(DOMRegionContext.XML_CDATA_TEXT, IStyleConstantsXML.CDATA_TEXT); + contextStyleMap.put(DOMRegionContext.XML_CDATA_CLOSE, IStyleConstantsXML.CDATA_BORDER); - contextStyleMap.put(XMLRegionContext.XML_PI_OPEN, IStyleConstantsXML.PI_BORDER); - contextStyleMap.put(XMLRegionContext.XML_PI_CONTENT, IStyleConstantsXML.PI_CONTENT); - contextStyleMap.put(XMLRegionContext.XML_PI_CLOSE, IStyleConstantsXML.PI_BORDER); + contextStyleMap.put(DOMRegionContext.XML_PI_OPEN, IStyleConstantsXML.PI_BORDER); + contextStyleMap.put(DOMRegionContext.XML_PI_CONTENT, IStyleConstantsXML.PI_CONTENT); + contextStyleMap.put(DOMRegionContext.XML_PI_CLOSE, IStyleConstantsXML.PI_BORDER); } @@ -150,15 +150,15 @@ public class XMLColorPage extends AbstractColorPage { protected void initDocTypeContextStyleMap(Dictionary contextStyleMap) { - contextStyleMap.put(XMLRegionContext.XML_ELEMENT_DECL_NAME, IStyleConstantsXML.DOCTYPE_NAME); - contextStyleMap.put(XMLRegionContext.XML_DOCTYPE_DECLARATION, IStyleConstantsXML.TAG_NAME); - contextStyleMap.put(XMLRegionContext.XML_DOCTYPE_DECLARATION_CLOSE, IStyleConstantsXML.DECL_BORDER); + contextStyleMap.put(DOMRegionContext.XML_ELEMENT_DECL_NAME, IStyleConstantsXML.DOCTYPE_NAME); + contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_DECLARATION, IStyleConstantsXML.TAG_NAME); + contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_DECLARATION_CLOSE, IStyleConstantsXML.DECL_BORDER); - contextStyleMap.put(XMLRegionContext.XML_DOCTYPE_NAME, IStyleConstantsXML.DOCTYPE_NAME); - contextStyleMap.put(XMLRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBLIC, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID); - contextStyleMap.put(XMLRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF); - contextStyleMap.put(XMLRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSTEM, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID); - contextStyleMap.put(XMLRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF); + contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_NAME, IStyleConstantsXML.DOCTYPE_NAME); + contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBLIC, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID); + contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF); + contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSTEM, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID); + contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF); } protected void initDocTypeDescriptions(Dictionary descriptions) { diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/reconcile/ReconcileStepForMarkup.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/reconcile/ReconcileStepForMarkup.java index 9a0fed0752..18c29b8acb 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/reconcile/ReconcileStepForMarkup.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/reconcile/ReconcileStepForMarkup.java @@ -31,7 +31,7 @@ import org.eclipse.wst.sse.ui.internal.reconcile.ReconcileAnnotationKey; import org.eclipse.wst.sse.ui.internal.reconcile.StructuredReconcileStep; import org.eclipse.wst.sse.ui.internal.reconcile.TemporaryAnnotation; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.internal.correction.ProblemIDsXML; import org.w3c.dom.Node; @@ -84,7 +84,7 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { int end = structuredDocumentRegion.getEndOffset(); for (int i = 0; i < textRegions.size() && errorCount < ELEMENT_ERROR_LIMIT && !structuredDocumentRegion.isDeleted(); i++) { ITextRegion textRegion = textRegions.get(i); - if (textRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME || textRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS || textRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + if (textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS || textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { if (start > structuredDocumentRegion.getStartOffset(textRegion)) start = structuredDocumentRegion.getStartOffset(textRegion); end = structuredDocumentRegion.getEndOffset(textRegion); @@ -114,7 +114,7 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { boolean closed = false; for (int i = 0; i < regions.size() && !structuredDocumentRegion.isDeleted(); i++) { r = regions.get(i); - if (r.getType() == XMLRegionContext.XML_TAG_CLOSE || r.getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE) + if (r.getType() == DOMRegionContext.XML_TAG_CLOSE || r.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) closed = true; } if (!closed) { @@ -140,7 +140,7 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { ITextRegionList regions = structuredDocumentRegion.getRegions(); if (regions.size() == 2) { // missing name region - if (regions.get(0).getType() == XMLRegionContext.XML_TAG_OPEN && regions.get(1).getType() == XMLRegionContext.XML_TAG_CLOSE) { + if (regions.get(0).getType() == DOMRegionContext.XML_TAG_OPEN && regions.get(1).getType() == DOMRegionContext.XML_TAG_CLOSE) { String message = SSEUIPlugin.getResourceString("%ReconcileStepForMarkup.3"); //$NON-NLS-1$ int start = structuredDocumentRegion.getStartOffset(); int length = structuredDocumentRegion.getLength(); @@ -167,7 +167,7 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { int errorCount = 0; for (int i = 0; i < textRegions.size() && errorCount < ELEMENT_ERROR_LIMIT; i++) { ITextRegion textRegion = textRegions.get(i); - if (textRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME || isTagCloseTextRegion(textRegion)) { + if (textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME || isTagCloseTextRegion(textRegion)) { // dangling name and '=' if (attrState == 2 && i >= 2) { // create annotation @@ -206,9 +206,9 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { errorCount++; } attrState = 1; - } else if (textRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + } else if (textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { attrState = 2; - } else if (textRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) { + } else if (textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) { attrState = 0; } } @@ -253,7 +253,7 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { int errorCount = 0; for (int i = 0; i < regions.size() && errorCount < ELEMENT_ERROR_LIMIT && !structuredDocumentRegion.isDeleted(); i++) { r = regions.get(i); - if (r.getType() == XMLRegionContext.XML_TAG_NAME) { + if (r.getType() == DOMRegionContext.XML_TAG_NAME) { String piText = structuredDocumentRegion.getText(r); int index = piText.indexOf(":"); //$NON-NLS-1$ if (index != -1) { @@ -282,7 +282,7 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { int errorCount = 0; for (int i = 0; i < regions.size() && errorCount < ELEMENT_ERROR_LIMIT; i++) { r = regions.get(i); - if (r.getType() != XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) + if (r.getType() != DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) continue; attrValueText = structuredDocumentRegion.getText(r); @@ -354,12 +354,12 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { ITextRegion r = null; for (int i = 0; i < regions.size(); i++) { r = regions.get(i); - if (r.getType() == XMLRegionContext.XML_TAG_OPEN || r.getType() == XMLRegionContext.XML_TAG_CLOSE) { + if (r.getType() == DOMRegionContext.XML_TAG_OPEN || r.getType() == DOMRegionContext.XML_TAG_CLOSE) { length++; - } else if (r.getType() == XMLRegionContext.XML_TAG_NAME) { + } else if (r.getType() == DOMRegionContext.XML_TAG_NAME) { tagName = sdRegion.getText(r); length += tagName.length(); - } else if (r.getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE) { + } else if (r.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) { selfClosed = true; } } @@ -375,7 +375,7 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { // quick fix info String tagClose = "/>"; //$NON-NLS-1$ int tagCloseOffset = xmlNode.getFirstStructuredDocumentRegion().getEndOffset(); - if (r != null && r.getType() == XMLRegionContext.XML_TAG_CLOSE) { + if (r != null && r.getType() == DOMRegionContext.XML_TAG_CLOSE) { tagClose = "/"; //$NON-NLS-1$ tagCloseOffset--; } @@ -406,7 +406,7 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { IStructuredDocumentRegion prev = structuredDocumentRegion.getPrevious(); if (prev != null && !prev.isDeleted()) { String prevText = prev.getFullText(); - if (prev.getType() == XMLRegionContext.XML_CONTENT && prevText.endsWith(" ")) { //$NON-NLS-1$ + if (prev.getType() == DOMRegionContext.XML_CONTENT && prevText.endsWith(" ")) { //$NON-NLS-1$ String message = SSEUIPlugin.getResourceString("%ReconcileStepForMarkup.5"); //$NON-NLS-1$ int start = prev.getStartOffset(); int length = prev.getLength(); @@ -487,7 +487,7 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { private boolean isEndTag(IStructuredDocumentRegion structuredDocumentRegion) { if (structuredDocumentRegion == null || structuredDocumentRegion.isDeleted()) return false; - return structuredDocumentRegion.getFirstRegion().getType() == XMLRegionContext.XML_END_TAG_OPEN; + return structuredDocumentRegion.getFirstRegion().getType() == DOMRegionContext.XML_END_TAG_OPEN; } /** @@ -500,7 +500,7 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { private boolean isPI(IStructuredDocumentRegion structuredDocumentRegion) { if (structuredDocumentRegion == null || structuredDocumentRegion.isDeleted()) return false; - return structuredDocumentRegion.getFirstRegion().getType() == XMLRegionContext.XML_PI_OPEN; + return structuredDocumentRegion.getFirstRegion().getType() == DOMRegionContext.XML_PI_OPEN; } /** @@ -513,14 +513,14 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { private boolean isStartTag(IStructuredDocumentRegion structuredDocumentRegion) { if (structuredDocumentRegion == null || structuredDocumentRegion.isDeleted()) return false; - return structuredDocumentRegion.getFirstRegion().getType() == XMLRegionContext.XML_TAG_OPEN; + return structuredDocumentRegion.getFirstRegion().getType() == DOMRegionContext.XML_TAG_OPEN; } // Because we check the "proper" closing separately from attribute // sequencing, we need to know what's // an appropriate close. private boolean isTagCloseTextRegion(ITextRegion textRegion) { - return textRegion.getType() == XMLRegionContext.XML_TAG_CLOSE || textRegion.getType() == XMLRegionContext.XML_EMPTY_TAG_CLOSE; + return textRegion.getType() == DOMRegionContext.XML_TAG_CLOSE || textRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE; } /** @@ -532,7 +532,7 @@ public class ReconcileStepForMarkup extends StructuredReconcileStep { private boolean isXMLContent(IStructuredDocumentRegion structuredDocumentRegion) { if(structuredDocumentRegion == null || structuredDocumentRegion.isDeleted()) return false; - return structuredDocumentRegion.getFirstRegion().getType() == XMLRegionContext.XML_CONTENT; + return structuredDocumentRegion.getFirstRegion().getType() == DOMRegionContext.XML_CONTENT; } /* diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForEmbeddedXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForEmbeddedXML.java index 4b6b071c65..50dc1f3ade 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForEmbeddedXML.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForEmbeddedXML.java @@ -17,7 +17,7 @@ import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.ui.registry.embedded.EmbeddedAdapterFactoryProvider; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMModel; -import org.eclipse.wst.xml.core.modelhandler.EmbeddedXML; +import org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML; public class AdapterFactoryProviderForEmbeddedXML implements EmbeddedAdapterFactoryProvider { diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForXML.java index 9db12d3bdf..6bd9349a6e 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForXML.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForXML.java @@ -23,8 +23,8 @@ import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter; import org.eclipse.wst.sse.ui.registry.AdapterFactoryProvider; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; +import org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.eclipse.wst.xml.core.modelhandler.ModelHandlerForXML; import org.eclipse.wst.xml.ui.DOMObserver; import org.eclipse.wst.xml.ui.internal.XMLUIPlugin; import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory; diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/style/LineStyleProviderForXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/style/LineStyleProviderForXML.java index c3d45a264f..7496af5afc 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/style/LineStyleProviderForXML.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/style/LineStyleProviderForXML.java @@ -18,7 +18,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.ui.style.AbstractLineStyleProvider; import org.eclipse.wst.sse.ui.style.LineStyleProvider; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.internal.XMLUIPlugin; public class LineStyleProviderForXML extends AbstractLineStyleProvider implements LineStyleProvider { @@ -41,49 +41,49 @@ public class LineStyleProviderForXML extends AbstractLineStyleProvider implement return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.CDATA_TEXT); } String type = region.getType(); - if ((type == XMLRegionContext.XML_CONTENT) || (type == XMLRegionContext.XML_DOCTYPE_INTERNAL_SUBSET)) { + if ((type == DOMRegionContext.XML_CONTENT) || (type == DOMRegionContext.XML_DOCTYPE_INTERNAL_SUBSET)) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.XML_CONTENT); - } else if ((type == XMLRegionContext.XML_TAG_OPEN) || (type == XMLRegionContext.XML_END_TAG_OPEN) || (type == XMLRegionContext.XML_TAG_CLOSE) || (type == XMLRegionContext.XML_EMPTY_TAG_CLOSE)) { + } else if ((type == DOMRegionContext.XML_TAG_OPEN) || (type == DOMRegionContext.XML_END_TAG_OPEN) || (type == DOMRegionContext.XML_TAG_CLOSE) || (type == DOMRegionContext.XML_EMPTY_TAG_CLOSE)) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_BORDER); - } else if ((type == XMLRegionContext.XML_CDATA_OPEN) || (type == XMLRegionContext.XML_CDATA_CLOSE)) { + } else if ((type == DOMRegionContext.XML_CDATA_OPEN) || (type == DOMRegionContext.XML_CDATA_CLOSE)) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.CDATA_BORDER); - } else if (type == XMLRegionContext.XML_CDATA_TEXT) { + } else if (type == DOMRegionContext.XML_CDATA_TEXT) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.CDATA_TEXT); - } else if (type == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) { + } else if (type == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_ATTRIBUTE_NAME); - } else if (type == XMLRegionContext.XML_DOCTYPE_DECLARATION) { + } else if (type == DOMRegionContext.XML_DOCTYPE_DECLARATION) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_NAME); - } else if (type == XMLRegionContext.XML_TAG_NAME) { + } else if (type == DOMRegionContext.XML_TAG_NAME) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_NAME); - } else if ((type == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { + } else if ((type == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE); - } else if (type == XMLRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { + } else if (type == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS); - } else if ((type == XMLRegionContext.XML_COMMENT_OPEN) || (type == XMLRegionContext.XML_COMMENT_CLOSE)) { + } else if ((type == DOMRegionContext.XML_COMMENT_OPEN) || (type == DOMRegionContext.XML_COMMENT_CLOSE)) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.COMMENT_BORDER); - } else if (type == XMLRegionContext.XML_COMMENT_TEXT) { + } else if (type == DOMRegionContext.XML_COMMENT_TEXT) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.COMMENT_TEXT); - } else if (type == XMLRegionContext.XML_DOCTYPE_NAME) { + } else if (type == DOMRegionContext.XML_DOCTYPE_NAME) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.DOCTYPE_NAME); - } else if (type == XMLRegionContext.XML_PI_CONTENT) { + } else if (type == DOMRegionContext.XML_PI_CONTENT) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.PI_CONTENT); - } else if ((type == XMLRegionContext.XML_PI_OPEN) || (type == XMLRegionContext.XML_PI_CLOSE)) { + } else if ((type == DOMRegionContext.XML_PI_OPEN) || (type == DOMRegionContext.XML_PI_CLOSE)) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.PI_BORDER); - } else if ((type == XMLRegionContext.XML_DECLARATION_OPEN) || (type == XMLRegionContext.XML_DECLARATION_CLOSE)) { + } else if ((type == DOMRegionContext.XML_DECLARATION_OPEN) || (type == DOMRegionContext.XML_DECLARATION_CLOSE)) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.DECL_BORDER); - } else if (type == XMLRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF) { + } else if (type == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF); - } else if (type == XMLRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF) { + } else if (type == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF); - } else if (type == XMLRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBLIC || type == XMLRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSTEM) { + } else if (type == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBLIC || type == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSTEM) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID); - } else if (type == XMLRegionContext.UNDEFINED) { + } else if (type == DOMRegionContext.UNDEFINED) { return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.CDATA_TEXT); - } else if (type == XMLRegionContext.WHITE_SPACE) { + } else if (type == DOMRegionContext.WHITE_SPACE) { // white space is normall not on its own ... but when it is, we'll // treat as content return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.XML_CONTENT); - } else if ((type == XMLRegionContext.XML_CHAR_REFERENCE) || (type == XMLRegionContext.XML_ENTITY_REFERENCE) || (type == XMLRegionContext.XML_PE_REFERENCE)) { + } else if ((type == DOMRegionContext.XML_CHAR_REFERENCE) || (type == DOMRegionContext.XML_ENTITY_REFERENCE) || (type == DOMRegionContext.XML_PE_REFERENCE)) { // we may want to character and entity references to have it own // color in future, // but for now, we'll make attribute value diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/taginfo/XMLTagInfoHoverProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/taginfo/XMLTagInfoHoverProcessor.java index 16d818b65a..3192bda049 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/taginfo/XMLTagInfoHoverProcessor.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/taginfo/XMLTagInfoHoverProcessor.java @@ -35,7 +35,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery; import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.eclipse.wst.xml.ui.internal.Logger; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -96,11 +96,11 @@ public class XMLTagInfoHoverProcessor implements ITextHover { if (region == null) return null; String regionType = region.getType(); - if (regionType == XMLRegionContext.XML_TAG_NAME) + if (regionType == DOMRegionContext.XML_TAG_NAME) result = computeTagNameHelp((IDOMNode) treeNode, parentNode, flatNode, region); - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) result = computeTagAttNameHelp((IDOMNode) treeNode, parentNode, flatNode, region); - else if (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE) + else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) result = computeTagAttValueHelp((IDOMNode) treeNode, parentNode, flatNode, region); return result; } @@ -176,7 +176,7 @@ public class XMLTagInfoHoverProcessor implements ITextHover { ITextRegion nameRegion = null; while (i >= 0) { nameRegion = openRegions.get(i--); - if (nameRegion.getType() == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) + if (nameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) break; } return nameRegion; @@ -262,7 +262,7 @@ public class XMLTagInfoHoverProcessor implements ITextHover { // only supply hoverhelp for tag name, attribute name, or // attribute value String regionType = region.getType(); - if ((regionType == XMLRegionContext.XML_TAG_NAME) || (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) || (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { + if ((regionType == DOMRegionContext.XML_TAG_NAME) || (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) || (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { try { // check if we are at whitespace before or after line IRegion line = textViewer.getDocument().getLineInformationOfOffset(offset); @@ -300,7 +300,7 @@ public class XMLTagInfoHoverProcessor implements ITextHover { // only supply hoverhelp for tag name, attribute name, or // attribute value String regionType = region.getType(); - if ((regionType == XMLRegionContext.XML_TAG_NAME) || (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_NAME) || (regionType == XMLRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { + if ((regionType == DOMRegionContext.XML_TAG_NAME) || (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) || (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) { try { // check if we are at whitespace before or after line IRegion line = textViewer.getDocument().getLineInformationOfOffset(offset); diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/text/XMLDocumentRegionEdgeMatcher.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/text/XMLDocumentRegionEdgeMatcher.java index 901fe89f37..496cd67dd9 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/text/XMLDocumentRegionEdgeMatcher.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/text/XMLDocumentRegionEdgeMatcher.java @@ -13,13 +13,13 @@ package org.eclipse.wst.xml.ui.text; import org.eclipse.wst.sse.ui.text.DocumentRegionEdgeMatcher; -import org.eclipse.wst.xml.core.parser.XMLRegionContext; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; public class XMLDocumentRegionEdgeMatcher extends DocumentRegionEdgeMatcher { public XMLDocumentRegionEdgeMatcher() { - super(new String[]{XMLRegionContext.XML_TAG_NAME, XMLRegionContext.XML_COMMENT_TEXT, XMLRegionContext.XML_CDATA_TEXT, XMLRegionContext.XML_PI_OPEN, XMLRegionContext.XML_PI_CONTENT}, null); + super(new String[]{DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_PI_CONTENT}, null); } } 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 aee1278567..e7e31b11c5 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 @@ -52,7 +52,6 @@ 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.IDOMModel; -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; import org.eclipse.wst.xsd.ui.internal.util.OpenOnSelectionHelper; @@ -76,7 +75,6 @@ public class XSDEditor extends XSDMultiPageEditorPart implements ITabbedProperty XSDSelectionManager xsdSelectionManager; private IStructuredModel result; - private XMLModelImpl model; public XSDEditor() { 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 f16aa0ff06..b9affa5eef 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 @@ -18,8 +18,8 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.format.FormatProcessorXML; import org.eclipse.wst.xml.core.internal.document.DocumentImpl; +import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.eclipse.xsd.XSDComplexTypeDefinition; import org.eclipse.xsd.XSDElementDeclaration; import org.eclipse.xsd.XSDFactory; 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 01a0f36a75..3afd74d9d9 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 @@ -21,8 +21,8 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.format.FormatProcessorXML; import org.eclipse.wst.xml.core.internal.document.DocumentImpl; +import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.eclipse.wst.xsd.ui.internal.graph.editparts.ComplexTypeDefinitionEditPart; import org.eclipse.wst.xsd.ui.internal.graph.editparts.ElementDeclarationEditPart; import org.eclipse.wst.xsd.ui.internal.graph.editparts.ModelGroupDefinitionEditPart; 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 62cd397a71..292df20d4a 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 @@ -21,8 +21,8 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.format.FormatProcessorXML; import org.eclipse.wst.xml.core.internal.document.DocumentImpl; +import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin; import org.eclipse.wst.xsd.ui.internal.util.TypesHelper; import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper; 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 8a033982ec..88aaa533bd 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 @@ -13,7 +13,7 @@ package org.eclipse.wst.xsd.ui.internal.commands; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.format.FormatProcessorXML; +import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.eclipse.xsd.XSDConcreteComponent; import org.w3c.dom.Element; 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 76bb37fff4..c4df8d04b0 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 @@ -14,7 +14,7 @@ import java.util.Collection; import java.util.Iterator; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.format.NodeFormatter; +import org.eclipse.wst.xml.core.internal.provisional.format.NodeFormatter; import org.w3c.dom.Node; public class DragNodesCommand extends BaseDragNodesCommand 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 5d13a52935..fdd52531ba 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 @@ -13,7 +13,7 @@ package org.eclipse.wst.xsd.ui.internal.util; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; import org.eclipse.wst.xml.core.document.IDOMModel; import org.eclipse.wst.xml.core.document.IDOMNode; -import org.eclipse.wst.xml.core.format.FormatProcessorXML; +import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.eclipse.xsd.util.XSDConstants; import org.w3c.dom.Document; import org.w3c.dom.Element; |