diff options
Diffstat (limited to 'bundles')
85 files changed, 99 insertions, 99 deletions
diff --git a/bundles/org.eclipse.jst.jsp.core/plugin.xml b/bundles/org.eclipse.jst.jsp.core/plugin.xml index 8b51dce76d..55daed301e 100644 --- a/bundles/org.eclipse.jst.jsp.core/plugin.xml +++ b/bundles/org.eclipse.jst.jsp.core/plugin.xml @@ -55,7 +55,7 @@ name="%Structured_JSP_Document_Factory_Extension.name"> <factory contentTypeId="org.eclipse.jst.jsp.core.jspsource" - class="org.eclipse.wst.sse.core.filebuffers.BasicStructuredDocumentFactory"/> + class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory"/> </extension> <extension point="org.eclipse.core.filebuffers.documentSetup" id="org.eclipse.jst.jsp.core.documentsetup" diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/JSPCorePlugin.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/JSPCorePlugin.java index bc9ee0b091..579bb56180 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/JSPCorePlugin.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/JSPCorePlugin.java @@ -20,7 +20,7 @@ import org.eclipse.jst.jsp.core.internal.java.search.JSPIndexManager; import org.eclipse.jst.jsp.core.internal.java.search.JSPSearchSupport; import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames; import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.osgi.framework.BundleContext; /** diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapter.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapter.java index a5a60f083a..ebfc05ff1b 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapter.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapter.java @@ -13,7 +13,7 @@ package org.eclipse.jst.jsp.core.internal.document; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.ui.contentproperties.IContentSettingsListener; /** diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterImpl.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterImpl.java index 916a01262c..067c59f832 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterImpl.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterImpl.java @@ -29,11 +29,11 @@ import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.IStructuredModel; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.core.internal.modelhandler.EmbeddedTypeRegistry; import org.eclipse.wst.sse.core.internal.modelhandler.EmbeddedTypeRegistryImpl; import org.eclipse.wst.sse.core.internal.util.Debug; import org.eclipse.wst.sse.core.internal.util.StringUtils; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.core.text.IStructuredPartitioning; import org.eclipse.wst.xml.core.document.IDOMNode; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/encoding/JSPDocumentLoader.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/encoding/JSPDocumentLoader.java index 014263258e..6e96066325 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/encoding/JSPDocumentLoader.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/encoding/JSPDocumentLoader.java @@ -38,10 +38,10 @@ import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory; import org.eclipse.wst.sse.core.internal.encoding.CodedReaderCreator; import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.core.internal.modelhandler.EmbeddedTypeRegistry; import org.eclipse.wst.sse.core.internal.modelhandler.EmbeddedTypeRegistryImpl; import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.core.parser.JSPCapableParser; import org.eclipse.wst.sse.core.parser.RegionParser; import org.eclipse.wst.sse.core.parser.TagMarker; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/EmbeddedTypeStateData.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/EmbeddedTypeStateData.java index 9148c4192b..87d76a4f08 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/EmbeddedTypeStateData.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/EmbeddedTypeStateData.java @@ -12,7 +12,7 @@ package org.eclipse.jst.jsp.core.internal.modelhandler; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; /** * This class is only for remembering old and new embedded handlers, diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/JSPModelLoader.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/JSPModelLoader.java index 429a45914e..bb748fbc1d 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/JSPModelLoader.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/JSPModelLoader.java @@ -37,13 +37,13 @@ import org.eclipse.wst.sse.core.IModelLoader; import org.eclipse.wst.sse.core.internal.PropagatingAdapter; import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.core.internal.model.AbstractModelLoader; import org.eclipse.wst.sse.core.internal.modelhandler.EmbeddedTypeRegistry; import org.eclipse.wst.sse.core.internal.modelhandler.EmbeddedTypeRegistryImpl; import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument; import org.eclipse.wst.sse.core.internal.util.Assert; import org.eclipse.wst.sse.core.internal.util.Debug; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.core.parser.JSPCapableParser; import org.eclipse.wst.sse.core.parser.RegionParser; import org.eclipse.wst.sse.core.text.IStructuredDocument; diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/ModelHandlerForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/ModelHandlerForJSP.java index 95edfd5c01..2d05171c63 100644 --- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/ModelHandlerForJSP.java +++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/modelhandler/ModelHandlerForJSP.java @@ -19,7 +19,7 @@ import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.wst.sse.core.IModelLoader; import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector; import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; -import org.eclipse.wst.sse.core.modelhandler.AbstractModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler; import org.eclipse.wst.sse.core.parser.BlockMarker; public class ModelHandlerForJSP extends AbstractModelHandler { diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/registry/AdapterFactoryProviderForJSP.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/registry/AdapterFactoryProviderForJSP.java index 445dd98908..1ab0587317 100644 --- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/registry/AdapterFactoryProviderForJSP.java +++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/registry/AdapterFactoryProviderForJSP.java @@ -22,8 +22,8 @@ import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterFactoryFo import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.internal.PropagatingAdapter; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; -import org.eclipse.wst.sse.core.modelhandler.IDocumentTypeHandler; import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter; import org.eclipse.wst.sse.ui.registry.AdapterFactoryProvider; import org.eclipse.wst.sse.ui.registry.AdapterFactoryRegistry; diff --git a/bundles/org.eclipse.wst.css.core/plugin.xml b/bundles/org.eclipse.wst.css.core/plugin.xml index 4b040f0e50..34363976db 100644 --- a/bundles/org.eclipse.wst.css.core/plugin.xml +++ b/bundles/org.eclipse.wst.css.core/plugin.xml @@ -65,7 +65,7 @@ name="%Structured_CSS_Document_Factory_Extension.name"> <factory contentTypeId="org.eclipse.wst.css.core.csssource" - class="org.eclipse.wst.sse.core.filebuffers.BasicStructuredDocumentFactory"/> + class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory"/> </extension> <extension point="org.eclipse.team.core.fileTypes"> diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCorePlugin.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCorePlugin.java index b34c6c65b3..8af3403c80 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCorePlugin.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/CSSCorePlugin.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.css.core.preferences.CSSPreferenceHelper; import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames; import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; /** * The main plugin class to be used in the desktop. diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CSSCleanupStrategyImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CSSCleanupStrategyImpl.java index 78dd1cb5a4..479ad78aca 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CSSCleanupStrategyImpl.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/cleanup/CSSCleanupStrategyImpl.java @@ -13,7 +13,7 @@ package org.eclipse.wst.css.core.internal.cleanup; import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.css.core.internal.CSSCorePlugin; import org.eclipse.wst.css.core.preferences.CSSModelPreferenceNames; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/ModelHandlerForCSS.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/ModelHandlerForCSS.java index fe125d97cb..d88097f8b7 100644 --- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/ModelHandlerForCSS.java +++ b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/modelhandler/ModelHandlerForCSS.java @@ -15,8 +15,8 @@ import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader; import org.eclipse.wst.sse.core.IModelLoader; import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector; import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; -import org.eclipse.wst.sse.core.modelhandler.AbstractModelHandler; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; public class ModelHandlerForCSS extends AbstractModelHandler implements IModelHandler { 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 b042dfcf1e..3b446747eb 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 @@ -14,7 +14,7 @@ import org.eclipse.core.runtime.Preferences; 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; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; /** * this a temp dummy class to map to ModelPreferences diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSourcePreferencePage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSourcePreferencePage.java index 1829b854e5..1a1a71a1c3 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSourcePreferencePage.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSourcePreferencePage.java @@ -25,7 +25,7 @@ import org.eclipse.wst.css.core.preferences.CSSModelPreferenceNames; 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; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.ui.preferences.XMLSourcePreferencePage; /** diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/registry/AdapterFactoryProviderCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/registry/AdapterFactoryProviderCSS.java index f410177431..4ad9e7e06b 100644 --- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/registry/AdapterFactoryProviderCSS.java +++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/registry/AdapterFactoryProviderCSS.java @@ -14,8 +14,8 @@ import org.eclipse.wst.css.ui.internal.contentoutline.JFaceNodeAdapterFactoryCSS import org.eclipse.wst.css.ui.internal.properties.CSSPropertySourceAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.IStructuredModel; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; -import org.eclipse.wst.sse.core.modelhandler.IDocumentTypeHandler; import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter; import org.eclipse.wst.sse.ui.registry.AdapterFactoryProvider; import org.eclipse.wst.sse.ui.util.Assert; diff --git a/bundles/org.eclipse.wst.dtd.core/plugin.xml b/bundles/org.eclipse.wst.dtd.core/plugin.xml index 43001a986a..e43aadb3f0 100644 --- a/bundles/org.eclipse.wst.dtd.core/plugin.xml +++ b/bundles/org.eclipse.wst.dtd.core/plugin.xml @@ -47,7 +47,7 @@ name="%Structured_DTD_Document_Factory_Extension.name"> <factory contentTypeId="org.eclipse.wst.dtd.core.dtdsource" - class="org.eclipse.wst.sse.core.filebuffers.BasicStructuredDocumentFactory"/> + class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory"/> </extension> <extension point="org.eclipse.team.core.fileTypes"> diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/modelhandler/ModelHandlerForDTD.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/modelhandler/ModelHandlerForDTD.java index 18f27f95e3..b8649362c7 100644 --- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/modelhandler/ModelHandlerForDTD.java +++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/modelhandler/ModelHandlerForDTD.java @@ -17,8 +17,8 @@ import org.eclipse.wst.dtd.core.internal.encoding.DTDDocumentLoader; import org.eclipse.wst.sse.core.IModelLoader; import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector; import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; -import org.eclipse.wst.sse.core.modelhandler.AbstractModelHandler; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; public final class ModelHandlerForDTD extends AbstractModelHandler implements IModelHandler { diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/registry/AdapterFactoryProviderForDTD.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/registry/AdapterFactoryProviderForDTD.java index 2c486079ef..6262a0d821 100644 --- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/registry/AdapterFactoryProviderForDTD.java +++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/registry/AdapterFactoryProviderForDTD.java @@ -14,8 +14,8 @@ package org.eclipse.wst.dtd.ui.internal.registry; import org.eclipse.wst.dtd.core.internal.modelhandler.ModelHandlerForDTD; import org.eclipse.wst.sse.core.IStructuredModel; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; -import org.eclipse.wst.sse.core.modelhandler.IDocumentTypeHandler; import org.eclipse.wst.sse.ui.registry.AdapterFactoryProvider; import org.eclipse.wst.sse.ui.util.Assert; diff --git a/bundles/org.eclipse.wst.html.core/plugin.xml b/bundles/org.eclipse.wst.html.core/plugin.xml index ddfb64c60f..4fc7e8aa43 100644 --- a/bundles/org.eclipse.wst.html.core/plugin.xml +++ b/bundles/org.eclipse.wst.html.core/plugin.xml @@ -51,7 +51,7 @@ name="%Structured_HTML_Document_Factory_Extension.name"> <factory contentTypeId="org.eclipse.wst.html.core.htmlsource" - class="org.eclipse.wst.sse.core.filebuffers.BasicStructuredDocumentFactory"/> + class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory"/> </extension> <extension point="org.eclipse.wst.sse.core.commentElementHandler"> diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/HTMLFilesPreferenceNames.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/HTMLFilesPreferenceNames.java index f273ce6aff..c812537930 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/HTMLFilesPreferenceNames.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/HTMLFilesPreferenceNames.java @@ -12,7 +12,7 @@ package org.eclipse.wst.html.core; import org.eclipse.core.runtime.IProduct; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; /** * Additional preferences for new HTML Files generation diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLContentBuilder.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLContentBuilder.java index 1580100a7f..79920b54f4 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLContentBuilder.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLContentBuilder.java @@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal; import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl; import org.w3c.dom.Document; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePlugin.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePlugin.java index f05966ffd0..63311e80f4 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePlugin.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePlugin.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.html.core.HTMLFilesPreferenceNames; import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames; import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; /** * The main plugin class to be used in the desktop. diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/AbstractNodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/AbstractNodeCleanupHandler.java index 788212f67c..47a66ddac3 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/AbstractNodeCleanupHandler.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/AbstractNodeCleanupHandler.java @@ -17,7 +17,7 @@ import org.eclipse.wst.sse.core.events.StructuredDocumentEvent; import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler; import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences; import org.eclipse.wst.sse.core.internal.cleanup.StructuredCleanupPreferences; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.xml.core.document.IDOMModel; 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 c21f355b5e..8c1c767416 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 @@ -28,8 +28,8 @@ import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; import org.eclipse.wst.sse.core.exceptions.SourceEditingRuntimeException; import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.sse.core.internal.util.StringUtils; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; 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.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java index 9d9e9da409..5c803fd722 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java @@ -23,7 +23,7 @@ import org.eclipse.wst.sse.core.IModelManager; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMDocumentType; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java index 0ad0c6bfca..28cb567f6e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java @@ -17,7 +17,7 @@ import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.INodeAdapter; import org.eclipse.wst.sse.core.INodeNotifier; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatProcessorImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatProcessorImpl.java index 4bf8bebfe8..3b4afe689e 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatProcessorImpl.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatProcessorImpl.java @@ -15,7 +15,7 @@ import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.sse.core.internal.SSECorePlugin; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML; import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java index 0ecca81ed7..ad151cecfe 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java @@ -20,7 +20,7 @@ import org.eclipse.wst.sse.core.internal.SSECorePlugin; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.xml.core.document.IDOMElement; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatterFactory.java index b4146dffb4..4c4b9d9a4d 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatterFactory.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatterFactory.java @@ -15,7 +15,7 @@ import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.sse.core.internal.SSECorePlugin; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML; import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java index 28202dd845..8a2f8d3b8f 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java @@ -22,9 +22,9 @@ import org.eclipse.wst.html.core.internal.htmlcss.HTMLStyleSelectorAdapterFactor import org.eclipse.wst.html.core.internal.htmlcss.StyleAdapterFactory; import org.eclipse.wst.html.core.internal.modelquery.ModelQueryAdapterFactoryForEmbeddedHTML; import org.eclipse.wst.sse.core.INodeAdapterFactory; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; import org.eclipse.wst.sse.core.internal.util.Assert; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.core.parser.BlockMarker; import org.eclipse.wst.sse.core.parser.BlockTagParser; import org.eclipse.wst.sse.core.parser.JSPCapableParser; diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java index 2a88f14129..9907ace7cd 100644 --- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java +++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java @@ -16,8 +16,8 @@ import org.eclipse.wst.html.core.internal.encoding.HTMLModelLoader; import org.eclipse.wst.sse.core.IModelLoader; import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector; import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; -import org.eclipse.wst.sse.core.modelhandler.AbstractModelHandler; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; public class ModelHandlerForHTML extends AbstractModelHandler implements IModelHandler { /** diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLMinimalContentModelGenerator.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLMinimalContentModelGenerator.java index 92917111b7..82cbfe30be 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLMinimalContentModelGenerator.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLMinimalContentModelGenerator.java @@ -14,7 +14,7 @@ import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.html.core.HTMLCMProperties; import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; import org.eclipse.wst.xml.ui.contentassist.XMLContentModelGenerator; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/HTMLNodeActionManager.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/HTMLNodeActionManager.java index aac9e5b2b5..9fdd487246 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/HTMLNodeActionManager.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentoutline/HTMLNodeActionManager.java @@ -19,7 +19,7 @@ import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.internal.contentmodel.CMNode; import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilder; import org.eclipse.wst.xml.ui.internal.contentoutline.XMLNodeActionManager; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupDialogHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupDialogHTML.java index ed80e494a0..b9170e466f 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupDialogHTML.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/edit/ui/CleanupDialogHTML.java @@ -28,8 +28,8 @@ import org.eclipse.wst.html.ui.internal.HTMLUIMessages; import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.contenttype.ContentTypeIdForXML; import org.eclipse.wst.xml.core.internal.cleanup.XMLCleanupPreferencesImpl; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSourcePreferencePage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSourcePreferencePage.java index e69decef02..747b1b1ace 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSourcePreferencePage.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLSourcePreferencePage.java @@ -21,7 +21,7 @@ import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.html.ui.internal.HTMLUIMessages; import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.ui.preferences.XMLSourcePreferencePage; public class HTMLSourcePreferencePage extends XMLSourcePreferencePage { diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForEmbeddedHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForEmbeddedHTML.java index 2be246ae01..56926a3e70 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForEmbeddedHTML.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForEmbeddedHTML.java @@ -12,7 +12,7 @@ package org.eclipse.wst.html.ui.internal.registry; import org.eclipse.wst.html.core.internal.modelhandler.EmbeddedHTML; import org.eclipse.wst.sse.core.IStructuredModel; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.ui.registry.embedded.EmbeddedAdapterFactoryProvider; public class AdapterFactoryProviderForEmbeddedHTML implements EmbeddedAdapterFactoryProvider { diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForHTML.java index f244e69bb5..97c7bb69e6 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForHTML.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/registry/AdapterFactoryProviderForHTML.java @@ -15,8 +15,8 @@ import org.eclipse.wst.html.core.internal.modelhandler.ModelHandlerForHTML; import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterFactoryForHTML; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.IStructuredModel; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; -import org.eclipse.wst.sse.core.modelhandler.IDocumentTypeHandler; import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter; import org.eclipse.wst.sse.ui.registry.AdapterFactoryProvider; import org.eclipse.wst.sse.ui.util.Assert; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/IStructuredModel.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/IStructuredModel.java index 6e5161001e..155f12cc2d 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/IStructuredModel.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/IStructuredModel.java @@ -24,9 +24,9 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.wst.sse.core.exceptions.ResourceAlreadyExists; import org.eclipse.wst.sse.core.exceptions.ResourceInUse; import org.eclipse.wst.sse.core.internal.encoding.EncodingRule; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; import org.eclipse.wst.sse.core.internal.util.URIResolver; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.undo.IStructuredTextUndoManager; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/FileBufferModelManager.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/FileBufferModelManager.java index 22e0003335..67257b1de8 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/FileBufferModelManager.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/FileBufferModelManager.java @@ -45,11 +45,11 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.wst.sse.core.IModelLoader; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.exceptions.ResourceInUse; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.internal.model.AbstractStructuredModel; import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry; import org.eclipse.wst.sse.core.internal.util.ProjectResolver; import org.eclipse.wst.sse.core.internal.util.URIResolver; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.xml.uriresolver.util.URIHelper; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/JSPAwareAdapterFactory.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/JSPAwareAdapterFactory.java index 2c6ea71914..5b35d770b7 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/JSPAwareAdapterFactory.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/JSPAwareAdapterFactory.java @@ -13,7 +13,7 @@ package org.eclipse.wst.sse.core.internal; import org.eclipse.wst.sse.core.INodeAdapterFactory; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; public interface JSPAwareAdapterFactory extends INodeAdapterFactory { diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ModelManagerPluginRegistryReader.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ModelManagerPluginRegistryReader.java index 9fc51557ac..6f448c14d2 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ModelManagerPluginRegistryReader.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ModelManagerPluginRegistryReader.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.wst.sse.core.INodeAdapterFactory; -import org.eclipse.wst.sse.core.modelhandler.IDocumentTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; import org.osgi.framework.Bundle; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECorePlugin.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECorePlugin.java index de14047c79..ad1a6243b3 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECorePlugin.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECorePlugin.java @@ -19,7 +19,7 @@ import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.builder.StructuredDocumentBuilder; import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.osgi.framework.BundleContext; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/BuilderModelProvider.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/BuilderModelProvider.java index d6f24e2eb3..53fb70eab4 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/BuilderModelProvider.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/BuilderModelProvider.java @@ -19,8 +19,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.Platform; import org.eclipse.wst.sse.core.IModelManager; import org.eclipse.wst.sse.core.IStructuredModel; -import org.eclipse.wst.sse.core.builder.IBuilderModelProvider; import org.eclipse.wst.sse.core.internal.Logger; +import org.eclipse.wst.sse.core.internal.ltk.builder.IBuilderModelProvider; import org.eclipse.wst.sse.core.text.IStructuredDocument; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/BuilderParticipantRegistryReader.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/BuilderParticipantRegistryReader.java index 1616e0b2b8..fc7a74837f 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/BuilderParticipantRegistryReader.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/BuilderParticipantRegistryReader.java @@ -21,10 +21,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.sse.core.builder.IBuilderDelegate; -import org.eclipse.wst.sse.core.builder.IBuilderParticipant; import org.eclipse.wst.sse.core.internal.Logger; import org.eclipse.wst.sse.core.internal.SSECorePlugin; +import org.eclipse.wst.sse.core.internal.ltk.builder.IBuilderDelegate; +import org.eclipse.wst.sse.core.internal.ltk.builder.IBuilderParticipant; import org.eclipse.wst.sse.core.internal.util.StringUtils; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/StructuredDocumentBuilder.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/StructuredDocumentBuilder.java index ebd09f7afb..15bcc97fe2 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/StructuredDocumentBuilder.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/builder/StructuredDocumentBuilder.java @@ -46,11 +46,11 @@ import org.eclipse.core.runtime.content.IContentDescription; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.wst.sse.core.builder.IBuilderDelegate; import org.eclipse.wst.sse.core.internal.Logger; import org.eclipse.wst.sse.core.internal.SSECoreMessages; import org.eclipse.wst.sse.core.internal.SSECorePlugin; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.ltk.builder.IBuilderDelegate; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; public class StructuredDocumentBuilder extends IncrementalProjectBuilder implements IExecutableExtension { diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/filebuffers/BasicStructuredDocumentFactory.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/filebuffers/BasicStructuredDocumentFactory.java index f0dba7997a..94594c3c7b 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/filebuffers/BasicStructuredDocumentFactory.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/filebuffers/BasicStructuredDocumentFactory.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.sse.core.filebuffers; +package org.eclipse.wst.sse.core.internal.filebuffers; import org.eclipse.core.filebuffers.IDocumentFactory; import org.eclipse.core.runtime.CoreException; @@ -22,9 +22,9 @@ import org.eclipse.core.runtime.content.IContentTypeManager; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.wst.sse.core.internal.document.NullStructuredDocumentPartitioner; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry; import org.eclipse.wst.sse.core.internal.text.JobSafeStructuredDocument; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; /** diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/builder/IBuilderDelegate.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/builder/IBuilderDelegate.java index 86379ec745..bcf8090573 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/builder/IBuilderDelegate.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/builder/IBuilderDelegate.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.sse.core.builder; +package org.eclipse.wst.sse.core.internal.ltk.builder; import java.util.Map; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/builder/IBuilderModelProvider.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/builder/IBuilderModelProvider.java index e1c3f917bd..2001e3dada 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/builder/IBuilderModelProvider.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/builder/IBuilderModelProvider.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.sse.core.builder; +package org.eclipse.wst.sse.core.internal.ltk.builder; import org.eclipse.core.resources.IFile; import org.eclipse.wst.sse.core.IStructuredModel; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/builder/IBuilderParticipant.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/builder/IBuilderParticipant.java index fbc4316fde..99d203397a 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/builder/IBuilderParticipant.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/builder/IBuilderParticipant.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.sse.core.builder; +package org.eclipse.wst.sse.core.internal.ltk.builder; import java.util.Map; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/modelhandler/AbstractModelHandler.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/modelhandler/AbstractModelHandler.java index 7ca93ac985..629fa262d1 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/modelhandler/AbstractModelHandler.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/modelhandler/AbstractModelHandler.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.sse.core.modelhandler; +package org.eclipse.wst.sse.core.internal.ltk.modelhandler; import java.util.ArrayList; import java.util.Collection; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/modelhandler/EmbeddedTypeHandler.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/modelhandler/EmbeddedTypeHandler.java index 416344d8d9..bfd6fa78ac 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/modelhandler/EmbeddedTypeHandler.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/modelhandler/EmbeddedTypeHandler.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.sse.core.modelhandler; +package org.eclipse.wst.sse.core.internal.ltk.modelhandler; import java.util.List; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/modelhandler/IDocumentTypeHandler.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/modelhandler/IDocumentTypeHandler.java index 7e77a6508b..b50c852d43 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/modelhandler/IDocumentTypeHandler.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/modelhandler/IDocumentTypeHandler.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.sse.core.modelhandler; +package org.eclipse.wst.sse.core.internal.ltk.modelhandler; import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector; import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/modelhandler/IModelHandler.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/modelhandler/IModelHandler.java index 268b72928c..9290825579 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/modelhandler/IModelHandler.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/ltk/modelhandler/IModelHandler.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.sse.core.modelhandler; +package org.eclipse.wst.sse.core.internal.ltk.modelhandler; import java.util.List; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/AbstractStructuredModel.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/AbstractStructuredModel.java index eefa2d45f6..5701ec169f 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/AbstractStructuredModel.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/AbstractStructuredModel.java @@ -45,9 +45,9 @@ import org.eclipse.wst.sse.core.internal.ILockable; import org.eclipse.wst.sse.core.internal.Logger; import org.eclipse.wst.sse.core.internal.SSECoreMessages; import org.eclipse.wst.sse.core.internal.encoding.EncodingRule; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.internal.util.URIResolver; import org.eclipse.wst.sse.core.internal.util.Utilities; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.undo.IStructuredTextUndoManager; diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/ModelManagerImpl.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/ModelManagerImpl.java index 9fa1555e83..9a636555ba 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/ModelManagerImpl.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/ModelManagerImpl.java @@ -65,12 +65,12 @@ import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway; import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento; import org.eclipse.wst.sse.core.internal.encoding.EncodingRule; import org.eclipse.wst.sse.core.internal.exceptions.MalformedOutputExceptionWithDetail; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry; import org.eclipse.wst.sse.core.internal.util.Assert; import org.eclipse.wst.sse.core.internal.util.ProjectResolver; import org.eclipse.wst.sse.core.internal.util.URIResolver; import org.eclipse.wst.sse.core.internal.util.Utilities; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.text.IStructuredDocument; /** diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistry.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistry.java index 8fab43b686..36d7563b80 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistry.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistry.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.wst.sse.core.internal.modelhandler; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; /** * The entries in this registry are, conceptually, singleton's Since only one diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistryImpl.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistryImpl.java index f8d642672e..e2d7548895 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistryImpl.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistryImpl.java @@ -15,8 +15,8 @@ package org.eclipse.wst.sse.core.internal.modelhandler; import java.util.HashSet; import java.util.Iterator; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; -import org.eclipse.wst.sse.core.modelhandler.IDocumentTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; /** diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistryReader.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistryReader.java index 08701de041..1344178cbd 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistryReader.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/EmbeddedTypeRegistryReader.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.wst.sse.core.internal.Logger; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.core.internal.util.Assert; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; public class EmbeddedTypeRegistryReader { diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerRegistry.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerRegistry.java index cae7f87a21..96829a3d54 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerRegistry.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerRegistry.java @@ -25,8 +25,8 @@ import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.content.IContentTypeManager; import org.eclipse.wst.sse.core.internal.Logger; import org.eclipse.wst.sse.core.internal.encoding.CodedIO; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.internal.util.Utilities; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; public class ModelHandlerRegistry { diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerRegistryReader.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerRegistryReader.java index c2c49d57bf..9765b6bac1 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerRegistryReader.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerRegistryReader.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.sse.core.modelhandler.AbstractModelHandler; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; /** diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerUtility.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerUtility.java index 58fb94f3d2..acaef3ab43 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerUtility.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/ModelHandlerUtility.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.wst.sse.core.internal.modelhandler; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; -import org.eclipse.wst.sse.core.modelhandler.IDocumentTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; /** * diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/PluginContributedFactoryReader.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/PluginContributedFactoryReader.java index 654d3f7020..3c0f99647d 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/PluginContributedFactoryReader.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/modelhandler/PluginContributedFactoryReader.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.internal.SSECorePlugin; -import org.eclipse.wst.sse.core.modelhandler.IDocumentTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; /** diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/preferences/CommonModelPreferenceNames.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/preferences/CommonModelPreferenceNames.java index 3880b2a13c..4f81510024 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/preferences/CommonModelPreferenceNames.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/preferences/CommonModelPreferenceNames.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.sse.core.preferences; +package org.eclipse.wst.sse.core.internal.preferences; /** diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/preferences/PreferenceChangeListener.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/preferences/PreferenceChangeListener.java index e5711169cd..e6956d9e2d 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/preferences/PreferenceChangeListener.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/preferences/PreferenceChangeListener.java @@ -10,7 +10,7 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ -package org.eclipse.wst.sse.core.preferences; +package org.eclipse.wst.sse.core.internal.preferences; /** * @deprecated This used to be used by our own PreferenceManager but since diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/participants/AbstractBuilderParticipant.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/participants/AbstractBuilderParticipant.java index e6c68ed16e..29fdcb0eb3 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/participants/AbstractBuilderParticipant.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/participants/AbstractBuilderParticipant.java @@ -19,8 +19,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.wst.sse.core.builder.IBuilderModelProvider; -import org.eclipse.wst.sse.core.builder.IBuilderParticipant; +import org.eclipse.wst.sse.core.internal.ltk.builder.IBuilderModelProvider; +import org.eclipse.wst.sse.core.internal.ltk.builder.IBuilderParticipant; 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.sse.core/src/org/eclipse/wst/sse/core/participants/TaskTagSeeker.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/participants/TaskTagSeeker.java index 0faeaa572b..3b34bbb1b5 100644 --- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/participants/TaskTagSeeker.java +++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/participants/TaskTagSeeker.java @@ -43,18 +43,18 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.sse.core.builder.IBuilderDelegate; import org.eclipse.wst.sse.core.document.IEncodedDocument; import org.eclipse.wst.sse.core.internal.Logger; import org.eclipse.wst.sse.core.internal.SSECorePlugin; import org.eclipse.wst.sse.core.internal.document.DocumentReader; +import org.eclipse.wst.sse.core.internal.ltk.builder.IBuilderDelegate; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.sse.core.internal.util.StringUtils; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.parser.RegionParser; import org.eclipse.wst.sse.core.parser.StructuredDocumentRegionHandler; import org.eclipse.wst.sse.core.parser.StructuredDocumentRegionParser; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; 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.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java index fe7d2e3e7e..aa5698daf9 100644 --- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java +++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java @@ -19,7 +19,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.RGB; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.sse.ui.internal.preferences.EditorPreferenceNames; import org.eclipse.wst.sse.ui.internal.projection.IStructuredTextFoldingProvider; import org.eclipse.wst.sse.ui.preferences.CommonEditorPreferenceNames; diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/PreferenceManager.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/PreferenceManager.java index 9d0535e802..74096df7e5 100644 --- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/PreferenceManager.java +++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/PreferenceManager.java @@ -36,7 +36,7 @@ import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.eclipse.wst.sse.core.preferences.PreferenceChangeListener; +import org.eclipse.wst.sse.core.internal.preferences.PreferenceChangeListener; import org.eclipse.wst.sse.ui.internal.Logger; import org.eclipse.wst.sse.ui.internal.SSEUIMessages; import org.w3c.dom.Document; diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TaskTagPreferenceTab.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TaskTagPreferenceTab.java index edc309243d..c023a00f33 100644 --- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TaskTagPreferenceTab.java +++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TaskTagPreferenceTab.java @@ -60,9 +60,9 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.wst.sse.core.internal.SSECorePlugin; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.sse.core.internal.util.StringUtils; import org.eclipse.wst.sse.core.participants.TaskTagSeeker; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; import org.eclipse.wst.sse.ui.internal.Logger; import org.eclipse.wst.sse.ui.internal.SSEUIMessages; import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryProvider.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryProvider.java index bdf522ac25..b6122b36bc 100644 --- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryProvider.java +++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryProvider.java @@ -13,7 +13,7 @@ package org.eclipse.wst.sse.ui.registry; import org.eclipse.wst.sse.core.IStructuredModel; -import org.eclipse.wst.sse.core.modelhandler.IDocumentTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; public interface AdapterFactoryProvider { diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/embedded/EmbeddedAdapterFactoryProvider.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/embedded/EmbeddedAdapterFactoryProvider.java index dadc360c58..3ff8fff7c1 100644 --- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/embedded/EmbeddedAdapterFactoryProvider.java +++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/embedded/EmbeddedAdapterFactoryProvider.java @@ -13,7 +13,7 @@ package org.eclipse.wst.sse.ui.registry.embedded; import org.eclipse.wst.sse.core.IStructuredModel; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; public interface EmbeddedAdapterFactoryProvider { diff --git a/bundles/org.eclipse.wst.xml.core/plugin.xml b/bundles/org.eclipse.wst.xml.core/plugin.xml index b95eb94325..6e17213302 100644 --- a/bundles/org.eclipse.wst.xml.core/plugin.xml +++ b/bundles/org.eclipse.wst.xml.core/plugin.xml @@ -52,7 +52,7 @@ name="%Structured_XML_Document_Factory_Extension.name"> <factory contentTypeId="org.eclipse.core.runtime.xml" - class="org.eclipse.wst.sse.core.filebuffers.BasicStructuredDocumentFactory"/> + class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory"/> </extension> <extension diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePlugin.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePlugin.java index da97753c91..962b707466 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePlugin.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/XMLCorePlugin.java @@ -17,7 +17,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; /** diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/CleanupProcessorXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/CleanupProcessorXML.java index d3c5f46a7e..fca2b79230 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/CleanupProcessorXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/CleanupProcessorXML.java @@ -18,7 +18,7 @@ import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler; import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences; import org.eclipse.wst.sse.core.internal.cleanup.StructuredCleanupPreferences; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.contenttype.ContentTypeIdForXML; import org.eclipse.wst.xml.core.internal.XMLCorePlugin; import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/NodeCleanupHandler.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/NodeCleanupHandler.java index ab72ddbe2f..d8775a0f4e 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/NodeCleanupHandler.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/cleanup/NodeCleanupHandler.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler; import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences; import org.eclipse.wst.sse.core.internal.cleanup.StructuredCleanupPreferences; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.internal.XMLCorePlugin; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java index c5cb70a8a7..efc2109f4a 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/document/DocumentImpl.java @@ -20,7 +20,7 @@ package org.eclipse.wst.xml.core.internal.document; import java.util.HashMap; import java.util.Map; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; import org.eclipse.wst.xml.core.NameValidator; import org.eclipse.wst.xml.core.IXMLCharEntity; import org.eclipse.wst.xml.core.document.IDOMDocument; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java index 3da04e2edf..63b81e510b 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/EmbeddedXML.java @@ -15,8 +15,8 @@ package org.eclipse.wst.xml.core.internal.modelhandler; import java.util.ArrayList; import java.util.List; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.core.parser.JSPCapableParser; import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryAdapterFactoryForEmbeddedXML; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/ModelHandlerForXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/ModelHandlerForXML.java index af3753b321..81a7035ecb 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/ModelHandlerForXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelhandler/ModelHandlerForXML.java @@ -15,8 +15,8 @@ package org.eclipse.wst.xml.core.internal.modelhandler; import org.eclipse.wst.sse.core.IModelLoader; import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector; import org.eclipse.wst.sse.core.internal.document.IDocumentLoader; -import org.eclipse.wst.sse.core.modelhandler.AbstractModelHandler; -import org.eclipse.wst.sse.core.modelhandler.IModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler; import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentCharsetDetector; import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/FormatProcessorXML.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/FormatProcessorXML.java index 324bdc3fbe..54b84b5a2f 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/FormatProcessorXML.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/FormatProcessorXML.java @@ -17,7 +17,7 @@ import org.eclipse.wst.sse.core.internal.SSECorePlugin; import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.internal.XMLCorePlugin; import org.eclipse.wst.xml.core.internal.document.CDATASectionImpl; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/NodeFormatter.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/NodeFormatter.java index 97b8154b0f..544e436359 100644 --- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/NodeFormatter.java +++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/provisional/format/NodeFormatter.java @@ -22,8 +22,8 @@ import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences; import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter; import org.eclipse.wst.sse.core.internal.format.StructuredFormatContraints; import org.eclipse.wst.sse.core.internal.parser.ContextRegion; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.sse.core.internal.util.StringUtils; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; 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.xml.ui/src/org/eclipse/wst/xml/ui/actions/CleanupDialogXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/actions/CleanupDialogXML.java index 1f6000833b..2b3569f260 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/actions/CleanupDialogXML.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/actions/CleanupDialogXML.java @@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.core.internal.XMLCorePlugin; import org.eclipse.wst.xml.ui.internal.XMLUIMessages; import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds; diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/preferences/XMLSourcePreferencePage.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/preferences/XMLSourcePreferencePage.java index b77a1c1f1a..7a63a4e797 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/preferences/XMLSourcePreferencePage.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/preferences/XMLSourcePreferencePage.java @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; +import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames; import org.eclipse.wst.sse.ui.preferences.ui.AbstractPreferencePage; import org.eclipse.wst.xml.core.internal.XMLCorePlugin; import org.eclipse.wst.xml.ui.internal.XMLUIMessages; diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForEmbeddedXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForEmbeddedXML.java index 50dc1f3ade..2953d09582 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForEmbeddedXML.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForEmbeddedXML.java @@ -13,7 +13,7 @@ package org.eclipse.wst.xml.ui.registry; import org.eclipse.wst.sse.core.IStructuredModel; -import org.eclipse.wst.sse.core.modelhandler.EmbeddedTypeHandler; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler; import org.eclipse.wst.sse.ui.registry.embedded.EmbeddedAdapterFactoryProvider; import org.eclipse.wst.xml.core.document.IDOMDocument; import org.eclipse.wst.xml.core.document.IDOMModel; diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForXML.java index 6f9f620824..1ef92a62a8 100644 --- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForXML.java +++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/registry/AdapterFactoryProviderForXML.java @@ -16,9 +16,9 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.wst.sse.core.INodeAdapterFactory; import org.eclipse.wst.sse.core.IStructuredModel; +import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; import org.eclipse.wst.sse.core.internal.util.Assert; -import org.eclipse.wst.sse.core.modelhandler.IDocumentTypeHandler; import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter; import org.eclipse.wst.sse.ui.registry.AdapterFactoryProvider; import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager; |