diff options
Diffstat (limited to 'bundles/org.eclipse.wst.html.core/src/org/eclipse/wst')
21 files changed, 65 insertions, 65 deletions
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; |