diff options
| author | david_williams | 2005-04-10 01:59:51 +0000 |
|---|---|---|
| committer | david_williams | 2005-04-10 01:59:51 +0000 |
| commit | 63219a2d13dec9a190adcbeab4038d788ff4358f (patch) | |
| tree | d9a3e98042fc2819c0be32393eba4dae9865ed76 | |
| parent | d349d70aa97a92d92705fcf5b7c3dd3d3cb1cf93 (diff) | |
| download | webtools.sourceediting-63219a2d13dec9a190adcbeab4038d788ff4358f.tar.gz webtools.sourceediting-63219a2d13dec9a190adcbeab4038d788ff4358f.tar.xz webtools.sourceediting-63219a2d13dec9a190adcbeab4038d788ff4358f.zip | |
java doc and specification and internalization
291 files changed, 848 insertions, 1059 deletions
diff --git a/bundles/org.eclipse.wst.css.core/cssprofile/description.txt b/bundles/org.eclipse.wst.css.core/cssprofile/description.txt new file mode 100644 index 0000000000..9c8754559d --- /dev/null +++ b/bundles/org.eclipse.wst.css.core/cssprofile/description.txt @@ -0,0 +1,15 @@ +/******************************************************************************* + * Copyright (c) 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 + + This file contains definitions of data used internally + by CSS code, needs no translation, + and in no way should be considered API. + *******************************************************************************/ +
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.css.core/plugin.xml b/bundles/org.eclipse.wst.css.core/plugin.xml index 593de790c5..4b040f0e50 100644 --- a/bundles/org.eclipse.wst.css.core/plugin.xml +++ b/bundles/org.eclipse.wst.css.core/plugin.xml @@ -47,9 +47,9 @@ <extension point="org.eclipse.wst.sse.core.modelHandler"> <modelHandler - class="org.eclipse.wst.css.core.modelhandler.ModelHandlerForCSS" + class="org.eclipse.wst.css.core.internal.modelhandler.ModelHandlerForCSS" associatedContentTypeId="org.eclipse.wst.css.core.csssource" - id="org.eclipse.wst.css.core.modelhandler"> + id="org.eclipse.wst.css.core.internal.modelhandler"> </modelHandler> </extension> <extension @@ -77,7 +77,7 @@ <extension point="org.eclipse.wst.sse.core.formatProcessors"> <processor - class="org.eclipse.wst.css.core.format.FormatProcessorCSS" + class="org.eclipse.wst.css.core.internal.format.FormatProcessorCSS" contentTypeId="org.eclipse.wst.css.core.csssource"> </processor> </extension> @@ -89,7 +89,7 @@ name="%CSS_Content_Type_Extension_Element.name" id="csssource" base-type="org.eclipse.core.runtime.text"> - <describer class="org.eclipse.wst.css.core.internal.content.ContentDescriberForCSS"/> + <describer class="org.eclipse.wst.css.core.internal.contenttype.ContentDescriberForCSS"/> </content-type> </extension> diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CleanupProcessorCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CleanupProcessorCSS.java index c325e536de..259e3bcf38 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CleanupProcessorCSS.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CleanupProcessorCSS.java @@ -16,12 +16,12 @@ import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.IDocument; import org.eclipse.wst.css.core.contenttype.ContentTypeIdForCSS; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.formatter.CSSFormatUtil; import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatter; import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatterFactory; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.IndexedRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNumber.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNumber.java index 3dea76d44d..2fcccb0145 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNumber.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contentmodel/PropCMNumber.java @@ -19,7 +19,7 @@ import java.util.Iterator; import java.util.Set; import java.util.Vector; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; import org.w3c.dom.css.CSSPrimitiveValue; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/AbstractContentDescriber.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/AbstractContentDescriber.java index 908dddba1e..7ff6b6c006 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/AbstractContentDescriber.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/AbstractContentDescriber.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.css.core.internal.content; +package org.eclipse.wst.css.core.internal.contenttype; import java.io.IOException; import java.io.InputStream; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/AbstractResourceEncodingDetector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/AbstractResourceEncodingDetector.java index 9c9fe13e95..f6716405ee 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/AbstractResourceEncodingDetector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/AbstractResourceEncodingDetector.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.css.core.internal.content; +package org.eclipse.wst.css.core.internal.contenttype; import java.io.BufferedInputStream; import java.io.BufferedReader; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/CSSHeadTokenizer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSHeadTokenizer.java index b25ebf716e..7dfb41fcb6 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/CSSHeadTokenizer.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSHeadTokenizer.java @@ -11,7 +11,7 @@ /* The following code was generated by JFlex 1.2.2 on 1/27/04 6:42 PM */ /*nlsXXX*/ -package org.eclipse.wst.css.core.internal.content; +package org.eclipse.wst.css.core.internal.contenttype; import java.io.IOException; import java.io.Reader; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/CSSHeadTokenizerConstants.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSHeadTokenizerConstants.java index b8ddef77fa..75446c750e 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/CSSHeadTokenizerConstants.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSHeadTokenizerConstants.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.content; +package org.eclipse.wst.css.core.internal.contenttype; public interface CSSHeadTokenizerConstants { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/CSSResourceEncodingDetector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSResourceEncodingDetector.java index 71f9b542a2..b8ba5f2294 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/CSSResourceEncodingDetector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/CSSResourceEncodingDetector.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.content; +package org.eclipse.wst.css.core.internal.contenttype; import java.io.IOException; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/ContentDescriberForCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/ContentDescriberForCSS.java index f2591bb572..ab00f913c6 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/ContentDescriberForCSS.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/ContentDescriberForCSS.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.content; +package org.eclipse.wst.css.core.internal.contenttype; import org.eclipse.core.runtime.content.ITextContentDescriber; import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/EncodingGuesser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/EncodingGuesser.java index bd05a5ec0b..82f6e5c49a 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/EncodingGuesser.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/EncodingGuesser.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.css.core.internal.content; +package org.eclipse.wst.css.core.internal.contenttype; /** * diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/HeadParserToken.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/HeadParserToken.java index b7d9a531be..882140702d 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/HeadParserToken.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/HeadParserToken.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.css.core.internal.content; +package org.eclipse.wst.css.core.internal.contenttype; public class HeadParserToken { private int fStart; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/IntStack.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/IntStack.java index ab95ad51e4..117136d832 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/IntStack.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/IntStack.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.css.core.internal.content; +package org.eclipse.wst.css.core.internal.contenttype; /* * diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/NullMemento.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/NullMemento.java index a664b0a5b7..10b9688339 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/content/NullMemento.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/contenttype/NullMemento.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.css.core.internal.content; +package org.eclipse.wst.css.core.internal.contenttype; import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento; import org.eclipse.wst.sse.core.internal.encoding.NonContentBasedEncodingRules; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/AbstractCSSNodeList.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/AbstractCSSNodeList.java index eb10e00def..de7b3e6a87 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/AbstractCSSNodeList.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/AbstractCSSNodeList.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; import java.util.Vector; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSAttrImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSAttrImpl.java index 92d03de02e..5af7c276a5 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSAttrImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSAttrImpl.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSNamedNodeMap; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNamedNodeMap; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; /** * diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSCharsetRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSCharsetRuleImpl.java index 6fa883655b..6632a659de 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSCharsetRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSCharsetRuleImpl.java @@ -12,10 +12,10 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSCharsetRule; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.util.CSSUtil; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.CSSUtil; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDeclarationItemParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDeclarationItemParser.java index aa99414765..7f9dbef7d5 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDeclarationItemParser.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDeclarationItemParser.java @@ -12,13 +12,13 @@ package org.eclipse.wst.css.core.internal.document; import java.util.Iterator; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICounter; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.util.CSSUtil; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICounter; +import org.eclipse.wst.css.core.internal.util.CSSUtil; import org.eclipse.wst.sse.core.internal.text.TextRegionListImpl; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDocumentImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDocumentImpl.java index c3bb647e9f..25a6e59b58 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDocumentImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSDocumentImpl.java @@ -12,17 +12,17 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSCharsetRule; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSMediaRule; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPageRule; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; -import org.eclipse.wst.css.core.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; import org.w3c.dom.css.CSSFontFaceRule; import org.w3c.dom.css.CSSPrimitiveValue; import org.w3c.dom.css.CSSRule; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSFontFaceRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSFontFaceRuleImpl.java index c3bdf63fe1..710410d9eb 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSFontFaceRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSFontFaceRuleImpl.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.w3c.dom.css.CSSFontFaceRule; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSImportRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSImportRuleImpl.java index 8dbbf5dc38..92e2c7f4bf 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSImportRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSImportRuleImpl.java @@ -12,15 +12,15 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.adapters.IModelProvideAdapter; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSStyleSheet; import org.eclipse.wst.css.core.internal.Logger; -import org.eclipse.wst.css.core.util.CSSLinkConverter; -import org.eclipse.wst.css.core.util.CSSUtil; -import org.eclipse.wst.css.core.util.URLModelProviderCSS; +import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvideAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet; +import org.eclipse.wst.css.core.internal.util.CSSLinkConverter; +import org.eclipse.wst.css.core.internal.util.CSSUtil; +import org.eclipse.wst.css.core.internal.util.URLModelProviderCSS; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.xml.core.document.IDOMNode; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSMediaRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSMediaRuleImpl.java index d71bfaf055..c756486a6a 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSMediaRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSMediaRuleImpl.java @@ -12,8 +12,8 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSMediaRule; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.w3c.dom.DOMException; import org.w3c.dom.css.CSSRule; import org.w3c.dom.css.CSSRuleList; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelCreationContext.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelCreationContext.java index bc640da725..1eaed7496d 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelCreationContext.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelCreationContext.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelDeletionContext.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelDeletionContext.java index ee63966d4b..f7ef6f6f2a 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelDeletionContext.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelDeletionContext.java @@ -17,8 +17,8 @@ import java.util.Collection; import java.util.Enumeration; import java.util.Iterator; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.util.CSSUtil; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.util.CSSUtil; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegionList; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelImpl.java index 3351667dcb..d15484871d 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelImpl.java @@ -16,23 +16,23 @@ import java.util.Iterator; import java.util.List; import java.util.Vector; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.document.ICSSSelectorList; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; -import org.eclipse.wst.css.core.document.ICSSStyleRule; -import org.eclipse.wst.css.core.document.ICSSValue; -import org.eclipse.wst.css.core.event.ICSSStyleListener; -import org.eclipse.wst.css.core.internal.event.CSSEmbededStyleNotifyAdapter; -import org.eclipse.wst.css.core.internal.event.CSSStyleNotifyAdapter; +import org.eclipse.wst.css.core.internal.event.ICSSStyleListener; +import org.eclipse.wst.css.core.internal.eventimpl.CSSEmbededStyleNotifyAdapter; +import org.eclipse.wst.css.core.internal.eventimpl.CSSStyleNotifyAdapter; import org.eclipse.wst.css.core.internal.parser.CSSSourceParser; -import org.eclipse.wst.css.core.util.ImportRuleCollector; -import org.eclipse.wst.css.core.util.ImportedCollector; -import org.eclipse.wst.css.core.util.SelectorsCollector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue; +import org.eclipse.wst.css.core.internal.util.ImportRuleCollector; +import org.eclipse.wst.css.core.internal.util.ImportedCollector; +import org.eclipse.wst.css.core.internal.util.SelectorsCollector; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.events.IStructuredDocumentListener; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelParser.java index c860c508a6..7222590a4b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelParser.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelParser.java @@ -15,18 +15,18 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Iterator; -import org.eclipse.wst.css.core.document.ICSSCharsetRule; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSMediaRule; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPageRule; -import org.eclipse.wst.css.core.document.ICSSRuleContainer; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSRuleContainer; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; import org.eclipse.wst.css.core.internal.text.StructuredDocumentWalker; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.util.CSSUtil; +import org.eclipse.wst.css.core.internal.util.CSSUtil; import org.eclipse.wst.sse.core.events.StructuredDocumentEvent; import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocumentRegion; import org.eclipse.wst.sse.core.internal.text.CoreNodeList; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdateContext.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdateContext.java index 31018fa4e7..6344998f6a 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdateContext.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdateContext.java @@ -14,10 +14,10 @@ package org.eclipse.wst.css.core.internal.document; import java.util.LinkedList; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.util.AbstractCssTraverser; -import org.eclipse.wst.css.core.util.CSSUtil; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.util.AbstractCssTraverser; +import org.eclipse.wst.css.core.internal.util.CSSUtil; import org.w3c.dom.DOMException; import org.w3c.dom.css.CSSPrimitiveValue; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdater.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdater.java index b8e740bb6f..b4f2f19edc 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdater.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUpdater.java @@ -12,12 +12,12 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.formatter.AttrChangeContext; import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatterFactory; import org.eclipse.wst.css.core.internal.formatter.CSSSourceGenerator; -import org.eclipse.wst.css.core.util.CSSUtil; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.util.CSSUtil; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.events.NoChangeEvent; import org.eclipse.wst.sse.core.events.StructuredDocumentEvent; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUtil.java index 4f748991a8..0fe2ba2d80 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUtil.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSModelUtil.java @@ -14,13 +14,13 @@ import java.util.Iterator; import java.util.Vector; import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSNodeList; -import org.eclipse.wst.css.core.document.ICSSRuleContainer; import org.eclipse.wst.css.core.internal.CSSCoreMessages; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.util.CSSUtil; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNodeList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSRuleContainer; +import org.eclipse.wst.css.core.internal.util.CSSUtil; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNamedNodeMapImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNamedNodeMapImpl.java index aa5eb3fc03..8ad512a0c6 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNamedNodeMapImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNamedNodeMapImpl.java @@ -14,8 +14,8 @@ package org.eclipse.wst.css.core.internal.document; import java.util.Iterator; -import org.eclipse.wst.css.core.document.ICSSNamedNodeMap; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNamedNodeMap; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeImpl.java index 3d9f584615..8c911d81ab 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeImpl.java @@ -14,14 +14,14 @@ package org.eclipse.wst.css.core.internal.document; import java.util.Iterator; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNamedNodeMap; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSNodeList; import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatterFactory; import org.eclipse.wst.css.core.internal.formatter.CSSSourceGenerator; -import org.eclipse.wst.css.core.util.ImportRuleCollector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNamedNodeMap; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNodeList; +import org.eclipse.wst.css.core.internal.util.ImportRuleCollector; import org.eclipse.wst.sse.core.AbstractNotifier; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeListImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeListImpl.java index 92c85597fa..7b89c6cb5c 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeListImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSNodeListImpl.java @@ -12,8 +12,8 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSNodeList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNodeList; /** * diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPageRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPageRuleImpl.java index c3c7d09f9f..ff87150881 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPageRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPageRuleImpl.java @@ -12,9 +12,9 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPageRule; -import org.eclipse.wst.css.core.document.ICSSSelectorList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveContainer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveContainer.java index ba20a24eff..bf2afcc0aa 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveContainer.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveContainer.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; /** * diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveValueImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveValueImpl.java index 285d4d0405..771f17d999 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveValueImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSPrimitiveValueImpl.java @@ -12,9 +12,9 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; import org.w3c.dom.DOMException; import org.w3c.dom.css.Counter; import org.w3c.dom.css.RGBColor; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleDeclContainer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleDeclContainer.java index d983a425e6..fbf4c10bfa 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleDeclContainer.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleDeclContainer.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.w3c.dom.css.CSSStyleDeclaration; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleImpl.java index d6cf4aae79..deab28a475 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSRuleImpl.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.w3c.dom.css.CSSRule; import org.w3c.dom.css.CSSStyleSheet; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelector.java index e3cdea06a1..b0f1bd17d2 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelector.java @@ -17,11 +17,11 @@ import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; -import org.eclipse.wst.css.core.adapters.IStyleSelectorAdapter; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.document.ICSSSelectorCombinator; -import org.eclipse.wst.css.core.document.ICSSSelectorItem; -import org.eclipse.wst.css.core.document.ICSSSimpleSelector; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSelectorAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorCombinator; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.xml.core.NameValidator; import org.w3c.dom.Element; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorCombinator.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorCombinator.java index 895ecb2343..5df2594d7f 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorCombinator.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorCombinator.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSSelectorCombinator; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorCombinator; /** * diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorItem.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorItem.java index 721b3a31a6..1134bcc628 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorItem.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorItem.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSSelectorItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem; /** * diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorListImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorListImpl.java index f6faac4d92..94c5afebf9 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorListImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorListImpl.java @@ -16,11 +16,11 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.document.ICSSSelectorList; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList; import org.w3c.dom.Element; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorParser.java index 1e9117e4c2..7f00342570 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorParser.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSelectorParser.java @@ -15,10 +15,10 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.eclipse.wst.css.core.document.ICSSSelectorCombinator; -import org.eclipse.wst.css.core.document.ICSSSelectorItem; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorCombinator; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSimpleSelector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSimpleSelector.java index b7d3f4e63e..9f76ea3507 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSimpleSelector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSSimpleSelector.java @@ -13,7 +13,7 @@ package org.eclipse.wst.css.core.internal.document; import java.util.ArrayList; import java.util.List; -import org.eclipse.wst.css.core.document.ICSSSimpleSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclItemImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclItemImpl.java index 7ff5d3c47b..f928edb931 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclItemImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclItemImpl.java @@ -12,14 +12,14 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader; import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatterFactory; import org.eclipse.wst.css.core.internal.formatter.CSSSourceGenerator; import org.eclipse.wst.css.core.internal.formatter.StyleDeclItemFormatter; import org.eclipse.wst.css.core.internal.parser.CSSSourceParser; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; import org.eclipse.wst.sse.core.text.IStructuredDocument; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationFactoryContext.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationFactoryContext.java index bda0b4dd22..3d6142f38f 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationFactoryContext.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationFactoryContext.java @@ -12,9 +12,9 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; public abstract class CSSStyleDeclarationFactoryContext { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationImpl.java index 9d2c6db06b..13136c82fc 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleDeclarationImpl.java @@ -12,10 +12,10 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; -import org.eclipse.wst.css.core.document.ICSSValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue; import org.w3c.dom.DOMException; import org.w3c.dom.css.CSSRule; import org.w3c.dom.css.CSSValue; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleRuleImpl.java index 73bbe7f217..367123d69b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleRuleImpl.java @@ -12,9 +12,9 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSSelectorList; -import org.eclipse.wst.css.core.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; import org.w3c.dom.DOMException; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleSheetImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleSheetImpl.java index da8ab687d9..7a935d2e3b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleSheetImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSStyleSheetImpl.java @@ -14,19 +14,19 @@ import java.util.Iterator; import java.util.List; import java.util.Vector; -import org.eclipse.wst.css.core.adapters.IStyleSheetAdapter; -import org.eclipse.wst.css.core.document.ICSSCharsetRule; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSMediaRule; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPageRule; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; -import org.eclipse.wst.css.core.document.ICSSStyleRule; -import org.eclipse.wst.css.core.document.ICSSStyleSheet; import org.eclipse.wst.css.core.internal.CSSCoreMessages; import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader; -import org.eclipse.wst.css.core.util.ImportRuleCollector; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet; +import org.eclipse.wst.css.core.internal.util.ImportRuleCollector; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.util.Assert; import org.w3c.dom.DOMException; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSUnknownRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSUnknownRuleImpl.java index cfbd98116e..3a5b0da2ec 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSUnknownRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CSSUnknownRuleImpl.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.w3c.dom.css.CSSUnknownRule; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CounterImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CounterImpl.java index e715cda50b..4c8bc09896 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CounterImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/CounterImpl.java @@ -12,8 +12,8 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICounter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICounter; import org.w3c.dom.DOMException; import org.w3c.dom.css.Counter; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/DOMCSSImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/DOMCSSImpl.java index 4b0e3e7c06..7242aae6c7 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/DOMCSSImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/DOMCSSImpl.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; import org.w3c.dom.css.CSSStyleSheet; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/MediaListImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/MediaListImpl.java index c7a30c0ae9..f9672ec423 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/MediaListImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/MediaListImpl.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.w3c.dom.DOMException; import org.w3c.dom.stylesheets.MediaList; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RGBColorImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RGBColorImpl.java index 4120fc25f5..6eec0640d7 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RGBColorImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RGBColorImpl.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.w3c.dom.css.CSSPrimitiveValue; import org.w3c.dom.css.RGBColor; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RectImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RectImpl.java index 83880274f1..4843768a07 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RectImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/document/RectImpl.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.document; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.w3c.dom.css.CSSPrimitiveValue; import org.w3c.dom.css.Rect; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/ByteUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/ByteUtil.java deleted file mode 100644 index 635e388b5c..0000000000 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/ByteUtil.java +++ /dev/null @@ -1,228 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ -package org.eclipse.wst.css.core.internal.encoding; - - - -public class ByteUtil { - - - public static void main(String[] args) { - String bigString = "\n<@ page\n"; //$NON-NLS-1$ - String target = "<@ PAGE"; //$NON-NLS-1$ - int match = findIfMatch(stringToByteArray(bigString), 7, 0, stringToByteArray(target)); - System.out.println(match); - } - - /** - * ByteUtil constructor comment. - */ - public ByteUtil() { - super(); - } - - /** - * @return int - * @param s1 - * byte[] - * @param s2 - * byte[] - * @param n - * int - * - * Compare bytes. If same, return 0. Otherwise non-zero. - */ - private static int _cmp(byte[] s1, int starts1pos, byte[] s2, int starts2pos, int complen, boolean ignorecase) { - if ((s1 == null) || (s2 == null)) - return 1; - int len_s1 = s1.length - starts1pos; - int len_s2 = s2.length - starts2pos; - if ((len_s1 <= 0) || (len_s2 <= 0)) - return 1; - if ((len_s1 < complen) || (len_s2 < complen)) - return 1; - - int len = complen; - int offset = 0; - byte c1 = (byte) 0, c2 = (byte) 0; - while (offset < len) { - if (ignorecase == true) { - c1 = _toUpper(s1[starts1pos + offset]); - c2 = _toUpper(s2[starts2pos + offset]); - } - else { - c1 = s1[starts1pos + offset]; - c2 = s2[starts2pos + offset]; - } - if (c1 == c2) { - offset++; - continue; - } - else { - break; - } - } - - return (offset == len ? 0 : (int) (c1 - c2)); - } - - /** - * @return byte - * @param c1 - * byte - * - * Convert to upper case letter. It's for ASCII only - */ - private static byte _toUpper(byte c1) { - if ((c1 >= (byte) 0x61) && (c1 <= (byte) 0x7a)) - c1 -= 0x20; - return c1; - } - - /** - * @return int - * @param string - * byte[] - * @param target - * byte[] - * - * Look for the index of 2nd byte[] within 1st byte[]. If being found, - * return the pos. Otherwise, return -1. This is case-insensitive. It's - * simlar to String.indexOf(). - */ - public static int findIfMatch(byte[] container, int length, int startpos, byte[] target) { - int container_len = length - startpos; - int target_len = target.length; - - // Clearly different - if ((container_len <= 0) || (target_len <= 0)) - return -1; - if (target_len > container_len) - return -1; - - // Look for the same bytes as 'target' in 'container' from startpos - int pos; - for (pos = startpos; pos < length; pos++) { - if (strCaseCmp(container, pos, target, 0, target_len) == 0) { - // matched. - return pos; - } - } - - return -1; - } - - /** - * Let the conversion be done in code since it's easier to reuse and - * verify than converting them by hand. - */ - private static byte[] stringToByteArray(String string) { - byte[] bytes = new byte[string.length()]; - for (int i = 0; i < string.length(); i++) - bytes[i] = (byte) string.charAt(i); // typecast to number using - // lower 8 bits only - return bytes; - } - - /** - * @return int - * @param container - * byte[] - * @param startpos - * int - * @param target - * byte - * - * This is case-insensitive. - */ - public static int findIfMatch(byte[] container, int length, int startpos, byte target) { - int container_len = length - startpos; - - if (container_len <= 0) - return -1; - - // Look for the same byte as 'target' in 'container' from startpos - int pos; - for (pos = startpos; pos < length; pos++) { - if (_toUpper(container[pos]) == _toUpper(target)) - return pos; - } - - return -1; - } - - /** - * @return int - * @param container - * byte[] - * @param length - * int - * @param startpos - * int - * @param target - * byte - * - * Skip same bytes as target. Return the position. If goes to end, return - * -1 - */ - public static int skipIfMatch(byte[] container, int length, int startpos, byte target) { - int container_len = length - startpos; - - // Clearly error - if (container_len <= 0) - return -1; - - int pos; - for (pos = startpos; pos < length; pos++) { - if (container[pos] != target) - break; - } - if (pos == length) { - // I found everything is target - pos = -1; - } - return pos; - } - - /** - * @return int - * @param s1 - * byte[] - * @param starts1pos - * int - * @param s2 - * byte[] - * @param starts2pos - * int - * - * It's similar to XPG4's strcasecmp() - */ - public static int strCaseCmp(byte[] s1, int starts1pos, byte[] s2, int starts2pos, int complen) { - return _cmp(s1, starts1pos, s2, starts2pos, complen, true); - } - - /** - * @return int - * @param s1 - * byte[] - * @param starts1pos - * int - * @param s2 - * byte[] - * @param starts2pos - * int - * - * It's similar to XPG4's strcmp() - */ - public static int strCmp(byte[] s1, int starts1pos, byte[] s2, int starts2pos, int complen) { - return _cmp(s1, starts1pos, s2, starts2pos, complen, false); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentCharsetDetector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentCharsetDetector.java index 9f194a5dfe..266de6834f 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentCharsetDetector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentCharsetDetector.java @@ -13,8 +13,8 @@ package org.eclipse.wst.css.core.internal.encoding; import java.util.Iterator; import org.eclipse.jface.text.IDocument; -import org.eclipse.wst.css.core.internal.content.CSSResourceEncodingDetector; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.contenttype.CSSResourceEncodingDetector; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; import org.eclipse.wst.sse.core.internal.document.DocumentReader; import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector; import org.eclipse.wst.sse.core.text.IStructuredDocument; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentLoader.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentLoader.java index 0bd511575a..9445dbe829 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentLoader.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/encoding/CSSDocumentLoader.java @@ -13,7 +13,7 @@ package org.eclipse.wst.css.core.internal.encoding; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.wst.css.core.contenttype.ContentTypeIdForCSS; -import org.eclipse.wst.css.core.internal.content.EncodingGuesser; +import org.eclipse.wst.css.core.internal.contenttype.EncodingGuesser; import org.eclipse.wst.css.core.internal.parser.CSSSourceParser; import org.eclipse.wst.css.core.internal.text.CSSStructuredDocumentReParser; import org.eclipse.wst.css.core.internal.text.StructuredTextPartitionerForCSS; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/event/ICSSStyleListener.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/ICSSStyleListener.java index 021394de83..d44e94b0b9 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/event/ICSSStyleListener.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/ICSSStyleListener.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.event; +package org.eclipse.wst.css.core.internal.event; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/event/ICSSStyleNotifier.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/ICSSStyleNotifier.java index cf824531f7..98655af8ff 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/event/ICSSStyleNotifier.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/ICSSStyleNotifier.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.event; +package org.eclipse.wst.css.core.internal.event; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/CSSEmbededStyleNotifyAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSEmbededStyleNotifyAdapter.java index f70e34aa42..0866ece4d8 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/CSSEmbededStyleNotifyAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSEmbededStyleNotifyAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.event; +package org.eclipse.wst.css.core.internal.eventimpl; -import org.eclipse.wst.css.core.adapters.IStyleSheetAdapter; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.event.ICSSStyleListener; +import org.eclipse.wst.css.core.internal.event.ICSSStyleListener; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.xml.core.document.IDOMNode; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/CSSStyleEventDeliverer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSStyleEventDeliverer.java index 0675a511e3..432b9dbfdc 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/CSSStyleEventDeliverer.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSStyleEventDeliverer.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.event; +package org.eclipse.wst.css.core.internal.eventimpl; import java.util.Vector; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.event.ICSSStyleListener; -import org.eclipse.wst.css.core.event.ICSSStyleNotifier; +import org.eclipse.wst.css.core.internal.event.ICSSStyleListener; +import org.eclipse.wst.css.core.internal.event.ICSSStyleNotifier; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/CSSStyleNotifyAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSStyleNotifyAdapter.java index b1d03be7ca..85c4e443f9 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/event/CSSStyleNotifyAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/eventimpl/CSSStyleNotifyAdapter.java @@ -8,20 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.event; +package org.eclipse.wst.css.core.internal.eventimpl; import java.util.Iterator; import java.util.Vector; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.document.ICSSStyleSheet; -import org.eclipse.wst.css.core.event.ICSSStyleListener; -import org.eclipse.wst.css.core.event.ICSSStyleNotifier; -import org.eclipse.wst.css.core.util.ImportedCollector; -import org.eclipse.wst.css.core.util.SelectorsCollector; +import org.eclipse.wst.css.core.internal.event.ICSSStyleListener; +import org.eclipse.wst.css.core.internal.event.ICSSStyleNotifier; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet; +import org.eclipse.wst.css.core.internal.util.ImportedCollector; +import org.eclipse.wst.css.core.internal.util.SelectorsCollector; /** @@ -30,7 +30,7 @@ import org.eclipse.wst.css.core.util.SelectorsCollector; public class CSSStyleNotifyAdapter implements ICSSStyleNotifier { protected java.util.Vector listeners; - protected final org.eclipse.wst.css.core.document.ICSSModel model; + protected final org.eclipse.wst.css.core.internal.provisional.document.ICSSModel model; protected boolean recording = false; /** @@ -163,12 +163,12 @@ public class CSSStyleNotifyAdapter implements ICSSStyleNotifier { /** * */ - public void styleChanged(org.eclipse.wst.css.core.document.ICSSModel srcModel, org.eclipse.wst.css.core.document.ICSSSelector[] removed, org.eclipse.wst.css.core.document.ICSSSelector[] added, java.lang.String media) { + public void styleChanged(org.eclipse.wst.css.core.internal.provisional.document.ICSSModel srcModel, org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector[] removed, org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector[] added, java.lang.String media) { } /** * */ - public void styleUpdate(org.eclipse.wst.css.core.document.ICSSModel srcModel) { + public void styleUpdate(org.eclipse.wst.css.core.internal.provisional.document.ICSSModel srcModel) { } }
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/format/CSSSourceFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/format/CSSSourceFormatter.java index 4ce2309227..96271897fb 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/format/CSSSourceFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/format/CSSSourceFormatter.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.format; +package org.eclipse.wst.css.core.internal.format; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.INodeAdapter; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/format/FormatProcessorCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/format/FormatProcessorCSS.java index ecb70ffc0f..d26e90202e 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/format/FormatProcessorCSS.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/format/FormatProcessorCSS.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.format; +package org.eclipse.wst.css.core.internal.format; import java.util.List; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.formatter.CSSFormatUtil; import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatter; import org.eclipse.wst.css.core.internal.formatter.CSSSourceFormatterFactory; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.IndexedRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AbstractCSSSourceFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AbstractCSSSourceFormatter.java index 482e8a4718..d73901ddc2 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AbstractCSSSourceFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AbstractCSSSourceFormatter.java @@ -16,20 +16,20 @@ import java.util.Iterator; import org.eclipse.jface.text.DefaultLineTracker; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.TextUtilities; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; -import org.eclipse.wst.css.core.document.ICSSStyleSheet; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategyImpl; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet; +import org.eclipse.wst.css.core.internal.util.CSSLinkConverter; +import org.eclipse.wst.css.core.internal.util.CSSUtil; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.CSSLinkConverter; -import org.eclipse.wst.css.core.util.CSSUtil; -import org.eclipse.wst.css.core.util.RegionIterator; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AttrFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AttrFormatter.java index 17552465e4..54f45724aa 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AttrFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/AttrFormatter.java @@ -13,16 +13,16 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSCharsetRule; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPageRule; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleRule; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.util.CSSUtil; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.CSSUtil; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; @@ -106,7 +106,7 @@ public class AttrFormatter extends DefaultCSSSourceFormatter { if (attr.getName().equals(ICSSStyleRule.SELECTOR) || attr.getName().equals(ICSSPageRule.SELECTOR)) { } else if (attr.getName().equals(ICSSImportRule.HREF)) { - String uri = org.eclipse.wst.css.core.util.CSSLinkConverter.stripFunc(value); + String uri = org.eclipse.wst.css.core.internal.util.CSSLinkConverter.stripFunc(value); String func = mgr.isPropValueUpperCase() ? "URL(" : "url(";//$NON-NLS-2$//$NON-NLS-1$ if (mgr.isQuoteInURI()) { String quote = mgr.getQuoteString(attr.getOwnerDocument().getModel()); diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSFormatUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSFormatUtil.java index 62631d3dea..8a07b528d3 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSFormatUtil.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSFormatUtil.java @@ -13,11 +13,11 @@ package org.eclipse.wst.css.core.internal.formatter; import java.util.ArrayList; import java.util.List; -import org.eclipse.wst.css.core.adapters.ICSSModelAdapter; -import org.eclipse.wst.css.core.adapters.IStyleDeclarationAdapter; -import org.eclipse.wst.css.core.adapters.IStyleSheetAdapter; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.adapters.ICSSModelAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatter.java index a132fe5497..4a9af068a9 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatter.java @@ -13,7 +13,7 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatterFactory.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatterFactory.java index 5d5bca8b27..059bb21108 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatterFactory.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceFormatterFactory.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.css.core.internal.formatter; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; import org.eclipse.wst.sse.core.INodeNotifier; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceGenerator.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceGenerator.java index ed8d1246a4..edfe8cb079 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceGenerator.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CSSSourceGenerator.java @@ -13,8 +13,8 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; public interface CSSSourceGenerator extends CSSSourceFormatter { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CharsetRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CharsetRuleFormatter.java index 04632b493e..b517b809fd 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CharsetRuleFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CharsetRuleFormatter.java @@ -13,14 +13,14 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSCharsetRule; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.util.CSSUtil; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.CSSUtil; -import org.eclipse.wst.css.core.util.RegionIterator; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CounterFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CounterFormatter.java index 09c800ae33..1b49189bab 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CounterFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/CounterFormatter.java @@ -13,14 +13,14 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICounter; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICounter; +import org.eclipse.wst.css.core.internal.util.CSSUtil; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.CSSUtil; -import org.eclipse.wst.css.core.util.RegionIterator; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DeclContainerFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DeclContainerFormatter.java index f9325fac6f..9e4b94dcf2 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DeclContainerFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DeclContainerFormatter.java @@ -13,9 +13,9 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DefaultCSSSourceFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DefaultCSSSourceFormatter.java index 7c5fd981e2..f92957a2e4 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DefaultCSSSourceFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/DefaultCSSSourceFormatter.java @@ -13,9 +13,9 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.parser.CSSRegionUtil; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.IndexedRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FontFaceRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FontFaceRuleFormatter.java index 5ffcbb8d6f..1f52eb8f20 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FontFaceRuleFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FontFaceRuleFormatter.java @@ -13,8 +13,8 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; @@ -38,7 +38,7 @@ public class FontFaceRuleFormatter extends DeclContainerFormatter { /** * */ - protected void formatPre(org.eclipse.wst.css.core.document.ICSSNode node, StringBuffer source) { + protected void formatPre(org.eclipse.wst.css.core.internal.provisional.document.ICSSNode node, StringBuffer source) { CSSCleanupStrategy stgy = getCleanupStrategy(node); int start = ((IndexedRegion) node).getStartOffset(); diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FunctionFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FunctionFormatter.java index bf7ff7e3ab..1a9da3e50e 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FunctionFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/FunctionFormatter.java @@ -13,9 +13,9 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; @@ -87,7 +87,7 @@ abstract public class FunctionFormatter extends AbstractCSSSourceFormatter { /** * */ - protected void formatPost(org.eclipse.wst.css.core.document.ICSSNode node, java.lang.StringBuffer source) { + protected void formatPost(org.eclipse.wst.css.core.internal.provisional.document.ICSSNode node, java.lang.StringBuffer source) { CSSCleanupStrategy stgy = getCleanupStrategy(node); int end = ((IndexedRegion) node).getEndOffset(); diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/ImportRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/ImportRuleFormatter.java index f9ab278fd4..812ff38a48 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/ImportRuleFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/ImportRuleFormatter.java @@ -13,14 +13,14 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.util.CSSUtil; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.CSSUtil; -import org.eclipse.wst.css.core.util.RegionIterator; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaListFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaListFormatter.java index a46aea58ef..c8c17008ee 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaListFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaListFormatter.java @@ -13,12 +13,12 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.RegionIterator; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaRuleFormatter.java index 5d054cde09..62787b34e2 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaRuleFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/MediaRuleFormatter.java @@ -13,11 +13,11 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.RegionIterator; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PageRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PageRuleFormatter.java index 47737539ee..9483541439 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PageRuleFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PageRuleFormatter.java @@ -13,13 +13,13 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPageRule; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.RegionIterator; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PrimitiveValueFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PrimitiveValueFormatter.java index 089effce2a..7ce688a053 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PrimitiveValueFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/PrimitiveValueFormatter.java @@ -13,14 +13,14 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.util.CSSUtil; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.CSSUtil; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.w3c.dom.css.CSSPrimitiveValue; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclItemFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclItemFormatter.java index acb6dad0f9..88bc0c0152 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclItemFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclItemFormatter.java @@ -13,14 +13,14 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.RegionIterator; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclarationFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclarationFormatter.java index ca0a2d7424..d558d46dec 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclarationFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleDeclarationFormatter.java @@ -13,9 +13,9 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; @@ -79,16 +79,16 @@ public class StyleDeclarationFormatter extends DefaultCSSSourceFormatter { } else if (prev == null) { // generate source : before the first // declaration - org.eclipse.wst.css.core.util.RegionIterator it = null; + org.eclipse.wst.css.core.internal.util.RegionIterator it = null; if (end > 0) { IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument(); - it = new org.eclipse.wst.css.core.util.RegionIterator(structuredDocument, end - 1); + it = new org.eclipse.wst.css.core.internal.util.RegionIterator(structuredDocument, end - 1); } else { int pos = getChildInsertPos(node); if (pos >= 0) { IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument(); - it = new org.eclipse.wst.css.core.util.RegionIterator(structuredDocument, pos - 1); + it = new org.eclipse.wst.css.core.internal.util.RegionIterator(structuredDocument, pos - 1); } } if (it != null) { @@ -108,16 +108,16 @@ public class StyleDeclarationFormatter extends DefaultCSSSourceFormatter { } else if (child == null) { // generate source : after the last // declaration - org.eclipse.wst.css.core.util.RegionIterator it = null; + org.eclipse.wst.css.core.internal.util.RegionIterator it = null; if (start > 0) { IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument(); - it = new org.eclipse.wst.css.core.util.RegionIterator(structuredDocument, start); + it = new org.eclipse.wst.css.core.internal.util.RegionIterator(structuredDocument, start); } else { int pos = getChildInsertPos(node); if (pos >= 0) { IStructuredDocument structuredDocument = node.getOwnerDocument().getModel().getStructuredDocument(); - it = new org.eclipse.wst.css.core.util.RegionIterator(structuredDocument, pos); + it = new org.eclipse.wst.css.core.internal.util.RegionIterator(structuredDocument, pos); } } if (it != null) { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleRuleFormatter.java index 451d1a7a92..badd8fe04d 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleRuleFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleRuleFormatter.java @@ -13,12 +13,12 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSAttr; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSStyleRule; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.util.RegionIterator; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSAttr; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleSheetFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleSheetFormatter.java index cfa211881d..7a6363941d 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleSheetFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/StyleSheetFormatter.java @@ -13,11 +13,11 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.util.RegionIterator; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; @@ -192,7 +192,7 @@ public class StyleSheetFormatter extends AbstractCSSSourceFormatter { /** * */ - protected void formatPre(org.eclipse.wst.css.core.document.ICSSNode node, java.lang.StringBuffer source) { + protected void formatPre(org.eclipse.wst.css.core.internal.provisional.document.ICSSNode node, java.lang.StringBuffer source) { int start = ((IndexedRegion) node).getStartOffset(); int end = (node.getFirstChild() != null && ((IndexedRegion) node.getFirstChild()).getEndOffset() > 0) ? ((IndexedRegion) node.getFirstChild()).getStartOffset() : getChildInsertPos(node); if (end > 0) { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/UnknownRuleFormatter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/UnknownRuleFormatter.java index 139dd3ff69..608ff78c5b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/UnknownRuleFormatter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/formatter/UnknownRuleFormatter.java @@ -13,8 +13,8 @@ package org.eclipse.wst.css.core.internal.formatter; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.css.core.document.ICSSNode; import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.w3c.dom.css.CSSUnknownRule; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMCategory.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCategory.java index 86a57db021..6bcd400723 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMCategory.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCategory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; public interface CSSMMCategory extends CSSMMNode { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMCharsetRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCharsetRule.java index 226f26abd3..d97fcdcdb5 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMCharsetRule.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCharsetRule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMContainer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMContainer.java index 0dfe14c32d..0b83713de1 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMContainer.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMDescriptor.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMDescriptor.java index 91364d5da6..14ba720d34 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMDescriptor.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMDescriptor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMFontFaceRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFontFaceRule.java index 6a96552c84..fe45dc2a6e 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMFontFaceRule.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFontFaceRule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMFunction.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFunction.java index 6b79c6c835..22df25d9ac 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMFunction.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFunction.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMImportRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMImportRule.java index ab0a0f3ccc..77fd1645ae 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMImportRule.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMImportRule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMKeyword.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMKeyword.java index 143a1de83b..5b45b32345 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMKeyword.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMKeyword.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMMediaRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMMediaRule.java index 637c38bf7f..b80aa21dc3 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMMediaRule.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMMediaRule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMNode.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNode.java index 2432fac4a0..d9ae2ea6de 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMNode.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNode.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMNumber.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNumber.java index ab80143f45..2ea1b27536 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMNumber.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNumber.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMPageRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPageRule.java index 5018390b4d..04f99e9d07 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMPageRule.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPageRule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMProperty.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMProperty.java index 6b9a6b016a..ec41462098 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMProperty.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMProperty.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMSelector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMSelector.java index 058c9e889f..d17ac199dc 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMSelector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMSelector.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; public interface CSSMMSelector extends CSSMMNode { String getSelectorType(); diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMString.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMString.java index 024a98aac1..c9ddf8d303 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMString.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMString.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMStyleRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleRule.java index 3257cc2229..80414fae3f 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMStyleRule.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleRule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMStyleSheet.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleSheet.java index f37b11ca3a..40dc67b422 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMStyleSheet.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleSheet.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMUnit.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMUnit.java index 798591f086..52910c6d4b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMMUnit.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMUnit.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMetaModel.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMetaModel.java index 1ced2a9fba..f80c2601cc 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSMetaModel.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMetaModel.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSProfile.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfile.java index 231504278d..1d5fb89fac 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSProfile.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfile.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSProfileRegistry.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfileRegistry.java index 870b793804..122b4cbdc3 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/CSSProfileRegistry.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfileRegistry.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel; +package org.eclipse.wst.css.core.internal.metamodel; @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.eclipse.wst.css.core.internal.metamodel.RegistryReader; +import org.eclipse.wst.css.core.internal.metamodelimpl.RegistryReader; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSFunctionID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSFunctionID.java index 9adc8da12c..8fd67b3297 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSFunctionID.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSFunctionID.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; public interface CSSFunctionID { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSKeywordID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSKeywordID.java index f2e1ce123d..856b36d919 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSKeywordID.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSKeywordID.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; public interface CSSKeywordID { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSMMTypeCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMMTypeCollector.java index 881ca877fb..c2baf782ed 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSMMTypeCollector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMMTypeCollector.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; public class CSSMMTypeCollector extends CSSMetaModelTraverser { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSMediaGroupID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMediaGroupID.java index ee42d64687..b7bda5465e 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSMediaGroupID.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMediaGroupID.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; public interface CSSMediaGroupID { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSMetaModelFinder.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelFinder.java index 934e05ec9b..ffb74111ff 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSMetaModelFinder.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelFinder.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.metamodel.CSSMetaModel; +import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.IStructuredModel; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSMetaModelTraverser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelTraverser.java index 436087008b..05a6f48d04 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSMetaModelTraverser.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelTraverser.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; import java.util.Iterator; import java.util.Stack; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSMetaModelUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelUtil.java index 901a0cd3a3..aad0b1b1bd 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSMetaModelUtil.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSMetaModelUtil.java @@ -8,20 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; -import org.eclipse.wst.css.core.document.ICSSStyleRule; -import org.eclipse.wst.css.core.metamodel.CSSMMDescriptor; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMProperty; -import org.eclipse.wst.css.core.metamodel.CSSMetaModel; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMDescriptor; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMProperty; +import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; import org.w3c.dom.css.CSSFontFaceRule; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSNumberID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSNumberID.java index 5bd9b1ed5a..4b367ab7a6 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSNumberID.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSNumberID.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; public interface CSSNumberID { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSProfileFinder.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSProfileFinder.java index 6d6f9261e7..fcdd2a58ab 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSProfileFinder.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSProfileFinder.java @@ -8,18 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.metamodel.CSSProfile; -import org.eclipse.wst.css.core.metamodel.CSSProfileRegistry; +import org.eclipse.wst.css.core.internal.metamodel.CSSProfile; +import org.eclipse.wst.css.core.internal.metamodel.CSSProfileRegistry; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.ui.contentproperties.ContentSettingsCreator; import org.eclipse.wst.sse.ui.contentproperties.IContentSettings; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSPropertyID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSPropertyID.java index 252d6379f0..5f66cdbd14 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSPropertyID.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSPropertyID.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; public interface CSSPropertyID { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSStringID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSStringID.java index 6157886591..c62519140d 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSStringID.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSStringID.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; public interface CSSStringID { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSUnitID.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSUnitID.java index 76cfac95ea..ce2b5f1d54 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/metamodel/util/CSSUnitID.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/util/CSSUnitID.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.metamodel.util; +package org.eclipse.wst.css.core.internal.metamodel.util; public interface CSSUnitID { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCategoryImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMCategoryImpl.java index db07505586..c841a62070 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCategoryImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMCategoryImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMCategory; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMCategory; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; class CSSMMCategoryImpl extends CSSMMNodeImpl implements CSSMMCategory { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCharsetRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMCharsetRuleImpl.java index 6e11efbf38..007deb6c9d 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMCharsetRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMCharsetRuleImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMCharsetRule; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMCharsetRule; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; class CSSMMCharsetRuleImpl extends CSSMMNodeImpl implements CSSMMCharsetRule { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMContainerImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMContainerImpl.java index 5903c55902..5e4c581ceb 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMContainerImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMContainerImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMContainer; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMContainer; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; class CSSMMContainerImpl extends CSSMMNodeImpl implements CSSMMContainer { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMDescriptorImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMDescriptorImpl.java index b3410691f7..7026c24839 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMDescriptorImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMDescriptorImpl.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; import java.util.Iterator; -import org.eclipse.wst.css.core.metamodel.CSSMMDescriptor; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMDescriptor; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; class CSSMMDescriptorImpl extends CSSMMNodeImpl implements CSSMMDescriptor { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFontFaceRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMFontFaceRuleImpl.java index 2e1c22fc58..c8d561e112 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFontFaceRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMFontFaceRuleImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMFontFaceRule; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMFontFaceRule; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; class CSSMMFontFaceRuleImpl extends CSSMMNodeImpl implements CSSMMFontFaceRule { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFunctionImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMFunctionImpl.java index 0be028ee58..a26b099a60 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMFunctionImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMFunctionImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMFunction; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMFunction; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; class CSSMMFunctionImpl extends CSSMMNodeImpl implements CSSMMFunction { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMImportRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMImportRuleImpl.java index 0f40141d07..582ea8b3f2 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMImportRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMImportRuleImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMImportRule; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMImportRule; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; class CSSMMImportRuleImpl extends CSSMMNodeImpl implements CSSMMImportRule { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMKeywordImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMKeywordImpl.java index f82b67b456..b46042ec91 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMKeywordImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMKeywordImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMKeyword; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMKeyword; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; class CSSMMKeywordImpl extends CSSMMNodeImpl implements CSSMMKeyword { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMMediaRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMMediaRuleImpl.java index 4a60ce6701..92dec7d171 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMMediaRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMMediaRuleImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMMediaRule; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMMediaRule; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; class CSSMMMediaRuleImpl extends CSSMMNodeImpl implements CSSMMMediaRule { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNodeImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMNodeImpl.java index 06c73a67e8..fb144d39b6 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNodeImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMNodeImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; import java.util.ArrayList; import java.util.Collections; @@ -17,7 +17,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; abstract class CSSMMNodeImpl implements CSSMMNode { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNumberImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMNumberImpl.java index 037c1f6ef3..0f2a9d8f74 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMNumberImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMNumberImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMNumber; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNumber; class CSSMMNumberImpl extends CSSMMNodeImpl implements CSSMMNumber { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPageRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPageRuleImpl.java index 3bbe54e62f..d793562033 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPageRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPageRuleImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMPageRule; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMPageRule; class CSSMMPageRuleImpl extends CSSMMNodeImpl implements CSSMMPageRule { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPropertyImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPropertyImpl.java index a9f7c3afe7..739098bd89 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPropertyImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPropertyImpl.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; import java.util.Iterator; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMProperty; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMProperty; class CSSMMPropertyImpl extends CSSMMNodeImpl implements CSSMMProperty { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPseudoClassImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPseudoClassImpl.java index ae8f81e12c..b0cab9a21d 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPseudoClassImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPseudoClassImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; class CSSMMPseudoClassImpl extends CSSMMSelectorImpl { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPseudoElementImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPseudoElementImpl.java index d047156399..71e906519b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMPseudoElementImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMPseudoElementImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; public class CSSMMPseudoElementImpl extends CSSMMSelectorImpl { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMSelectorExpressionImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMSelectorExpressionImpl.java index 1d1e11e99f..e58be60331 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMSelectorExpressionImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMSelectorExpressionImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; import java.util.HashMap; import java.util.Map; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMSelectorImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMSelectorImpl.java index 590b3fe608..c7a82cfc84 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMSelectorImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMSelectorImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMSelector; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMSelector; abstract class CSSMMSelectorImpl extends CSSMMNodeImpl implements CSSMMSelector { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStringImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStringImpl.java index 39ab26ca0b..143759a231 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStringImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStringImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMString; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMString; class CSSMMStringImpl extends CSSMMNodeImpl implements CSSMMString { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleRuleImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStyleRuleImpl.java index f1919eeaf9..706cff645e 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleRuleImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStyleRuleImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMStyleRule; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMStyleRule; class CSSMMStyleRuleImpl extends CSSMMNodeImpl implements CSSMMStyleRule { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleSheetImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStyleSheetImpl.java index a276d2dfde..a9de98ac41 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMStyleSheetImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMStyleSheetImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMStyleSheet; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMStyleSheet; class CSSMMStyleSheetImpl extends CSSMMNodeImpl implements CSSMMStyleSheet { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMUnitImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMUnitImpl.java index 7e90766f29..74f3f3e4fa 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMMUnitImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMUnitImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMUnit; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMUnit; /** * CSSMMUnit : embedded type diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMetaModelImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMetaModelImpl.java index 8ae89dfa82..85725d411b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSMetaModelImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMetaModelImpl.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMStyleSheet; -import org.eclipse.wst.css.core.metamodel.CSSMetaModel; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMStyleSheet; +import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel; class CSSMetaModelImpl extends CSSMMNodeImpl implements CSSMetaModel { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfileImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSProfileImpl.java index 09fdbe745a..ab81cd7387 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfileImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSProfileImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; @@ -23,8 +23,8 @@ import java.util.ResourceBundle; import org.eclipse.core.runtime.Platform; import org.eclipse.wst.css.core.internal.Logger; -import org.eclipse.wst.css.core.metamodel.CSSMetaModel; -import org.eclipse.wst.css.core.metamodel.CSSProfile; +import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel; +import org.eclipse.wst.css.core.internal.metamodel.CSSProfile; import org.osgi.framework.Bundle; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfileTest.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSProfileTest.java index f1b8777221..6711596bed 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/CSSProfileTest.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSProfileTest.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; import java.net.MalformedURLException; import java.net.URL; import org.eclipse.wst.css.core.internal.Logger; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMetaModel; -import org.eclipse.wst.css.core.metamodel.CSSProfile; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel; +import org.eclipse.wst.css.core.internal.metamodel.CSSProfile; class CSSProfileTest { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/MetaModelErrors.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/MetaModelErrors.java index aaae5587f9..968c58ea0c 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/MetaModelErrors.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/MetaModelErrors.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; interface MetaModelErrors { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/NodePool.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/NodePool.java index 635bf5bd07..7d5dd2f2ec 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/NodePool.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/NodePool.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; import java.util.ArrayList; import java.util.HashMap; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/ProfileHandler.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileHandler.java index c9481a66c5..1ee30b5090 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/ProfileHandler.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileHandler.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; import java.io.IOException; import java.net.MalformedURLException; @@ -20,10 +20,10 @@ import java.util.ResourceBundle; import java.util.Stack; import org.eclipse.wst.css.core.internal.Logger; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMSelector; -import org.eclipse.wst.css.core.metamodel.CSSProfile; -import org.eclipse.wst.css.core.metamodel.CSSProfileRegistry; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMSelector; +import org.eclipse.wst.css.core.internal.metamodel.CSSProfile; +import org.eclipse.wst.css.core.internal.metamodel.CSSProfileRegistry; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/ProfileKeywords.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileKeywords.java index 47f8dee96e..468315bc9b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/ProfileKeywords.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileKeywords.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; interface ProfileKeywords { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/ProfileLoader.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileLoader.java index e1b5315376..18262e1781 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/ProfileLoader.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ProfileLoader.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; @@ -17,7 +17,7 @@ import java.io.InputStream; import java.util.ResourceBundle; import org.eclipse.wst.css.core.internal.Logger; -import org.eclipse.wst.css.core.metamodel.CSSMetaModel; +import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/RegistryReader.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/RegistryReader.java index 489b288f37..c328e2c63f 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/RegistryReader.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/RegistryReader.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.wst.css.core.internal.Logger; -import org.eclipse.wst.css.core.metamodel.CSSProfile; +import org.eclipse.wst.css.core.internal.metamodel.CSSProfile; import org.osgi.framework.Bundle; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/ValueCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ValueCollector.java index e92f3993fd..b42deadd34 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/ValueCollector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/ValueCollector.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.util.CSSMetaModelTraverser; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelTraverser; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/XMLReaderUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/XMLReaderUtil.java index a22aa7cfd9..2e894cd356 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodel/XMLReaderUtil.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/XMLReaderUtil.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.internal.metamodel; +package org.eclipse.wst.css.core.internal.metamodelimpl; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/modelhandler/CSSModelLoader.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/CSSModelLoader.java index 427b059d80..bd2364a86b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/modelhandler/CSSModelLoader.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/CSSModelLoader.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.modelhandler; +package org.eclipse.wst.css.core.internal.modelhandler; import org.eclipse.wst.css.core.internal.document.CSSModelImpl; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/modelhandler/ModelHandlerForCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/ModelHandlerForCSS.java index 1dec329656..fe125d97cb 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/modelhandler/ModelHandlerForCSS.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/ModelHandlerForCSS.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.modelhandler; +package org.eclipse.wst.css.core.internal.modelhandler; import org.eclipse.wst.css.core.internal.encoding.CSSDocumentCharsetDetector; import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSRegionUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSRegionUtil.java index ace7fa6f6f..f9ca54f98e 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSRegionUtil.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSRegionUtil.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.css.core.internal.parser; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; public class CSSRegionUtil { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSSourceParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSSourceParser.java index 1d1337f5f2..75f633d637 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSSourceParser.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSSourceParser.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.wst.css.core.internal.Logger; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; import org.eclipse.wst.sse.core.parser.RegionParser; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSTokenizer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSTokenizer.java index c864f79480..e56c6bc295 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSTokenizer.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/CSSTokenizer.java @@ -19,8 +19,8 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.wst.css.core.internal.parser.regions.CSSTextRegionFactory; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; import org.eclipse.wst.sse.core.text.ITextRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/regions/CSSContextRegion.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/regions/CSSContextRegion.java index 1548f41cab..52490069da 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/regions/CSSContextRegion.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parser/regions/CSSContextRegion.java @@ -12,6 +12,8 @@ package org.eclipse.wst.css.core.internal.parser.regions; import org.eclipse.wst.sse.core.internal.parser.ContextRegion; +// ISSUE: this apprears not required to be subclassed and could be removed. + public class CSSContextRegion extends ContextRegion { public CSSContextRegion(String context, int start, int textLength, int length) { fType = context; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/parser/CSSRegionContexts.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSRegionContexts.java index 8b43dfb216..cd3bd13c1d 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/parser/CSSRegionContexts.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSRegionContexts.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.parser; +package org.eclipse.wst.css.core.internal.parserz; /** */ diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/parser/CSSTextParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSTextParser.java index 20cba6c0da..922c3f1b41 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/parser/CSSTextParser.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSTextParser.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.parser; +package org.eclipse.wst.css.core.internal.parserz; import java.io.IOException; import java.io.Reader; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/parser/CSSTextToken.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSTextToken.java index e68b858c8a..adcf01fe67 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/parser/CSSTextToken.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/parserz/CSSTextToken.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.parser; +package org.eclipse.wst.css.core.internal.parserz; public class CSSTextToken { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/ICSSModelAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/ICSSModelAdapter.java index c9095174df..ceb24e6bbf 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/ICSSModelAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/ICSSModelAdapter.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.adapters; +package org.eclipse.wst.css.core.internal.provisional.adapters; -import org.eclipse.wst.css.core.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; import org.eclipse.wst.sse.core.INodeAdapter; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/IModelProvideAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IModelProvideAdapter.java index b40be5ec5e..edfe95dde8 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/IModelProvideAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IModelProvideAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.adapters; +package org.eclipse.wst.css.core.internal.provisional.adapters; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/IStyleDeclarationAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleDeclarationAdapter.java index 967d8d87b7..897f1b7a73 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/IStyleDeclarationAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleDeclarationAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.adapters; +package org.eclipse.wst.css.core.internal.provisional.adapters; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/IStyleSelectorAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSelectorAdapter.java index b163d2701a..4428ac1d9c 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/IStyleSelectorAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSelectorAdapter.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.adapters; +package org.eclipse.wst.css.core.internal.provisional.adapters; -import org.eclipse.wst.css.core.document.ICSSSimpleSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector; import org.eclipse.wst.sse.core.INodeAdapter; import org.w3c.dom.Element; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/IStyleSheetAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSheetAdapter.java index 33e09d258d..a4e8251f5e 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/IStyleSheetAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSheetAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.adapters; +package org.eclipse.wst.css.core.internal.provisional.adapters; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/IStyleSheetListAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSheetListAdapter.java index 418db30cff..4263f90c69 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/adapters/IStyleSheetListAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/adapters/IStyleSheetListAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.adapters; +package org.eclipse.wst.css.core.internal.provisional.adapters; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSAccess.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSAccess.java index f05ef5a504..6d84c33d70 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSAccess.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSAccess.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSAttr.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSAttr.java index 087d93b525..611e4c101b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSAttr.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSAttr.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSCharsetRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSCharsetRule.java index b861262a5a..8687ebfd23 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSCharsetRule.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSCharsetRule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSDocument.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSDocument.java index 8d70e3a490..b4f6429ae1 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSDocument.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSDocument.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSImportRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSImportRule.java index 9818c2f160..a514aa6f3f 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSImportRule.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSImportRule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSMediaRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSMediaRule.java index d06f3c5a71..aef95a1186 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSMediaRule.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSMediaRule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSModel.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSModel.java index 15f5f3fd6e..ae33e48b93 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSModel.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSModel.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; -import org.eclipse.wst.css.core.event.ICSSStyleNotifier; +import org.eclipse.wst.css.core.internal.event.ICSSStyleNotifier; import org.eclipse.wst.sse.core.IStructuredModel; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSNamedNodeMap.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNamedNodeMap.java index 321acca79d..86c136a7cf 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSNamedNodeMap.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNamedNodeMap.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSNode.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNode.java index f8af0b89f4..1a7abbf35a 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSNode.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNode.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSNodeList.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNodeList.java index 235bfbe8cb..98681d731a 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSNodeList.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSNodeList.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSPageRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSPageRule.java index a182fad23f..8e98335589 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSPageRule.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSPageRule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSPrimitiveValue.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSPrimitiveValue.java index 0260b69f00..f6a0ebaaff 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSPrimitiveValue.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSPrimitiveValue.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSRuleContainer.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSRuleContainer.java index 61ea7d317c..ddbe1db75c 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSRuleContainer.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSRuleContainer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSSelector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelector.java index 301ceb9c8b..5f3a13f10a 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSSelector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelector.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSSelectorCombinator.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorCombinator.java index 62ceac299b..f0e25a5740 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSSelectorCombinator.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorCombinator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSSelectorItem.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorItem.java index 94dae8924c..2e3585b939 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSSelectorItem.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorItem.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSSelectorList.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorList.java index c4608ddde5..1514ce8636 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSSelectorList.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSelectorList.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSSimpleSelector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSimpleSelector.java index 4e332e42bf..74e779d9a4 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSSimpleSelector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSSimpleSelector.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSStyleDeclItem.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleDeclItem.java index 6d4b080379..5b170c442b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSStyleDeclItem.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleDeclItem.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSStyleDeclaration.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleDeclaration.java index f9aeb80c82..c3d16aff6d 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSStyleDeclaration.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleDeclaration.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSStyleRule.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleRule.java index 95fe26fd9c..ccc785ac42 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSStyleRule.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleRule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSStyleSheet.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleSheet.java index 7da1f4710a..3686d8ba35 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSStyleSheet.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSStyleSheet.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSValue.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSValue.java index 90715e9cea..f73231d714 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSValue.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSValue.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSValueList.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSValueList.java index 91a59346ea..546e4527a7 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICSSValueList.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICSSValueList.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICounter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICounter.java index fc57d59e68..4eea179d60 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/ICounter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/ICounter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/IDOMImplementationCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/IDOMImplementationCSS.java index 81edc69b3f..5b08544733 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/IDOMImplementationCSS.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/IDOMImplementationCSS.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/IDocumentStyle.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/IDocumentStyle.java index bed9a86504..03dbeda12a 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/document/IDocumentStyle.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/provisional/document/IDocumentStyle.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.document; +package org.eclipse.wst.css.core.internal.provisional.document; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/tasks/CSSTaskTagSeeker.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/tasks/CSSTaskTagSeeker.java index 95bb82eb73..b718c44bed 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/tasks/CSSTaskTagSeeker.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/tasks/CSSTaskTagSeeker.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.core.internal.tasks; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; import org.eclipse.wst.sse.core.participants.TaskTagSeeker; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/CSSStructuredDocumentReParser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/CSSStructuredDocumentReParser.java index 804b480b4d..a142d1055a 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/CSSStructuredDocumentReParser.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/text/CSSStructuredDocumentReParser.java @@ -14,9 +14,9 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; import org.eclipse.wst.css.core.internal.Logger; import org.eclipse.wst.css.core.internal.parser.CSSRegionUtil; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.util.CSSUtil; -import org.eclipse.wst.css.core.util.RegionIterator; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.util.CSSUtil; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.sse.core.events.StructuredDocumentEvent; import org.eclipse.wst.sse.core.internal.text.StructuredDocumentReParser; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/AbstractCssTraverser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/AbstractCssTraverser.java index b418efe034..95d538d0c3 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/AbstractCssTraverser.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/AbstractCssTraverser.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; import java.util.ArrayList; import java.util.Stack; import java.util.Vector; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSStyleSheet; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSClassTraverser.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSClassTraverser.java index 042a314d52..e7574d6f6d 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSClassTraverser.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSClassTraverser.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; @@ -17,15 +17,15 @@ import java.util.Collection; import java.util.Collections; import java.util.Iterator; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSMediaRule; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.document.ICSSSelectorItem; -import org.eclipse.wst.css.core.document.ICSSSelectorList; -import org.eclipse.wst.css.core.document.ICSSSimpleSelector; -import org.eclipse.wst.css.core.document.ICSSStyleRule; -import org.eclipse.wst.css.core.document.ICSSStyleSheet; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSLinkConverter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSLinkConverter.java index b59b147165..df3b16c74b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSLinkConverter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSLinkConverter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.xml.core.document.IDOMNode; @@ -26,7 +26,7 @@ import org.w3c.dom.css.CSSValue; /** * */ -public class CSSLinkConverter extends org.eclipse.wst.css.core.util.AbstractCssTraverser { +public class CSSLinkConverter extends org.eclipse.wst.css.core.internal.util.AbstractCssTraverser { private static final String URL_BEGIN = "url("; //$NON-NLS-1$ private static final String URL_END = ")"; //$NON-NLS-1$ private static final String EMPTY = ""; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSPathService.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSPathService.java index 4d4af853ed..1ebe163ed3 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSPathService.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSPathService.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSSelectorListFactory.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSSelectorListFactory.java index 633e1fc8c1..04b97e8793 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSSelectorListFactory.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSSelectorListFactory.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; -import org.eclipse.wst.css.core.document.ICSSSelectorList; import org.eclipse.wst.css.core.internal.document.CSSSelectorListImpl; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList; public class CSSSelectorListFactory { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSStyleDeclarationFactory.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSStyleDeclarationFactory.java index 0aec11a558..e3e48e69bc 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSStyleDeclarationFactory.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSStyleDeclarationFactory.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; import org.eclipse.wst.css.core.internal.document.CSSStyleDeclarationFactoryContext; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSUtil.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSUtil.java index 34805eaaf4..adfd9ea726 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/CSSUtil.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/CSSUtil.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; @@ -17,8 +17,8 @@ import java.util.Iterator; import org.eclipse.wst.css.core.internal.Logger; import org.eclipse.wst.css.core.internal.parser.CSSRegionUtil; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegionList; import org.eclipse.wst.sse.core.text.ITextRegion; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/ImportRuleCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/ImportRuleCollector.java index 429f892e64..6ec4ec0de4 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/ImportRuleCollector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/ImportRuleCollector.java @@ -8,21 +8,21 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; import java.util.Vector; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSStyleSheet; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet; /** * */ -public class ImportRuleCollector extends org.eclipse.wst.css.core.util.AbstractCssTraverser { +public class ImportRuleCollector extends org.eclipse.wst.css.core.internal.util.AbstractCssTraverser { protected java.util.Vector rules = new Vector(); protected ICSSStyleSheet target = null; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/ImportedCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/ImportedCollector.java index 86dfc67c3a..2c4751ef8f 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/ImportedCollector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/ImportedCollector.java @@ -8,20 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; import java.util.List; import java.util.Vector; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; /** * */ -public class ImportedCollector extends org.eclipse.wst.css.core.util.AbstractCssTraverser { +public class ImportedCollector extends org.eclipse.wst.css.core.internal.util.AbstractCssTraverser { protected java.util.Vector externals = new Vector(); diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/RegionIterator.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/RegionIterator.java index 572f87dcfe..37a6280857 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/RegionIterator.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/RegionIterator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/SelectionCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectionCollector.java index 3f8dee934d..e22a57e379 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/SelectionCollector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectionCollector.java @@ -8,20 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; import java.util.ArrayList; import java.util.List; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.IndexedRegion; /** */ -public class SelectionCollector extends org.eclipse.wst.css.core.util.AbstractCssTraverser { +public class SelectionCollector extends org.eclipse.wst.css.core.internal.util.AbstractCssTraverser { int start, end; List selectedNodes; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/SelectorValidator.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectorValidator.java index 80ca47728b..0a92aafd51 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/SelectorValidator.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectorValidator.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.document.ICSSSelectorItem; -import org.eclipse.wst.css.core.document.ICSSSelectorList; -import org.eclipse.wst.css.core.document.ICSSSimpleSelector; import org.eclipse.wst.css.core.internal.document.CSSSelectorListImpl; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector; public class SelectorValidator { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/SelectorsCollector.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectorsCollector.java index 26143c0c45..fcaa32ee98 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/SelectorsCollector.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/SelectorsCollector.java @@ -8,17 +8,17 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; import java.util.Iterator; import java.util.Vector; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.document.ICSSSelectorList; -import org.eclipse.wst.css.core.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/URLHelper.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/URLHelper.java index d4a3a0e776..ba00c5f34c 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/URLHelper.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/URLHelper.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/URLModelProviderCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/URLModelProviderCSS.java index 499a2a5757..1d8b2db014 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/URLModelProviderCSS.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/URLModelProviderCSS.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util; +package org.eclipse.wst.css.core.internal.util; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BackgroundPositionXSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundPositionXSubStyleAdapter.java index edf94f0d4b..29ab93ce28 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BackgroundPositionXSubStyleAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundPositionXSubStyleAdapter.java @@ -8,23 +8,23 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import java.util.Collection; import java.util.Iterator; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSValue; -import org.eclipse.wst.css.core.document.ICSSValueList; import org.eclipse.wst.css.core.internal.contentmodel.IValID; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; import org.eclipse.wst.css.core.internal.contentmodel.PropCMSubProperty; import org.eclipse.wst.css.core.internal.contentmodel.PropCMUtil; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSValueList; import org.w3c.dom.css.CSSPrimitiveValue; import org.w3c.dom.css.CSSValue; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BackgroundPositionYSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundPositionYSubStyleAdapter.java index 4023462f08..bb9e9a7d6e 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BackgroundPositionYSubStyleAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundPositionYSubStyleAdapter.java @@ -8,23 +8,23 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import java.util.Collection; import java.util.Iterator; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSValue; -import org.eclipse.wst.css.core.document.ICSSValueList; import org.eclipse.wst.css.core.internal.contentmodel.IValID; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; import org.eclipse.wst.css.core.internal.contentmodel.PropCMSubProperty; import org.eclipse.wst.css.core.internal.contentmodel.PropCMUtil; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSValueList; import org.w3c.dom.css.CSSPrimitiveValue; import org.w3c.dom.css.CSSValue; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BackgroundShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundShorthandAdapter.java index bc42dd28e8..d9b5fe6d54 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BackgroundShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BackgroundShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** @@ -65,7 +65,7 @@ public class BackgroundShorthandAdapter implements IShorthandAdapter { pos = pos + " " + tokens[i].image;//$NON-NLS-1$ } } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) { if (pos == null || pos.length() <= 0) pos = tokens[i].image; else @@ -135,7 +135,7 @@ public class BackgroundShorthandAdapter implements IShorthandAdapter { pos = pos + " " + tokens[i].image;//$NON-NLS-1$ } } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) { if (pos == null) pos = tokens[i].image; else diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderBottomShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderBottomShorthandAdapter.java index 95f851c614..09b505eaad 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderBottomShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderBottomShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** @@ -54,7 +54,7 @@ public class BorderBottomShorthandAdapter implements IShorthandAdapter { else if (propColor.canHave(tokens[i].image)) color = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { width = tokens[i].image; } else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) { @@ -106,7 +106,7 @@ public class BorderBottomShorthandAdapter implements IShorthandAdapter { else if (propColor.canHave(tokens[i].image)) color = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { width = tokens[i].image; } else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderColorShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderColorShorthandAdapter.java index fe81a31766..e314007295 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderColorShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderColorShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderLeftShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderLeftShorthandAdapter.java index 23564e68c0..cbc793082b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderLeftShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderLeftShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** @@ -54,7 +54,7 @@ public class BorderLeftShorthandAdapter implements IShorthandAdapter { else if (propColor.canHave(tokens[i].image)) color = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { width = tokens[i].image; } else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) { @@ -106,7 +106,7 @@ public class BorderLeftShorthandAdapter implements IShorthandAdapter { else if (propColor.canHave(tokens[i].image)) color = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { width = tokens[i].image; } else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderRightShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderRightShorthandAdapter.java index a62197b4f7..d74e440bb5 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderRightShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderRightShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** @@ -54,7 +54,7 @@ public class BorderRightShorthandAdapter implements IShorthandAdapter { else if (propColor.canHave(tokens[i].image)) color = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { width = tokens[i].image; } else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) { @@ -106,7 +106,7 @@ public class BorderRightShorthandAdapter implements IShorthandAdapter { else if (propColor.canHave(tokens[i].image)) color = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { width = tokens[i].image; } else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderShorthandAdapter.java index 6f82189ce4..6da333361b 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** @@ -54,7 +54,7 @@ public class BorderShorthandAdapter implements IShorthandAdapter { else if (propColor.canHave(tokens[i].image)) color = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { width = tokens[i].image; } else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) { @@ -106,7 +106,7 @@ public class BorderShorthandAdapter implements IShorthandAdapter { else if (propColor.canHave(tokens[i].image)) color = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { width = tokens[i].image; } else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderStyleShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderStyleShorthandAdapter.java index 337560a1a0..b5fb9629d4 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderStyleShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderStyleShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderTopShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderTopShorthandAdapter.java index c619eebba9..a728399aad 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderTopShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderTopShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** @@ -54,7 +54,7 @@ public class BorderTopShorthandAdapter implements IShorthandAdapter { else if (propColor.canHave(tokens[i].image)) color = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { width = tokens[i].image; } else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) { @@ -106,7 +106,7 @@ public class BorderTopShorthandAdapter implements IShorthandAdapter { else if (propColor.canHave(tokens[i].image)) color = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER) { width = tokens[i].image; } else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_HASH) { diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderWidthShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderWidthShorthandAdapter.java index 8c41ad739a..cda09e6fc7 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/BorderWidthShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/BorderWidthShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** @@ -44,7 +44,7 @@ public class BorderWidthShorthandAdapter implements IShorthandAdapter { String[] idents = new String[4]; int j = 0; for (int i = 0; i < tokens.length; i++) { - if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) + if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) idents[j++] = tokens[i].image; if (j == 4) break; @@ -89,7 +89,7 @@ public class BorderWidthShorthandAdapter implements IShorthandAdapter { String[] idents = new String[4]; int j = 0; for (int i = 0; i < tokens.length; i++) { - if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) + if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) idents[j++] = tokens[i].image; if (j == 4) break; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/CSSPropertyContext.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/CSSPropertyContext.java index b01714576f..1b40706a19 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/CSSPropertyContext.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/CSSPropertyContext.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; @@ -18,10 +18,10 @@ import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; -import org.eclipse.wst.css.core.document.ICSSValue; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; import org.eclipse.wst.css.core.internal.contentmodel.PropCMSubProperty; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue; import org.w3c.dom.css.CSSValue; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ClipBottomSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipBottomSubStyleAdapter.java index dc3dfcc901..28f06fc521 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ClipBottomSubStyleAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipBottomSubStyleAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ClipLeftSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipLeftSubStyleAdapter.java index cf2110dfde..58ba873b73 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ClipLeftSubStyleAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipLeftSubStyleAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ClipRightSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipRightSubStyleAdapter.java index bd796745c9..1560afccd5 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ClipRightSubStyleAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipRightSubStyleAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ClipSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipSubStyleAdapter.java index dc7792f3ad..e019a34d0c 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ClipSubStyleAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipSubStyleAdapter.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; -import org.eclipse.wst.css.core.document.ICSSValue; import org.eclipse.wst.css.core.internal.contentmodel.IValID; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue; import org.w3c.dom.css.Rect; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ClipTopSubStyleAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipTopSubStyleAdapter.java index 1786db845f..71b5d537f8 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ClipTopSubStyleAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ClipTopSubStyleAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/FontShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/FontShorthandAdapter.java index dbfbebd9db..41d49ccf55 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/FontShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/FontShorthandAdapter.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.IValID; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** @@ -80,7 +80,7 @@ public class FontShorthandAdapter implements IShorthandAdapter { else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER && weight == null && propWeight.canHave(tokens[i].image)) { weight = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) { size = tokens[i].image; break; // if size found, break loop } @@ -104,7 +104,7 @@ public class FontShorthandAdapter implements IShorthandAdapter { // line-height ? if (i < tokens.length && tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR && tokens[i].image.equals("/")) { //$NON-NLS-1$ for (i++; i < tokens.length; i++) { - if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) { + if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) { height = tokens[i++].image; break; } @@ -181,7 +181,7 @@ public class FontShorthandAdapter implements IShorthandAdapter { else if (tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER && weight == null && propWeight.canHave(tokens[i].image)) { weight = tokens[i].image; } - else if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) { + else if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) { size = tokens[i].image; break; // if size found, break loop } @@ -205,7 +205,7 @@ public class FontShorthandAdapter implements IShorthandAdapter { // line-height ? if (i < tokens.length && tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR && tokens[i].image.equals("/")) { //$NON-NLS-1$ for (i++; i < tokens.length; i++) { - if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) { + if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT) { height = tokens[i++].image; break; } diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ICSS2Properties.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ICSS2Properties.java index 743b1c13a5..02d518c4ec 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ICSS2Properties.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ICSS2Properties.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import java.util.Enumeration; import java.util.Iterator; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; import org.w3c.dom.css.CSS2Properties; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/IShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/IShorthandAdapter.java index 1a03f2aad1..5a91f0a723 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/IShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/IShorthandAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ISubPropertyAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ISubPropertyAdapter.java index 90e19ce5f0..7d87b6bc01 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ISubPropertyAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ISubPropertyAdapter.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ListStyleShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ListStyleShorthandAdapter.java index dbf2018722..f6020335f9 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ListStyleShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ListStyleShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/MarginShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/MarginShorthandAdapter.java index 287abb50b7..b53afc6f70 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/MarginShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/MarginShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** @@ -43,7 +43,7 @@ public class MarginShorthandAdapter implements IShorthandAdapter { String[] idents = new String[4]; int j = 0; for (int i = 0; i < tokens.length; i++) { - if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) + if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) idents[j++] = tokens[i].image; if (j == 4) break; @@ -89,7 +89,7 @@ public class MarginShorthandAdapter implements IShorthandAdapter { String[] idents = new String[4]; int j = 0; for (int i = 0; i < tokens.length; i++) { - if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) + if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) idents[j++] = tokens[i].image; if (j == 4) break; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/PaddingShorthandAdapter.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/PaddingShorthandAdapter.java index 7e0dd4d184..5cde483c2f 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/PaddingShorthandAdapter.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/PaddingShorthandAdapter.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; /** @@ -43,7 +43,7 @@ public class PaddingShorthandAdapter implements IShorthandAdapter { String[] idents = new String[4]; int j = 0; for (int i = 0; i < tokens.length; i++) { - if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) + if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) idents[j++] = tokens[i].image; if (j == 4) break; @@ -88,7 +88,7 @@ public class PaddingShorthandAdapter implements IShorthandAdapter { String[] idents = new String[4]; int j = 0; for (int i = 0; i < tokens.length; i++) { - if (org.eclipse.wst.css.core.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) + if (org.eclipse.wst.css.core.internal.util.CSSUtil.isLength(tokens[i]) || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER || tokens[i].kind == CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE) idents[j++] = tokens[i].image; if (j == 4) break; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ValueData.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ValueData.java index 05a2079ff0..a64f3b12d4 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/util/declaration/ValueData.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/util/declaration/ValueData.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.css.core.util.declaration; +package org.eclipse.wst.css.core.internal.util.declaration; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/preferences/CSSPreferenceHelper.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/preferences/CSSPreferenceHelper.java index 2db57c4664..b042dfcf1e 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/preferences/CSSPreferenceHelper.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/preferences/CSSPreferenceHelper.java @@ -11,8 +11,8 @@ package org.eclipse.wst.css.core.preferences; import org.eclipse.core.runtime.Preferences; -import org.eclipse.wst.css.core.document.ICSSModel; import org.eclipse.wst.css.core.internal.CSSCorePlugin; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; import org.eclipse.wst.sse.core.internal.SSECorePlugin; import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/text/ICSSPartitionTypes.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/text/ICSSPartitionTypes.java index 323ab609ed..8bc473a57a 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/text/ICSSPartitionTypes.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/text/ICSSPartitionTypes.java @@ -3,9 +3,9 @@ package org.eclipse.wst.css.core.text; import org.eclipse.wst.sse.core.text.IStructuredPartitionTypes; /** - * This interface is not intended to be implemented. - * It defines the partitioning for CSS and all its partitions. - * Clients should reference the partition type Strings defined here directly. + * This interface is not intended to be implemented. It defines the + * partitioning for CSS and all its partitions. Clients should reference the + * partition type Strings defined here directly. * * @since 1.0 */ diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/StructuredTextViewerConfigurationCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/StructuredTextViewerConfigurationCSS.java index 867fbd2d31..3959422592 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/StructuredTextViewerConfigurationCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/StructuredTextViewerConfigurationCSS.java @@ -19,7 +19,7 @@ import org.eclipse.jface.text.contentassist.IContentAssistant; import org.eclipse.jface.text.formatter.IContentFormatter; import org.eclipse.jface.text.formatter.MultiPassContentFormatter; import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.wst.css.core.format.FormatProcessorCSS; +import org.eclipse.wst.css.core.internal.format.FormatProcessorCSS; import org.eclipse.wst.css.core.text.ICSSPartitionTypes; import org.eclipse.wst.css.ui.autoedit.StructuredAutoEditStrategyCSS; import org.eclipse.wst.css.ui.contentassist.CSSContentAssistProcessor; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/autoedit/StructuredAutoEditStrategyCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/autoedit/StructuredAutoEditStrategyCSS.java index ddb0840bea..2292acb47f 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/autoedit/StructuredAutoEditStrategyCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/autoedit/StructuredAutoEditStrategyCSS.java @@ -12,9 +12,9 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DocumentCommand; import org.eclipse.jface.text.IDocument; import org.eclipse.ui.texteditor.ITextEditorExtension3; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.RegionIterator; import org.eclipse.wst.css.ui.internal.Logger; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistContext.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistContext.java index 3d1baeda6e..f9527d9e5c 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistContext.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistContext.java @@ -11,14 +11,14 @@ package org.eclipse.wst.css.ui.contentassist; import org.eclipse.jface.text.BadLocationException; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.metamodel.CSSMetaModel; -import org.eclipse.wst.css.core.metamodel.util.CSSMetaModelFinder; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; -import org.eclipse.wst.css.core.util.CSSUtil; -import org.eclipse.wst.css.core.util.RegionIterator; +import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel; +import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelFinder; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.util.CSSUtil; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistProcessor.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistProcessor.java index 8e00a3bd5d..be2637fcbc 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistProcessor.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSContentAssistProcessor.java @@ -13,10 +13,10 @@ package org.eclipse.wst.css.ui.contentassist; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.wst.css.core.adapters.ICSSModelAdapter; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.adapters.ICSSModelAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.html.core.htmlcss.StyleAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.IStructuredModel; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalArranger.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalArranger.java index 854e87d1ca..6dbf349a69 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalArranger.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalArranger.java @@ -16,15 +16,15 @@ import java.util.List; import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.wst.css.core.document.ICSSMediaRule; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPageRule; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; -import org.eclipse.wst.css.core.document.ICSSStyleRule; -import org.eclipse.wst.css.core.document.ICSSStyleSheet; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet; import org.w3c.dom.css.CSSFontFaceRule; class CSSProposalArranger { diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGenerator.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGenerator.java index 483645adfe..ea8448f7f5 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGenerator.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGenerator.java @@ -17,9 +17,9 @@ import java.util.List; import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.RegionIterator; import org.eclipse.wst.css.ui.image.CSSImageHelper; import org.eclipse.wst.sse.core.text.ITextRegion; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForAtmarkRule.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForAtmarkRule.java index 1539037d77..75b3129353 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForAtmarkRule.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForAtmarkRule.java @@ -14,16 +14,16 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.wst.css.core.document.ICSSCharsetRule; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.util.CSSMetaModelUtil; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelUtil; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.util.SelectionCollector; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.SelectionCollector; import org.eclipse.wst.css.ui.image.CSSImageType; import org.eclipse.wst.sse.core.text.ITextRegion; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForDeclarationName.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForDeclarationName.java index 6bf20406c4..99b9b7dca4 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForDeclarationName.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForDeclarationName.java @@ -16,11 +16,11 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.util.CSSMetaModelUtil; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelUtil; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; import org.eclipse.wst.css.ui.image.CSSImageType; import org.eclipse.wst.css.ui.preferences.CSSPreferenceManager; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForDeclarationValue.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForDeclarationValue.java index f80c0f9575..73bdc6c7b9 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForDeclarationValue.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForDeclarationValue.java @@ -15,21 +15,21 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.metamodel.CSSMMDescriptor; -import org.eclipse.wst.css.core.metamodel.CSSMMFunction; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMNumber; -import org.eclipse.wst.css.core.metamodel.CSSMMProperty; -import org.eclipse.wst.css.core.metamodel.CSSMMUnit; -import org.eclipse.wst.css.core.metamodel.util.CSSFunctionID; -import org.eclipse.wst.css.core.metamodel.util.CSSMetaModelUtil; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMDescriptor; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMFunction; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNumber; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMProperty; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMUnit; +import org.eclipse.wst.css.core.internal.metamodel.util.CSSFunctionID; +import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelUtil; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.util.CSSUtil; +import org.eclipse.wst.css.core.internal.util.RegionIterator; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; -import org.eclipse.wst.css.core.util.CSSUtil; -import org.eclipse.wst.css.core.util.RegionIterator; import org.eclipse.wst.css.ui.image.CSSImageType; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; 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 2829b07511..ee81dd5fd2 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 @@ -16,8 +16,8 @@ import java.util.Iterator; import java.util.List; import java.util.Vector; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSStyleRule; +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; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForPseudoSelector.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForPseudoSelector.java index a9c92a5851..79bfddb034 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForPseudoSelector.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentassist/CSSProposalGeneratorForPseudoSelector.java @@ -17,14 +17,14 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPageRule; -import org.eclipse.wst.css.core.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMSelector; +import org.eclipse.wst.css.core.internal.metamodel.util.CSSMMTypeCollector; import org.eclipse.wst.css.core.internal.parser.CSSRegionUtil; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMMSelector; -import org.eclipse.wst.css.core.metamodel.util.CSSMMTypeCollector; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; import org.eclipse.wst.css.ui.image.CSSImageType; import org.eclipse.wst.sse.core.text.ITextRegion; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentproperties/ContentSettingsRegistry.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentproperties/ContentSettingsRegistry.java index 8862b955eb..fbb96b62da 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentproperties/ContentSettingsRegistry.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/contentproperties/ContentSettingsRegistry.java @@ -10,8 +10,8 @@ package org.eclipse.wst.css.ui.contentproperties; import java.util.Iterator; -import org.eclipse.wst.css.core.metamodel.CSSProfile; -import org.eclipse.wst.css.core.metamodel.CSSProfileRegistry; +import org.eclipse.wst.css.core.internal.metamodel.CSSProfile; +import org.eclipse.wst.css.core.internal.metamodel.CSSProfileRegistry; import org.eclipse.wst.sse.ui.contentproperties.ui.ComboList; import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/image/CSSImageType.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/image/CSSImageType.java index 9efa575dcf..547fc354a3 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/image/CSSImageType.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/image/CSSImageType.java @@ -15,20 +15,20 @@ package org.eclipse.wst.css.ui.image; import java.util.HashMap; import java.util.Map; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.document.ICSSSelectorItem; -import org.eclipse.wst.css.core.document.ICSSSelectorList; -import org.eclipse.wst.css.core.document.ICSSSimpleSelector; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleRule; -import org.eclipse.wst.css.core.metamodel.CSSMMProperty; -import org.eclipse.wst.css.core.metamodel.CSSMetaModel; -import org.eclipse.wst.css.core.metamodel.util.CSSMetaModelFinder; -import org.eclipse.wst.css.core.metamodel.util.CSSMetaModelUtil; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMProperty; +import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel; +import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelFinder; +import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelUtil; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; import org.w3c.dom.css.CSSCharsetRule; import org.w3c.dom.css.CSSFontFaceRule; import org.w3c.dom.css.CSSImportRule; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentoutline/CSSNodeAdapter.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentoutline/CSSNodeAdapter.java index ba6736fe8e..08598982e3 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentoutline/CSSNodeAdapter.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentoutline/CSSNodeAdapter.java @@ -20,11 +20,11 @@ import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.views.properties.PropertySheetPage; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; -import org.eclipse.wst.css.core.document.ICSSStyleRule; -import org.eclipse.wst.css.core.document.ICSSStyleSheet; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet; import org.eclipse.wst.sse.core.IAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/ProjectionModelNodeAdapterCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/ProjectionModelNodeAdapterCSS.java index d0cfbdfc86..a0d908cb9b 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/ProjectionModelNodeAdapterCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/ProjectionModelNodeAdapterCSS.java @@ -25,7 +25,7 @@ import org.eclipse.jface.text.source.projection.ProjectionViewer; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Canvas; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IndexedRegion; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/ProjectionModelNodeAdapterFactoryCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/ProjectionModelNodeAdapterFactoryCSS.java index 01230e028f..318196ac5e 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/ProjectionModelNodeAdapterFactoryCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/ProjectionModelNodeAdapterFactoryCSS.java @@ -12,7 +12,7 @@ package org.eclipse.wst.css.ui.internal.projection; import org.eclipse.jface.text.source.projection.ProjectionViewer; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.AbstractAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/StructuredTextFoldingProviderCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/StructuredTextFoldingProviderCSS.java index b5ca48df8d..6982b921f1 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/StructuredTextFoldingProviderCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/StructuredTextFoldingProviderCSS.java @@ -4,8 +4,8 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.source.projection.IProjectionListener; import org.eclipse.jface.text.source.projection.ProjectionViewer; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.StructuredModelManager; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSPropertySource.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSPropertySource.java index d4f284950e..530b83126e 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSPropertySource.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSPropertySource.java @@ -24,14 +24,14 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSNodeList; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.metamodel.CSSMMCategory; -import org.eclipse.wst.css.core.metamodel.CSSMMNode; -import org.eclipse.wst.css.core.metamodel.CSSMetaModel; -import org.eclipse.wst.css.core.metamodel.util.CSSMetaModelFinder; -import org.eclipse.wst.css.core.metamodel.util.CSSMetaModelUtil; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMCategory; +import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode; +import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel; +import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelFinder; +import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelUtil; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNodeList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; import org.eclipse.wst.css.ui.internal.CSSUIMessages; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java index 6b2b65c1ce..85e359e3c8 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java @@ -24,9 +24,9 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.views.properties.TextPropertyDescriptor; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.util.CSSPathService; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.util.CSSPathService; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.xml.core.document.IDOMNode; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectCSSAction.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectCSSAction.java index 4e3302d2fe..4f4db63151 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectCSSAction.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectCSSAction.java @@ -9,7 +9,7 @@ package org.eclipse.wst.css.ui.internal.selection; import org.eclipse.jface.text.Region; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.ui.internal.StructuredTextEditor; import org.eclipse.wst.sse.ui.internal.selection.SelectionHistory; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectEnclosingCSSAction.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectEnclosingCSSAction.java index 2e506b1149..56117cd277 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectEnclosingCSSAction.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectEnclosingCSSAction.java @@ -9,7 +9,7 @@ package org.eclipse.wst.css.ui.internal.selection; import org.eclipse.jface.text.Region; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.internal.StructuredTextEditor; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectNextCSSAction.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectNextCSSAction.java index f45f491c82..11765f0cbf 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectNextCSSAction.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectNextCSSAction.java @@ -9,7 +9,7 @@ package org.eclipse.wst.css.ui.internal.selection; import org.eclipse.jface.text.Region; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.internal.StructuredTextEditor; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectPreviousCSSAction.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectPreviousCSSAction.java index 52101d2980..cdeac26f2c 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectPreviousCSSAction.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructureSelectPreviousCSSAction.java @@ -9,7 +9,7 @@ package org.eclipse.wst.css.ui.internal.selection; import org.eclipse.jface.text.Region; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.IndexedRegion; import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.internal.StructuredTextEditor; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/preferences/ui/CSSColorPage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/preferences/ui/CSSColorPage.java index 5c9df40547..49ba5f30ae 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/preferences/ui/CSSColorPage.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/preferences/ui/CSSColorPage.java @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.wst.css.core.contenttype.ContentTypeIdForCSS; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; import org.eclipse.wst.css.ui.internal.CSSUIMessages; import org.eclipse.wst.css.ui.internal.CSSUIPlugin; import org.eclipse.wst.css.ui.internal.editor.IHelpContextIds; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/registry/AdapterFactoryProviderCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/registry/AdapterFactoryProviderCSS.java index 1023ecf7fd..ccd3214c86 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/registry/AdapterFactoryProviderCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/registry/AdapterFactoryProviderCSS.java @@ -9,7 +9,7 @@ package org.eclipse.wst.css.ui.registry; import org.eclipse.ui.views.properties.IPropertySource; -import org.eclipse.wst.css.core.modelhandler.ModelHandlerForCSS; +import org.eclipse.wst.css.core.internal.modelhandler.ModelHandlerForCSS; import org.eclipse.wst.css.ui.internal.contentoutline.JFaceNodeAdapterFactoryCSS; import org.eclipse.wst.css.ui.internal.properties.CSSPropertySourceAdapterFactory; import org.eclipse.wst.sse.core.IAdapterFactory; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/style/LineStyleProviderForCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/style/LineStyleProviderForCSS.java index a0bbe94781..e886eb2ea6 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/style/LineStyleProviderForCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/style/LineStyleProviderForCSS.java @@ -16,7 +16,7 @@ import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.TextAttribute; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; import org.eclipse.wst.css.ui.internal.CSSUIPlugin; import org.eclipse.wst.sse.core.text.ITextRegion; import org.eclipse.wst.sse.ui.style.AbstractLineStyleProvider; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/style/LineStyleProviderForEmbeddedCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/style/LineStyleProviderForEmbeddedCSS.java index e1620e1b15..9f5a463c71 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/style/LineStyleProviderForEmbeddedCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/style/LineStyleProviderForEmbeddedCSS.java @@ -15,8 +15,8 @@ import java.util.List; import org.eclipse.jface.text.ITypedRegion; import org.eclipse.jface.text.TextAttribute; import org.eclipse.swt.custom.StyleRange; -import org.eclipse.wst.css.core.parser.CSSTextParser; -import org.eclipse.wst.css.core.parser.CSSTextToken; +import org.eclipse.wst.css.core.internal.parserz.CSSTextParser; +import org.eclipse.wst.css.core.internal.parserz.CSSTextToken; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/text/CSSDocumentRegionEdgeMatcher.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/text/CSSDocumentRegionEdgeMatcher.java index ce975a9b81..47892fe5c1 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/text/CSSDocumentRegionEdgeMatcher.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/text/CSSDocumentRegionEdgeMatcher.java @@ -12,7 +12,7 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; import org.eclipse.jface.text.source.ICharacterPairMatcher; -import org.eclipse.wst.css.core.parser.CSSRegionContexts; +import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/CSSContentOutlineConfiguration.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/CSSContentOutlineConfiguration.java index a64fa6919b..c28da18a1b 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/CSSContentOutlineConfiguration.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/CSSContentOutlineConfiguration.java @@ -17,9 +17,9 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.IContentProvider; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue; import org.eclipse.wst.css.ui.internal.CSSUIPlugin; import org.eclipse.wst.sse.core.IAdapterFactory; import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateActionContributionItem; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeContentProviderCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeContentProviderCSS.java index e5eee49477..969580b8d5 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeContentProviderCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeContentProviderCSS.java @@ -16,12 +16,12 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.wst.css.core.document.ICSSDocument; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; import org.eclipse.wst.sse.core.IAdapterFactory; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeContentProvider; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeLabelProviderCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeLabelProviderCSS.java index e012f671df..9ac2b7f9a5 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeLabelProviderCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeLabelProviderCSS.java @@ -16,12 +16,12 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.css.core.document.ICSSMediaRule; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSPageRule; -import org.eclipse.wst.css.core.document.ICSSPrimitiveValue; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; import org.eclipse.wst.css.ui.image.CSSImageHelper; import org.eclipse.wst.css.ui.image.CSSImageType; import org.eclipse.wst.sse.core.IAdapterFactory; diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/properties/CSSPropertySheetConfiguration.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/properties/CSSPropertySheetConfiguration.java index 5972406b2b..608ca47d1b 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/properties/CSSPropertySheetConfiguration.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/properties/CSSPropertySheetConfiguration.java @@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.wst.css.core.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.ui.views.properties.StructuredPropertySheetConfiguration; public class CSSPropertySheetConfiguration extends StructuredPropertySheetConfiguration { 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/document/DocumentStyleImpl.java index b48a7ec029..9e9269569f 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/document/DocumentStyleImpl.java @@ -16,7 +16,7 @@ */ package org.eclipse.wst.html.core.document; -import org.eclipse.wst.css.core.adapters.IStyleSheetListAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMModel; 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/document/ElementStyleImpl.java index 89d407bb3b..729c5982d8 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/document/ElementStyleImpl.java @@ -16,8 +16,8 @@ */ package org.eclipse.wst.html.core.document; -import org.eclipse.wst.css.core.adapters.IStyleDeclarationAdapter; -import org.eclipse.wst.css.core.adapters.IStyleSheetAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.xml.core.document.IDOMElement; import org.eclipse.wst.xml.core.internal.document.ElementImpl; 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/format/EmbeddedCSSFormatter.java index d70f8d8d1a..71fa18638f 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/format/EmbeddedCSSFormatter.java @@ -12,10 +12,10 @@ package org.eclipse.wst.html.core.format; -import org.eclipse.wst.css.core.adapters.IStyleSheetAdapter; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.format.CSSSourceFormatter; +import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.html.core.HTMLFormatContraints; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; 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/format/HTMLElementFormatter.java index dc430d53b6..5d36f6d6fb 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/format/HTMLElementFormatter.java @@ -12,10 +12,10 @@ package org.eclipse.wst.html.core.format; import java.util.Iterator; -import org.eclipse.wst.css.core.adapters.IStyleDeclarationAdapter; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.format.CSSSourceFormatter; +import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.html.core.HTMLFormatContraints; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/AbstractCSSModelAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/AbstractCSSModelAdapter.java index b4f361f2d9..6068367705 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/AbstractCSSModelAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/AbstractCSSModelAdapter.java @@ -13,10 +13,10 @@ package org.eclipse.wst.html.core.htmlcss; import java.util.Collection; import java.util.Iterator; -import org.eclipse.wst.css.core.adapters.ICSSModelAdapter; import org.eclipse.wst.css.core.contenttype.ContentTypeIdForCSS; -import org.eclipse.wst.css.core.document.ICSSModel; import org.eclipse.wst.css.core.internal.document.CSSModelImpl; +import org.eclipse.wst.css.core.internal.provisional.adapters.ICSSModelAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IStructuredModel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/AbstractStyleSheetAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/AbstractStyleSheetAdapter.java index fb8d0bf914..0e7d1b48ba 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/AbstractStyleSheetAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/AbstractStyleSheetAdapter.java @@ -14,13 +14,13 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; -import org.eclipse.wst.css.core.adapters.IModelProvideAdapter; -import org.eclipse.wst.css.core.adapters.IStyleSheetAdapter; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.event.ICSSStyleListener; -import org.eclipse.wst.css.core.util.ImportedCollector; +import org.eclipse.wst.css.core.internal.event.ICSSStyleListener; +import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvideAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; +import org.eclipse.wst.css.core.internal.util.ImportedCollector; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.xml.core.document.IDOMModel; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryContext.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryContext.java index 2bd84f382e..2977b3f3ca 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryContext.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryContext.java @@ -14,12 +14,12 @@ package org.eclipse.wst.html.core.htmlcss; import java.util.Enumeration; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; -import org.eclipse.wst.css.core.document.ICSSValue; import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty; -import org.eclipse.wst.css.core.util.CSSLinkConverter; -import org.eclipse.wst.css.core.util.declaration.CSSPropertyContext; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue; +import org.eclipse.wst.css.core.internal.util.CSSLinkConverter; +import org.eclipse.wst.css.core.internal.util.declaration.CSSPropertyContext; /** */ diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryDeclarationData.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryDeclarationData.java index 2b42b8d943..908d13f0ac 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryDeclarationData.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryDeclarationData.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.html.core.htmlcss; -import org.eclipse.wst.css.core.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryTraverser.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryTraverser.java index 9cddce0c46..bba205de51 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryTraverser.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryTraverser.java @@ -12,13 +12,13 @@ package org.eclipse.wst.html.core.htmlcss; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.document.ICSSSelector; -import org.eclipse.wst.css.core.document.ICSSSelectorList; -import org.eclipse.wst.css.core.document.ICSSStyleDeclaration; -import org.eclipse.wst.css.core.document.ICSSStyleRule; -import org.eclipse.wst.css.core.util.AbstractCssTraverser; -import org.eclipse.wst.css.core.util.CSSStyleDeclarationFactory; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; +import org.eclipse.wst.css.core.internal.util.AbstractCssTraverser; +import org.eclipse.wst.css.core.internal.util.CSSStyleDeclarationFactory; import org.w3c.dom.Element; import org.w3c.dom.css.ElementCSSInlineStyle; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryValueData.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryValueData.java index 26f56b700e..42c16e5de8 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryValueData.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/CSSQueryValueData.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.html.core.htmlcss; -import org.eclipse.wst.css.core.util.declaration.ValueData; +import org.eclipse.wst.css.core.internal.util.declaration.ValueData; 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 f395c3f148..6658964e28 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 @@ -19,13 +19,13 @@ import java.util.Iterator; import java.util.List; import java.util.Vector; -import org.eclipse.wst.css.core.adapters.IStyleSheetAdapter; -import org.eclipse.wst.css.core.adapters.IStyleSheetListAdapter; -import org.eclipse.wst.css.core.document.ICSSImportRule; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.util.CSSClassTraverser; -import org.eclipse.wst.css.core.util.ImportRuleCollector; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +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.sse.core.INodeAdapter; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLStyleSelectorAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLStyleSelectorAdapter.java index d7a8426848..5b10b2cae7 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLStyleSelectorAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLStyleSelectorAdapter.java @@ -14,8 +14,8 @@ package org.eclipse.wst.html.core.htmlcss; import java.util.StringTokenizer; -import org.eclipse.wst.css.core.adapters.IStyleSelectorAdapter; -import org.eclipse.wst.css.core.document.ICSSSimpleSelector; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSelectorAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector; import org.eclipse.wst.sse.core.INodeNotifier; import org.w3c.dom.Element; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLStyleSelectorAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLStyleSelectorAdapterFactory.java index e14a0d03fe..bd4b302b36 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLStyleSelectorAdapterFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/HTMLStyleSelectorAdapterFactory.java @@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.htmlcss; -import org.eclipse.wst.css.core.adapters.IStyleSelectorAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSelectorAdapter; import org.eclipse.wst.sse.core.IAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/LinkElementAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/LinkElementAdapter.java index c1e1b12140..5a27eee3a6 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/LinkElementAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/LinkElementAdapter.java @@ -14,10 +14,10 @@ import java.io.UnsupportedEncodingException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.wst.css.core.adapters.IModelProvideAdapter; -import org.eclipse.wst.css.core.adapters.IStyleSheetListAdapter; import org.eclipse.wst.css.core.contenttype.ContentTypeIdForCSS; -import org.eclipse.wst.css.core.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvideAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.util.URIResolver; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleAdapterFactory.java index 4bfd785633..1f59ce91b2 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleAdapterFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleAdapterFactory.java @@ -12,9 +12,9 @@ package org.eclipse.wst.html.core.htmlcss; -import org.eclipse.wst.css.core.adapters.IStyleDeclarationAdapter; -import org.eclipse.wst.css.core.adapters.IStyleSheetAdapter; -import org.eclipse.wst.css.core.adapters.IStyleSheetListAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter; import org.eclipse.wst.html.core.HTML40Namespace; import org.eclipse.wst.sse.core.IAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapter; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleAttrAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleAttrAdapter.java index bd7ec28d61..a671c6bf01 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleAttrAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleAttrAdapter.java @@ -12,9 +12,9 @@ package org.eclipse.wst.html.core.htmlcss; -import org.eclipse.wst.css.core.adapters.IStyleDeclarationAdapter; -import org.eclipse.wst.css.core.document.ICSSModel; import org.eclipse.wst.css.core.internal.parser.CSSSourceParser; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.events.IStructuredDocumentListener; import org.eclipse.wst.sse.core.events.NewDocumentEvent; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleElementAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleElementAdapter.java index 9799c43f92..7d309b3417 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleElementAdapter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/StyleElementAdapter.java @@ -12,9 +12,9 @@ package org.eclipse.wst.html.core.htmlcss; -import org.eclipse.wst.css.core.adapters.IModelProvideAdapter; -import org.eclipse.wst.css.core.adapters.IStyleSheetListAdapter; -import org.eclipse.wst.css.core.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvideAdapter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; import org.eclipse.wst.html.core.HTML40Namespace; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.events.IStructuredDocumentListener; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/URLHelper.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/URLHelper.java index e62dd0de09..2d633c0878 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/URLHelper.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/htmlcss/URLHelper.java @@ -13,7 +13,7 @@ package org.eclipse.wst.html.core.htmlcss; /** * @deprecated - use com.ibm.sse.model.css.util.URLHelper */ -public class URLHelper extends org.eclipse.wst.css.core.util.URLHelper { +public class URLHelper extends org.eclipse.wst.css.core.internal.util.URLHelper { /** * @param baseUrl diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/CSSTextNodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/CSSTextNodeCleanupHandler.java index 5a82446496..3b0e0d5c35 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/CSSTextNodeCleanupHandler.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/CSSTextNodeCleanupHandler.java @@ -12,10 +12,10 @@ package org.eclipse.wst.html.core.internal.cleanup; -import org.eclipse.wst.css.core.adapters.IStyleSheetAdapter; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.format.CSSSourceFormatter; +import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.text.IStructuredDocument; 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 f43de4eeac..84a8587d66 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 @@ -20,10 +20,10 @@ import java.util.Locale; import org.eclipse.jface.text.BadLocationException; import org.eclipse.text.edits.InsertEdit; import org.eclipse.text.edits.MultiTextEdit; -import org.eclipse.wst.css.core.adapters.IStyleDeclarationAdapter; -import org.eclipse.wst.css.core.document.ICSSModel; -import org.eclipse.wst.css.core.document.ICSSNode; -import org.eclipse.wst.css.core.format.CSSSourceFormatter; +import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter; +import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.exceptions.SourceEditingRuntimeException; 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/modelhandler/EmbeddedHTML.java index f660717c14..6758cd4c5e 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/modelhandler/EmbeddedHTML.java @@ -15,7 +15,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import org.eclipse.wst.css.core.adapters.IStyleSelectorAdapter; +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; 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 7abc475fca..1d4a40a942 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 @@ -13,8 +13,8 @@ package org.eclipse.wst.html.ui.contentproperties.ui; import java.util.Enumeration; import java.util.Iterator; -import org.eclipse.wst.css.core.metamodel.CSSProfile; -import org.eclipse.wst.css.core.metamodel.CSSProfileRegistry; +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.sse.core.internal.encoding.CommonCharsetNames; |