diff options
Diffstat (limited to 'bundles/org.eclipse.wst.html.ui/src/org')
19 files changed, 279 insertions, 165 deletions
diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextEditorHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextEditorHTML.java index 8704f70e53..23e5266953 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextEditorHTML.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextEditorHTML.java @@ -19,18 +19,17 @@ import org.eclipse.wst.html.ui.internal.search.HTMLFindOccurrencesAction; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.eclipse.wst.sse.ui.edit.util.ActionDefinitionIds; import org.eclipse.wst.sse.ui.edit.util.StructuredTextEditorActionConstants; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesActionProvider; -import org.eclipse.wst.sse.ui.nls.ResourceHandler; import org.eclipse.wst.xml.ui.actions.AddBlockCommentActionXML; import org.eclipse.wst.xml.ui.actions.RemoveBlockCommentActionXML; import org.eclipse.wst.xml.ui.actions.ToggleCommentActionXML; - public class StructuredTextEditorHTML extends StructuredTextEditor { protected void createActions() { super.createActions(); - ResourceBundle resourceBundle = ResourceHandler.getResourceBundle(); + ResourceBundle resourceBundle = SSEUIPlugin.getDefault().getResourceBundle(); Action action = new CleanupActionHTML(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_CLEANUP_DOCUMENT + DOT, this); action.setActionDefinitionId(ActionDefinitionIds.CLEANUP_DOCUMENT); diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java index 26a531e3ff..7cf796b5cb 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/StructuredTextViewerConfigurationHTML.java @@ -54,11 +54,11 @@ 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.text.rules.StructuredTextPartitioner; -import org.eclipse.wst.sse.ui.EditorPlugin; import org.eclipse.wst.sse.ui.StructuredTextReconciler; import org.eclipse.wst.sse.ui.StructuredTextViewer; import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; import org.eclipse.wst.sse.ui.format.StructuredFormattingStrategy; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.preferences.CommonEditorPreferenceNames; import org.eclipse.wst.sse.ui.preferences.PreferenceKeyGenerator; import org.eclipse.wst.sse.ui.style.IHighlighter; @@ -74,7 +74,6 @@ import org.eclipse.wst.xml.ui.internal.correction.CorrectionProcessorXML; import org.eclipse.wst.xml.ui.reconcile.StructuredTextReconcilingStrategyForContentModel; import org.eclipse.wst.xml.ui.reconcile.StructuredTextReconcilingStrategyForMarkup; - public class StructuredTextViewerConfigurationHTML extends StructuredTextViewerConfiguration { InformationPresenter fInformationPresenter = null; @@ -261,7 +260,7 @@ public class StructuredTextViewerConfigurationHTML extends StructuredTextViewerC //fReconciler.setEditor(editorPart); } - IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore(); + IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore(); boolean reconcilingEnabled = store.getBoolean(CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS); // the second time through, the strategies are set @@ -277,7 +276,7 @@ public class StructuredTextViewerConfigurationHTML extends StructuredTextViewerC // check language (ContentTypeID).... String contentTypeId = sModel.getContentTypeIdentifier(); //sModel.getModelHandler().getAssociatedContentTypeId(); String generatedKey = PreferenceKeyGenerator.generateKey(CommonEditorPreferenceNames.EDITOR_VALIDATION_METHOD, contentTypeId); - String validationMethodPref = EditorPlugin.getInstance().getPreferenceStore().getString(generatedKey); + String validationMethodPref = SSEUIPlugin.getInstance().getPreferenceStore().getString(generatedKey); IReconcilingStrategy defaultStrategy = null; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ContentSettingsRegistry.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ContentSettingsRegistry.java index 4e75cdb47f..82aee306a0 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ContentSettingsRegistry.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ContentSettingsRegistry.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.contentproperties.ui; - - import java.util.Enumeration; import java.util.Iterator; @@ -21,11 +19,11 @@ import org.eclipse.wst.css.core.metamodel.CSSProfileRegistry; import org.eclipse.wst.html.core.document.HTMLDocumentTypeEntry; import org.eclipse.wst.html.core.document.HTMLDocumentTypeRegistry; import org.eclipse.wst.sse.ui.contentproperties.ui.ComboList; -import org.eclipse.wst.sse.ui.nls.ResourceHandler; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; public final class ContentSettingsRegistry { - private static final String NONE = ResourceHandler.getString("UI_none"); //$NON-NLS-1$ + private static final String NONE = SSEUIPlugin.getResourceString("%UI_none"); //$NON-NLS-1$ public static String maxLengthStringInHTMLDocumentTypeRegistry = ""; //$NON-NLS-1$ public static String maxLengthStringInCharacterCodeRegistry = ""; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/HTMLContentSettingsPropertyPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/HTMLContentSettingsPropertyPage.java index 0cc12bdcdb..6d6e0dcfe4 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/HTMLContentSettingsPropertyPage.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/HTMLContentSettingsPropertyPage.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.contentproperties.ui; - - import java.util.Map; import org.eclipse.core.resources.IResource; @@ -26,7 +24,7 @@ import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; import org.eclipse.wst.sse.ui.contentproperties.IContentSettings; import org.eclipse.wst.sse.ui.contentproperties.ui.ComboListOnPropertyPage; import org.eclipse.wst.sse.ui.contentproperties.ui.ContentSettingsPropertyPage; -import org.eclipse.wst.sse.ui.nls.ResourceHandler; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; public final class HTMLContentSettingsPropertyPage extends ContentSettingsPropertyPage implements org.eclipse.swt.events.SelectionListener { @@ -53,7 +51,7 @@ public final class HTMLContentSettingsPropertyPage extends ContentSettingsProper // create description of implecit DOCTYPE Label label = new Label(propertyPage, SWT.LEFT); - label.setText(ResourceHandler.getString("UI_Description_of_role_of_following_DOCTYPE"));//$NON-NLS-1$ + label.setText(SSEUIPlugin.getResourceString("%UI_Description_of_role_of_following_DOCTYPE"));//$NON-NLS-1$ GridData data = new GridData(); data.horizontalAlignment = GridData.FILL; data.horizontalSpan = numCols; @@ -201,7 +199,7 @@ public final class HTMLContentSettingsPropertyPage extends ContentSettingsProper GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL); data.horizontalIndent = 10; publicLabel.setLayoutData(data); - publicLabel.setText(ResourceHandler.getString("UI_Public_ID"));//$NON-NLS-1$ + publicLabel.setText(SSEUIPlugin.getResourceString("%UI_Public_ID"));//$NON-NLS-1$ publicIdText = new Text(super.propertyPage, SWT.BORDER | SWT.READ_ONLY); data = new GridData(); @@ -211,7 +209,7 @@ public final class HTMLContentSettingsPropertyPage extends ContentSettingsProper data = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL); data.horizontalIndent = 10; systemLabel.setLayoutData(data); - systemLabel.setText(ResourceHandler.getString("UI_System_ID"));//$NON-NLS-1$ + systemLabel.setText(SSEUIPlugin.getResourceString("%UI_System_ID"));//$NON-NLS-1$ systemIdText = new Text(super.propertyPage, SWT.BORDER | SWT.READ_ONLY); data = new GridData(); diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ProjectContentSettingsPropertyPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ProjectContentSettingsPropertyPage.java index e5203dbfd1..0dd50b8a52 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ProjectContentSettingsPropertyPage.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/contentproperties/ui/ProjectContentSettingsPropertyPage.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.contentproperties.ui; - - import java.util.Map; import org.eclipse.core.resources.IResource; @@ -21,14 +19,13 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; import org.eclipse.wst.html.ui.internal.Logger; import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.html.ui.internal.nls.ResourceHandler; import org.eclipse.wst.sse.ui.contentproperties.IContentSettings; import org.eclipse.wst.sse.ui.contentproperties.ui.ComboListOnPropertyPage; import org.eclipse.wst.sse.ui.contentproperties.ui.ContentSettingsPropertyPage; - public final class ProjectContentSettingsPropertyPage extends ContentSettingsPropertyPage implements org.eclipse.swt.events.SelectionListener { @@ -54,7 +51,7 @@ public final class ProjectContentSettingsPropertyPage extends ContentSettingsPro // create description of implecit DOCTYPE Label label = new Label(propertyPage, SWT.LEFT); - label.setText(ResourceHandler.getString("UI_Description_of_role_of_following_DOCTYPE"));//$NON-NLS-1$ + label.setText(HTMLUIPlugin.getResourceString("%UI_Description_of_role_of_following_DOCTYPE"));//$NON-NLS-1$ GridData data = new GridData(); data.horizontalAlignment = GridData.FILL; data.horizontalSpan = numCols; @@ -205,7 +202,7 @@ public final class ProjectContentSettingsPropertyPage extends ContentSettingsPro GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL); data.horizontalIndent = 10; publicLabel.setLayoutData(data); - publicLabel.setText(ResourceHandler.getString("UI_Public_ID"));//$NON-NLS-1$ + publicLabel.setText(HTMLUIPlugin.getResourceString("%UI_Public_ID"));//$NON-NLS-1$ publicIdText = new Text(super.propertyPage, SWT.BORDER | SWT.READ_ONLY); data = new GridData(); @@ -215,7 +212,7 @@ public final class ProjectContentSettingsPropertyPage extends ContentSettingsPro data = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL); data.horizontalIndent = 10; systemLabel.setLayoutData(data); - systemLabel.setText(ResourceHandler.getString("UI_System_ID"));//$NON-NLS-1$ + systemLabel.setText(HTMLUIPlugin.getResourceString("%UI_System_ID"));//$NON-NLS-1$ systemIdText = new Text(super.propertyPage, SWT.BORDER | SWT.READ_ONLY); data = new GridData(); diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/edit/ui/CleanupDialogHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/edit/ui/CleanupDialogHTML.java index 1f1d042748..8d264b162a 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/edit/ui/CleanupDialogHTML.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/edit/ui/CleanupDialogHTML.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.edit.ui; - - import org.eclipse.core.runtime.Preferences; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; @@ -26,12 +24,12 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.wst.common.encoding.CommonEncodingPreferenceNames; import org.eclipse.wst.common.encoding.content.IContentTypeIdentifier; -import org.eclipse.wst.html.core.HTMLCorePlugin; +import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.modelhandler.IModelHandler; import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; -import org.eclipse.wst.sse.ui.nls.ResourceHandler; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.xml.core.cleanup.XMLCleanupPreferencesImpl; public class CleanupDialogHTML extends Dialog implements SelectionListener { @@ -58,7 +56,7 @@ public class CleanupDialogHTML extends Dialog implements SelectionListener { } public Control createDialogArea(Composite parent) { - getShell().setText(ResourceHandler.getString("Cleanup_UI_")); //$NON-NLS-1$ = "Cleanup" + getShell().setText(SSEUIPlugin.getResourceString("%Cleanup_UI_")); //$NON-NLS-1$ = "Cleanup" Composite composite = new Composite(parent, SWT.NULL); createDialogAreaInComposite(composite); @@ -71,33 +69,33 @@ public class CleanupDialogHTML extends Dialog implements SelectionListener { // Convert tag name case // d257064 need to associate group w/ radio buttons so radio buttons header can be read Group tagNameCase = new Group(composite, SWT.NONE); - tagNameCase.setText(ResourceHandler.getString("Tag_name_case_for_HTML_UI_")); //$NON-NLS-1$ = "Tag name case for HTML:" + tagNameCase.setText(SSEUIPlugin.getResourceString("%Tag_name_case_for_HTML_UI_")); //$NON-NLS-1$ = "Tag name case for HTML:" GridLayout hLayout = new GridLayout(); hLayout.numColumns = 3; tagNameCase.setLayout(hLayout); fRadioButtonTagNameCaseAsis = new Button(tagNameCase, SWT.RADIO); - fRadioButtonTagNameCaseAsis.setText(ResourceHandler.getString("Tag_name_case_As-is_UI_")); //$NON-NLS-1$ = "&As-is" + fRadioButtonTagNameCaseAsis.setText(SSEUIPlugin.getResourceString("%Tag_name_case_As-is_UI_")); //$NON-NLS-1$ = "&As-is" fRadioButtonTagNameCaseAsis.addSelectionListener(this); fRadioButtonTagNameCaseLower = new Button(tagNameCase, SWT.RADIO); - fRadioButtonTagNameCaseLower.setText(ResourceHandler.getString("Tag_name_case_Lower_UI_")); //$NON-NLS-1$ = "&Lower" + fRadioButtonTagNameCaseLower.setText(SSEUIPlugin.getResourceString("%Tag_name_case_Lower_UI_")); //$NON-NLS-1$ = "&Lower" fRadioButtonTagNameCaseLower.addSelectionListener(this); fRadioButtonTagNameCaseUpper = new Button(tagNameCase, SWT.RADIO); - fRadioButtonTagNameCaseUpper.setText(ResourceHandler.getString("Tag_name_case_Upper_UI_")); //$NON-NLS-1$ = "&Upper" + fRadioButtonTagNameCaseUpper.setText(SSEUIPlugin.getResourceString("%Tag_name_case_Upper_UI_")); //$NON-NLS-1$ = "&Upper" fRadioButtonTagNameCaseUpper.addSelectionListener(this); // Convert attr name case // d257064 need to associate group w/ radio buttons so radio buttons header can be read Group attrNameCase = new Group(composite, SWT.NONE); - attrNameCase.setText(ResourceHandler.getString("Attribute_name_case_for_HTML_UI_")); //$NON-NLS-1$ = "Attribute name case for HTML:" + attrNameCase.setText(SSEUIPlugin.getResourceString("%Attribute_name_case_for_HTML_UI_")); //$NON-NLS-1$ = "Attribute name case for HTML:" attrNameCase.setLayout(hLayout); fRadioButtonAttrNameCaseAsis = new Button(attrNameCase, SWT.RADIO); - fRadioButtonAttrNameCaseAsis.setText(ResourceHandler.getString("Attribute_name_case_As-is_UI_")); //$NON-NLS-1$ = "A&s-is" + fRadioButtonAttrNameCaseAsis.setText(SSEUIPlugin.getResourceString("%Attribute_name_case_As-is_UI_")); //$NON-NLS-1$ = "A&s-is" fRadioButtonAttrNameCaseAsis.addSelectionListener(this); fRadioButtonAttrNameCaseLower = new Button(attrNameCase, SWT.RADIO); - fRadioButtonAttrNameCaseLower.setText(ResourceHandler.getString("Attribute_name_case_Lower_UI_")); //$NON-NLS-1$ = "L&ower" + fRadioButtonAttrNameCaseLower.setText(SSEUIPlugin.getResourceString("%Attribute_name_case_Lower_UI_")); //$NON-NLS-1$ = "L&ower" fRadioButtonAttrNameCaseLower.addSelectionListener(this); fRadioButtonAttrNameCaseUpper = new Button(attrNameCase, SWT.RADIO); - fRadioButtonAttrNameCaseUpper.setText(ResourceHandler.getString("Attribute_name_case_Upper_UI_")); //$NON-NLS-1$ = "U&pper" + fRadioButtonAttrNameCaseUpper.setText(SSEUIPlugin.getResourceString("%Attribute_name_case_Upper_UI_")); //$NON-NLS-1$ = "U&pper" fRadioButtonAttrNameCaseUpper.addSelectionListener(this); } @@ -116,40 +114,40 @@ public class CleanupDialogHTML extends Dialog implements SelectionListener { // Insert missing required attrs fCheckBoxInsertRequiredAttrs = new Button(composite, SWT.CHECK); - fCheckBoxInsertRequiredAttrs.setText(ResourceHandler.getString("Insert_required_attributes_UI_")); //$NON-NLS-1$ + fCheckBoxInsertRequiredAttrs.setText(SSEUIPlugin.getResourceString("%Insert_required_attributes_UI_")); //$NON-NLS-1$ fCheckBoxInsertRequiredAttrs.addSelectionListener(this); // Insert missing begin/end tags fCheckBoxInsertMissingTags = new Button(composite, SWT.CHECK); - fCheckBoxInsertMissingTags.setText(ResourceHandler.getString("Insert_missing_tags_UI_")); //$NON-NLS-1$ = "Insert missing tags" + fCheckBoxInsertMissingTags.setText(SSEUIPlugin.getResourceString("%Insert_missing_tags_UI_")); //$NON-NLS-1$ = "Insert missing tags" fCheckBoxInsertMissingTags.addSelectionListener(this); // Quote attribute values fCheckBoxQuoteAttrValues = new Button(composite, SWT.CHECK); - fCheckBoxQuoteAttrValues.setText(ResourceHandler.getString("Quote_attribute_values_UI_")); //$NON-NLS-1$ = "Quote attribute values" + fCheckBoxQuoteAttrValues.setText(SSEUIPlugin.getResourceString("%Quote_attribute_values_UI_")); //$NON-NLS-1$ = "Quote attribute values" fCheckBoxQuoteAttrValues.addSelectionListener(this); // Format source fCheckBoxFormatSource = new Button(composite, SWT.CHECK); - fCheckBoxFormatSource.setText(ResourceHandler.getString("Format_source_UI_")); //$NON-NLS-1$ = "Format source" + fCheckBoxFormatSource.setText(SSEUIPlugin.getResourceString("%Format_source_UI_")); //$NON-NLS-1$ = "Format source" fCheckBoxFormatSource.addSelectionListener(this); // Convert EOL code fCheckBoxConvertEOLCodes = new Button(composite, SWT.CHECK); - fCheckBoxConvertEOLCodes.setText(ResourceHandler.getString("Convert_EOL_codes_UI_")); //$NON-NLS-1$ = "Convert end-of-line codes" + fCheckBoxConvertEOLCodes.setText(SSEUIPlugin.getResourceString("%Convert_EOL_codes_UI_")); //$NON-NLS-1$ = "Convert end-of-line codes" fCheckBoxConvertEOLCodes.addSelectionListener(this); Composite EOLCodes = new Composite(composite, SWT.NULL); GridLayout hLayout = new GridLayout(); hLayout.numColumns = 3; EOLCodes.setLayout(hLayout); fRadioButtonConvertEOLWindows = new Button(EOLCodes, SWT.RADIO); - fRadioButtonConvertEOLWindows.setText(ResourceHandler.getString("EOL_Windows_UI")); //$NON-NLS-1$ = "Windows" + fRadioButtonConvertEOLWindows.setText(SSEUIPlugin.getResourceString("%EOL_Windows_UI")); //$NON-NLS-1$ = "Windows" fRadioButtonConvertEOLWindows.addSelectionListener(this); fRadioButtonConvertEOLUnix = new Button(EOLCodes, SWT.RADIO); - fRadioButtonConvertEOLUnix.setText(ResourceHandler.getString("EOL_Unix_UI")); //$NON-NLS-1$ = "Unix" + fRadioButtonConvertEOLUnix.setText(SSEUIPlugin.getResourceString("%EOL_Unix_UI")); //$NON-NLS-1$ = "Unix" fRadioButtonConvertEOLUnix.addSelectionListener(this); fRadioButtonConvertEOLMac = new Button(EOLCodes, SWT.RADIO); - fRadioButtonConvertEOLMac.setText(ResourceHandler.getString("EOL_Mac_UI")); //$NON-NLS-1$ = "Mac" + fRadioButtonConvertEOLMac.setText(SSEUIPlugin.getResourceString("%EOL_Mac_UI")); //$NON-NLS-1$ = "Mac" fRadioButtonConvertEOLMac.addSelectionListener(this); } diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPlugin.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPlugin.java index a7890b24e6..19e5b746af 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPlugin.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPlugin.java @@ -11,6 +11,9 @@ package org.eclipse.wst.html.ui.internal; import java.io.IOException; +import java.text.MessageFormat; +import java.util.MissingResourceException; +import java.util.ResourceBundle; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.templates.ContextTypeRegistry; @@ -24,7 +27,7 @@ import org.eclipse.wst.html.ui.templates.TemplateContextTypeHTML; import org.eclipse.wst.html.ui.templates.TemplateContextTypeHTMLAttribute; import org.eclipse.wst.html.ui.templates.TemplateContextTypeHTMLAttributeValue; import org.eclipse.wst.html.ui.templates.TemplateContextTypeHTMLTag; -import org.eclipse.wst.sse.ui.EditorPlugin; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.preferences.CommonEditorPreferenceNames; import org.eclipse.wst.sse.ui.preferences.PreferenceKeyGenerator; import org.eclipse.wst.sse.ui.preferences.ui.ColorHelper; @@ -33,7 +36,6 @@ import org.eclipse.wst.sse.ui.registry.AdapterFactoryRegistryImpl; import org.eclipse.wst.sse.ui.registry.embedded.EmbeddedAdapterFactoryRegistryImpl; import org.eclipse.wst.xml.ui.style.IStyleConstantsXML; - /** * The main plugin class to be used in the desktop. */ @@ -41,6 +43,10 @@ public class HTMLUIPlugin extends AbstractUIPlugin { public final static String ID = "org.eclipse.wst.html.ui"; //$NON-NLS-1$ protected static HTMLUIPlugin instance = null; + //Resource bundle. + private ResourceBundle resourceBundle; + private static final String KEY_PREFIX = "%"; //$NON-NLS-1$ + private static final String KEY_DOUBLE_PREFIX = "%%"; //$NON-NLS-1$ /** * The template store for the html editor. @@ -59,7 +65,7 @@ public class HTMLUIPlugin extends AbstractUIPlugin { // Force a call to initialize default preferences since // initializeDefaultPreferences is only called if *this* plugin's // preference store is accessed - initializeDefaultHTMLPreferences(EditorPlugin.getDefault().getPreferenceStore()); + initializeDefaultHTMLPreferences(SSEUIPlugin.getDefault().getPreferenceStore()); } public static HTMLUIPlugin getDefault() { @@ -87,7 +93,7 @@ public class HTMLUIPlugin extends AbstractUIPlugin { // ignore this preference store // use EditorPlugin preference store - IPreferenceStore editorStore = EditorPlugin.getDefault().getPreferenceStore(); + IPreferenceStore editorStore = SSEUIPlugin.getDefault().getPreferenceStore(); initializeDefaultHTMLPreferences(editorStore); } @@ -189,4 +195,49 @@ public class HTMLUIPlugin extends AbstractUIPlugin { return fContextTypeRegistry; } + + /** + * Returns the string from the plugin's resource bundle, + * or 'key' if not found. + */ + public static String getResourceString(String value) { + String s = value.trim(); + if (!s.startsWith(KEY_PREFIX, 0)) + return s; + if (s.startsWith(KEY_DOUBLE_PREFIX, 0)) + return s.substring(1); + + int ix = s.indexOf(' '); + String key = ix == -1 ? s : s.substring(0, ix); + + ResourceBundle bundle = getDefault().getResourceBundle(); + try { + return (bundle != null) ? bundle.getString(key.substring(1)) : key; + } catch (MissingResourceException e) { + return key; + } + } + + public static String getResourceString(String key, Object[] args) { + + try { + return MessageFormat.format(getResourceString(key), args); + } catch (IllegalArgumentException e) { + return getResourceString(key); + } + + } + + /** + * Returns the plugin's resource bundle, + */ + public ResourceBundle getResourceBundle() { + try { + if (resourceBundle == null) + resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.html.ui.internal.HTMLUIPluginResources"); + } catch (MissingResourceException x) { + resourceBundle = null; + } + return resourceBundle; + } } diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPluginResources.properties b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPluginResources.properties new file mode 100644 index 0000000000..47296db127 --- /dev/null +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/HTMLUIPluginResources.properties @@ -0,0 +1,159 @@ +############################################################################### +# Copyright (c) 2004 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +## The following line is a sample HTML document. Please translate only the following parts: +## HTML Highlighting Preferences +## we need a flaming logo +Sample_HTML_doc=<!DOCTYPE HTML\n\tPUBLIC \"-//W3C/DTD/ HTML 4.01 Transitional//EN\"\n\t\"http://www.w3.org/TR/html4/loose.dtd\">\n<HTML>\n\t<HEAD>\n\t\t<META content=\"text/html\">\n\t\t<TITLE>HTML Highlighting Preferences</TITLE>\n\t</HEAD>\n<BODY>\n\t<!--\n\t\twe need a flaming logo!\n\t-->\n</BODY>\n</HTML> +! XML Common UI +! Constants for strings + +NEW=New +DELETE=Remove +ADD_TEXT=Add Text +ADD_CDATA_SECTION=Add CDATA Section +ADD_COMMENT=Add Commen&t +ADD_PROCESSING_INSTRUCTION=Add Processing Instruction + +_UI_MENU_ADD_AFTER=Add &After +_UI_MENU_ADD_ATTRIBUTE=Add A&ttribute +_UI_MENU_ADD_BEFORE=Add &Before +_UI_MENU_ADD_CHILD=Add &Child +_UI_MENU_REMOVE=Re&move +_UI_MENU_REPLACE_WITH=Re&place With +_UI_MENU_ADD_DOCTYPE=Add DOCTYPE... +_UI_MENU_EDIT_DOCTYPE=Edit DOCTYPE... +_UI_MENU_ADD_GRAMMAR_INFORMATION=Add Grammar Information +_UI_MENU_VALIDATE_XML=Validate XML File +_UI_LABEL_UNDO_ADD_DESCRIPTION=Add +_UI_LABEL_UNDO_REPLACE_DESCRIPTION=Replace +_UI_LABEL_EDIT_DOCTYPE=Edit DOCTYPE +_UI_INFO_EXPAND_ALL=Expand All +_UI_INFO_COLLAPSE_ALL=Collapse All + +_UI_MENU_ADD_DTD_INFORMATION=Add DTD Information... +_UI_MENU_ADD_SCHEMA_INFORMATION=Add Schema Information... +_UI_MENU_EDIT_SCHEMA_INFORMATION=Edit &Schema Information... +_UI_MENU_EDIT_PROCESSING_INSTRUCTION=Edit Process&ing Instruction... + +_UI_MENU_ADD_DTD_INFORMATION_TITLE=Add DTD Information +_UI_MENU_EDIT_PROCESSING_INSTRUCTION_TITLE=Edit Processing Instruction +_UI_MENU_EDIT_SCHEMA_INFORMATION_TITLE=Edit Schema Information + +_UI_MENU_NEW_ATTRIBUTE=&New Attribute... +_UI_MENU_NEW_ATTRIBUTE_TITLE=New Attribute +_UI_MENU_EDIT_ATTRIBUTE=Edit Attribute... +_UI_MENU_EDIT_ATTRIBUTE_TITLE=Edit Attribute +_UI_MENU_NEW_ELEMENT=New &Element... +_UI_MENU_NEW_ELEMENT_TITLE=New Element +_UI_MENU_RENAME=R&ename +_UI_MENU_RENAME_TITLE=Rename +_UI_LABEL_ELEMENT_NAME=Element name: +_UI_LABEL_LOADING_GRAMMAR=Loading grammar: + +_UI_MENU_ADD_COMMENT=Add Comment +_UI_MENU_ADD_PROCESSING_INSTRUCTION=Add Processing Instruction +_UI_MENU_ADD_CDATA_SECTION=Add CDATA Section +_UI_MENU_ADD_PCDATA=Add #PCDATA; + +_UI_MENU_COMMENT=C&omment +_UI_MENU_PROCESSING_INSTRUCTION=P&rocessing Instruction +_UI_MENU_CDATA_SECTION=CDATA Section +_UI_MENU_PCDATA=#PC&DATA; + +_UI_MENU_ADD=Add + +_UI_COMMENT_VALUE=comment +_UI_PI_TARGET_VALUE=target +_UI_PI_DATA_VALUE=data +_UI_LABEL_ROOT_ELEMENT_VALUE=RootElement + +_UI_LABEL_TARGET_COLON=Target: +_UI_LABEL_DATA_COLON=Data: +_UI_LABEL_ROOT_ELEMENT_NAME_COLON=Root element name: +_UI_LABEL_PUBLIC_ID_COLON=Public ID: +_UI_LABEL_SYSTEM_ID_COLON=System ID: +_UI_LABEL_BROWSE=Browse... +_UI_LABEL_SELECT_XML_CATALOG_ENTRY=Select XML Catalog Entry +_UI_LABEL_SPECIFY_SYSTEM_ID=Specify System ID +_UI_LABEL_SELECT_FILE=Select File + +_UI_LABEL_KEY=Key +_UI_LABEL_URI=URI: +_UI_LABEL_XML_CATALOG_COLON=XML Catalog +_UI_LABEL_NAMESPACE_NAME=Namespace Name +_UI_LABEL_LOCATION_HINT=Location Hint +_UI_LABEL_PREFIX=Prefix +_UI_LABEL_NAMESPACE_NAME_COLON=Namespace Name: +_UI_LABEL_LOCATION_HINT_COLON=Location Hint: +_UI_LABEL_PREFIX_COLON=Prefix: +_UI_NO_NAMESPACE_NAME=<no namespace name> +_UI_NO_PREFIX=<no prefix> + +_UI_LABEL_XML_SCHEMA_INFORMATION=XML Schema Information + +_UI_LABEL_NAME_COLON=Name: +_UI_LABEL_VALUE_COLON=Value: + +_UI_BUTTON_DELETE=Delete +_UI_BUTTON_NEW=New... +_UI_BUTTON_EDIT=Edit... + +_UI_LABEL_NEW_NAMESPACE_INFORMATION=New Namespace Information +_UI_LABEL_EDIT_NAMESPACE_INFORMATION=Edit Namespace Information + +! +! Assign links to an XML file +! +_UI_WORK_BENCH=Workbench Files... +_UI_FILE_SYSTEM=Import Files... +_UI_ASSIGN_XSL=Assign An XSL Stylesheet To The XML File +_UI_ASSIGN_DTD=Assign A DTD file To The XML File +_UI_ASSIGN_XSD=Assign An XML schema To The XML File +_UI_SELECT_XSL_TITLE=Select an XSL File +_UI_SELECT_XSL_DESC=Select an XSL file from the workbench. + +_UI_ASSIGN=Assign +_UI_XSD=XML Schema... +_UI_DTD=DTD... +_UI_XSL=XSL Stylesheet... + +! XMLValidator.java +_UI_XML_VALIDATOR=XML Validator +! SelectFileOrXMLCatalogIdPanel.java + +_UI_RADIO_BUTTON_SELECT_FROM_WORKSPACE=Select file from workbench +_UI_RADIO_BUTTON_SELECT_FROM_CATALOG=Select XML Catalog entry + +_UI_WARNING_TITLE_ROOT_ELEMENT_REQUIRED=Root Element Required +_UI_WARNING_DOCUMENT_REQUIRES_ROOT=The document requires a root element in order to add schema information. +_UI_WARNING_MORE_THAN_ONE_NS_WITH_NAME=More than one namespace has been specified with the namespace name : +_UI_WARNING_MORE_THAN_ONE_NS_WITHOUT_NAME=More than one schema has been specified without a namespace name +_UI_WARNING_MORE_THAN_ONE_NS_WITHOUT_PREFIX=More than one namespace has been specificed without a prefix +_UI_WARNING_MORE_THAN_ONE_NS_WITH_PREFIX=More than one namespace has been specified with the prefix : +_UI_WARNING_SCHEMA_CAN_NOT_BE_LOCATED=The specified schema can not be located : +_UI_WARNING_LOCATION_HINT_NOT_SPECIFIED=A location hint has not been specified for the namespace with name +_UI_WARNING_NAMESPACE_NAME_NOT_SPECIFIED=A name must be specified for the namespace with prefix : +_UI_WARNING_PREFIX_NOT_SPECIFIED=A prefix must be specified for the namespace named : +_UI_WARNING_ROOT_ELEMENT_MUST_BE_SPECIFIED=A root element name must be specified. +_UI_WARNING_SYSTEM_ID_MUST_BE_SPECIFIED=A system ID must be specified. + +_ERROR_XML_ATTRIBUTE_ALREADY_EXISTS=The element already has an attribute with this name. + +# +TemplateContextTypeHTMLTag.0=HTML Tags +TemplateContextTypeHTML.0=All HTML +TemplateContextTypeHTMLAttributeValue.0=HTML Attribute Values +TemplateContextTypeHTMLAttribute.0=HTML Attributes + +HTMLFilesPreferencePage.0=Loading files... +HTMLFilesPreferencePage.1=Add this suffix (if not specified): +HTMLFilesPreferencePage.2=Insert DOCTYPE declaration +HTMLFilesPreferencePage.3=Insert GENERATOR with META tag diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLContentAssistProcessor.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLContentAssistProcessor.java index b016096985..d6d201b385 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLContentAssistProcessor.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLContentAssistProcessor.java @@ -38,9 +38,9 @@ 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.core.text.ITextRegionList; -import org.eclipse.wst.sse.ui.EditorPlugin; import org.eclipse.wst.sse.ui.StructuredTextViewer; import org.eclipse.wst.sse.ui.edit.util.SharedEditorPluginImageHelper; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; import org.eclipse.wst.sse.ui.preferences.CommonEditorPreferenceNames; @@ -412,7 +412,7 @@ public class HTMLContentAssistProcessor extends AbstractContentAssistProcessor i protected IPreferenceStore getPreferenceStore() { if (fPreferenceStore == null) - fPreferenceStore = EditorPlugin.getDefault().getPreferenceStore(); + fPreferenceStore = SSEUIPlugin.getDefault().getPreferenceStore(); return fPreferenceStore; } 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 1d04f65b89..a056830a9e 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 @@ -10,14 +10,12 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.internal.contentassist; - - import org.eclipse.core.runtime.Preferences; import org.eclipse.wst.common.contentmodel.CMElementDeclaration; import org.eclipse.wst.common.contentmodel.CMNode; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.HTMLCorePlugin; import org.eclipse.wst.html.core.contentmodel.HTMLElementDeclaration; +import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; import org.eclipse.wst.xml.ui.contentassist.XMLContentModelGenerator; import org.w3c.dom.Node; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/nls/ResourceHandler.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/nls/ResourceHandler.java deleted file mode 100644 index a629f04897..0000000000 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/nls/ResourceHandler.java +++ /dev/null @@ -1,70 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.html.ui.internal.nls; - -import java.text.MessageFormat; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -public class ResourceHandler { - - - private static ResourceBundle fgResourceBundle; - - /** - * Returns the resource bundle used by all classes in this Project - */ - public static ResourceBundle getResourceBundle() { - try { - return ResourceBundle.getBundle("EditingHTML");//$NON-NLS-1$ - } - catch (MissingResourceException e) { - // does nothing - this method will return null and - // getString(String) will return the key - // it was called with - } - return null; - } - - public static String getString(String key) { - if (fgResourceBundle == null) { - fgResourceBundle = getResourceBundle(); - } - - if (fgResourceBundle != null) { - try { - return fgResourceBundle.getString(key); - } - catch (MissingResourceException e) { - return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$ - } - } - else { - return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$ - } - } - - public static String getString(String key, Object[] args) { - - try { - return MessageFormat.format(getString(key), args); - } - catch (IllegalArgumentException e) { - return getString(key); - } - - } - - public static String getString(String key, Object[] args, int x) { - - return getString(key); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLColorPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLColorPage.java index a77e0f2515..490522ce74 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLColorPage.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLColorPage.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.preferences.ui; - - import java.util.ArrayList; import java.util.Dictionary; import java.util.Hashtable; @@ -21,8 +19,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.wst.common.encoding.content.IContentTypeIdentifier; +import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.html.ui.internal.nls.ResourceHandler; import org.eclipse.wst.sse.core.IModelManager; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore; @@ -54,7 +52,7 @@ public class HTMLColorPage extends XMLColorPage { } public String getSampleText() { - return ResourceHandler.getString("Sample_HTML_doc"); //$NON-NLS-1$ = "<!DOCTYPE HTML\n\tPUBLIC \"-//W3C/DTD/ HTML 4.01 Transitional//EN\"\n\t\"http://www.w3.org/TR/html4/loose.dtd\">\n<HTML>\n\t<HEAD>\n\t\t<META content=\"text/html\">\n\t\t<TITLE>HTML Highlighting Preferences</TITLE>\n\t</HEAD>\n<BODY>\n\t<!--\n\t\twe need a flaming logo!\n\t-->\n\t<%\t%>\n</BODY>\n</HTML>" + return HTMLUIPlugin.getResourceString("%Sample_HTML_doc"); //$NON-NLS-1$ = "<!DOCTYPE HTML\n\tPUBLIC \"-//W3C/DTD/ HTML 4.01 Transitional//EN\"\n\t\"http://www.w3.org/TR/html4/loose.dtd\">\n<HTML>\n\t<HEAD>\n\t\t<META content=\"text/html\">\n\t\t<TITLE>HTML Highlighting Preferences</TITLE>\n\t</HEAD>\n<BODY>\n\t<!--\n\t\twe need a flaming logo!\n\t-->\n\t<%\t%>\n</BODY>\n</HTML>" } diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLFilesPreferencePage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLFilesPreferencePage.java index 53bd4784ea..0b896b7f7c 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLFilesPreferencePage.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLFilesPreferencePage.java @@ -21,16 +21,15 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.wst.common.encoding.CommonEncodingPreferenceNames; -import org.eclipse.wst.html.core.HTMLCorePlugin; import org.eclipse.wst.html.core.HTMLFilesPreferenceNames; +import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.html.ui.internal.nls.ResourceHandler; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.xml.ui.preferences.EncodingSettings; import org.eclipse.wst.xml.ui.preferences.WorkbenchDefaultEncodingSettings; import org.eclipse.wst.xml.ui.preferences.XMLFilesPreferencePage; - public class HTMLFilesPreferencePage extends XMLFilesPreferencePage { private WorkbenchDefaultEncodingSettings fInputEncodingSettings = null; private Text fHtmlext_Field; @@ -77,7 +76,7 @@ public class HTMLFilesPreferencePage extends XMLFilesPreferencePage { protected void createContentsForLoadingGroup(Composite parent) { Group group = createGroup(parent, 1); - group.setText(ResourceHandler.getString("HTMLFilesPreferencePage.0")); //$NON-NLS-1$ + group.setText(HTMLUIPlugin.getResourceString("%HTMLFilesPreferencePage.0")); //$NON-NLS-1$ fInputEncodingSettings = new WorkbenchDefaultEncodingSettings(group); } @@ -126,24 +125,24 @@ public class HTMLFilesPreferencePage extends XMLFilesPreferencePage { */ protected void createContentsForCreatingGroup(Composite parent) { Group creatingGroup = createGroup(parent, 2); - creatingGroup.setText(org.eclipse.wst.sse.ui.nls.ResourceHandler.getString("Creating_files")); //$NON-NLS-1$ + creatingGroup.setText(SSEUIPlugin.getResourceString("%Creating_files")); //$NON-NLS-1$ // Add this suffix.. - createLabel(creatingGroup, ResourceHandler.getString("HTMLFilesPreferencePage.1")); //$NON-NLS-1$ + createLabel(creatingGroup, HTMLUIPlugin.getResourceString("%HTMLFilesPreferencePage.1")); //$NON-NLS-1$ fHtmlext_Field = createTextField(creatingGroup); // Encoding.. - Label label = createLabel(creatingGroup, org.eclipse.wst.sse.ui.nls.ResourceHandler.getString("Encoding_desc")); //$NON-NLS-1$ + Label label = createLabel(creatingGroup, SSEUIPlugin.getResourceString("%Encoding_desc")); //$NON-NLS-1$ ((GridData)label.getLayoutData()).horizontalSpan = 2; fEncodingSettings = new EncodingSettings(creatingGroup); ((GridData)fEncodingSettings.getLayoutData()).horizontalSpan = 2; // Insert DOCTYPE declaration - fDoctype_Button = createCheckBox(creatingGroup, ResourceHandler.getString("HTMLFilesPreferencePage.2")); //$NON-NLS-1$ + fDoctype_Button = createCheckBox(creatingGroup, HTMLUIPlugin.getResourceString("%HTMLFilesPreferencePage.2")); //$NON-NLS-1$ ((GridData)fDoctype_Button.getLayoutData()).horizontalSpan = 2; // Insert GENERATOR with META tag - fGenerator_Button = createCheckBox(creatingGroup, ResourceHandler.getString("HTMLFilesPreferencePage.3")); //$NON-NLS-1$ + fGenerator_Button = createCheckBox(creatingGroup, HTMLUIPlugin.getResourceString("%HTMLFilesPreferencePage.3")); //$NON-NLS-1$ ((GridData)fGenerator_Button.getLayoutData()).horizontalSpan = 2; } /* (non-Javadoc) diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLSourcePreferencePage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLSourcePreferencePage.java index 35fbea7fe2..56f6eacd7f 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLSourcePreferencePage.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/preferences/ui/HTMLSourcePreferencePage.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.preferences.ui; - - import org.eclipse.core.runtime.Preferences; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; @@ -19,10 +17,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.wst.common.encoding.content.IContentTypeIdentifier; -import org.eclipse.wst.html.core.HTMLCorePlugin; +import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.html.ui.internal.editor.IHelpContextIds; import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames; -import org.eclipse.wst.sse.ui.nls.ResourceHandler; +import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.preferences.PreferenceKeyGenerator; import org.eclipse.wst.xml.ui.preferences.XMLSourcePreferencePage; @@ -60,19 +58,19 @@ public class HTMLSourcePreferencePage extends XMLSourcePreferencePage { protected Composite createContentsForPreferredCaseGroup(Composite parent, int columnSpan) { Group caseGroup = createGroup(parent, columnSpan); - caseGroup.setText(ResourceHandler.getString("Preferred_markup_case_UI_")); //$NON-NLS-1$ = "Preferred markup case" + caseGroup.setText(SSEUIPlugin.getResourceString("%Preferred_markup_case_UI_")); //$NON-NLS-1$ = "Preferred markup case" // d257064 need to associate group w/ radio buttons so radio buttons header can be read Group tagNameGroup = createGroup(caseGroup, 1); - tagNameGroup.setText(ResourceHandler.getString("Tag_names__UI_")); //$NON-NLS-1$ = "Tag names:" - fTagNameUpper = createRadioButton(tagNameGroup, ResourceHandler.getString("Tag_names_Upper_case_UI_")); //$NON-NLS-1$ = "&Upper case" - fTagNameLower = createRadioButton(tagNameGroup, ResourceHandler.getString("Tag_names_Lower_case_UI_")); //$NON-NLS-1$ = "&Lower case" + tagNameGroup.setText(SSEUIPlugin.getResourceString("%Tag_names__UI_")); //$NON-NLS-1$ = "Tag names:" + fTagNameUpper = createRadioButton(tagNameGroup, SSEUIPlugin.getResourceString("%Tag_names_Upper_case_UI_")); //$NON-NLS-1$ = "&Upper case" + fTagNameLower = createRadioButton(tagNameGroup, SSEUIPlugin.getResourceString("%Tag_names_Lower_case_UI_")); //$NON-NLS-1$ = "&Lower case" // d257064 need to associate group w/ radio buttons so radio buttons header can be read Group attrNameGroup = createGroup(caseGroup, 1); - attrNameGroup.setText(ResourceHandler.getString("Attribute_names__UI_")); //$NON-NLS-1$ = "Attribute names:" - fAttrNameUpper = createRadioButton(attrNameGroup, ResourceHandler.getString("Attribute_names_Upper_case_UI_")); //$NON-NLS-1$ = "U&pper case" - fAttrNameLower = createRadioButton(attrNameGroup, ResourceHandler.getString("Attribute_names_Lower_case_UI_")); //$NON-NLS-1$ = "L&ower case" + attrNameGroup.setText(SSEUIPlugin.getResourceString("%Attribute_names__UI_")); //$NON-NLS-1$ = "Attribute names:" + fAttrNameUpper = createRadioButton(attrNameGroup, SSEUIPlugin.getResourceString("%Attribute_names_Upper_case_UI_")); //$NON-NLS-1$ = "U&pper case" + fAttrNameLower = createRadioButton(attrNameGroup, SSEUIPlugin.getResourceString("%Attribute_names_Lower_case_UI_")); //$NON-NLS-1$ = "L&ower case" return parent; diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTML.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTML.java index a06a0377e9..3267389534 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTML.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTML.java @@ -10,11 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.templates; -import org.eclipse.wst.html.ui.internal.nls.ResourceHandler; +import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; import org.eclipse.wst.xml.ui.templates.TemplateContextTypeIds; import org.eclipse.wst.xml.ui.templates.TemplateContextTypeXML; - /** * Base class for HTML template context types. Templates of this context * type apply to any place within HTML content type. @@ -23,7 +22,7 @@ public class TemplateContextTypeHTML extends TemplateContextTypeXML { public static final String HTML_PREFIX = "html_"; //$NON-NLS-1$ public TemplateContextTypeHTML() { - this(generateContextTypeId(TemplateContextTypeIds.ALL), ResourceHandler.getString("TemplateContextTypeHTML.0")); //$NON-NLS-1$ + this(generateContextTypeId(TemplateContextTypeIds.ALL), HTMLUIPlugin.getResourceString("%TemplateContextTypeHTML.0")); //$NON-NLS-1$ } /** diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLAttribute.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLAttribute.java index 1ad10c7050..50f78b8b16 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLAttribute.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLAttribute.java @@ -10,17 +10,15 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.templates; -import org.eclipse.wst.html.ui.internal.nls.ResourceHandler; +import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; import org.eclipse.wst.xml.ui.templates.TemplateContextTypeIds; - - /** * Templates of this context type apply to any attributes within HTML content type. */ public class TemplateContextTypeHTMLAttribute extends TemplateContextTypeHTML { public TemplateContextTypeHTMLAttribute() { - super(generateContextTypeId(TemplateContextTypeIds.ATTRIBUTE), ResourceHandler.getString("TemplateContextTypeHTMLAttribute.0")); //$NON-NLS-1$ + super(generateContextTypeId(TemplateContextTypeIds.ATTRIBUTE), HTMLUIPlugin.getResourceString("%TemplateContextTypeHTMLAttribute.0")); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLAttributeValue.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLAttributeValue.java index 33f1ecb949..33fb8051a0 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLAttributeValue.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLAttributeValue.java @@ -10,10 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.templates; -import org.eclipse.wst.html.ui.internal.nls.ResourceHandler; +import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; import org.eclipse.wst.xml.ui.templates.TemplateContextTypeIds; - /** * Templates of this context type apply to any attribute values * within HTML content type. @@ -21,6 +20,6 @@ import org.eclipse.wst.xml.ui.templates.TemplateContextTypeIds; public class TemplateContextTypeHTMLAttributeValue extends TemplateContextTypeHTML { public TemplateContextTypeHTMLAttributeValue() { - super(generateContextTypeId(TemplateContextTypeIds.ATTRIBUTEVALUE), ResourceHandler.getString("TemplateContextTypeHTMLAttributeValue.0")); //$NON-NLS-1$ + super(generateContextTypeId(TemplateContextTypeIds.ATTRIBUTEVALUE), HTMLUIPlugin.getResourceString("%TemplateContextTypeHTMLAttributeValue.0")); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLTag.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLTag.java index ee62385096..49b8b3809b 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLTag.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/templates/TemplateContextTypeHTMLTag.java @@ -10,16 +10,15 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.templates; -import org.eclipse.wst.html.ui.internal.nls.ResourceHandler; +import org.eclipse.wst.html.ui.internal.HTMLUIPlugin; import org.eclipse.wst.xml.ui.templates.TemplateContextTypeIds; - /** * Templates of this context type apply to any tags within HTML content type. */ public class TemplateContextTypeHTMLTag extends TemplateContextTypeHTML { public TemplateContextTypeHTMLTag() { - super(generateContextTypeId(TemplateContextTypeIds.TAG), ResourceHandler.getString("TemplateContextTypeHTMLTag.0")); //$NON-NLS-1$ + super(generateContextTypeId(TemplateContextTypeIds.TAG), HTMLUIPlugin.getResourceString("%TemplateContextTypeHTMLTag.0")); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/views/contentoutline/HTMLNodeActionManager.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/views/contentoutline/HTMLNodeActionManager.java index 797099ef25..b1d94971ca 100644 --- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/views/contentoutline/HTMLNodeActionManager.java +++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/views/contentoutline/HTMLNodeActionManager.java @@ -10,17 +10,14 @@ *******************************************************************************/ package org.eclipse.wst.html.ui.views.contentoutline; - - import org.eclipse.core.runtime.Preferences; import org.eclipse.jface.viewers.Viewer; import org.eclipse.wst.common.contentmodel.CMNode; import org.eclipse.wst.common.contentmodel.util.DOMContentBuilder; import org.eclipse.wst.common.encoding.content.IContentTypeIdentifier; import org.eclipse.wst.html.core.HTMLCMProperties; -import org.eclipse.wst.html.core.HTMLCorePlugin; -import org.eclipse.wst.html.core.PreferenceNames; import org.eclipse.wst.html.core.format.HTMLFormatProcessorImpl; +import org.eclipse.wst.html.core.internal.HTMLCorePlugin; import org.eclipse.wst.html.core.preferences.HTMLContentBuilder; import org.eclipse.wst.sse.core.IStructuredModel; import org.eclipse.wst.sse.core.format.IStructuredFormatProcessor; |