diff options
Diffstat (limited to 'bundles/org.eclipse.wst.dtd.ui/src')
4 files changed, 10 insertions, 16 deletions
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPlugin.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPlugin.java index d8f45f06ef..5b2028ef36 100644 --- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPlugin.java +++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPlugin.java @@ -22,7 +22,7 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.wst.common.encoding.content.IContentTypeIdentifier; import org.eclipse.wst.dtd.ui.style.IStyleConstantsDTD; -import org.eclipse.wst.sse.ui.EditorPlugin; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.preferences.PreferenceKeyGenerator; import org.eclipse.wst.sse.ui.preferences.ui.ColorHelper; @@ -85,7 +85,7 @@ public class DTDUIPlugin extends AbstractUIPlugin { // Force a call to initialize default preferences since // initializeDefaultPreferences is only called if *this* plugin's // preference store is accessed - initializeDefaultDTDPreferences(EditorPlugin.getDefault() + initializeDefaultDTDPreferences(SSEUIPlugin.getDefault() .getPreferenceStore()); } @@ -146,7 +146,7 @@ public class DTDUIPlugin extends AbstractUIPlugin { protected void initializeDefaultPreferences(IPreferenceStore store) { // ignore this preference store // use EditorPlugin preference store - IPreferenceStore editorStore = EditorPlugin.getDefault().getPreferenceStore(); + IPreferenceStore editorStore = SSEUIPlugin.getDefault().getPreferenceStore(); initializeDefaultDTDPreferences(editorStore); } } diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/preferences/DTDColorPage.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/preferences/DTDColorPage.java index 200e0ea462..a4c3a60ffd 100644 --- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/preferences/DTDColorPage.java +++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/preferences/DTDColorPage.java @@ -29,15 +29,13 @@ import org.eclipse.wst.dtd.ui.internal.editor.IHelpContextIds; import org.eclipse.wst.dtd.ui.style.IStyleConstantsDTD; import org.eclipse.wst.sse.core.IModelManager; import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.ui.EditorPlugin; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore; import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.OverlayKey; import org.eclipse.wst.sse.ui.preferences.PreferenceKeyGenerator; import org.eclipse.wst.sse.ui.preferences.ui.AbstractColorPage; import org.eclipse.wst.sse.ui.preferences.ui.StyledTextColorPicker; - - public class DTDColorPage extends AbstractColorPage { protected Control createContents(Composite parent) { @@ -69,7 +67,7 @@ public class DTDColorPage extends AbstractColorPage { } protected IPreferenceStore doGetPreferenceStore() { - return EditorPlugin.getDefault().getPreferenceStore(); + return SSEUIPlugin.getDefault().getPreferenceStore(); } public String getSampleText() { @@ -147,7 +145,7 @@ public class DTDColorPage extends AbstractColorPage { // saving its own super.performOk(); - EditorPlugin.getDefault().savePluginPreferences(); + SSEUIPlugin.getDefault().savePluginPreferences(); return true; } diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/style/LineStyleProviderForDTD.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/style/LineStyleProviderForDTD.java index be41e5e67a..7f24c94bed 100644 --- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/style/LineStyleProviderForDTD.java +++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/style/LineStyleProviderForDTD.java @@ -10,8 +10,6 @@ * Jens Lukowski/Innoopract - initial renaming/restructuring * *******************************************************************************/ - - package org.eclipse.wst.dtd.ui.style; import org.eclipse.jface.preference.IPreferenceStore; @@ -20,12 +18,11 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.wst.common.encoding.content.IContentTypeIdentifier; import org.eclipse.wst.dtd.core.parser.DTDRegionTypes; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.sse.ui.EditorPlugin; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.preferences.PreferenceKeyGenerator; import org.eclipse.wst.sse.ui.style.AbstractLineStyleProvider; import org.eclipse.wst.sse.ui.style.LineStyleProvider; - public class LineStyleProviderForDTD extends AbstractLineStyleProvider implements LineStyleProvider { public LineStyleProviderForDTD() { super(); @@ -80,7 +77,7 @@ public class LineStyleProviderForDTD extends AbstractLineStyleProvider implement } protected IPreferenceStore getColorPreferences() { - return EditorPlugin.getDefault().getPreferenceStore(); + return SSEUIPlugin.getDefault().getPreferenceStore(); } protected String getPreferenceKey(String key) { diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/style/LineStyleProviderForDTDSubSet.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/style/LineStyleProviderForDTDSubSet.java index e75860e636..f937117893 100644 --- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/style/LineStyleProviderForDTDSubSet.java +++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/style/LineStyleProviderForDTDSubSet.java @@ -30,13 +30,12 @@ import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.text.IStructuredDocument; import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion; import org.eclipse.wst.sse.core.text.ITextRegion; -import org.eclipse.wst.sse.ui.EditorPlugin; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.preferences.PreferenceKeyGenerator; import org.eclipse.wst.sse.ui.preferences.ui.ColorHelper; import org.eclipse.wst.sse.ui.style.AbstractLineStyleProvider; import org.eclipse.wst.sse.ui.style.LineStyleProvider; - public class LineStyleProviderForDTDSubSet extends AbstractLineStyleProvider implements LineStyleProvider { private int fInternalAdjustment; @@ -76,7 +75,7 @@ public class LineStyleProviderForDTDSubSet extends AbstractLineStyleProvider imp } protected IPreferenceStore getColorPreferences() { - return EditorPlugin.getDefault().getPreferenceStore(); + return SSEUIPlugin.getDefault().getPreferenceStore(); } /** |