[91158] resource strings for sse
diff --git a/bundles/org.eclipse.wst.sse.core/plugin.properties b/bundles/org.eclipse.wst.sse.core/plugin.properties
index 5ea54cc..17b531a 100644
--- a/bundles/org.eclipse.wst.sse.core/plugin.properties
+++ b/bundles/org.eclipse.wst.sse.core/plugin.properties
@@ -21,11 +21,6 @@
CSS_Profile_Extension.name=CSS Profile Extension
Comment_Element_Handler_Extension.name=Comment Element Handler Extension
Model_Handler_Extension.name=Model Handler Extension
-SDMB.name=Structured Document and Model Builder
Format_Processors_Extension_Point.name=Format Processors Extension Point
Structured_Builder_Delegate_Extension_Point.name=Structured Builder Delegate Extension Point
-Structured_Sources_Task_Extension.name=Structured Sources Task
-###############################################################################
-# The following property keys maybe unused. Commented out on 12/7/2004. Uncomment if needed.
-#JSP_Embedded_Content_Type_Handler_Extension_Point.name=JSP Embedded Content Type Handler Extension Point
-#Structured_Builder_Participant_Extension.name=Structured Builder Participant Extension
+Structured_Sources_Task_Extension.name=Structured Sources Task
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/CodedReaderCreator.java b/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/CodedReaderCreator.java
index c7b99c4..86ad915 100644
--- a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/CodedReaderCreator.java
+++ b/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/CodedReaderCreator.java
@@ -31,6 +31,7 @@
import org.eclipse.core.runtime.content.IContentDescription;
import org.eclipse.core.runtime.content.IContentTypeManager;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.wst.sse.core.internal.SSECoreMessages;
import org.eclipse.wst.sse.core.internal.encoding.util.Assert;
import org.eclipse.wst.sse.core.internal.encoding.util.BufferedLimitedStream;
import org.eclipse.wst.sse.core.internal.encoding.util.Logger;
@@ -464,7 +465,7 @@
final IFile file = fIFile;
final String charset = encoding;
// TODO: externalize string later
- Job migrater = new Job("Migrate Charset") {
+ Job migrater = new Job(SSECoreMessages.Migrate_Charset) { //$NON-NLS-1$
protected IStatus run(IProgressMonitor monitor) {
if (file != null) {
try {
diff --git a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/CodedStreamCreator.java b/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/CodedStreamCreator.java
index b7b1f7b..729173f 100644
--- a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/CodedStreamCreator.java
+++ b/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/CodedStreamCreator.java
@@ -34,6 +34,7 @@
import org.eclipse.core.runtime.content.IContentDescription;
import org.eclipse.core.runtime.content.IContentTypeManager;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.wst.sse.core.internal.SSECoreMessages;
import org.eclipse.wst.sse.core.internal.SSECorePlugin;
import org.eclipse.wst.sse.core.internal.encoding.util.Assert;
import org.eclipse.wst.sse.core.internal.encoding.util.Logger;
@@ -451,7 +452,7 @@
final IFile file = fIFile;
final String charset = encoding;
// TODO: externalize string later
- Job migrater = new Job("Migrate Charset") {
+ Job migrater = new Job(SSECoreMessages.Migrate_Charset) { //$NON-NLS-1$
protected IStatus run(IProgressMonitor monitor) {
if (file != null) {
try {
diff --git a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/CharsetResourceHandler.java b/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/CharsetResourceHandler.java
index 2dec0d1..a1bfeea 100644
--- a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/CharsetResourceHandler.java
+++ b/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/CharsetResourceHandler.java
@@ -15,7 +15,6 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -31,8 +30,6 @@
*/
public static ResourceBundle getResourceBundle() {
try {
- // TODO: rework this in terms of Platform.getPlugin(descriptor)
- // and Location
URL configURI = Platform.getBundle(ICodedResourcePlugin.ID).getEntry("/"); //$NON-NLS-1$
String configPathString = configURI + "config/charset"; //$NON-NLS-1$
return ResourceBundleHelper.getResourceBundle(configPathString);
@@ -67,13 +64,4 @@
}
return result;
}
-
- public static String getString(String key, Object[] args) {
- try {
- return MessageFormat.format(getString(key), args);
- }
- catch (IllegalArgumentException e) {
- return getString(key);
- }
- }
}
diff --git a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/CodedResourcePlugin.java b/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/CodedResourcePlugin.java
index e5c948f..32c0b70 100644
--- a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/CodedResourcePlugin.java
+++ b/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/CodedResourcePlugin.java
@@ -12,10 +12,6 @@
*******************************************************************************/
package org.eclipse.wst.sse.core.internal.encoding.util;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Plugin;
@@ -29,10 +25,6 @@
public class CodedResourcePlugin extends Plugin implements ICodedResourcePlugin {
//The shared instance.
private static CodedResourcePlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
- private static final String KEY_PREFIX = "%"; //$NON-NLS-1$
- private static final String KEY_DOUBLE_PREFIX = "%%"; //$NON-NLS-1$
/**
* Returns the shared instance.
@@ -60,49 +52,4 @@
Preferences prefs = getPluginPreferences();
prefs.setDefault(CommonEncodingPreferenceNames.USE_3BYTE_BOM_WITH_UTF8, false);
}
-
- /**
- * 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.sse.core.internal.encoding.internal.CommonEncodingPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
}
diff --git a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/CommonEncodingPluginResources.properties b/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/CommonEncodingPluginResources.properties
deleted file mode 100644
index 1d96a0e..0000000
--- a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/CommonEncodingPluginResources.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-# Jens Lukowski/Innoopract - initial renaming/restructuring
-#
-###############################################################################
-EncodingPreferencePage.0=Encoding settings for Web and XML files:
-EncodingPreferencePage.1=Use 3 byte BOM (Byte Order Mark) when saving UTF-8 encoded files
diff --git a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/SupportedJavaEncoding.java b/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/SupportedJavaEncoding.java
index 36525a5..63e3218 100644
--- a/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/SupportedJavaEncoding.java
+++ b/bundles/org.eclipse.wst.sse.core/src-encoding/org/eclipse/wst/sse/core/internal/encoding/util/SupportedJavaEncoding.java
@@ -41,10 +41,8 @@
// the value (2nd param) is the real IANA name, names are
// case-insensitive
// Japanese
- {"X-EUC-JP", "EUC-JP"}, // EUC encoding,
- // Japanese//$NON-NLS-2$//$NON-NLS-1$
- {"X-SJIS", "SHIFT_JIS"}, // Shift-JIS,
- // Japanese//$NON-NLS-2$//$NON-NLS-1$
+ {"X-EUC-JP", "EUC-JP"}, //$NON-NLS-2$//$NON-NLS-1$
+ {"X-SJIS", "SHIFT_JIS"}, //$NON-NLS-2$//$NON-NLS-1$
{"ANSI_X3.4-1968", "US-ASCII"}}; //$NON-NLS-1$ //$NON-NLS-2$
private static ArrayList ianaEncodings = null, javaEncodings = null;
@@ -66,23 +64,19 @@
// getIANAEncodingName().
{"US-ASCII", "ASCII"}, // US ASCII//$NON-NLS-2$//$NON-NLS-1$
// changed to Cp1252 for MS compatibility
- //{"ISO-8859-1", "ISO8859_1"} // ISO Latin-1
- {"ISO-8859-1", "Cp1252"}, // ISO
- // Latin-1//$NON-NLS-2$//$NON-NLS-1$
- {"ISO-8859-2", "ISO8859_2"}, // Central/East European (Slavic:
- // Czech, Croat, German,
- // Hungarian, Polish, Romanian,
- // Slovak,
- // Slovenian)//$NON-NLS-2$//$NON-NLS-1$
- {"ISO-8859-3", "ISO8859_3"}, // Southern European (Esperanto,
- // Galician, Maltese,
- // Turkish)//$NON-NLS-2$//$NON-NLS-1$
- {"ISO-8859-4", "ISO8859_4"}, // Cyrillic (Estonian, Latvian,
- // Lithuanian)//$NON-NLS-2$//$NON-NLS-1$
- {"ISO-8859-5", "ISO8859_5"}, // Cyrillic (Bulgarian,
- // Byelorussian, Macedonian,
- // Serbian,
- // Ukrainian)//$NON-NLS-2$//$NON-NLS-1$
+ // {"ISO-8859-1", "ISO8859_1"} // ISO Latin-1
+ // ISO Latin-1
+ {"ISO-8859-1", "Cp1252"}, //$NON-NLS-2$//$NON-NLS-1$
+ // Central/East European (Slavic: Czech, Croat, German,
+ // Hungarian, Polish, Romanian, Slovak, Slovenian)
+ {"ISO-8859-2", "ISO8859_2"}, //$NON-NLS-2$//$NON-NLS-1$
+ // Southern European (Esperanto, Galician, Maltese, Turkish)
+ {"ISO-8859-3", "ISO8859_3"}, //$NON-NLS-2$//$NON-NLS-1$
+ // Cyrillic (Estonian, Latvian, Lithuanian)
+ {"ISO-8859-4", "ISO8859_4"}, //$NON-NLS-2$//$NON-NLS-1$
+ // Cyrillic (Bulgarian, Byelorussian, Macedonian, Serbian,
+ // Ukrainian)
+ {"ISO-8859-5", "ISO8859_5"}, //$NON-NLS-2$//$NON-NLS-1$
{"ISO-8859-6", "ISO8859_6"}, // Arabic(Logical)//$NON-NLS-2$//$NON-NLS-1$
{"WINDOWS-1256", "Cp1256"}, // Arabic//$NON-NLS-2$//$NON-NLS-1$
{"ISO-8859-7", "ISO8859_7"}, // Greek//$NON-NLS-2$//$NON-NLS-1$
@@ -93,46 +87,49 @@
{"WINDOWS-1255", "Cp1255"}, // Hebrew//$NON-NLS-2$//$NON-NLS-1$
{"ISO-8859-9", "ISO8859_9"}, // Turkish//$NON-NLS-2$//$NON-NLS-1$
// Japanese
- {"EUC-JP", "EUC_JP"}, // EUC encoding,
- // Japanese//$NON-NLS-2$//$NON-NLS-1$
- {"ISO-2022-JP", "ISO2022JP"}, // ISO 2022,
- // Japanese//$NON-NLS-2$//$NON-NLS-1$
+ // EUC encoding, Japanese
+ {"EUC-JP", "EUC_JP"}, //$NON-NLS-2$//$NON-NLS-1$
+ // ISO 2022, Japanese
+ {"ISO-2022-JP", "ISO2022JP"}, //$NON-NLS-2$//$NON-NLS-1$
// changed for MS compatibility
- //{"SHIFT_JIS", "SJIS"}, // Shift-JIS, Japanese
- {"SHIFT_JIS", "MS932"}, // Shift-JIS,
- // Japanese//$NON-NLS-2$//$NON-NLS-1$
+ // {"SHIFT_JIS", "SJIS"}, // Shift-JIS, Japanese
+ // Shift-JIS, Japanese
+ {"SHIFT_JIS", "MS932"}, //$NON-NLS-2$//$NON-NLS-1$
// Korean
// changed for MS compatibility
- //{"EUC-KR", "EUC_KR"}, // EUC encoding, Korean
- {"EUC-KR", "MS949"}, // EUC encoding,
- // Korean//$NON-NLS-2$//$NON-NLS-1$
- {"ISO-2022-KR", "ISO2022KR"}, // ISO 2022,
- // Korean//$NON-NLS-2$//$NON-NLS-1$
+ // {"EUC-KR", "EUC_KR"}, // EUC encoding, Korean
+ // EUC encoding, Korean
+ {"EUC-KR", "MS949"}, //$NON-NLS-2$//$NON-NLS-1$
+ // ISO 2022, Korean
+ {"ISO-2022-KR", "ISO2022KR"}, //$NON-NLS-2$//$NON-NLS-1$
// Traditional Chinese
// changed for MS compatibility
- //{"BIG5", "Big5"}, // Big5, Traditional Chinese
- {"BIG5", "MS950"}, // Big5, Traditional
- // Chinese//$NON-NLS-2$//$NON-NLS-1$
+ // {"BIG5", "Big5"}, // Big5, Traditional Chinese
+ // Big5, Traditional Chinese
+ {"BIG5", "MS950"}, //$NON-NLS-2$//$NON-NLS-1$
// Simplified Chinese(Use IANA MIME preferred name)
- //{"GB_2312-80", "GBK"}, // GBK, Simplified Chinese
- {"GB2312", "MS936"}, // GBK, Simplified
- // Chinese//$NON-NLS-2$//$NON-NLS-1$
- {"GB18030", "GB18030"}, // GB18030, new Chinese encoding
- // //$NON-NLS-1$ //$NON-NLS-2$
+ // {"GB_2312-80", "GBK"}, // GBK, Simplified Chinese
+ // GBK, Simplified Chinese
+ {"GB2312", "MS936"}, //$NON-NLS-2$//$NON-NLS-1$
+ // GB18030, new Chinese encoding
+ {"GB18030", "GB18030"}, //$NON-NLS-1$ //$NON-NLS-2$
// Thai
- {"TIS-620", "TIS620"}, // Thai. Thai Industrial Standards
- // Institute(TISI)//$NON-NLS-2$//$NON-NLS-1$
- {"WINDOWS-874", "MS874"}, // Microsoft
- // Thai//$NON-NLS-2$//$NON-NLS-1$
+ // Thai. Thai Industrial Standards
+ // Institute(TISI)
+ {"TIS-620", "TIS620"}, //$NON-NLS-2$//$NON-NLS-1$
+ // Microsoft Thai
+ {"WINDOWS-874", "MS874"}, //$NON-NLS-2$//$NON-NLS-1$
// Unicode
- {"UTF-8", "UTF8"}, // ISO 10646/Unicode, one-byte
- // encoding//$NON-NLS-2$//$NON-NLS-1$
- {"UTF-16", "UnicodeBig"}, // ISO 10646/Unicode, two-byte
- // encoding//$NON-NLS-2$//$NON-NLS-1$
- {"UTF-16BE", "UnicodeBig"}, // Unicode
- // BigEndian//$NON-NLS-2$//$NON-NLS-1$
- {"UTF-16LE", "UnicodeLittle"} // Unicode
- // LittleEndian//$NON-NLS-2$//$NON-NLS-1$
+ // ISO 10646/Unicode, one-byte
+ // encoding
+ {"UTF-8", "UTF8"}, //$NON-NLS-2$//$NON-NLS-1$
+ // ISO 10646/Unicode, two-byte
+ // encoding
+ {"UTF-16", "UnicodeBig"},//$NON-NLS-2$//$NON-NLS-1$
+ // Unicode BigEndian
+ {"UTF-16BE", "UnicodeBig"}, //$NON-NLS-2$//$NON-NLS-1$
+ // Unicode LittleEndian
+ {"UTF-16LE", "UnicodeLittle"} //$NON-NLS-2$//$NON-NLS-1$
};
private static Hashtable supportedAliasNames = null;
private static Hashtable supportedEncodingDisplayNames = null;
@@ -184,7 +181,8 @@
* Convert IANA encoding name to Java Converter Name.
*/
public String getJavaConverterName(String iana) {
- String iana_name = getUniquefromAlias(iana); // to see if iana is an
+ String iana_name = getUniquefromAlias(iana); // to see if iana is
+ // an
// alias
if (iana_name != null) {
return ((String) supportedEncodingNames.get(iana_name.toUpperCase()));
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/exceptions/SourceEditingRuntimeException.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/exceptions/SourceEditingRuntimeException.java
index 09b979c..762f8ef 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/exceptions/SourceEditingRuntimeException.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/exceptions/SourceEditingRuntimeException.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package org.eclipse.wst.sse.core.exceptions;
-import org.eclipse.wst.sse.core.internal.SSECorePlugin;
+import org.eclipse.wst.sse.core.internal.SSECoreMessages;
/**
* The SourceEditingRuntimeException is often thrown by Source Editor methods
@@ -65,7 +65,7 @@
embeddedMessage = originalException.getClass().getName() + ": " + originalException.getMessage(); //$NON-NLS-1$
// not all exceptions have messages (e.g. many
// NullPointerException)
- String originalError = SSECorePlugin.getResourceString("%Original_Error__UI_"); //$NON-NLS-1$ = "Original Error:"
+ String originalError = SSECoreMessages.Original_Error__UI_; //$NON-NLS-1$ = "Original Error:"
if (result == null)
result = ""; //$NON-NLS-1$
if (embeddedMessage != null)
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/filebuffers/BasicStructuredDocumentFactory.java
index bf32334..f0dba79 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/filebuffers/BasicStructuredDocumentFactory.java
@@ -89,7 +89,7 @@
* java.lang.String, java.lang.Object)
*/
public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
- fContentTypeIdentifier = config.getAttribute("contentTypeId");
+ fContentTypeIdentifier = config.getAttribute("contentTypeId"); //$NON-NLS-1$
if (data != null) {
if (data instanceof String && data.toString().length() > 0) {
fContentTypeIdentifier = (String) data;
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 710965c..7969a1f 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
@@ -113,7 +113,7 @@
// ignore resolveCrossProjectLinks value
if (uri == null)
return null;
- if (uri.startsWith("file:")) {
+ if (uri.startsWith("file:")) { //$NON-NLS-1$
try {
URL url = new URL(uri);
return url.getFile();
@@ -160,7 +160,7 @@
if (!(textBuffer.getDocument() instanceof IStructuredDocument))
return;
if (debugTextBufferLifeCycle) {
- System.out.println("Learned new buffer: " + buffer.getLocation().toString() + " " + buffer + " " + ((ITextFileBuffer) buffer).getDocument());
+ System.out.println("Learned new buffer: " + buffer.getLocation().toString() + " " + buffer + " " + ((ITextFileBuffer) buffer).getDocument()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
DocumentInfo info = new DocumentInfo();
info.buffer = textBuffer;
@@ -176,7 +176,7 @@
if (!(textBuffer.getDocument() instanceof IStructuredDocument))
return;
if (debugTextBufferLifeCycle) {
- System.out.println("Discarded buffer: " + buffer.getLocation().toString() + " " + buffer + " " + ((ITextFileBuffer) buffer).getDocument());
+ System.out.println("Discarded buffer: " + buffer.getLocation().toString() + " " + buffer + " " + ((ITextFileBuffer) buffer).getDocument()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
DocumentInfo info = (DocumentInfo) fDocumentMap.get(textBuffer.getDocument());
if (info != null) {
@@ -190,14 +190,14 @@
public void dirtyStateChanged(IFileBuffer buffer, boolean isDirty) {
if (buffer instanceof ITextFileBuffer) {
if (debugTextBufferLifeCycle) {
- System.out.println("Buffer dirty state changed: (" + isDirty + ") " + buffer.getLocation().toString() + " " + buffer + " " + ((ITextFileBuffer) buffer).getDocument());
+ System.out.println("Buffer dirty state changed: (" + isDirty + ") " + buffer.getLocation().toString() + " " + buffer + " " + ((ITextFileBuffer) buffer).getDocument()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
ITextFileBuffer textBuffer = (ITextFileBuffer) buffer;
if (!(textBuffer.getDocument() instanceof IStructuredDocument))
return;
DocumentInfo info = (DocumentInfo) fDocumentMap.get(textBuffer.getDocument());
if (info != null && info.model != null) {
- String msg = "Updating model dirty state for" + info.buffer.getLocation();
+ String msg = "Updating model dirty state for" + info.buffer.getLocation(); //$NON-NLS-1$
if (debugFileBufferModelManagement || debugTextBufferLifeCycle) {
System.out.println(msg);
}
@@ -223,7 +223,7 @@
public void underlyingFileDeleted(IFileBuffer buffer) {
if (buffer instanceof ITextFileBuffer) {
if (debugTextBufferLifeCycle) {
- System.out.println("Deleted buffer: " + buffer.getLocation().toOSString() + " " + buffer);
+ System.out.println("Deleted buffer: " + buffer.getLocation().toOSString() + " " + buffer); //$NON-NLS-1$ //$NON-NLS-2$
}
}
}
@@ -231,16 +231,16 @@
public void underlyingFileMoved(IFileBuffer buffer, IPath path) {
if (buffer instanceof ITextFileBuffer) {
if (debugTextBufferLifeCycle) {
- System.out.println("Moved buffer from: " + buffer.getLocation().toOSString() + " " + buffer);
- System.out.println("Moved buffer to: " + path.toOSString() + " " + buffer);
+ System.out.println("Moved buffer from: " + buffer.getLocation().toOSString() + " " + buffer); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("Moved buffer to: " + path.toOSString() + " " + buffer); //$NON-NLS-1$ //$NON-NLS-2$
}
}
}
}
- static final boolean debugFileBufferModelManagement = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.sse.core/filebuffers/modelmanagement"));
+ static final boolean debugFileBufferModelManagement = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.sse.core/filebuffers/modelmanagement")); //$NON-NLS-1$ //$NON-NLS-2$
- static final boolean debugTextBufferLifeCycle = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.sse.core/filebuffers/lifecycle"));
+ static final boolean debugTextBufferLifeCycle = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.sse.core/filebuffers/lifecycle")); //$NON-NLS-1$ //$NON-NLS-2$
private static FileBufferModelManager instance;
@@ -258,9 +258,9 @@
for (int i = 0; i < danglingDocuments.length; i++) {
DocumentInfo info = (DocumentInfo) instance.fDocumentMap.get(danglingDocuments[i]);
if (info.modelReferenceCount > 0)
- System.err.println("LEAKED MODEL: " + info.buffer.getLocation() + " " + (info.model != null ? info.model.getId() : null));
+ System.err.println("LEAKED MODEL: " + info.buffer.getLocation() + " " + (info.model != null ? info.model.getId() : null)); //$NON-NLS-1$ //$NON-NLS-2$
if (info.bufferReferenceCount > 0)
- System.err.println("LEAKED BUFFER: " + info.buffer.getLocation() + " " + info.buffer.getDocument());
+ System.err.println("LEAKED BUFFER: " + info.buffer.getLocation() + " " + info.buffer.getDocument()); //$NON-NLS-1$ //$NON-NLS-2$
}
}
FileBuffers.getTextFileBufferManager().removeFileBufferListener(instance.fFileBufferListener);
@@ -404,7 +404,7 @@
try {
IPath location = new Path(file.getAbsolutePath());
if (debugFileBufferModelManagement) {
- System.out.println("FileBufferModelManager connecting to File " + location);
+ System.out.println("FileBufferModelManager connecting to File " + location); //$NON-NLS-1$
}
bufferManager.connect(location, getProgressMonitor());
ITextFileBuffer buffer = bufferManager.getTextFileBuffer(location);
@@ -415,7 +415,7 @@
}
}
catch (CoreException e) {
- Logger.log(Logger.ERROR, "Error getting model for " + file.getPath(), e);
+ Logger.log(Logger.ERROR, "Error getting model for " + file.getPath(), e); //$NON-NLS-1$
}
return model;
}
@@ -425,7 +425,7 @@
ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
try {
if (debugFileBufferModelManagement) {
- System.out.println("FileBufferModelManager connecting to IFile " + file.getLocation());
+ System.out.println("FileBufferModelManager connecting to IFile " + file.getLocation()); //$NON-NLS-1$
}
bufferManager.connect(file.getLocation(), getProgressMonitor());
ITextFileBuffer buffer = bufferManager.getTextFileBuffer(file.getLocation());
@@ -448,7 +448,7 @@
}
}
catch (CoreException e) {
- Logger.log(Logger.ERROR, "Error getting model for " + file.getLocation(), e);
+ Logger.log(Logger.ERROR, "Error getting model for " + file.getLocation(), e); //$NON-NLS-1$
}
return model;
}
@@ -460,7 +460,7 @@
DocumentInfo info = (DocumentInfo) fDocumentMap.get(document);
if (info != null && info.model == null) {
if (debugFileBufferModelManagement) {
- System.out.println("FileBufferModelManager creating model for " + info.buffer.getLocation() + " " + info.buffer.getDocument());
+ System.out.println("FileBufferModelManager creating model for " + info.buffer.getLocation() + " " + info.buffer.getDocument()); //$NON-NLS-1$ //$NON-NLS-2$
}
info.modelReferenceCount++;
@@ -481,7 +481,7 @@
}
}
catch (ResourceInUse e) {
- Logger.log(Logger.ERROR, "attempted to create new model with existing ID", e);
+ Logger.log(Logger.ERROR, "attempted to create new model with existing ID", e); //$NON-NLS-1$
model = null;
}
}
@@ -510,20 +510,20 @@
DocumentInfo info = (DocumentInfo) fDocumentMap.get(document);
if (info != null) {
if (debugFileBufferModelManagement) {
- System.out.println("FileBufferModelManager noticed full release of model for " + info.buffer.getLocation() + " " + info.buffer.getDocument());
+ System.out.println("FileBufferModelManager noticed full release of model for " + info.buffer.getLocation() + " " + info.buffer.getDocument()); //$NON-NLS-1$ //$NON-NLS-2$
}
info.model = null;
info.modelReferenceCount--;
if (info.selfConnected) {
if (debugFileBufferModelManagement) {
- System.out.println("FileBufferModelManager disconnecting from " + info.buffer.getLocation() + " " + info.buffer.getDocument());
+ System.out.println("FileBufferModelManager disconnecting from " + info.buffer.getLocation() + " " + info.buffer.getDocument()); //$NON-NLS-1$ //$NON-NLS-2$
}
IPath location = info.buffer.getLocation();
try {
FileBuffers.getTextFileBufferManager().disconnect(info.buffer.getLocation(), getProgressMonitor());
}
catch (CoreException e) {
- Logger.log(Logger.ERROR, "Error releasing model for " + location, e);
+ Logger.log(Logger.ERROR, "Error releasing model for " + location, e); //$NON-NLS-1$
}
}
}
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECoreMessages.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECoreMessages.java
new file mode 100644
index 0000000..d0d48d9
--- /dev/null
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECoreMessages.java
@@ -0,0 +1,39 @@
+/**********************************************************************
+ * Copyright (c) 2005 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 - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.wst.sse.core.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Strings used by SSE Core
+ *
+ * @since 1.0
+ */
+public class SSECoreMessages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.wst.sse.core.internal.SSECorePluginResources";//$NON-NLS-1$
+
+ public static String A_model_s_id_can_not_be_nu_EXC_;
+ public static String Program_Error__ModelManage_EXC_;
+ public static String Original_Error__UI_;
+ public static String ModelPlugin_0;
+ public static String StructuredDocumentBuilder_0;
+ public static String Text_Change_UI_;
+
+ public static String Migrate_Charset;
+
+ static {
+ // load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, SSECoreMessages.class);
+ }
+
+ private SSECoreMessages() {
+ // cannot create new instance
+ }
+}
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 55e6cd8..de14047 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
@@ -12,10 +12,6 @@
*******************************************************************************/
package org.eclipse.wst.sse.core.internal;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Preferences;
import org.eclipse.wst.sse.core.IModelManager;
@@ -31,10 +27,7 @@
* SSE Core Plugin.
*/
public class SSECorePlugin extends Plugin {
- static SSECorePlugin instance = null;
- private ResourceBundle resourceBundle;
- private static final String KEY_PREFIX = "%"; //$NON-NLS-1$
- private static final String KEY_DOUBLE_PREFIX = "%%"; //$NON-NLS-1$
+ static SSECorePlugin instance = null;
private static final String OFF = "off"; //$NON-NLS-1$
public static final String STRUCTURED_BUILDER = "org.eclipse.wst.sse.core.structuredbuilder"; //$NON-NLS-1$
@@ -129,52 +122,4 @@
public IModelManager getModelManager() {
return StructuredModelManager.getModelManager();
}
-
- /**
- * 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.sse.core.internal.SSECorePluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
}
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECorePluginResources.properties b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECorePluginResources.properties
index a956704..13600cb 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECorePluginResources.properties
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECorePluginResources.properties
@@ -4,66 +4,17 @@
# 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
# Jens Lukowski/Innoopract - initial renaming/restructuring
-#
+#
###############################################################################
-A_model's_id_can_not_be_nu_EXC_=A model's id can not be null
+A_model_s_id_can_not_be_nu_EXC_=A model's id can not be null
Program_Error__ModelManage_EXC_=Program Error: ModelManagerImpl::saveModel. Model should be in the cache
Original_Error__UI_=Original Error:
-ModelPlugin.0=Structured Builder
-StructuredDocumentBuilder.0=Updating builders
+ModelPlugin_0=Structured Builder
+StructuredDocumentBuilder_0=Updating builders
Text_Change_UI_=Text Change
###############################################################################
-Unkown_internal_scanner_er_ERROR_=Unkown internal scanner error
-Internal_error__unknown_st_ERROR_=Internal error: unknown state
-Error__could_not_match_inp_ERROR_=Error: could not match input
-Error__pushback_value_was__ERROR_=Error: pushback value was too large
-An_I/O_error_occured_while_EXC_=An I/O error occured while scanning :
-3concat=File not found : \"{0}\"
-5concat=Error opening file \"{0}\"
-ul_____(template)_UI_=ul (template)
-<ul>_n__<li>_Item_one_</li_UI_=<ul>\n <li> Item one </li>\n <li> Item two </li>\n</ul>\n
-dl_____(template)_UI_=dl (template)
-<dl>_n__<dt>_First_definit_UI_=<dl>\n <dt> First definition <dd> First explanation\n <dt> Second definition <dd> Second explanation\n</dl>\n
-table_____(template)_UI_=table (template)
-<table_border>_n__<tr>_n___UI_=<table border>\n <tr>\n <th>Column 1 Heading</th>\n <th>Column 2 Heading</th>\n </tr>\n <tr>\n <td>Row 1: Col 1</td>\n <td>Row 1: Col 2</td>\n </tr>\n</table>\n
-ol_____(template)_UI_=ol (template)
-<ol>_n__<li>_Item_one_</li_UI_=<ol>\n <li> Item one </li>\n <li> Item two </li>\n</ol>\n
-html____(template)_UI_=html (template)
-<html>_n<head>_n<title>Ins_UI_=<html>\n<head>\n<title>Insert title here</title>\n</head>\n<body>\n<|c>\n</body>\n</html>
-script_____(commented)_UI_=script (commented)
-style_____(commented)_UI_=style (commented)
-img_____(map)_UI=img (map)
-Usage___java_HTMLTokenizer_EXC_=Usage : java HTMLTokenizer <inputfile>
-## on the following line, just translate: "place title here" and "place content here"
-__>_n_t_t<TITLE><|c>place__UI_=\">\n\t\t<TITLE><|c>place title here</TITLE>\n\t</HEAD>\n\t<BODY>\n\t\tplace content here\n\t</BODY>\n</HTML>
-Flatmodel_constructor_doesn__t_know_how_to_deal_with_non-string_4=Flatmodel constructor doesn\'t know how to deal with non-string
-unexpected_ModelManager_Impl_1=unexpected ModelManager Impl
-continuous_1=continuous
-paged_2=paged
-visual_3=visual
-aural_4=aural
-tactile_5=tactile
-grid_6=grid
-bitmap_7=bitmap
-interactive_8=interactive
-static_9=static
-all_10=all
-Cleaning_up_element_{0}=Cleaning up element \"{0}\"
-Uppercasing_attribute_name_{0}=Uppercasing attribute name \"{0}\"
-Lowercasing_attribute_name_{0}=Lowercasing attribute name \"{0}\"
-Uppercasing_tag_name_{0}=Uppercasing tag name \"{0}\"
-Lowercasing_tag_name_{0}=Lowercasing tag name \"{0}\"
-Inserting_missing_end_tag_{0}=Inserting missing end tag \"{0}\"
-Inserting_missing_start_tag_{0}=Inserting missing start tag \"{0}\"
-Inserting_default_attribute_value_{0}=Inserting default attribute value \"{0}\"
-Quoting_attribute_value_{0}=Quoting attribute value \"{0}\"
-Formatting_start_tag_of_element_{0}=Formatting start tag of element \"{0}\"
-Formatting_end_tag_of_element_{0}=Formatting end tag of element \"{0}\"
-Formatting_element_{0}=Formatting element \"{0}\"
-Formatting_indentation_before_element_{0}=Formatting indentation before element \"{0}\"
-Formatting_indentation_after_element_{0}=Formatting indentation after element \"{0}\"
-Formatting_element_{0}=Formatting element \"{0}\"
+Migrate_Charset=Migrate Charset
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 84cd0e2..ebd09f7 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
@@ -48,6 +48,7 @@
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;
@@ -239,7 +240,7 @@
}
IProject[] allProjects = root.getProjects();
IProgressMonitor localMonitor = subMonitorFor(monitor, allProjects.length);
- localMonitor.beginTask(SSECorePlugin.getResourceString("%StructuredDocumentBuilder.0"), 1); //$NON-NLS-1$
+ localMonitor.beginTask(SSECoreMessages.StructuredDocumentBuilder_0, 1); //$NON-NLS-1$
for (int i = 0; i < allProjects.length && !monitor.isCanceled(); i++) {
add(localMonitor, allProjects[i], validateEditContext);
localMonitor.worked(1);
@@ -537,7 +538,7 @@
void doTaskTagProcessing() {
// Must make sure the builder is registered for projects which may
// have been created before this plugin was activated.
- Job adder = new WorkspaceJob(SSECorePlugin.getResourceString("%ModelPlugin.0")) { //$NON-NLS-1$
+ Job adder = new WorkspaceJob(SSECoreMessages.ModelPlugin_0) { //$NON-NLS-1$
public IStatus runInWorkspace(IProgressMonitor monitor) {
add(monitor, ResourcesPlugin.getWorkspace().getRoot(), null);
return Status.OK_STATUS;
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/document/StructuredDocumentFactory.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/document/StructuredDocumentFactory.java
index d79680e..240031b 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/document/StructuredDocumentFactory.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/document/StructuredDocumentFactory.java
@@ -39,7 +39,7 @@
break;
default :
- throw new IllegalArgumentException("request document type was not known");
+ throw new IllegalArgumentException("request document type was not known"); //$NON-NLS-1$
}
return result;
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/AbstractModelLoader.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/AbstractModelLoader.java
index 52a1695..3c06035 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/AbstractModelLoader.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/AbstractModelLoader.java
@@ -71,7 +71,7 @@
protected void addFactories(IStructuredModel model, List factoryList) {
Assert.isNotNull(model);
FactoryRegistry registry = model.getFactoryRegistry();
- Assert.isNotNull(registry, "IStructuredModel " + model.getId() + " has a null FactoryRegistry");
+ Assert.isNotNull(registry, "IStructuredModel " + model.getId() + " has a null FactoryRegistry"); //$NON-NLS-1$ //$NON-NLS-2$
if (factoryList != null) {
Iterator iterator = factoryList.iterator();
while (iterator.hasNext()) {
@@ -261,7 +261,7 @@
long memoryUsed = 0;
if (DEBUG) {
memoryUsed = computeMem();
- System.out.println("measuring heap memory for " + filename);
+ System.out.println("measuring heap memory for " + filename); //$NON-NLS-1$
//System.out.println("heap memory used before load: " +
// memoryUsed);
}
@@ -281,7 +281,7 @@
long memoryAtEnd = computeMem();
//System.out.println("heap memory used after loading new
// document: " + memoryAtEnd);
- System.out.println(" heap memory implied used by document: " + (memoryAtEnd - memoryUsed));
+ System.out.println(" heap memory implied used by document: " + (memoryAtEnd - memoryUsed)); //$NON-NLS-1$
}
@@ -305,7 +305,7 @@
long memoryAtEnd = computeMem();
//System.out.println("heap memory used after setting to model: "
// + memoryAtEnd);
- System.out.println(" heap memory implied used by document and model: " + (memoryAtEnd - memoryUsed));
+ System.out.println(" heap memory implied used by document and model: " + (memoryAtEnd - memoryUsed)); //$NON-NLS-1$
}
}
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 4edb8cf..98f0595 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
@@ -43,7 +43,7 @@
import org.eclipse.wst.sse.core.exceptions.SourceEditingRuntimeException;
import org.eclipse.wst.sse.core.internal.ILockable;
import org.eclipse.wst.sse.core.internal.Logger;
-import org.eclipse.wst.sse.core.internal.SSECorePlugin;
+import org.eclipse.wst.sse.core.internal.SSECoreMessages;
import org.eclipse.wst.sse.core.internal.encoding.EncodingRule;
import org.eclipse.wst.sse.core.modelhandler.IModelHandler;
import org.eclipse.wst.sse.core.text.IStructuredDocument;
@@ -178,8 +178,8 @@
}
- static final String DEBUG_STATE_TRACE_CATEGORY = "org.eclipse.wst.sse.core/structuredmodel/state";
- static final boolean DEBUG_STATE = "true".equalsIgnoreCase(Platform.getDebugOption(DEBUG_STATE_TRACE_CATEGORY));
+ static final String DEBUG_STATE_TRACE_CATEGORY = "org.eclipse.wst.sse.core/structuredmodel/state"; //$NON-NLS-1$
+ static final boolean DEBUG_STATE = "true".equalsIgnoreCase(Platform.getDebugOption(DEBUG_STATE_TRACE_CATEGORY)); //$NON-NLS-1$
private FactoryRegistry factoryRegistry;
private String fBaseLocation;
@@ -524,7 +524,7 @@
// another thread
if (fModelStateListeners != null) {
if (DEBUG_STATE) {
- System.out.println("IModelStateListener event for " + getId() + " : modelAboutToBeReinitialized");
+ System.out.println("IModelStateListener event for " + getId() + " : modelAboutToBeReinitialized"); //$NON-NLS-1$ //$NON-NLS-2$
}
Object[] holdListeners = fModelStateListeners;
for (int i = 0; i < holdListeners.length; i++) {
@@ -578,7 +578,7 @@
// another thread
if (fModelStateListeners != null) {
if (DEBUG_STATE) {
- System.out.println("IModelStateListener event for " + getId() + " : modelDirtyStateChanged");
+ System.out.println("IModelStateListener event for " + getId() + " : modelDirtyStateChanged"); //$NON-NLS-1$ //$NON-NLS-2$
}
Object[] holdListeners = fModelStateListeners;
for (int i = 0; i < holdListeners.length; i++) {
@@ -596,7 +596,7 @@
// another thread
if (fModelStateListeners != null) {
if (DEBUG_STATE) {
- System.out.println("IModelStateListener event for " + getId() + " : modelReinitialized");
+ System.out.println("IModelStateListener event for " + getId() + " : modelReinitialized"); //$NON-NLS-1$ //$NON-NLS-2$
}
Object[] holdListeners = fModelStateListeners;
for (int i = 0; i < holdListeners.length; i++) {
@@ -619,7 +619,7 @@
// another thread
if (fModelStateListeners != null) {
if (DEBUG_STATE) {
- System.out.println("IModelStateListener event for " + getId() + " : modelResourceDeleted");
+ System.out.println("IModelStateListener event for " + getId() + " : modelResourceDeleted"); //$NON-NLS-1$ //$NON-NLS-2$
}
Object[] holdListeners = fModelStateListeners;
for (int i = 0; i < holdListeners.length; i++) {
@@ -642,7 +642,7 @@
// another thread
if (fModelStateListeners != null) {
if (DEBUG_STATE) {
- System.out.println("IModelStateListener event for " + getId() + " : modelResourceMoved");
+ System.out.println("IModelStateListener event for " + getId() + " : modelResourceMoved"); //$NON-NLS-1$ //$NON-NLS-2$
}
Object[] holdListeners = fModelStateListeners;
for (int i = 0; i < holdListeners.length; i++) {
@@ -828,7 +828,7 @@
if (fModelStateChanging == 0) {
if (DEBUG_STATE) {
- System.out.println("IModelStateListener event for " + getId() + " : modelAboutToBeChanged"); //$NON-NLS-1$
+ System.out.println("IModelStateListener event for " + getId() + " : modelAboutToBeChanged"); //$NON-NLS-1$ //$NON-NLS-2$
}
fireModelAboutToBeChanged();
@@ -859,7 +859,7 @@
// and try to continue
if (fModelStateChanging < 0) {
fModelStateChanging = 0;
- Logger.log(Logger.ERROR, "Program Error: modelStateChanging was less than zero");
+ Logger.log(Logger.ERROR, "Program Error: modelStateChanging was less than zero"); //$NON-NLS-1$
}
@@ -1362,7 +1362,7 @@
// since it uses hashtables, and you can't have a null id for a
// hashtable.
if (newId == null)
- throw new IllegalArgumentException(SSECorePlugin.getResourceString("%A_model's_id_can_not_be_nu_EXC_")); //$NON-NLS-1$ = "A model's id can not be null"
+ throw new IllegalArgumentException(SSECoreMessages.A_model_s_id_can_not_be_nu_EXC_); //$NON-NLS-1$ = "A model's id can not be null"
// To gaurd againt throwing a spurious ResourceInUse exception,
// which can occur when two pieces of code both want to change the id,
// so the second request is spurious, we'll ignore any requests that
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/LifecycleNotificationManager.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/LifecycleNotificationManager.java
index 7043581..0a7ea1b 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/LifecycleNotificationManager.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/LifecycleNotificationManager.java
@@ -23,8 +23,8 @@
*/
class LifecycleNotificationManager {
- static final String DEFAULT_TRACE_CATEGORY = "org.eclipse.wst.sse.core/structuredmodel/lifecycle";
- static final boolean DEBUG = "true".equalsIgnoreCase(Platform.getDebugOption(DEFAULT_TRACE_CATEGORY));
+ static final String DEFAULT_TRACE_CATEGORY = "org.eclipse.wst.sse.core/structuredmodel/lifecycle"; //$NON-NLS-1$
+ static final boolean DEBUG = "true".equalsIgnoreCase(Platform.getDebugOption(DEFAULT_TRACE_CATEGORY)); //$NON-NLS-1$
private Object[] fListeners;
@@ -46,7 +46,7 @@
*/
void addListener(IModelLifecycleListener listener) {
if (Utilities.contains(fListeners, listener)) {
- Logger.log(Logger.WARNING_DEBUG, "IModelLifecycleListener " + listener + " listening more than once");
+ Logger.log(Logger.WARNING_DEBUG, "IModelLifecycleListener " + listener + " listening more than once"); //$NON-NLS-1$ //$NON-NLS-2$
}
int oldSize = 0;
if (fListeners != null) {
@@ -94,14 +94,14 @@
fListeners = newListeners;
}
if (Utilities.contains(fListeners, listener)) {
- Logger.log(Logger.WARNING_DEBUG, "IModelLifecycleListener " + listener + " removed once but still listening");
+ Logger.log(Logger.WARNING_DEBUG, "IModelLifecycleListener " + listener + " removed once but still listening"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
void signalLifecycleEvent(ModelLifecycleEvent event) {
if (DEBUG) {
- Logger.trace(DEFAULT_TRACE_CATEGORY, "ModelLifecycleEvent fired for " + event.getModel().getId() + ": " + event.toString());
- System.out.println("ModelLifecycleEvent fired for " + event.getModel().getId() + ": " + event.toString());
+ Logger.trace(DEFAULT_TRACE_CATEGORY, "ModelLifecycleEvent fired for " + event.getModel().getId() + ": " + event.toString()); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("ModelLifecycleEvent fired for " + event.getModel().getId() + ": " + event.toString()); //$NON-NLS-1$ //$NON-NLS-2$
}
// We must assign listeners to local variable, since the add and
// remove listener methods can change the actual instance of the
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 03415d7..703df76 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
@@ -44,9 +44,9 @@
import org.eclipse.text.edits.MultiTextEdit;
import org.eclipse.text.edits.ReplaceEdit;
import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
import org.eclipse.wst.sse.core.IModelLoader;
import org.eclipse.wst.sse.core.IModelManager;
+import org.eclipse.wst.sse.core.INodeAdapterFactory;
import org.eclipse.wst.sse.core.IStructuredModel;
import org.eclipse.wst.sse.core.document.IEncodedDocument;
import org.eclipse.wst.sse.core.exceptions.ResourceAlreadyExists;
@@ -55,7 +55,7 @@
import org.eclipse.wst.sse.core.internal.FileBufferModelManager;
import org.eclipse.wst.sse.core.internal.Logger;
import org.eclipse.wst.sse.core.internal.NullMemento;
-import org.eclipse.wst.sse.core.internal.SSECorePlugin;
+import org.eclipse.wst.sse.core.internal.SSECoreMessages;
import org.eclipse.wst.sse.core.internal.document.DocumentReader;
import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
@@ -210,8 +210,8 @@
}
// we expect to always return something
if (sharedObject == null) {
- debugException = new Exception("instance only for stack trace");
- Logger.logException("Program Error: no model recorded for id " + id, debugException);
+ debugException = new Exception("instance only for stack trace"); //$NON-NLS-1$
+ Logger.logException("Program Error: no model recorded for id " + id, debugException); //$NON-NLS-1$
}
@@ -231,7 +231,7 @@
model = _commonCreateModel(id, handler, resolver);
IModelLoader loader = handler.getModelLoader();
if (inputStream == null) {
- Logger.log(Logger.WARNING, "model was requested for id " + id + " without a content InputStream");
+ Logger.log(Logger.WARNING, "model was requested for id " + id + " without a content InputStream"); //$NON-NLS-1$ //$NON-NLS-2$
}
loader.load(id, Utilities.getMarkSupportedStream(inputStream), model, encoding, lineDelimiter);
}
@@ -408,7 +408,7 @@
public IStructuredModel _getModelFor(IStructuredDocument document, ReadEditType accessType) {
IStructuredModel model = null;
String id = FileBufferModelManager.getInstance().calculateId(document);
- Assert.isNotNull(id, "unknown IStructuredDocument " + document);
+ Assert.isNotNull(id, "unknown IStructuredDocument " + document); //$NON-NLS-1$
SharedObject sharedObject = (SharedObject) fManagedObjects.get(id);
if (sharedObject != null) {
sharedObject = (SharedObject) fManagedObjects.get(id);
@@ -732,7 +732,7 @@
ModelHandlerRegistry cr = getModelHandlerRegistry();
IModelHandler handler = cr.getHandlerForContentTypeId(contentTypeId);
if (handler == null)
- Logger.log(Logger.ERROR, "Program error: no model handler found for " + contentTypeId);
+ Logger.log(Logger.ERROR, "Program error: no model handler found for " + contentTypeId); //$NON-NLS-1$
loader = handler.getDocumentLoader();
IStructuredDocument result = (IStructuredDocument) loader.createNewStructuredDocument();
return result;
@@ -1492,7 +1492,7 @@
// let's see if we already have it in our cache
SharedObject sharedObject = (SharedObject) fManagedObjects.get(id);
if (sharedObject == null || sharedObject.theSharedModel == null) {
- throw new SourceEditingRuntimeException(SSECorePlugin.getResourceString("%Program_Error__ModelManage_EXC_")); //$NON-NLS-1$ = "Program Error: ModelManagerImpl::saveModel. Model should be in the cache"
+ throw new SourceEditingRuntimeException(SSECoreMessages.Program_Error__ModelManage_EXC_); //$NON-NLS-1$ = "Program Error: ModelManagerImpl::saveModel. Model should be in the cache"
}
else {
boolean saved = false;
@@ -1531,7 +1531,7 @@
// let's see if we already have it in our cache
SharedObject sharedObject = (SharedObject) fManagedObjects.get(id);
if (sharedObject == null) {
- throw new SourceEditingRuntimeException(SSECorePlugin.getResourceString("%Program_Error__ModelManage_EXC_")); //$NON-NLS-1$ = "Program Error: ModelManagerImpl::saveModel. Model should be in the cache"
+ throw new SourceEditingRuntimeException(SSECoreMessages.Program_Error__ModelManage_EXC_); //$NON-NLS-1$ = "Program Error: ModelManagerImpl::saveModel. Model should be in the cache"
}
else {
// if this model was based on a File Buffer and we're writing back
@@ -1562,7 +1562,7 @@
// let's see if we already have it in our cache
SharedObject sharedObject = (SharedObject) fManagedObjects.get(id);
if (sharedObject == null) {
- throw new SourceEditingRuntimeException(SSECorePlugin.getResourceString("%Program_Error__ModelManage_EXC_")); //$NON-NLS-1$ = "Program Error: ModelManagerImpl::saveModel. Model should be in the cache"
+ throw new SourceEditingRuntimeException(SSECoreMessages.Program_Error__ModelManage_EXC_); //$NON-NLS-1$ = "Program Error: ModelManagerImpl::saveModel. Model should be in the cache"
}
else {
CodedStreamCreator codedStreamCreator = new CodedStreamCreator();
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/BasicStructuredDocument.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/BasicStructuredDocument.java
index ec17ad6..ee1a770 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/BasicStructuredDocument.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/BasicStructuredDocument.java
@@ -158,7 +158,7 @@
if (cachedRegionPositionArray.size() > MAX_SIZE) {
cachedRegionPositionArray.clear();
if (DEBUG) {
- System.out.println("cachedRegionPositionArray cleared at size " + MAX_SIZE);
+ System.out.println("cachedRegionPositionArray cleared at size " + MAX_SIZE); //$NON-NLS-1$
}
}
position = new Integer(cachedRegionPositionArray.size());
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/MinimalDocument.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/MinimalDocument.java
index 68cd412..66e5af3 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/MinimalDocument.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/MinimalDocument.java
@@ -231,8 +231,8 @@
}
public ITypedRegion getPartition(int offset) throws BadLocationException {
- Logger.log(Logger.WARNING, "An instance of MinimalDocument was asked for its partition, sometime indicating a deleted region was being accessed.");
- return new TypedRegion(0,0, "undefined");
+ Logger.log(Logger.WARNING, "An instance of MinimalDocument was asked for its partition, sometime indicating a deleted region was being accessed."); //$NON-NLS-1$
+ return new TypedRegion(0,0, "undefined"); //$NON-NLS-1$
//throw new NotImplementedException("intentionally not implemented"); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/undo/StructuredTextUndoManager.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/undo/StructuredTextUndoManager.java
index 4bad063..f67d829 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/undo/StructuredTextUndoManager.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/undo/StructuredTextUndoManager.java
@@ -29,7 +29,7 @@
import org.eclipse.wst.sse.core.events.RegionsReplacedEvent;
import org.eclipse.wst.sse.core.events.StructuredDocumentEvent;
import org.eclipse.wst.sse.core.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.SSECorePlugin;
+import org.eclipse.wst.sse.core.internal.SSECoreMessages;
import org.eclipse.wst.sse.core.text.IStructuredDocument;
import org.eclipse.wst.sse.core.undo.CommandCursorPosition;
import org.eclipse.wst.sse.core.undo.IDocumentSelectionMediator;
@@ -136,7 +136,7 @@
}
- private static final String TEXT_CHANGE_TEXT = SSECorePlugin.getResourceString("%Text_Change_UI_"); //$NON-NLS-1$
+ private static final String TEXT_CHANGE_TEXT = SSECoreMessages.Text_Change_UI_; //$NON-NLS-1$
private CommandStack fCommandStack = null;
private StructuredTextCompoundCommandImpl fCompoundCommand = null;
private String fCompoundCommandDescription = null;
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/model/IModelManagerProposed.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/model/IModelManagerProposed.java
index 2d40405..b485840 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/model/IModelManagerProposed.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/model/IModelManagerProposed.java
@@ -67,7 +67,7 @@
* For debug purposes only.
*/
public String toString() {
- return "Model Access Type: " + fType;
+ return "Model Access Type: " + fType; //$NON-NLS-1$
}
}
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 fea860c..39a7c3d 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
@@ -328,9 +328,9 @@
}
}
} catch (CoreException e) {
- Logger.logException("Exception with " + file.getFullPath().toString(), e);
+ Logger.logException("Exception with " + file.getFullPath().toString(), e); //$NON-NLS-1$
} catch (CharacterCodingException e) {
- Logger.log(Logger.INFO, "TaskTagSeeker encountered CharacterCodingException reading " + file.getFullPath().toOSString());
+ Logger.log(Logger.INFO, "TaskTagSeeker encountered CharacterCodingException reading " + file.getFullPath().toOSString()); //$NON-NLS-1$
} catch (IOException e) {
Logger.logException(e);
}
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/text/IStructuredPartitioning.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/text/IStructuredPartitioning.java
index 3b7c434..a228c34 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/text/IStructuredPartitioning.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/text/IStructuredPartitioning.java
@@ -8,5 +8,5 @@
public interface IStructuredPartitioning {
/** String to identify default partitioning*/
- String DEFAULT_STRUCTURED_PARTITIONING = "org.eclipse.wst.sse.core.default_structured_text_partitioning";
+ String DEFAULT_STRUCTURED_PARTITIONING = "org.eclipse.wst.sse.core.default_structured_text_partitioning"; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/JarUtilities.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/JarUtilities.java
index 46f87a5..818d64e 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/JarUtilities.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/JarUtilities.java
@@ -68,7 +68,7 @@
jarfile = new ZipFile(jarFilename);
}
catch (IOException ioExc) {
- Logger.logException("JarUtilities: " + jarFilename, ioExc);
+ Logger.logException("JarUtilities: " + jarFilename, ioExc); //$NON-NLS-1$
closeJarFile(jarfile);
}
@@ -81,7 +81,7 @@
entryInputStream = jarfile.getInputStream(zentry);
}
catch (IOException ioExc) {
- Logger.logException("JarUtilities: " + jarFilename, ioExc);
+ Logger.logException("JarUtilities: " + jarFilename, ioExc); //$NON-NLS-1$
}
if (entryInputStream != null) {
@@ -145,10 +145,10 @@
}
}
catch (ZipException zExc) {
- Logger.log(Logger.WARNING, "JarUtilities ZipException: " + jarFilename + " " + zExc.getMessage());
+ Logger.log(Logger.WARNING, "JarUtilities ZipException: " + jarFilename + " " + zExc.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
}
catch (IOException ioExc) {
- Logger.log(Logger.WARNING, "JarUtilities IOException: " + jarFilename + " " + ioExc.getMessage());
+ Logger.log(Logger.WARNING, "JarUtilities IOException: " + jarFilename + " " + ioExc.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
}
finally {
closeJarFile(jarfile);
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/ProjectResolver.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/ProjectResolver.java
index f73f86a..82684d1 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/ProjectResolver.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/ProjectResolver.java
@@ -92,7 +92,7 @@
// Workaround for problem in URIHelper; uris starting with '/' are
// returned as-is.
String location = uri;
- if (uri.startsWith("/")) {
+ if (uri.startsWith("/")) { //$NON-NLS-1$
IProject p = getProject();
if(p != null && p.exists())
location = p.getLocation().toString() + uri;
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/Utilities.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/Utilities.java
index b84e219..4de3cfd 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/Utilities.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/util/Utilities.java
@@ -37,7 +37,8 @@
if (changes == null) {
// the delete case
lengthDifference = 0 - lengthToReplace;
- } else {
+ }
+ else {
lengthDifference = changes.length() - lengthToReplace;
}
if (Debug.debugStructuredDocument) {
@@ -113,8 +114,8 @@
*/
public static String makeShortId(Object id) {
if (id == null)
- id = "NOID"; //com.ibm.sed.util.Assert.isNotNull(id);
- // //$NON-NLS-1$
+ // com.ibm.sed.util.Assert.isNotNull(id);
+ id = "NOID";//$NON-NLS-1$
String whole = id.toString();
String part = whole.substring(whole.lastIndexOf("/") + 1); //$NON-NLS-1$
return "..." + part; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.wst.sse.ui/plugin.properties b/bundles/org.eclipse.wst.sse.ui/plugin.properties
index 4cb5819..5bed95c 100644
--- a/bundles/org.eclipse.wst.sse.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.sse.ui/plugin.properties
@@ -20,6 +20,7 @@
#
sourceEditorFontDefiniton.label=Structured Text Editor Text Font
+sourceEditorFontDefintion.description=The Structured text editor text font is used by Structured text editors.
Adapter_Factory_Description_Extension.name=Adapter Factory Description Extension
Embedded_Content_Type_Adapter_Factory_Provider_Extension.name=Embedded Content Type Adapter Factory Provider Extension
@@ -65,16 +66,13 @@
##########################################################################
Source=&Source
FormatDocument=&Format document
-
##
-Spell_Check_label=Spell Check
-Spell_Check_tooltip=Spell Check
-#
Breakpoint_Extension_Point.name=Breakpoint Extension Point
-SpellCheck_Extension_Point.name=SpellCheck Extension Point
Source_Validation_Extension_Point.name=Reconcile Validator Extension Point
-Open_On_Extension_Point.name=Open On Extension Point
###############################################################################
-# The following property keys maybe unused. Commented out on 12/7/2004. Uncomment if needed.
-#sourceEditorFontDefintion.description=The Structured text editor text font is used by Structured text editors.
+# The following property keys maybe unused. Commented out on 4/12/2005. Uncomment if needed.
#Bean_Info_Provider_Extension.name=Bean Info Provider Extension
+#SpellCheck_Extension_Point.name=SpellCheck Extension Point
+#Open_On_Extension_Point.name=Open On Extension Point
+#Spell_Check_label=Spell Check
+#Spell_Check_tooltip=Spell Check
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.sse.ui/src-encoding/org/eclipse/wst/sse/core/internal/encoding/ui/EncodingPreferencePage.java b/bundles/org.eclipse.wst.sse.ui/src-encoding/org/eclipse/wst/sse/core/internal/encoding/ui/EncodingPreferencePage.java
index 009810c..8fe747f 100644
--- a/bundles/org.eclipse.wst.sse.ui/src-encoding/org/eclipse/wst/sse/core/internal/encoding/ui/EncodingPreferencePage.java
+++ b/bundles/org.eclipse.wst.sse.ui/src-encoding/org/eclipse/wst/sse/core/internal/encoding/ui/EncodingPreferencePage.java
@@ -24,6 +24,7 @@
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
import org.eclipse.wst.sse.core.internal.encoding.util.CodedResourcePlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
/**
* @deprecated - this should not be handled by the platform and not WTP
@@ -64,7 +65,7 @@
protected Control createContents(Composite parent) {
Composite composite = createComposite(parent);
- String description = CodedResourcePlugin.getResourceString("%EncodingPreferencePage.0"); //$NON-NLS-1$
+ String description = SSEUIMessages.EncodingPreferencePage_0; //$NON-NLS-1$
// ISSUE: the following to lines look redundant,
// not sure what was trying to be accomplished.
@@ -72,7 +73,7 @@
createLabel(composite, description);
createLabel(composite, ""); //$NON-NLS-1$
- String checkBoxLabel = CodedResourcePlugin.getResourceString("%EncodingPreferencePage.1"); //$NON-NLS-1$
+ String checkBoxLabel = SSEUIMessages.EncodingPreferencePage_1; //$NON-NLS-1$
fUse3ByteBOMWithUTF8CheckBox = createCheckBox(composite, checkBoxLabel);
return composite;
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java
index 61119a1..9eef449 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextViewerConfiguration.java
@@ -63,7 +63,7 @@
*/
public class StructuredTextViewerConfiguration extends TextSourceViewerConfiguration implements IExtendedConfiguration {
- private static final String CONTENT_ASSIST_PROCESSOR_EXTENDED_ID = "contentassistprocessor";
+ private static final String CONTENT_ASSIST_PROCESSOR_EXTENDED_ID = "contentassistprocessor"; //$NON-NLS-1$
public static final String ID = "textviewerconfiguration"; //$NON-NLS-1$
protected String[] configuredContentTypes;
protected IEditorPart editorPart;
@@ -477,7 +477,7 @@
* the preference store to use
*/
public void setPreferenceStore(IPreferenceStore store) {
- Assert.isLegal(fPreferenceStore == null || fPreferenceStore == store, "TextSourceViewerConfiguration's preference store may only be set once");
+ Assert.isLegal(fPreferenceStore == null || fPreferenceStore == store, "TextSourceViewerConfiguration's preference store may only be set once"); //$NON-NLS-1$
fPreferenceStore = store;
}
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/contentproperties/ui/ContentSettingsPropertyPage.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/contentproperties/ui/ContentSettingsPropertyPage.java
index 4f8dcbb..d099e1f 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/contentproperties/ui/ContentSettingsPropertyPage.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/contentproperties/ui/ContentSettingsPropertyPage.java
@@ -37,6 +37,7 @@
import org.eclipse.wst.sse.ui.contentproperties.ContentSettings;
import org.eclipse.wst.sse.ui.contentproperties.ContentSettingsCreator;
import org.eclipse.wst.sse.ui.contentproperties.IContentSettings;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
public abstract class ContentSettingsPropertyPage extends PropertyPage {
@@ -102,10 +103,10 @@
protected Composite composite;
protected IContentSettings contentSettings;
- protected final String CSS_LABEL = SSEUIPlugin.getResourceString("%UI_CSS_profile___2"); //$NON-NLS-1$
- protected final String DEVICE_LABEL = SSEUIPlugin.getResourceString("%UI_Target_Device___3"); //$NON-NLS-1$
+ protected final String CSS_LABEL = SSEUIMessages.UI_CSS_profile___2; //$NON-NLS-1$
+ protected final String DEVICE_LABEL = SSEUIMessages.UI_Target_Device___3; //$NON-NLS-1$
- protected final String DOCUMENT_LABEL = SSEUIPlugin.getResourceString("%UI_Default_HTML_DOCTYPE_ID___1"); //$NON-NLS-1$
+ protected final String DOCUMENT_LABEL = SSEUIMessages.UI_Default_HTML_DOCTYPE_ID___1; //$NON-NLS-1$
protected int numberOfCombo;
protected int numCols = 1;
protected int numRows = 1;
@@ -127,7 +128,7 @@
Label label = new Label(propertyPage, SWT.LEFT);
label.setText(title);
- if (title != null && title.startsWith(SSEUIPlugin.getResourceString("%UI_Default_HTML_DOCTYPE_ID___1"))) { //$NON-NLS-1$
+ if (title != null && title.startsWith(SSEUIMessages.UI_Default_HTML_DOCTYPE_ID___1)) { //$NON-NLS-1$
GridData data = new GridData();
data.horizontalIndent = 10;
label.setLayoutData(data);
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/extension/ExtendedEditorActionBuilder.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/extension/ExtendedEditorActionBuilder.java
index 504970b..c9df659 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/extension/ExtendedEditorActionBuilder.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/extension/ExtendedEditorActionBuilder.java
@@ -90,7 +90,7 @@
System.out.println(getClass().getName() + "#contributeToMenu() added: " + ad.getId()); //$NON-NLS-1$
}
} catch (Exception e) {
- Logger.logException("contributing to menu", e);
+ Logger.logException("contributing to menu", e); //$NON-NLS-1$
}
}
}
@@ -134,7 +134,7 @@
System.out.println(getClass().getName() + "#contributeToPopupMenu() added: " + ad.getId()); //$NON-NLS-1$
}
} catch (Exception e) {
- Logger.logException("contributing to popup", e);
+ Logger.logException("contributing to popup", e); //$NON-NLS-1$
}
}
}
@@ -172,7 +172,7 @@
System.out.println(getClass().getName() + "#contributeToToolBar() added: " + ad.getId()); //$NON-NLS-1$
}
} catch (Exception e) {
- Logger.logException("contributing to toolbar", e);
+ Logger.logException("contributing to toolbar", e); //$NON-NLS-1$
}
}
}
@@ -247,7 +247,7 @@
}
item.setVisible(visible);
} catch (Exception e) {
- Logger.logException("updating actions", e);
+ Logger.logException("updating actions", e); //$NON-NLS-1$
}
}
}
@@ -275,7 +275,7 @@
}
}
} catch (Exception e) {
- Logger.logException("setting active editor on actions", e);
+ Logger.logException("setting active editor on actions", e); //$NON-NLS-1$
}
}
}
@@ -310,7 +310,7 @@
}
}
} catch (Exception e) {
- Logger.logException("updating toolbar actions", e);
+ Logger.logException("updating toolbar actions", e); //$NON-NLS-1$
}
}
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/CaretMediator.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/CaretMediator.java
index 9bc2f8e..bbac19f 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/CaretMediator.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/CaretMediator.java
@@ -63,7 +63,7 @@
class RefreshDelayJob extends Job {
private int fDelay = 0;
RefreshDelayJob(int delay) {
- super("caret update");
+ super(SSEUIMessages.caret_update); //$NON-NLS-1$
setSystem(true);
fDelay = delay;
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/GotoAnnotationAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/GotoAnnotationAction.java
index f745b49..d138ff1 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/GotoAnnotationAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/GotoAnnotationAction.java
@@ -84,10 +84,10 @@
* @param editor
*/
public GotoAnnotationAction(String prefix, boolean forward) {
- super(SSEUIPlugin.getDefault().getResourceBundle(), prefix, null);
+ super(SSEUIMessages.getResourceBundle(), prefix, null);
fForward = forward;
fPrefix = prefix;
- fLabel = SSEUIPlugin.getResourceString("%" + fPrefix);
+ fLabel = SSEUIMessages.getResourceBundle().getString(fPrefix);
}
/*
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java
new file mode 100644
index 0000000..d33ce7a
--- /dev/null
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java
@@ -0,0 +1,374 @@
+/**********************************************************************
+ * Copyright (c) 2005 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 - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.wst.sse.ui.internal;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Strings used by SSE UI
+ *
+ * @since 1.0
+ */
+public class SSEUIMessages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.wst.sse.ui.internal.SSEUIPluginResources";//$NON-NLS-1$
+ private static ResourceBundle fResourceBundle;
+
+ public static String Error_opening_file_UI_;
+ public static String _UI_File_is_read_only;
+ public static String _32concat_EXC_;
+ public static String Multiple_errors;
+ public static String _Undo_Text_Change__Ctrl_Z_UI_;
+ public static String Undo_Text_Change__UI_;
+ public static String _Undo__0___Ctrl_Z_UI_;
+ public static String Undo___0___UI_;
+ public static String _Redo_Text_Change__Ctrl_Y_UI_;
+ public static String Redo_Text_Change__UI_;
+ public static String _Redo__0___Ctrl_Y_UI_;
+ public static String Redo___0___UI_;
+ public static String FormatMenu_label;
+ public static String Format_Document_UI_;
+ public static String Format_Active_Elements_UI_;
+ public static String Text_Cut_UI_;
+ public static String Text_Paste_UI_;
+
+ public static String Cleanup_Document_UI_;
+
+ public static String Editor_Cut_label;
+ public static String Editor_Cut_tooltip;
+ public static String Editor_Cut_image;
+ public static String Editor_Cut_description;
+ public static String Editor_Copy_label;
+ public static String Editor_Copy_tooltip;
+ public static String Editor_Copy_image;
+ public static String Editor_Copy_description;
+ public static String Editor_Paste_label;
+ public static String Editor_Paste_tooltip;
+ public static String Editor_Paste_image;
+ public static String Editor_Paste_description;
+ public static String Editor_Delete_label;
+ public static String Editor_Delete_tooltip;
+ public static String Editor_Delete_image;
+ public static String Editor_Delete_description;
+
+ public static String ContentAssistProposals_label;
+ public static String ContentAssistProposals_tooltip;
+ public static String ContentAssistProposals_description;
+ public static String QuickFix_label;
+ public static String QuickFix_tooltip;
+ public static String QuickFix_image;
+ public static String QuickFix_description;
+ public static String ToggleComment_label;
+ public static String ToggleComment_tooltip;
+ public static String ToggleComment_image;
+ public static String ToggleComment_description;
+ public static String AddBlockComment_label;
+ public static String AddBlockComment_tooltip;
+ public static String AddBlockComment_image;
+ public static String AddBlockComment_description;
+ public static String RemoveBlockComment_label;
+ public static String RemoveBlockComment_tooltip;
+ public static String RemoveBlockComment_image;
+ public static String RemoveBlockComment_description;
+ public static String CleanupDocument_label;
+ public static String CleanupDocument_tooltip;
+ public static String CleanupDocument_image;
+ public static String CleanupDocument_description;
+ public static String FormatDocument_label;
+ public static String FormatDocument_tooltip;
+ public static String FormatDocument_image;
+ public static String FormatDocument_description;
+ public static String FormatActiveElements_label;
+ public static String FormatActiveElements_tooltip;
+ public static String FormatActiveElements_image;
+ public static String FormatActiveElements_description;
+ public static String OpenFileFromSource_label;
+ public static String OpenFileFromSource_tooltip;
+ public static String OpenFileFromSource_image;
+ public static String OpenFileFromSource_description;
+ public static String ShowTooltipDesc_label;
+ public static String ShowTooltipDesc_tooltip;
+ public static String ShowTooltipDesc_image;
+ public static String ShowTooltipDesc_description;
+ public static String StructureSelectEnclosing_label;
+ public static String StructureSelectEnclosing_tooltip;
+ public static String StructureSelectEnclosing_description;
+ public static String StructureSelectNext_label;
+ public static String StructureSelectNext_tooltip;
+ public static String StructureSelectNext_description;
+ public static String StructureSelectPrevious_label;
+ public static String StructureSelectPrevious_tooltip;
+ public static String StructureSelectPrevious_description;
+ public static String StructureSelectHistory_label;
+ public static String StructureSelectHistory_tooltip;
+ public static String StructureSelectHistory_description;
+ public static String Text_Shift_Right_UI_;
+ public static String Text_Shift_Left_UI_;
+ // public static String Save_label;
+ // public static String An_error_has_occurred_when_ERROR_;
+ // public static String Problems_During_Save_As_UI_;
+ // public static String Save_could_not_be_complete_UI_;
+
+ public static String _4concat;
+ public static String Content_type__UI_;
+ public static String Foreground_UI_;
+ public static String Background_UI_;
+ public static String Bold_UI_;
+ public static String Italics_UI;
+ public static String Restore_Default_UI_;
+ public static String Sample_text__UI_;
+
+ public static String AddBreakpoint_label;
+ public static String AddBreakpoint_tooltip;
+ public static String AddBreakpoint_description;
+ public static String AddBreakpoint_error_dialog_title;
+ public static String AddBreakpoint_error_dialog_message;
+ public static String ToggleBreakpoint_label;
+ public static String ToggleBreakpoint_tooltip;
+ public static String ToggleBreakpoint_description;
+ public static String EnableBreakpoint_label;
+ public static String EnableBreakpoint_tooltip;
+ public static String EnableBreakpoint_description;
+ public static String DisableBreakpoint_label;
+ public static String DisableBreakpoint_tooltip;
+ public static String DisableBreakpoint_description;
+ public static String ManageBreakpoints_add_label;
+ public static String ManageBreakpoints_remove_label;
+ public static String ManageBreakpoints_tooltip;
+ public static String ManageBreakpoints_error_adding_title1;
+ public static String ManageBreakpoints_error_adding_message1;
+ // public static String ManageBreakpoints_error_removing_title1;
+ // public static String ManageBreakpoints_error_removing_message1;
+ // public static String ManageBreakpoints_error_retrieving_message;
+
+ public static String AbstractColorPageDescription;
+ // public static String JSPSourcePreferencePageDescription;
+ public static String EditorModelUtil_0;
+ public static String EditorModelUtil_1;
+
+ // These strings are accessed using resource bundle and in properties
+ // file, need to use '.' instead of '_' in some keys
+ public static String Editor_ManageBookmarks_tooltip;
+ public static String Editor_ManageBookmarks_image;
+ public static String Editor_ManageBookmarks_description;
+ public static String Editor_ManageBookmarks_add_label;
+ public static String Editor_ManageBookmarks_remove_label;
+ public static String Editor_ManageBookmarks_add_dialog_title;
+ public static String Editor_ManageBookmarks_add_dialog_message;
+ public static String Editor_ManageBookmarks_error_dialog_title;
+ public static String Editor_ManageBookmarks_error_dialog_message;
+ public static String Editor_ManageTasks_tooltip;
+ public static String Editor_ManageTasks_image;
+ public static String Editor_ManageTasks_description;
+ public static String Editor_ManageTasks_add_label;
+ public static String Editor_ManageTasks_remove_label;
+ public static String Editor_ManageTasks_add_dialog_title;
+ public static String Editor_ManageTasks_add_dialog_message;
+ public static String Editor_ManageTasks_error_dialog_title;
+ public static String Editor_ManageTasks_error_dialog_message;
+
+ // web content settings
+ public static String UI_Default_HTML_DOCTYPE_ID___1;
+ public static String UI_CSS_profile___2;
+ public static String UI_Target_Device___3;
+
+ // public static String Editor_error_save_message;
+ // public static String Editor_error_save_title;
+ // public static String Editor_warning_save_delete;
+
+ // actions
+ // public static String Previous_annotation;
+ // public static String Next_annotation;
+
+ // Annotation Types
+ // public static String AnnotationTypes_Errors;
+ // public static String AnnotationTypes_Warnings;
+ // public static String AnnotationTypes_Tasks;
+ // public static String AnnotationTypes_SearchResults;
+ // public static String AnnotationTypes_Bookmarks;
+ // public static String AnnotationTypes_Others;
+
+ // public static String Editor_ConvertToWindows_label;
+ // public static String Editor_ConvertToWindows_tooltip;
+ // public static String Editor_ConvertToWindows_image;
+ // public static String Editor_ConvertToWindows_description;
+ //
+ // public static String Editor_ConvertToUNIX_label;
+ // public static String Editor_ConvertToUNIX_tooltip;
+ // public static String Editor_ConvertToUNIX_image;
+ // public static String Editor_ConvertToUNIX_description;
+ //
+ // public static String Editor_ConvertToMac_label;
+ // public static String Editor_ConvertToMac_tooltip;
+ // public static String Editor_ConvertToMac_image;
+ // public static String Editor_ConvertToMac_description;
+
+ public static String Editor_ToggleInsertMode_label;
+
+ public static String EditPreferences_label;
+ public static String EditPreferences_tooltip;
+ public static String EditPreferences_description;
+ //
+ // These strings are used in Workbench menu bar
+ //
+ public static String ExpandSelectionToMenu_label;
+ public static String SourceMenu_label;
+ // public static String ConvertLineDelimitersMenu_label;
+ // public static String FindOccurrences_label;
+ //
+ public static String FindOccurrencesActionProvider_0;
+ public static String RemoveAction_0;
+ public static String ShowPropertiesAction_0;
+ public static String StructuredContentOutlineConfiguration_0;
+ public static String StructuredContentOutlineConfiguration_1;
+ public static String AbstractOpenOn_0;
+ public static String FormatActionDelegate_jobName;
+ public static String FormatActionDelegate_errorStatusMessage;
+ public static String FormatActionDelegate_3;
+ public static String FormatActionDelegate_4;
+ public static String FormatActionDelegate_5;
+ // public static String ConvertLineDelimitersToCRLFActionDelegate_jobName;
+ // public static String
+ // ConvertLineDelimitersToCRLFActionDelegate_errorStatusMessage;
+ // public static String ConvertLineDelimitersToCRLFActionDelegate_3;
+ // public static String ConvertLineDelimitersToCRLFActionDelegate_4;
+ public static String TranslucencyPreferenceTab_0;
+ public static String TranslucencyPreferenceTab_1;
+ public static String StructuredTextEditorPreferencePage_2;
+ public static String StructuredTextEditorPreferencePage_6;
+ public static String StructuredTextEditorPreferencePage_20;
+ public static String StructuredTextEditorPreferencePage_23;
+ public static String StructuredTextEditorPreferencePage_24;
+ public static String StructuredTextEditorPreferencePage_30;
+ public static String StructuredTextEditorPreferencePage_37;
+ public static String StructuredTextEditorPreferencePage_38;
+ public static String TaskTagPreferenceTab_0;
+ public static String TaskTagPreferenceTab_1;
+ public static String TaskTagPreferenceTab_2;
+ public static String TaskTagPreferenceTab_3;
+ public static String TaskTagPreferenceTab_5;
+ public static String TaskTagPreferenceTab_6;
+ public static String TaskTagPreferenceTab_7;
+ public static String TaskTagPreferenceTab_8;
+ public static String TaskTagPreferenceTab_9;
+ public static String TaskTagPreferenceTab_10;
+ public static String TaskTagPreferenceTab_12;
+ public static String TaskTagPreferenceTab_13;
+ public static String TaskTagPreferenceTab_14;
+ public static String TaskTagPreferenceTab_15;
+ public static String TaskTagPreferenceTab_16;
+ public static String TaskTagPreferenceTab_17;
+ public static String TaskTagPreferenceTab_18;
+ public static String TaskTagPreferenceTab_19;
+ public static String TaskTagPreferenceTab_20;
+ public static String TaskTagPreferenceTab_22;
+ public static String TaskTagPreferenceTab_23;
+ public static String TaskTagPreferenceTab_24;
+ public static String TaskTagPreferenceTab_25;
+ public static String TaskTagPreferenceTab_26;
+ public static String TaskTagPreferenceTab_27;
+ public static String TaskTagPreferenceTab_28;
+ public static String TaskTagPreferenceTab_29;
+ public static String TaskTagPreferenceTab_30;
+ public static String TaskTagPreferenceTab_31;
+
+ public static String FilePreferencePage_0;
+ public static String NoModificationCompletionProposal_0;
+ public static String ToggleBreakpointAction_0;
+ public static String ManageBreakpointAction_0;
+ public static String ManageBreakpointAction_1;
+ public static String EditBreakpointAction_0;
+ // Used in Structured Text Editor Preference Page / Hovers Tab
+ public static String TextHoverPreferenceTab_title;
+ // public static String TextHoverPreferenceTab_annotationRollover;
+ // public static String TextHoverPreferenceTab_showAffordance;
+ public static String TextHoverPreferenceTab_hoverPreferences;
+ // public static String TextHoverPreferenceTab_enabled;
+ public static String TextHoverPreferenceTab_keyModifier;
+ public static String TextHoverPreferenceTab_description;
+ public static String TextHoverPreferenceTab_modifierIsNotValid;
+ public static String TextHoverPreferenceTab_modifierIsNotValidForHover;
+ public static String TextHoverPreferenceTab_duplicateModifier;
+ public static String TextHoverPreferenceTab_nameColumnTitle;
+ public static String TextHoverPreferenceTab_modifierColumnTitle;
+ public static String TextHoverPreferenceTab_delimiter;
+ public static String TextHoverPreferenceTab_insertDelimiterAndModifierAndDelimiter;
+ public static String TextHoverPreferenceTab_insertModifierAndDelimiter;
+ public static String TextHoverPreferenceTab_insertDelimiterAndModifier;
+
+ // used dynamically
+ public static String combinationHover_label;
+ public static String combinationHover_desc;
+ public static String problemHover_label;
+ public static String problemHover_desc;
+ public static String documentationHover_label;
+ public static String documentationHover_desc;
+ public static String annotationHover_label;
+ public static String annotationHover_desc;
+
+ public static String EditStructuredTextEditorPreferencesAction_0;
+ public static String StructuredTextEditorPreferencePage_0;
+ // public static String BasicFindOccurrencesAction_0;
+ // public static String BasicSearchLabelProvider_0;
+ public static String PreferenceManager_0;
+ // public static String NavigationPreferenceTab_0;
+ public static String OccurrencesSearchQuery_0;
+ // public static String OccurrencesSearchQuery_1;
+ public static String OccurrencesSearchQuery_2;
+ // public static String FileModelProvider_0;
+ // public static String JFaceNodeAdapter_0;
+ public static String ShowView_errorTitle;
+ public static String proc_dirty_regions_0;
+ // Encoding
+ public static String EncodingPreferencePage_0;
+ public static String EncodingPreferencePage_1;
+
+ public static String busy;
+ public static String caret_update;
+ public static String EmptyFilePreferencePage_0;
+
+ public static String OffsetStatusLineContributionItem_0;
+ public static String OffsetStatusLineContributionItem_2;
+ public static String OffsetStatusLineContributionItem_3;
+ public static String OffsetStatusLineContributionItem_4;
+ public static String OffsetStatusLineContributionItem_5;
+ public static String OffsetStatusLineContributionItem_8;
+ public static String OffsetStatusLineContributionItem_9;
+ public static String OffsetStatusLineContributionItem_10;
+ public static String OffsetStatusLineContributionItem_11;
+ public static String OffsetStatusLineContributionItem_13;
+ public static String OffsetStatusLineContributionItem_14;
+ public static String OffsetStatusLineContributionItem_15;
+ public static String OffsetStatusLineContributionItem_16;
+ public static String OffsetStatusLineContributionItem_17;
+ public static String OffsetStatusLineContributionItem_18;
+
+ static {
+ // load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, SSEUIMessages.class);
+ }
+
+ private SSEUIMessages() {
+ // cannot create new instance
+ }
+
+ public static ResourceBundle getResourceBundle() {
+ try {
+ if (fResourceBundle == null)
+ fResourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
+ }
+ catch (MissingResourceException x) {
+ fResourceBundle = null;
+ }
+ return fResourceBundle;
+ }
+}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPlugin.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPlugin.java
index 3f9a6fb..37b5885 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPlugin.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPlugin.java
@@ -14,10 +14,6 @@
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.wst.sse.ui.registry.AdapterFactoryRegistry;
import org.eclipse.wst.sse.ui.registry.AdapterFactoryRegistryImpl;
@@ -30,10 +26,6 @@
public final static String ID = "org.eclipse.wst.sse.ui"; //$NON-NLS-1$
static SSEUIPlugin 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$
public static SSEUIPlugin getDefault() {
return instance;
@@ -71,49 +63,4 @@
}
return fTextHoverManager;
}
-
- /**
- * 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.sse.ui.internal.SSEUIPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties
index dfc45a3..4a39fe8 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties
@@ -4,590 +4,340 @@
# 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
# Jens Lukowski/Innoopract - initial renaming/restructuring
-#
+#
###############################################################################
-Encoding_warning_UI_=Encoding warning
-FileDocumentProvider.task.saving=Saving
-Unable_to_save_the_documen_ERROR_=Unable to save the document. Output file not found.
-Unable_to_save_the_documen1_ERROR_=Unable to save the document. Unsupported encoding.
-Unable_to_save_the_documen2_ERROR_=Unable to save the document. An I/O error occurred while saving the document.
-cannot_convert_some_characters=The encoding ({0}) cannot convert some characters (such as the one in position {1}). Press ''OK'' to save anyway (and some characters will be converted to ''?'' in the saved file), or press ''Cancel'' to return to the editor.
-cannot_convert_some_characters2=The encoding ({0}) cannot convert some characters. Press ''OK'' to save anyway (and some characters will be converted to ''?'' in the saved file), or press ''Cancel'' to return to the editor.
Error_opening_file_UI_=Error opening file
_UI_File_is_read_only=File {0} is read-only.
-7concat_ERROR_=One or more characters could not be decoded according to the encoding parameter {1}. Position of first invalid character is {0}.
-8concat_ERROR_=One or more characters could not be decoded according to the encoding parameter {1}. Position of first invalid character is greater than {0}.
-This_encoding_({0})_is_not_supported._The_default_encoding_({1})_will_be_used_instead._1=This encoding ({0}) is not supported. The default encoding ({1}) will be used instead.
-This_encoding_({0})_is_not_supported._Continue_the_save_using_the_default_({1})__2=This encoding ({0}) is not supported. Continue the save using the default ({1})?
-Information=Information
-PluginAction.operationNotAvailableMessage=The chosen operation is not currently available.
-32concat_EXC_=Editor could not be open on {0}
+_32concat_EXC_=Editor could not be open on {0}
Multiple_errors=Multiple annotations found at this line:
-&Undo_Text_Change_@Ctrl+Z_UI_=&Undo Text Change @Ctrl+Z
-Undo_Text_Change._UI_=Undo Text Change.
-&Undo_{0}_@Ctrl+Z_UI_=&Undo {0} @Ctrl+Z
-Undo__{0}._UI_=Undo: {0}.
-&Redo_Text_Change_@Ctrl+Y_UI_=&Redo Text Change @Ctrl+Y
-Redo_Text_Change._UI_=Redo Text Change.
-&Redo_{0}_@Ctrl+Y_UI_=&Redo {0} @Ctrl+Y
-Redo__{0}._UI_=Redo: {0}.
-FormatMenu.label=F&ormat
+_Undo_Text_Change__Ctrl_Z_UI_=&Undo Text Change @Ctrl+Z
+Undo_Text_Change__UI_=Undo Text Change.
+_Undo__0___Ctrl_Z_UI_=&Undo {0} @Ctrl+Z
+Undo___0___UI_=Undo: {0}.
+_Redo_Text_Change__Ctrl_Y_UI_=&Redo Text Change @Ctrl+Y
+Redo_Text_Change__UI_=Redo Text Change.
+_Redo__0___Ctrl_Y_UI_=&Redo {0} @Ctrl+Y
+Redo___0___UI_=Redo: {0}.
+FormatMenu_label=F&ormat
Format_Document_UI_=Format Document
Format_Active_Elements_UI_=Format Active Elements
Text_Cut_UI_=Text Cut
Text_Paste_UI_=Text Paste
###############################################################################
-Macro_must_have_a_name_INFO_=Macro must have a name
-Macro_name_can_not_start_w_INFO_=Macro name can not start with whitespace
-Rename_Macro_UI_=Rename Macro
-Copy_Macro_UI_=Copy Macro
-New_Macro_UI_=New Macro
-Source__UI_=Source:
-The_maximum_width_must_be__UI_=The maximum width must be an integer
-Only_whitespace_characters_UI_=Only whitespace characters are allowed in the indentation
-The_number_of_spaces_must__UI_=The number of spaces must be an integer
-Alphabetically_sort_the_li_UI_=Alphabetically sort the list of proposals
-Prompt_when_these_characte_UI_=Prompt when these characters are inserted:
-This_encoding({0})_is_not__WARN_=This encoding({0}) is not supported. Continue ?
-The_encoding_of_Preference_WARN_=The encoding of Preference({0}) and the encoding in the document({1}) are different. {1} will be used. Continue ?
-Begin/End_Comment_UI_=Begin/End Comment
-Commented_Text_UI_=Commented Text
-Begin/End_CDATA_UI_=Begin/End CDATA
-CDATA_UI_=CDATA
-Begin/End_Processing_Instr_UI_=Begin/End Processing Instruction
-Processing_Instruction_Con_UI_=Processing Instruction Content
-Start/End_Markup_UI_=Start/End Markup
-Names_UI_=Names
-## on the following line solely translate: Begin
-Begin_DOCTYPE_UI_=Begin DOCTYPE
-## on the following line solely translate: keyword
-DOCTYPE_SYSTEM/PUBLIC_keyw_UI_=DOCTYPE SYSTEM/PUBLIC keyword
-## on the following line solely translate: End
-End_DOCTYPE_UI_=End DOCTYPE
-Click_on_the_sample_text_w_UI_=Click on the sample text whose style you want to customize:
-1This_encoding({0})_is_not__WARN_=This encoding({0}) is not supported. The default encoding will be used instead.
-A_temporary_backup_version_WARN_=A temporary backup version of the file {0} was found in {1}.\n\nThis indicates a previous editing session with this file did not end normally and the file you are trying to edit might have been damaged. Would you like to use the backup version?
-Improper_shutdown_warning_UI_=Improper shutdown warning
-Editing_canceled_at_users__INFO_=Editing canceled at users request
-Unable_to_save_the_documen3_ERROR_=Unable to save the document. An severe I/O error occurred while saving the document.
-An_I/O_error_while_creatin_ERROR_=An I/O error while creating temporary backup copy
-An_severe_I/O_error_while__ERROR_=An severe I/O error while creating temporary backup copy
Cleanup_Document_UI_=Cleanup Document
-Source_UI_=Source
-Invalid_Input__Must_be_IFi_ERROR_=Invalid Input: Must be IFileEditorInput
-An_error_has_occurred_when1_ERROR_=An error has occurred when initializing the input for the the editor's source page.
-No_known_attribute__UI_=No known attribute
-Content_Assist_not_availab_UI_=Content Assist not available at the current location
-SEVERE_internal_error_occu_UI_=SEVERE internal error occurred
-Double_Quotes_UI_=Double Quotes
-Single_Quotes_UI_=Single Quotes
-ContentAssistProposals.label=Con&tent Assist
-ContentAssistProposals.tooltip=Content Assist
-ContentAssistProposals.image=
-ContentAssistProposals.description=Content Assist
-QuickFix.label=&Quick Fix
-QuickFix.tooltip=Quick Fix
-QuickFix.image=
-QuickFix.description=Quick Fix
-Comment.label=Co&mment
-Comment.tooltip=Comment
-Comment.image=
-Comment.description=Comment
-Uncomment.label=&Uncomment
-Uncomment.tooltip=Uncomment
-Uncomment.image=
-Uncomment.description=Uncomment
-ToggleComment.label=Togg&le Comment
-ToggleComment.tooltip=Toggle Comment
-ToggleComment.image=
-ToggleComment.description=Toggle Comment
-AddBlockComment.label=Add &Block Comment
-AddBlockComment.tooltip=Add Block Comment
-AddBlockComment.image=
-AddBlockComment.description=Add Block Comment
-RemoveBlockComment.label=Remove Bloc&k Comment
-RemoveBlockComment.tooltip=Remove Block Comment
-RemoveBlockComment.image=
-RemoveBlockComment.description=Remove Block Comment
-CleanupDocument.label=C&leanup Document...
-CleanupDocument.tooltip=Cleanup Document
-CleanupDocument.image=
-CleanupDocument.description=Cleanup Document
-FormatDocument.label=&Document
-FormatDocument.tooltip=Format Document
-FormatDocument.image=
-FormatDocument.description=Format Document
-FormatActiveElements.label=Act&ive Elements
-FormatActiveElements.tooltip=Format Active Elements
-FormatActiveElements.image=
-FormatActiveElements.description=Format Active Elements
-OpenFileFromSource.label=Op&en Selection
-OpenFileFromSource.tooltip=Open an editor on the selected link
-OpenFileFromSource.image=
-OpenFileFromSource.description=Open an editor on the selected link
-ShowTooltipDesc.label=Show &Tooltip Description
-ShowTooltipDesc.tooltip=Displays the hover help for the selected element
-ShowTooltipDesc.image=
-ShowTooltipDesc.description=Displays the hover help for the selected element
-StructureSelectEnclosing.label=&Enclosing Element
-StructureSelectEnclosing.tooltip=Expand selection to include enclosing element
-StructureSelectEnclosing.description=Expand selection to include enclosing element
-StructureSelectNext.label=&Next Element
-StructureSelectNext.tooltip=Expand selection to include next sibling
-StructureSelectNext.description=Expand selection to include next sibling
-StructureSelectPrevious.label=&Previous Element
-StructureSelectPrevious.tooltip=Expand selection to include previous sibling
-StructureSelectPrevious.description=Expand selection to include previous sibling
-StructureSelectHistory.label=&Restore Last Selection
-StructureSelectHistory.tooltip=Restore last selection
-StructureSelectHistory.description=Restore last selection
-Save.label=&Save
+
+Editor_Cut_label=Cu&t@Ctrl+X
+Editor_Cut_tooltip=Cut
+Editor_Cut_image=
+Editor_Cut_description=Cut
+
+Editor_Copy_label=&Copy@Ctrl+C
+Editor_Copy_tooltip=Copy
+Editor_Copy_image=
+Editor_Copy_description=Copy
+
+Editor_Paste_label=&Paste@Ctrl+V
+Editor_Paste_tooltip=Paste
+Editor_Paste_image=
+Editor_Paste_description=Paste
+
+Editor_Delete_label=&Delete@Delete
+Editor_Delete_tooltip=Delete
+Editor_Delete_image=
+Editor_Delete_description=Delete
+
+ContentAssistProposals_label=Con&tent Assist
+ContentAssistProposals_tooltip=Content Assist
+ContentAssistProposals_description=Content Assist
+
+QuickFix_label=&Quick Fix
+QuickFix_tooltip=Quick Fix
+QuickFix_image=
+QuickFix_description=Quick Fix
+
+ToggleComment_label=Togg&le Comment
+ToggleComment_tooltip=Toggle Comment
+ToggleComment_image=
+ToggleComment_description=Toggle Comment
+AddBlockComment_label=Add &Block Comment
+AddBlockComment_tooltip=Add Block Comment
+AddBlockComment_image=
+AddBlockComment_description=Add Block Comment
+RemoveBlockComment_label=Remove Bloc&k Comment
+RemoveBlockComment_tooltip=Remove Block Comment
+RemoveBlockComment_image=
+RemoveBlockComment_description=Remove Block Comment
+CleanupDocument_label=C&leanup Document...
+CleanupDocument_tooltip=Cleanup Document
+CleanupDocument_image=
+CleanupDocument_description=Cleanup Document
+FormatDocument_label=&Document
+FormatDocument_tooltip=Format Document
+FormatDocument_image=
+FormatDocument_description=Format Document
+FormatActiveElements_label=Act&ive Elements
+FormatActiveElements_tooltip=Format Active Elements
+FormatActiveElements_image=
+FormatActiveElements_description=Format Active Elements
+OpenFileFromSource_label=Op&en Selection
+OpenFileFromSource_tooltip=Open an editor on the selected link
+OpenFileFromSource_image=
+OpenFileFromSource_description=Open an editor on the selected link
+ShowTooltipDesc_label=Show &Tooltip Description
+ShowTooltipDesc_tooltip=Displays the hover help for the selected element
+ShowTooltipDesc_image=
+ShowTooltipDesc_description=Displays the hover help for the selected element
+StructureSelectEnclosing_label=&Enclosing Element
+StructureSelectEnclosing_tooltip=Expand selection to include enclosing element
+StructureSelectEnclosing_description=Expand selection to include enclosing element
+StructureSelectNext_label=&Next Element
+StructureSelectNext_tooltip=Expand selection to include next sibling
+StructureSelectNext_description=Expand selection to include next sibling
+StructureSelectPrevious_label=&Previous Element
+StructureSelectPrevious_tooltip=Expand selection to include previous sibling
+StructureSelectPrevious_description=Expand selection to include previous sibling
+StructureSelectHistory_label=&Restore Last Selection
+StructureSelectHistory_tooltip=Restore last selection
+StructureSelectHistory_description=Restore last selection
+Text_Shift_Right_UI_=Text Shift Right
+Text_Shift_Left_UI_=Text Shift Left
+Save_label=&Save
An_error_has_occurred_when_ERROR_=An error has occurred when retrieving resources for the source editor. The Eclipse Workbench installation may have been corrupted.
-No_content_model_found_UI_=No content model found
## save as problems (next two) should match what is in workbench
Problems_During_Save_As_UI_=Problems During Save As...
Save_could_not_be_complete_UI_=Save could not be completed.
-2concat=Macro name \"{0}\" is already in use
-3concat=Close with \"{0}\"
-5concat=Close with \"></{0}>\"
-8concat=<{0}> has no known child tags
-27concat=No known child tag names of <{0}> begin with \"{1}\"
-28concat=<{0}> has no known child tags
-15concat=End with {0}>
-17concat=End with \"</{0}>\"
-18concat=The document element <{0}> is already present.
-29concat=No definition was found for element <{0}> in {1}
-20concat=No definition was found for element <{0}>
-24concat=No content model found for {0}.
-25concat=Element <{0}> is unknown.
-30concat=<{0}> has no known child tags.
-31concat=Element <{0}> is unknown.
-11concat=No known child tag names of <{0}> begin with \"{1}\".
-14concat=<{0}> has no known child tags.
-9concat=Close with {0}
-6concat=comment {0}
-Capitalization_style_of_pr_UI_=Capitalization style of proposals:
-CSS_Cleanup_UI_=CSS Cleanup
-Cleanup_UI_=Cleanup
-Identifier_case__UI_=Identifier case:
-Property_name_case__UI_=Property name case:
-model_did_not_existing_dur_UI_=model did not existing during reload request in FileModelProvider
-new_File_was_null_after_mo_UI_=new File was null after move ... should be impossible
-Property_value_case__UI_=Property value case:
-Selector_tag_name_case__UI_=Selector tag name case:
-Quote_values_UI_=Quote values
-The_line_width_must_be_an__EXC_=The line width must be an integer
-Incorrect_call_UI_=Incorrect call
-1concat_ERROR_={0} has no available child tags.
-Edit_Document_Type_UI_=Edit Document Type
-DocumentType_name__UI_=DocumentType name:
-Public_identifier__UI_=Public identifier:
-System_reference__UI_=System reference:
-All_UI_=All
-Tag_UI_=Tag
-Attribute_UI_=Attribute
-Attribute_Value_UI_=Attribute Value
-1concat={0} has no available child tags.
-Text_Shift_Right_UI_=Text Shift Right
-Text_Shift_Left_UI_=Text Shift Left
-4concat_EXC_={0} is in use.
-12concat_ERROR_={0} was in use or open in an editor.
-23concat_EXC_=Resource {0} does not exist.
-Add..._UI_=Add...
-Error_during_save_UI_=Error during save
-Operation_could_not_be_com_ERROR_=Operation could not be completed. Be sure to save your work in any open editors.
-Java_Content_Assist_is_not_UI_=Java Content Assist is not available for the current cursor location
-End_with=End with
-Close_with=Close with
-4concat=''{0}'' is not a valid input
-## The following strings are for "XML->XML Source" Preferences and "Web Tools->Source" Preferences
-Formatting_UI_=Formatting
-Line_width__UI_=Line &width:
-Clear_all_blank_lines_UI_=Clear all &blank lines
-Source_page_UI_=Source page
-Show_line_numbers_UI_=Show line &numbers
-Show_overview_ruler_UI_=Show o&verview ruler
-Tab_width__UI_=&Tab width:
-Content_assist_UI_=Content assist
-Automatically_make_suggest_UI_=Automatically ma&ke suggestions
-Prompt_when_these_characte_UI_=P&rompt when these characters are inserted:
-Preferred_markup_case_UI_=Preferred markup case for content assist, and code generation
-Tag_names__UI_=Tag names:
-Tag_names_Upper_case_UI_=&Uppercase
-Tag_names_Lower_case_UI_=&Lowercase
-Attribute_names__UI_=Attribute names:
-Attribute_names_Upper_case_UI_=U&ppercase
-Attribute_names_Lower_case_UI_=L&owercase
-## The following strings are for "XML->XML Source->Macros" Preferences and "Web Tools->Source->Macros" Preferences
-New..._UI_=Ne&w...
-Copy..._UI_=&Copy...
-Rename..._UI_=&Rename...
-Remove_UI_=Re&move
-Enabled_at_Location__UI_=&Enabled at Location:
-Content__UI_=Co&ntent:
-Set_Cursor_Position_UI_=&Set Cursor Position
-Macro_name__UI_=&Macro name:
-New_macro_name__UI_=New ¯o name:
+
+_4concat=''{0}'' is not a valid input
## The following strings are for "XML->XML Source->XML Style" Preferences, "Web Tools->Source->HTML Style" Preferences, and "Web Tools->Source->JavaScript Style" Preferences
Content_type__UI_=Co&ntent type:
Foreground_UI_=&Foreground:
Background_UI_=&Background:
Bold_UI_=B&old
+Italics_UI=Italics
Restore_Default_UI_=&Restore Default
Sample_text__UI_=&Sample text:
-## The following strings are for the XML/HTML Cleanup dialog
-As-is_UI_=As-is
-Lower_UI_=Lower
-Upper_UI_=Upper
-Tag_name_case_for_HTML_UI_=Tag name case for HTML:
-Tag_name_case_As-is_UI_=&As-is
-Tag_name_case_Lower_UI_=&Lower
-Tag_name_case_Upper_UI_=&Upper
-Attribute_name_case_for_HTML_UI_=Attribute name case for HTML:
-Attribute_name_case_As-is_UI_=A&s-is
-Attribute_name_case_Lower_UI_=L&ower
-Attribute_name_case_Upper_UI_=U&pper
-Compress_empty_element_tags_UI_=&Compress empty element tags
-Insert_required_attributes_UI_=Insert &required attributes
-Insert_missing_tags_UI_=&Insert missing tags
-Quote_attribute_values_UI_=&Quote attribute values
-Format_source_UI_=&Format source
-Convert_EOL_codes_UI_=Convert line &delimiters to
-EOL_Windows_UI=&Windows
-EOL_Unix_UI=U&NIX
-EOL_Mac_UI=&Mac
-CSS_Cleanup_..._UI_=&CSS Cleanup ...
##
-AddBreakpoint.label=Add &Breakpoint
-AddBreakpoint.tooltip=Add Breakpoint
-AddBreakpoint.description=Add Breakpoint
-AddBreakpoint.error.dialog.title=Add Breakpoint
-AddBreakpoint.error.dialog.message=Cannot add breakpoint
+AddBreakpoint_label=Add &Breakpoint
+AddBreakpoint_tooltip=Add Breakpoint
+AddBreakpoint_description=Add Breakpoint
+AddBreakpoint_error_dialog_title=Add Breakpoint
+AddBreakpoint_error_dialog_message=Cannot add breakpoint
##
-ToggleBreakpoint.label=Toggle Breakpoint
-ToggleBreakpoint.tooltip=Toggle Breakpoint
-ToggleBreakpoint.description=Toggle Breakpoint
+ToggleBreakpoint_label=Toggle Breakpoint
+ToggleBreakpoint_tooltip=Toggle Breakpoint
+ToggleBreakpoint_description=Toggle Breakpoint
##
-EnableBreakpoint.label=Enable Breakpoint
-EnableBreakpoint.tooltip=Enable Breakpoint
-EnableBreakpoint.description=Enable Breakpoint
+EnableBreakpoint_label=Enable Breakpoint
+EnableBreakpoint_tooltip=Enable Breakpoint
+EnableBreakpoint_description=Enable Breakpoint
##
-DisableBreakpoint.label=Disable Breakpoint
-DisableBreakpoint.tooltip=Disable Breakpoint
-DisableBreakpoint.description=Disable Breakpoint
+DisableBreakpoint_label=Disable Breakpoint
+DisableBreakpoint_tooltip=Disable Breakpoint
+DisableBreakpoint_description=Disable Breakpoint
##
-ManageBreakpoints.add.label=Add &Breakpoint
-ManageBreakpoints.remove.label=Remove Breakpoint
-ManageBreakpoints.tooltip=Add/Remove Breakpoint
-ManageBreakpoints.error.adding.title1=Add Breakpoint
-ManageBreakpoints.error.adding.message1=Cannot add breakpoint
-ManageBreakpoints.error.removing.title1=Remove Breakpoint
-ManageBreakpoints.error.removing.message1=Cannot remove breakpoint
-ManageBreakpoints.error.retrieving.message=Retrieving markers failed:
-Hide_Hover_Help_1=Hide Hover Help
-Show_Hover_Help_2=Show Hover Help
-&Hover_Help_3=&Hover Help
+ManageBreakpoints_add_label=Add &Breakpoint
+ManageBreakpoints_remove_label=Remove Breakpoint
+ManageBreakpoints_tooltip=Add/Remove Breakpoint
+ManageBreakpoints_error_adding_title1=Add Breakpoint
+ManageBreakpoints_error_adding_message1=Cannot add breakpoint
+ManageBreakpoints_error_removing_title1=Remove Breakpoint
+ManageBreakpoints_error_removing_message1=Cannot remove breakpoint
+ManageBreakpoints_error_retrieving_message=Retrieving markers failed:
+
AbstractColorPageDescription=Customize the syntax highlighting by selecting the type of text whose style you want to customize from either the combo box or the sample text area
JSPSourcePreferencePageDescription=Embedded content type\'s source preferences will be used. Select the file type for customization
-Creating_or_saving_files=Creating or saving files
-End-of-line_code_desc=The following line delimiter will apply:
-End-of-line_code=&Line delimiter:
-Creating_files=Creating files
-Encoding_desc=The following encoding will apply:
-Encoding=En&coding:
-XMLMacroPageDescription=Create, remove or edit Macros
-&Split_lines_1=&Split lines
-Split_&multiple_attributes_2=Split &multiple attributes each on a new line
-&Indent_using_tabs_3=&Indent using tabs
-Bad_attribute_name_1=Bad attribute name
-## tag info
-Element____1=Element :
-Content_Model____2=Content Model :
-Attribute____3=Attribute :
-Data_Type____4=Data Type :
-Enumerated_Values____5=Enumerated Values :
-##
-Source_Menu_UI=&Source
-Highlight_Current_Line=Hi&ghlight current line
-Show_Attributes=Show Attributes
-Grammar_Constraints=Grammar Constraints
-Use_inferred_grammar_in_absence_of_DTD/Schema=Use inferred grammar in absence of DTD/Schema
-Text_font=Text font:
-C&hange...=C&hange...
-NodeName_may_not_have_nested_content={0} may not have nested content
##
-Editor.Cut.label=Cu&t@Ctrl+X
-Editor.Cut.tooltip=Cut
-Editor.Cut.image=
-Editor.Cut.description=Cut
+EditorModelUtil_0=model in invalid state
+EditorModelUtil_1=There was a problem adding adapter factories
-Editor.Copy.label=&Copy@Ctrl+C
-Editor.Copy.tooltip=Copy
-Editor.Copy.image=
-Editor.Copy.description=Copy
-
-Editor.Paste.label=&Paste@Ctrl+V
-Editor.Paste.tooltip=Paste
-Editor.Paste.image=
-Editor.Paste.description=Paste
-
-Editor.Delete.label=&Delete@Delete
-Editor.Delete.tooltip=Delete
-Editor.Delete.image=
-Editor.Delete.description=Delete
## These are copied from org.eclipse.ui.texteditor.EditorMessages.properties
## They are needed temporarily until CMVC defect 203158 / Bugzilla defect 20054 is fixed
-Editor.ManageBookmarks.tooltip=Adds and Removes Bookmarks
-Editor.ManageBookmarks.image=
-Editor.ManageBookmarks.description=Adds and removes Bookmarks
-Editor.ManageBookmarks.add.label=Add Boo&kmark...
-Editor.ManageBookmarks.remove.label=Remove Boo&kmark
-Editor.ManageBookmarks.add.dialog.title=Add Bookmark
-Editor.ManageBookmarks.add.dialog.message=Enter Bookmark name
-Editor.ManageBookmarks.error.dialog.title=Managing Bookmarks
-Editor.ManageBookmarks.error.dialog.message=Problems managing bookmarks
+Editor_ManageBookmarks_tooltip=Adds and Removes Bookmarks
+Editor_ManageBookmarks_image=
+Editor_ManageBookmarks_description=Adds and removes Bookmarks
+Editor_ManageBookmarks_add.label=Add Boo&kmark...
+Editor_ManageBookmarks_remove.label=Remove Boo&kmark
+Editor_ManageBookmarks_add.dialog.title=Add Bookmark
+Editor_ManageBookmarks_add.dialog.message=Enter Bookmark name
+Editor_ManageBookmarks_error.dialog.title=Managing Bookmarks
+Editor_ManageBookmarks_error.dialog.message=Problems managing bookmarks
-Editor.ManageTasks.tooltip=Adds and Removes Tasks
-Editor.ManageTasks.image=
-Editor.ManageTasks.description=Adds and removes Tasks
-Editor.ManageTasks.add.label=Add &Task...
-Editor.ManageTasks.remove.label=Remove &Task
-Editor.ManageTasks.add.dialog.title=Add Task
-Editor.ManageTasks.add.dialog.message=Enter Task description
-Editor.ManageTasks.error.dialog.title=Managing Tasks
-Editor.ManageTasks.error.dialog.message=Problems managing tasks
+Editor_ManageTasks_tooltip=Adds and Removes Tasks
+Editor_ManageTasks_image=
+Editor_ManageTasks_description=Adds and removes Tasks
+Editor_ManageTasks_add.label=Add &Task...
+Editor_ManageTasks_remove.label=Remove &Task
+Editor_ManageTasks_add.dialog.title=Add Task
+Editor_ManageTasks_add.dialog.message=Enter Task description
+Editor_ManageTasks_error.dialog.title=Managing Tasks
+Editor_ManageTasks_error.dialog.message=Problems managing tasks
# web content settings
-UI_Description_of_role_of_following_DOCTYPE=Use the following default document type when no DOCTYPE is declared in a file:
UI_Default_HTML_DOCTYPE_ID___1=&Document type:
UI_CSS_profile___2=&CSS profile:
UI_Target_Device___3=&Target device:
-UI_none=none
-UI_Public_ID=Public ID:
-UI_System_ID=System ID:
-ERROR_CORE_CSSContentSettingsPropertyPage_is_instantiated_by_choosing_resource_except_any_file_1=CSSContentSettingsPropertyPage is instantiated by choosing resource except any file
-ERROR_CORE_index_is_out_of_range_in_applySelectedPropertyValue()_in_class_CSSContentSettingsPropertyPage_2=index is out of range in applySelectedPropertyValue() in class CSSContentSettingsPropertyPage
-ERROR_CORE_index_is_out_of_range_in_deleteNoneProperty()_in_class_CSSContentSettingsPropertyPage_3=index is out of range in deleteNoneProperty() in class CSSContentSettingsPropertyPage
-ERROR_CORE_the_number_of_items_is_different_in_list_and_Combo__1=the number of items is different in list and Combo
-#
-ERROR_COREDEV_HTMLContentSettingsPropertyPage_is_instantiated_by_choosing_resource_except_any_file_1=HTMLContentSettingsPropertyPage is instantiated by choosing resource except any file
-ERROR_COREDEV_index_is_out_of_range_in_applySelectedPropertyValue()_in_class_HTMLContentSettingsPropertyPage_2=index is out of range in applySelectedPropertyValue() in class HTMLContentSettingsPropertyPage
-ERROR_COREDEV_index_is_out_of_range_in_deleteNoneProperty()_in_class_HTMLContentSettingsPropertyPage_3=index is out of range in deleteNoneProperty() in class HTMLContentSettingsPropertyPage
-ERROR_COREDEV_ProjectContentSettingsPropertyPage_is_instantiated_by_choosing_resource_except_project_1=ProjectContentSettingsPropertyPage is instantiated by choosing resource except project
-ERROR_COREDEV_index_is_out_of_range_in_applySelectedPropertyValue()_in_class_ProjectContentSettingsPropertyPage_2=index is out of range in applySelectedPropertyValue() in class ProjectContentSettingsPropertyPage
-ERROR_COREDEV_index_is_out_of_range_in_deleteNoneProperty()_in_class_ProjectContentSettingsPropertyPage_3=index is out of range in deleteNoneProperty() in class ProjectContentSettingsPropertyPage
-# jspf,jsf content settings
-_UI_Content_Type_Label_=&Content type:
-_UI_Language_Label_=&Language:
-_UI_Character_Code_Label_=&Encoding:
-_UI_IANA_=IANA:
-_UI_Error_Msg_Content_Type_=Invalid Content Type
-_UI_Error_Msg_Language_=Invalid Language
-_UI_Description_J2EE_Project_=The properties for J2EE Web projects act as "project" default to be lookup when no properties are specified for a particular JSP fragment file.
-_UI_Description_JSPF_File_=The properties are used instead of the page directive that cannot be specified in JSP fragment files. The project setting is used if you specify "none".
-
-#
#
# The following lines copied from org\eclipse\ui\editors\text\TextEditorMessages.properties in org.eclipse.ui plugin
-Editor.error.save.message=Save could not be completed. {0}
-Editor.error.save.title=Problems During Save As...
-Editor.warning.save.delete=The original file ''{0}'' has been deleted.
-Set_color_and_visibilty_of_editor_annotations=Set color and visibilty of editor annotations:
-Analyze_annotations_while_typing=Analyze syntax &while typing
-Analyze_validity_while_typing=Analyze &validity while typing
-Annotation_Presentation=Annotation Presentation:
-Show_in_text=Show in &text
-Show_in_overview_ruler=Show in overview &ruler
-Color=C&olor
-Show_hover_help=Show hov&er help
-#
-Ill-formed_syntax=Ill-formed syntax:
-Style_Rule_declares_nothing=Style Rule declares nothing
-Style_Declaration_declares_nothing=Style Declaration declares nothing
-Attribute_{0}_is_missing_a_value=Attribute \"{0}\" is missing a value
-Attribute_{0}_has_no_value=Attribute \"{0}\" has no value
-End_tag_has_attributes=End tag has attributes
-Invalid_value_{0}=Invalid value \"{0}\"
-Unknown_attribute_{0}=Unknown attribute \"{0}\"
-Missing_required_attribute_{0}=Missing required attribute \"{0}\"
-Unknown_element_{0}=Unknown element \"{0}\"
-Missing_end_tag_{0}=Missing end tag \"{0}\"
-Missing_start_tag_{0}=Missing start tag \"{0}\"
+Editor_error_save_message=Save could not be completed. {0}
+Editor_error_save_title=Problems During Save As...
+Editor_warning_save_delete=The original file ''{0}'' has been deleted.
# actions
Previous_annotation=Previous Annotation
Next_annotation=Next Annotation
# Annotation Types
-AnnotationTypes.Errors=Errors
-AnnotationTypes.Warnings=Warnings
-AnnotationTypes.Tasks=Tasks
-AnnotationTypes.SearchResults=Search Results
-AnnotationTypes.Bookmarks=Bookmarks
-AnnotationTypes.Others=Others
+AnnotationTypes_Errors=Errors
+AnnotationTypes_Warnings=Warnings
+AnnotationTypes_Tasks=Tasks
+AnnotationTypes_SearchResults=Search Results
+AnnotationTypes_Bookmarks=Bookmarks
+AnnotationTypes_Others=Others
-Editor.ConvertToWindows.label=&Windows
-Editor.ConvertToWindows.tooltip=Converts line delimiters to Windows
-Editor.ConvertToWindows.image=
-Editor.ConvertToWindows.description=Converts line delimiters to Windows
+Editor_ConvertToWindows_label=&Windows
+Editor_ConvertToWindows_tooltip=Converts line delimiters to Windows
+Editor_ConvertToWindows_image=
+Editor_ConvertToWindows_description=Converts line delimiters to Windows
-Editor.ConvertToUNIX.label=&UNIX
-Editor.ConvertToUNIX.tooltip=Converts line delimiters to UNIX
-Editor.ConvertToUNIX.image=
-Editor.ConvertToUNIX.description=Converts line delimiters to UNIX
+Editor_ConvertToUNIX_label=&UNIX
+Editor_ConvertToUNIX_tooltip=Converts line delimiters to UNIX
+Editor_ConvertToUNIX_image=
+Editor_ConvertToUNIX_description=Converts line delimiters to UNIX
-Editor.ConvertToMac.label=&Mac
-Editor.ConvertToMac.tooltip=Converts line delimiters to Mac
-Editor.ConvertToMac.image=
-Editor.ConvertToMac.description=Converts line delimiters to Mac
+Editor_ConvertToMac_label=&Mac
+Editor_ConvertToMac_tooltip=Converts line delimiters to Mac
+Editor_ConvertToMac_image=
+Editor_ConvertToMac_description=Converts line delimiters to Mac
-Editor.ToggleInsertMode.label=Sma&rt Insert Mode
+Editor_ToggleInsertMode_label=Sma&rt Insert Mode
-EditPreferences.label=Pre&ferences...
-EditPreferences.tooltip=Display preferences for this editor
-EditPreferences.description=Display preferences for this editor
##########################################################################
# These strings are used in Workbench menu bar
##########################################################################
-ExpandSelectionToMenu.label=E&xpand Selection To
-SourceMenu.label=&Source
-ConvertLineDelimitersMenu.label=Co&nvert Line Delimiters to
-FindOccurrences.label=O&ccurrences in File
+ExpandSelectionToMenu_label=E&xpand Selection To
+SourceMenu_label=&Source
+ConvertLineDelimitersMenu_label=Co&nvert Line Delimiters to
+FindOccurrences_label=O&ccurrences in File
#
-FindOccurrencesActionProvider.0=Current selection does not resolve to a searchable element
-RemoveAction.0=Remove Property
-ShowPropertiesAction.0=P&roperties
-StructuredContentOutlineConfiguration.0=Collapse All
-StructuredContentOutlineConfiguration.1=Link with Editor
-AbstractOpenOn.0=Current text selection does not resolve to a file
-FormatActionDelegate.jobName=Formatting documents
-FormatActionDelegate.errorStatusMessage=Exceptions occurred while formatting documents
-FormatActionDelegate.3=Formatting {0}
-FormatActionDelegate.4=Exception occurred while formatting document {0}
-FormatActionDelegate.5=MalformedInputException occurred while formatting document {0}
-ConvertLineDelimitersToCRLFActionDelegate.jobName=Converting line delimiters
-ConvertLineDelimitersToCRLFActionDelegate.errorStatusMessage=Exceptions occurred while converting line delimiters
-ConvertLineDelimitersToCRLFActionDelegate.3=Converting line delimiters for {0}
-ConvertLineDelimitersToCRLFActionDelegate.4=Exception occurred while converting line delimiters for document {0}
-TranslucencyPreferenceTab.0=Read-Only text style
-TranslucencyPreferenceTab.1=Read-Only contrast percentage:
-StructuredTextEditorPreferencePage.1=Line number foreground
-StructuredTextEditorPreferencePage.2=Matching brackets highlight
-StructuredTextEditorPreferencePage.3=Current line highlight
-StructuredTextEditorPreferencePage.4=Print margin
-StructuredTextEditorPreferencePage.5=Link
-StructuredTextEditorPreferencePage.6=The following preferences apply to the HTML, JSP, XML, and other source editors.
-StructuredTextEditorPreferencePage.7=S&upport hyperlink style navigation for "Open Declaration"
-StructuredTextEditorPreferencePage.8=Hyperlink style navigation key &modifier:
-StructuredTextEditorPreferencePage.15=The modifier 'Shift' is not allowed because 'Shift' + click sets a new selection.
-StructuredTextEditorPreferencePage.16=Displayed &tab width:
-StructuredTextEditorPreferencePage.17=Print margin col&umn:
-StructuredTextEditorPreferencePage.18=Show overview &ruler
-StructuredTextEditorPreferencePage.19=Show lin&e numbers
-StructuredTextEditorPreferencePage.20=Highlight &matching brackets
-StructuredTextEditorPreferencePage.21=Hi&ghlight current line
-StructuredTextEditorPreferencePage.22=Sho&w print margin
-StructuredTextEditorPreferencePage.23=Appearance co&lor options:
-StructuredTextEditorPreferencePage.24=C&olor:
-StructuredTextEditorPreferencePage.25=Always &show Quick Diff coloring
-StructuredTextEditorPreferencePage.26=Show changes using &characters instead of colors (on line number bar only)
-StructuredTextEditorPreferencePage.27=Quickdiff &reference providers:
-StructuredTextEditorPreferencePage.28=Make &Default
-StructuredTextEditorPreferencePage.29=(default)
-StructuredTextEditorPreferencePage.30=A&nalyze annotations while typing
-StructuredTextEditorPreferencePage.31=Show &quick fixables
-StructuredTextEditorPreferencePage.32=Annotation presentation options
-StructuredTextEditorPreferencePage.33=Annotations
-StructuredTextEditorPreferencePage.34=Nav&igation
-StructuredTextEditorPreferencePage.35=&Quick Diff
-StructuredTextEditorPreferencePage.36=(default)
-StructuredTextEditorPreferencePage.37=Empty input
-StructuredTextEditorPreferencePage.38=is not a valid input.
-StructuredTextEditorPreferencePage.39=is not a valid input.
-TaskTagPreferenceTab.0=High
-TaskTagPreferenceTab.1=Low
-TaskTagPreferenceTab.2=Normal
-TaskTagPreferenceTab.3=N/A
-TaskTagPreferenceTab.5=Task Tag
-TaskTagPreferenceTab.6=Tag
-TaskTagPreferenceTab.7=Priority
-TaskTagPreferenceTab.8=High
-TaskTagPreferenceTab.9=Normal
-TaskTagPreferenceTab.10=Low
-TaskTagPreferenceTab.12=Tag
-TaskTagPreferenceTab.13=Priority
-TaskTagPreferenceTab.14=New...
-TaskTagPreferenceTab.15=Edit...
-TaskTagPreferenceTab.16=Remove
-TaskTagPreferenceTab.17=Move Up
-TaskTagPreferenceTab.18=Move Down
-TaskTagPreferenceTab.19=Note: changes may not be visible until the workspace is rebuilt
-TaskTagPreferenceTab.20=Task Tags
-TaskTagPreferenceTab.22=Task Tags Settings Changed
-TaskTagPreferenceTab.23=The task tags settings have changed. A full rebuild is required to make changes effective. Do the full build now?
-TaskTagPreferenceTab.24=Yes
-TaskTagPreferenceTab.25=No
-TaskTagPreferenceTab.26=Cancel
-TaskTagPreferenceTab.27=Detecting tasks for task tags
-TaskTagPreferenceTab.28=build aborted
-TaskTagPreferenceTab.29=build completed
-TaskTagPreferenceTab.30=build had errors
-TaskTagPreferenceTab.31=Search for Task Tags
-FilePreferencePage.0=Expand the tree to edit preferences for a specific content type.
-NoModificationCompletionProposal.0=No corrections available
-ToggleBreakpointAction.0=Toggle &Breakpoints
-ManageBreakpointAction.0=&Enable Breakpoints
-ManageBreakpointAction.1=&Disable Breakpoints
-EditBreakpointAction.0=Breakpoint &Properties...
-ReconcileStepForMarkup.0=Missing closing quote
-ReconcileStepForMarkup.1=Missing quotes for attribute value
-ReconcileStepForMarkup.2=A tagname cannot start with a space
-ReconcileStepForMarkup.3=Empty tags are not allowed
-ReconcileStepForMarkup.4=Namespaces are not allowed in a Processing Instruction target
-ReconcileStepForMarkup.5=Spaces are not allowed before a Processing Instruction
-ReconcileStepForMarkup.6=Tag missing closing bracket '>'
+FindOccurrencesActionProvider_0=Current selection does not resolve to a searchable element
+RemoveAction_0=Remove Property
+ShowPropertiesAction_0=P&roperties
+StructuredContentOutlineConfiguration_0=Collapse All
+StructuredContentOutlineConfiguration_1=Link with Editor
+AbstractOpenOn_0=Current text selection does not resolve to a file
+FormatActionDelegate_jobName=Formatting documents
+FormatActionDelegate_errorStatusMessage=Exceptions occurred while formatting documents
+FormatActionDelegate_3=Formatting {0}
+FormatActionDelegate_4=Exception occurred while formatting document {0}
+FormatActionDelegate_5=MalformedInputException occurred while formatting document {0}
+ConvertLineDelimitersToCRLFActionDelegate_jobName=Converting line delimiters
+ConvertLineDelimitersToCRLFActionDelegate_errorStatusMessage=Exceptions occurred while converting line delimiters
+ConvertLineDelimitersToCRLFActionDelegate_3=Converting line delimiters for {0}
+ConvertLineDelimitersToCRLFActionDelegate_4=Exception occurred while converting line delimiters for document {0}
+TranslucencyPreferenceTab_0=Read-Only text style
+TranslucencyPreferenceTab_1=Read-Only contrast percentage:
+StructuredTextEditorPreferencePage_2=Matching brackets highlight
+StructuredTextEditorPreferencePage_6=The following preferences apply to the HTML, JSP, XML, and other source editors.
+StructuredTextEditorPreferencePage_20=Highlight &matching brackets
+StructuredTextEditorPreferencePage_23=Appearance co&lor options:
+StructuredTextEditorPreferencePage_24=C&olor:
+StructuredTextEditorPreferencePage_30=A&nalyze annotations while typing
+StructuredTextEditorPreferencePage_37=Empty input
+StructuredTextEditorPreferencePage_38=is not a valid input.
+TaskTagPreferenceTab_0=High
+TaskTagPreferenceTab_1=Low
+TaskTagPreferenceTab_2=Normal
+TaskTagPreferenceTab_3=N/A
+TaskTagPreferenceTab_5=Task Tag
+TaskTagPreferenceTab_6=Tag
+TaskTagPreferenceTab_7=Priority
+TaskTagPreferenceTab_8=High
+TaskTagPreferenceTab_9=Normal
+TaskTagPreferenceTab_10=Low
+TaskTagPreferenceTab_12=Tag
+TaskTagPreferenceTab_13=Priority
+TaskTagPreferenceTab_14=New...
+TaskTagPreferenceTab_15=Edit...
+TaskTagPreferenceTab_16=Remove
+TaskTagPreferenceTab_17=Move Up
+TaskTagPreferenceTab_18=Move Down
+TaskTagPreferenceTab_19=Note: changes may not be visible until the workspace is rebuilt
+TaskTagPreferenceTab_20=Task Tags
+TaskTagPreferenceTab_22=Task Tags Settings Changed
+TaskTagPreferenceTab_23=The task tags settings have changed. A full rebuild is required to make changes effective. Do the full build now?
+TaskTagPreferenceTab_24=Yes
+TaskTagPreferenceTab_25=No
+TaskTagPreferenceTab_26=Cancel
+TaskTagPreferenceTab_27=Detecting tasks for task tags
+TaskTagPreferenceTab_28=build aborted
+TaskTagPreferenceTab_29=build completed
+TaskTagPreferenceTab_30=build had errors
+TaskTagPreferenceTab_31=Search for Task Tags
+FilePreferencePage_0=Expand the tree to edit preferences for a specific content type.
+NoModificationCompletionProposal_0=No corrections available
+ToggleBreakpointAction_0=Toggle &Breakpoints
+ManageBreakpointAction_0=&Enable Breakpoints
+ManageBreakpointAction_1=&Disable Breakpoints
+EditBreakpointAction_0=Breakpoint &Properties...
## Used in Structured Text Editor Preference Page / Hovers Tab
-TextHoverPreferenceTab.title=Hovers
-TextHoverPreferenceTab.annotationRollover=&Enable annotation roll-over (on new editors)
-TextHoverPreferenceTab.showAffordance=&Show affordance in hover on how to make it sticky
-TextHoverPreferenceTab.hoverPreferences=Text &Hover key modifier preferences:
-TextHoverPreferenceTab.enabled=&Enabled
-TextHoverPreferenceTab.keyModifier=Pressed key &modifier while hovering:
-TextHoverPreferenceTab.description=Description:
-TextHoverPreferenceTab.modifierIsNotValid=Modifier ''{0}'' is not valid.
-TextHoverPreferenceTab.modifierIsNotValidForHover=Modifier ''{0}'' for ''{1}'' hover is not valid.
-TextHoverPreferenceTab.duplicateModifier=''{0}'' hover uses the same modifier as ''{1}'' hover.
-TextHoverPreferenceTab.nameColumnTitle=Text Hover Name
-TextHoverPreferenceTab.modifierColumnTitle=Pressed Key Modifier While Hovering
-TextHoverPreferenceTab.delimiter=+
-TextHoverPreferenceTab.insertDelimiterAndModifierAndDelimiter=\ + {0} +
-TextHoverPreferenceTab.insertModifierAndDelimiter=\ {0} +
-TextHoverPreferenceTab.insertDelimiterAndModifier=\ + {0}
-combinationHover.label=Combined Hover
-combinationHover.desc=Tries the hovers in the sequence listed in the table below this one and uses the one which fits best for the selected element and the current context.
-problemHover.label=Problem Description
-problemHover.desc=Shows the description of the selected problem.
-documentationHover.label=Documentation Description
-documentationHover.desc=Shows the documentation of the selected element.
-annotationHover.label=Annotation Description
-annotationHover.desc=Shows the description of the selected annotation.
-EditStructuredTextEditorPreferencesAction.0=Editor Preferences
-StructuredTextEditorPreferencePage.0=Appearance
-BasicFindOccurrencesAction.0=region match:
-BasicSearchLabelProvider.0=line
-PreferenceManager.0=Original Error:
-NavigationPreferenceTab.0=Modifier ''{0}'' is not valid.
-OccurrencesSearchQuery.0={0} - {1} Occurrences in {2}
-OccurrencesSearchQuery.1={0} - 1 Occurrence in {1}
-OccurrencesSearchQuery.2=file
-EOL_Windows=Windows
-EOL_Unix=UNIX
-EOL_Mac=Mac
-EOL_NoTranslation=No translation
-FileModelProvider.0=Error reloading {0}
-JFaceNodeAdapter.0=Update Outline
-ShowView.errorTitle=Problems Showing View
-proc_dirty_regions.0 = Processing Dirty Regions
\ No newline at end of file
+TextHoverPreferenceTab_title=Hovers
+TextHoverPreferenceTab_annotationRollover=&Enable annotation roll-over (on new editors)
+TextHoverPreferenceTab_showAffordance=&Show affordance in hover on how to make it sticky
+TextHoverPreferenceTab_hoverPreferences=Text &Hover key modifier preferences:
+TextHoverPreferenceTab_enabled=&Enabled
+TextHoverPreferenceTab_keyModifier=Pressed key &modifier while hovering:
+TextHoverPreferenceTab_description=Description:
+TextHoverPreferenceTab_modifierIsNotValid=Modifier ''{0}'' is not valid.
+TextHoverPreferenceTab_modifierIsNotValidForHover=Modifier ''{0}'' for ''{1}'' hover is not valid.
+TextHoverPreferenceTab_duplicateModifier=''{0}'' hover uses the same modifier as ''{1}'' hover.
+TextHoverPreferenceTab_nameColumnTitle=Text Hover Name
+TextHoverPreferenceTab_modifierColumnTitle=Pressed Key Modifier While Hovering
+TextHoverPreferenceTab_delimiter=+
+TextHoverPreferenceTab_insertDelimiterAndModifierAndDelimiter=\ + {0} +
+TextHoverPreferenceTab_insertModifierAndDelimiter=\ {0} +
+TextHoverPreferenceTab_insertDelimiterAndModifier=\ + {0}
+combinationHover_label=Combined Hover
+combinationHover_desc=Tries the hovers in the sequence listed in the table below this one and uses the one which fits best for the selected element and the current context.
+problemHover_label=Problem Description
+problemHover_desc=Shows the description of the selected problem.
+documentationHover_label=Documentation Description
+documentationHover_desc=Shows the documentation of the selected element.
+annotationHover_label=Annotation Description
+annotationHover_desc=Shows the description of the selected annotation.
+EditStructuredTextEditorPreferencesAction_0=Editor Preferences
+StructuredTextEditorPreferencePage_0=Appearance
+BasicFindOccurrencesAction_0=region match:
+BasicSearchLabelProvider_0=line
+PreferenceManager_0=Original Error:
+NavigationPreferenceTab_0=Modifier ''{0}'' is not valid.
+OccurrencesSearchQuery_0={0} - {1} Occurrences in {2}
+OccurrencesSearchQuery_1={0} - 1 Occurrence in {1}
+OccurrencesSearchQuery_2=file
+FileModelProvider_0=Error reloading {0}
+JFaceNodeAdapter_0=Update Outline
+ShowView_errorTitle=Problems Showing View
+proc_dirty_regions_0 = Processing Dirty Regions
+## Encoding
+EncodingPreferencePage_0=Encoding settings for Web and XML files:
+EncodingPreferencePage_1=Use 3 byte BOM (Byte Order Mark) when saving UTF-8 encoded files
+busy=busy
+caret_update=caret update
+EmptyFilePreferencePage_0=Expand the tree to edit preferences for a specific content type.
+OffsetStatusLineContributionItem_0=Selection Information:
+OffsetStatusLineContributionItem_2=Partitions
+OffsetStatusLineContributionItem_3=ITextRegions
+OffsetStatusLineContributionItem_4=Content-Type:
+OffsetStatusLineContributionItem_5=Model Handler:
+OffsetStatusLineContributionItem_8=Partitioning:
+OffsetStatusLineContributionItem_9=Start
+OffsetStatusLineContributionItem_10=Length
+OffsetStatusLineContributionItem_11=Type
+OffsetStatusLineContributionItem_13=Partitioner:
+OffsetStatusLineContributionItem_14=Partitioner:
+OffsetStatusLineContributionItem_15=Start
+OffsetStatusLineContributionItem_16=Length
+OffsetStatusLineContributionItem_17=Text Length
+OffsetStatusLineContributionItem_18=Context
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ShowViewAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ShowViewAction.java
index 12f91b8..6e43f03 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ShowViewAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ShowViewAction.java
@@ -91,7 +91,7 @@
try {
page.showView(getViewID());
} catch (PartInitException e) {
- ErrorDialog.openError(window.getShell(), SSEUIPlugin.getResourceString("%ShowView.errorTitle"), //$NON-NLS-1$
+ ErrorDialog.openError(window.getShell(), SSEUIMessages.ShowView_errorTitle, //$NON-NLS-1$
e.getMessage(), e.getStatus());
}
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StorageModelProvider.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StorageModelProvider.java
index a47198d..058dc0c 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StorageModelProvider.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StorageModelProvider.java
@@ -27,6 +27,7 @@
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.source.AnnotationModel;
import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IStorageEditorInput;
import org.eclipse.ui.editors.text.FileDocumentProvider;
@@ -607,7 +608,7 @@
}
catch (CoreException noStorageExc) {
if (logExceptions)
- Logger.logException(SSEUIPlugin.getResourceString("%32concat_EXC_", new Object[]{input.getName()}), noStorageExc); //$NON-NLS-1$
+ Logger.logException(NLS.bind(SSEUIMessages._32concat_EXC_, new Object[]{input.getName()}), noStorageExc);
}
IStructuredModel model = null;
@@ -618,7 +619,7 @@
}
catch (IOException e) {
if (logExceptions)
- Logger.logException(SSEUIPlugin.getResourceString("%32concat_EXC_", new Object[]{input}), e); //$NON-NLS-1$
+ Logger.logException(NLS.bind(SSEUIMessages._32concat_EXC_, new Object[]{input}), e);
}
finally {
if (contents != null) {
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredDocumentToTextAdapter.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredDocumentToTextAdapter.java
index 63f3fc7..e259891 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredDocumentToTextAdapter.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredDocumentToTextAdapter.java
@@ -276,7 +276,7 @@
}
}
- private static final String EMPTY_STRING = "";
+ private static final String EMPTY_STRING = ""; //$NON-NLS-1$
private final static boolean redrawBackground = true;
@@ -354,8 +354,8 @@
if (DEBUG && fDocument != null && !(fDocument instanceof ILockable)) {
- System.out.println("Warning: non ILockable document used in StructuredDocumentToTextAdapter");
- System.out.println(" document updates on non-display thread will not be safe if editor open");
+ System.out.println("Warning: non ILockable document used in StructuredDocumentToTextAdapter"); //$NON-NLS-1$
+ System.out.println(" document updates on non-display thread will not be safe if editor open"); //$NON-NLS-1$
}
if (fDocument instanceof IStructuredDocument) {
((IStructuredDocument) fDocument).addDocumentChangedListener(internalStructuredDocumentListener);
@@ -1260,7 +1260,7 @@
}
else {
// else, ignore!, since risk of deadlock
- throw new IllegalStateException("non lockable document used for structuredDocumentToTextAdapter");
+ throw new IllegalStateException("non lockable document used for structuredDocumentToTextAdapter"); //$NON-NLS-1$
}
}
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextAnnotationHover.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextAnnotationHover.java
index e5646d9..0da68e0 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextAnnotationHover.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextAnnotationHover.java
@@ -210,7 +210,7 @@
StringBuffer buffer = new StringBuffer();
printer.addPageProlog(buffer);
- printer.addParagraph(buffer, SSEUIPlugin.getResourceString("%Multiple_errors")); //$NON-NLS-1$
+ printer.addParagraph(buffer, SSEUIMessages.Multiple_errors); //$NON-NLS-1$
printer.startBulletList(buffer);
Iterator e = messages.iterator();
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextEditor.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextEditor.java
index 6805797..5f2da79 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextEditor.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextEditor.java
@@ -67,6 +67,7 @@
import org.eclipse.jface.text.source.projection.ProjectionSupport;
import org.eclipse.jface.text.source.projection.ProjectionViewer;
import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DropTarget;
@@ -387,6 +388,7 @@
private static final long BUSY_STATE_DELAY = 1000;
public static final String CORE_SSE_ACTIVITY_ID = "com.ibm.wtp.xml.core"; //$NON-NLS-1$
protected static final String DOT = "."; //$NON-NLS-1$
+ private final static String UNDERSCORE = "_"; //$NON-NLS-1$
private static final String EDITOR_CONTEXT_MENU_ID = "org.eclipse.wst.sse.ui.StructuredTextEditor.context"; //$NON-NLS-1$
/** Non-NLS strings */
@@ -394,10 +396,10 @@
public static final String GROUP_NAME_ADDITIONS = "additions"; //$NON-NLS-1$
public static final String GROUP_NAME_FORMAT = "Format"; //$NON-NLS-1$
public static final String GROUP_NAME_FORMAT_EXT = "Format.ext"; //$NON-NLS-1$
- private static final String REDO_ACTION_DESC = SSEUIPlugin.getResourceString("%Redo__{0}._UI_"); //$NON-NLS-1$ = "Redo: {0}."
- private static final String REDO_ACTION_DESC_DEFAULT = SSEUIPlugin.getResourceString("%Redo_Text_Change._UI_"); //$NON-NLS-1$ = "Redo Text Change."
- private static final String REDO_ACTION_TEXT = SSEUIPlugin.getResourceString("%&Redo_{0}_@Ctrl+Y_UI_"); //$NON-NLS-1$ = "&Redo {0} @Ctrl+Y"
- private static final String REDO_ACTION_TEXT_DEFAULT = SSEUIPlugin.getResourceString("%&Redo_Text_Change_@Ctrl+Y_UI_"); //$NON-NLS-1$ = "&Redo Text Change @Ctrl+Y"
+ private static final String REDO_ACTION_DESC = SSEUIMessages.Redo___0___UI_; //$NON-NLS-1$ = "Redo: {0}."
+ private static final String REDO_ACTION_DESC_DEFAULT = SSEUIMessages.Redo_Text_Change__UI_; //$NON-NLS-1$ = "Redo Text Change."
+ private static final String REDO_ACTION_TEXT = SSEUIMessages._Redo__0___Ctrl_Y_UI_; //$NON-NLS-1$ = "&Redo {0} @Ctrl+Y"
+ private static final String REDO_ACTION_TEXT_DEFAULT = SSEUIMessages._Redo_Text_Change__Ctrl_Y_UI_; //$NON-NLS-1$ = "&Redo Text Change @Ctrl+Y"
protected static final String SSE_MODEL_ID = "org.eclipse.wst.sse.core"; //$NON-NLS-1$
/**
* Constant for representing an error status. This is considered a value
@@ -411,10 +413,10 @@
static final protected IStatus STATUS_OK = new Status(IStatus.OK, SSEUIPlugin.ID, IStatus.OK, "OK", null); //$NON-NLS-1$
/** Translatable strings */
- private static final String UNDO_ACTION_DESC = SSEUIPlugin.getResourceString("%Undo__{0}._UI_"); //$NON-NLS-1$ = "Undo: {0}."
- private static final String UNDO_ACTION_DESC_DEFAULT = SSEUIPlugin.getResourceString("%Undo_Text_Change._UI_"); //$NON-NLS-1$ = "Undo Text Change."
- private static final String UNDO_ACTION_TEXT = SSEUIPlugin.getResourceString("%&Undo_{0}_@Ctrl+Z_UI_"); //$NON-NLS-1$ = "&Undo {0} @Ctrl+Z"
- private static final String UNDO_ACTION_TEXT_DEFAULT = SSEUIPlugin.getResourceString("%&Undo_Text_Change_@Ctrl+Z_UI_"); //$NON-NLS-1$ = "&Undo Text Change @Ctrl+Z"
+ private static final String UNDO_ACTION_DESC = SSEUIMessages.Undo___0___UI_; //$NON-NLS-1$ = "Undo: {0}."
+ private static final String UNDO_ACTION_DESC_DEFAULT = SSEUIMessages.Undo_Text_Change__UI_; //$NON-NLS-1$ = "Undo Text Change."
+ private static final String UNDO_ACTION_TEXT = SSEUIMessages._Undo__0___Ctrl_Z_UI_; //$NON-NLS-1$ = "&Undo {0} @Ctrl+Z"
+ private static final String UNDO_ACTION_TEXT_DEFAULT = SSEUIMessages._Undo_Text_Change__Ctrl_Z_UI_; //$NON-NLS-1$ = "&Undo Text Change @Ctrl+Z"
/**
* @param args
@@ -514,7 +516,7 @@
boolean enableFormatMenu = (formatAll != null && formatAll.isEnabled()) || (formatSelection != null && formatSelection.isEnabled()) || (cleanupAll != null && cleanupAll.isEnabled());
if (getSourceViewer().isEditable() && enableFormatMenu) {
- String label = SSEUIPlugin.getResourceString("%FormatMenu.label"); //$NON-NLS-1$ = "Format"
+ String label = SSEUIMessages.FormatMenu_label; //$NON-NLS-1$ = "Format"
MenuManager subMenu = new MenuManager(label, GROUP_NAME_FORMAT);
subMenu.add(new GroupMarker(GROUP_NAME_FORMAT_EXT));
addAction(subMenu, StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_DOCUMENT);
@@ -673,7 +675,7 @@
// mapping, but since it relies on the IEditorSite ID, it can't be
// relied on for MultiPageEditorParts. Instead, force the action
// registration manually.
- setAction(ITextEditorActionConstants.RULER_DOUBLE_CLICK, new MarkerRulerAction(SSEUIPlugin.getDefault().getResourceBundle(), "Editor.ManageBookmarks.", this, getVerticalRuler(), IMarker.BOOKMARK, true));
+ setAction(ITextEditorActionConstants.RULER_DOUBLE_CLICK, new MarkerRulerAction(SSEUIMessages.getResourceBundle(), "Editor_ManageBookmarks_", this, getVerticalRuler(), IMarker.BOOKMARK, true)); //$NON-NLS-1$
}
}
@@ -691,14 +693,14 @@
protected void createActions() {
super.createActions();
- ResourceBundle resourceBundle = SSEUIPlugin.getDefault().getResourceBundle();
+ ResourceBundle resourceBundle = SSEUIMessages.getResourceBundle();
IWorkbenchHelpSystem helpSystem = SSEUIPlugin.getDefault().getWorkbench().getHelpSystem();
// TextView Action - moving the selected text to
// the clipboard
// override the cut/paste/delete action to make
// them run on read-only
// files
- Action action = new TextOperationAction(resourceBundle, "Editor.Cut.", this, ITextOperationTarget.CUT, true); //$NON-NLS-1$
+ Action action = new TextOperationAction(resourceBundle, "Editor_Cut_", this, ITextOperationTarget.CUT, true); //$NON-NLS-1$
action.setActionDefinitionId(IWorkbenchActionDefinitionIds.CUT);
setAction(ITextEditorActionConstants.CUT, action);
helpSystem.setHelp(action, IAbstractTextEditorHelpContextIds.CUT_ACTION);
@@ -708,7 +710,7 @@
// override the cut/paste/delete action to make
// them run on read-only
// files
- action = new TextOperationAction(resourceBundle, "Editor.Paste.", this, ITextOperationTarget.PASTE, true); //$NON-NLS-1$
+ action = new TextOperationAction(resourceBundle, "Editor_Paste_", this, ITextOperationTarget.PASTE, true); //$NON-NLS-1$
action.setActionDefinitionId(IWorkbenchActionDefinitionIds.PASTE);
setAction(ITextEditorActionConstants.PASTE, action);
helpSystem.setHelp(action, IAbstractTextEditorHelpContextIds.PASTE_ACTION);
@@ -719,21 +721,21 @@
// override the cut/paste/delete action to make
// them run on read-only
// files
- action = new TextOperationAction(resourceBundle, "Editor.Delete.", this, ITextOperationTarget.DELETE, true); //$NON-NLS-1$
+ action = new TextOperationAction(resourceBundle, "Editor_Delete_", this, ITextOperationTarget.DELETE, true); //$NON-NLS-1$
action.setActionDefinitionId(IWorkbenchActionDefinitionIds.DELETE);
setAction(ITextEditorActionConstants.DELETE, action);
helpSystem.setHelp(action, IAbstractTextEditorHelpContextIds.DELETE_ACTION);
// SourceView Action - requesting information at
// the current insertion
// position
- action = new TextOperationAction(SSEUIPlugin.getDefault().getResourceBundle(), StructuredTextEditorActionConstants.ACTION_NAME_INFORMATION + DOT, this, ISourceViewer.INFORMATION, true);
+ action = new TextOperationAction(SSEUIMessages.getResourceBundle(), StructuredTextEditorActionConstants.ACTION_NAME_INFORMATION + UNDERSCORE, this, ISourceViewer.INFORMATION, true);
action.setActionDefinitionId(ActionDefinitionIds.INFORMATION);
setAction(StructuredTextEditorActionConstants.ACTION_NAME_INFORMATION, action);
markAsStateDependentAction(StructuredTextEditorActionConstants.ACTION_NAME_INFORMATION, true);
// SourceView Action - requesting content assist to
// show completetion
// proposals for the current insert position
- action = new TextOperationAction(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_CONTENTASSIST_PROPOSALS + DOT, this, ISourceViewer.CONTENTASSIST_PROPOSALS, true);
+ action = new TextOperationAction(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_CONTENTASSIST_PROPOSALS + UNDERSCORE, this, ISourceViewer.CONTENTASSIST_PROPOSALS, true);
helpSystem.setHelp(action, IHelpContextIds.CONTMNU_CONTENTASSIST_HELPID);
action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
setAction(StructuredTextEditorActionConstants.ACTION_NAME_CONTENTASSIST_PROPOSALS, action);
@@ -741,21 +743,21 @@
// SourceView Action - requesting content assist to
// show the content
// information for the current insert position
- action = new TextOperationAction(SSEUIPlugin.getDefault().getResourceBundle(), StructuredTextEditorActionConstants.ACTION_NAME_CONTENTASSIST_CONTEXT_INFORMATION + DOT, this, ISourceViewer.CONTENTASSIST_CONTEXT_INFORMATION);
+ action = new TextOperationAction(SSEUIMessages.getResourceBundle(), StructuredTextEditorActionConstants.ACTION_NAME_CONTENTASSIST_CONTEXT_INFORMATION + UNDERSCORE, this, ISourceViewer.CONTENTASSIST_CONTEXT_INFORMATION);
action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_CONTEXT_INFORMATION);
setAction(StructuredTextEditorActionConstants.ACTION_NAME_CONTENTASSIST_CONTEXT_INFORMATION, action);
markAsStateDependentAction(StructuredTextEditorActionConstants.ACTION_NAME_CONTENTASSIST_CONTEXT_INFORMATION, true);
// StructuredTextViewer Action - requesting
// correction assist to show
// correction proposals for the current position
- action = new TextOperationAction(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_QUICK_FIX + DOT, this, StructuredTextViewer.QUICK_FIX, true);
+ action = new TextOperationAction(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_QUICK_FIX + UNDERSCORE, this, StructuredTextViewer.QUICK_FIX, true);
action.setActionDefinitionId(ActionDefinitionIds.QUICK_FIX);
setAction(StructuredTextEditorActionConstants.ACTION_NAME_QUICK_FIX, action);
markAsStateDependentAction(StructuredTextEditorActionConstants.ACTION_NAME_QUICK_FIX, true);
// StructuredTextViewer Action - requesting format
// of the whole
// document
- action = new TextOperationAction(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_DOCUMENT + DOT, this, StructuredTextViewer.FORMAT_DOCUMENT);
+ action = new TextOperationAction(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_DOCUMENT + UNDERSCORE, this, StructuredTextViewer.FORMAT_DOCUMENT);
helpSystem.setHelp(action, IHelpContextIds.CONTMNU_FORMAT_DOC_HELPID);
action.setActionDefinitionId(ActionDefinitionIds.FORMAT_DOCUMENT);
setAction(StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_DOCUMENT, action);
@@ -764,7 +766,7 @@
// StructuredTextViewer Action - requesting format
// of the active
// elements
- action = new TextOperationAction(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_ACTIVE_ELEMENTS + DOT, this, StructuredTextViewer.FORMAT_ACTIVE_ELEMENTS);
+ action = new TextOperationAction(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_ACTIVE_ELEMENTS + UNDERSCORE, this, StructuredTextViewer.FORMAT_ACTIVE_ELEMENTS);
helpSystem.setHelp(action, IHelpContextIds.CONTMNU_FORMAT_ELEMENTS_HELPID);
action.setActionDefinitionId(ActionDefinitionIds.FORMAT_ACTIVE_ELEMENTS);
setAction(StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_ACTIVE_ELEMENTS, action);
@@ -780,7 +782,7 @@
action = new EditBreakpointAction(this, getVerticalRuler());
setAction(ActionDefinitionIds.EDIT_BREAKPOINTS, action);
// StructuredTextViewer Action - open file on selection
- action = new OpenHyperlinkAction(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_OPEN_FILE + DOT, this, getSourceViewer());
+ action = new OpenHyperlinkAction(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_OPEN_FILE + UNDERSCORE, this, getSourceViewer());
action.setActionDefinitionId(ActionDefinitionIds.OPEN_FILE);
setAction(StructuredTextEditorActionConstants.ACTION_NAME_OPEN_FILE, action);
@@ -1252,21 +1254,21 @@
}
private void logUnexpectedDocumentKind(IEditorInput input) {
- Logger.log(Logger.WARNING, "StructuredTextEditor being used without StructuredDocument");
+ Logger.log(Logger.WARNING, "StructuredTextEditor being used without StructuredDocument"); //$NON-NLS-1$
String name = null;
if (input != null) {
name = input.getName();
} else {
- name = "input was null";
+ name = "input was null"; //$NON-NLS-1$
}
- Logger.log(Logger.WARNING, " Input Name: " + name);
+ Logger.log(Logger.WARNING, " Input Name: " + name); //$NON-NLS-1$
String implClass = null;
if (getDocument() != null) {
implClass = getDocument().getClass().toString();
} else {
- implClass = "document was null";
+ implClass = "document was null"; //$NON-NLS-1$
}
- Logger.log(Logger.WARNING, " Document implementation: " + implClass);
+ Logger.log(Logger.WARNING, " Document implementation: " + implClass); //$NON-NLS-1$
}
/**
@@ -2343,7 +2345,7 @@
// update title and/or fonts and/or background
//
// temp solution, for testing, uses "busy"
- setPartName("busy");
+ setPartName(SSEUIMessages.busy); //$NON-NLS-1$
} else {
// reset to what it was
setPartName(fRememberTitle);
@@ -2670,9 +2672,9 @@
int offset2 = widgetOffset2ModelOffset(getSourceViewer(), selection.y);
String text = null;
if (offset1 != offset2)
- text = "[" + offset1 + "-" + offset2 + "]";
+ text = "[" + offset1 + "-" + offset2 + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
else
- text = "[ " + offset1 + " ]";
+ text = "[ " + offset1 + " ]"; //$NON-NLS-1$ //$NON-NLS-2$
field.setText(text == null ? fErrorLabel : text);
}
}
@@ -2687,7 +2689,7 @@
IEditorInput input = getEditorInput();
if (input instanceof IFileEditorInput) {
if (input == null) {
- String msg = SSEUIPlugin.getResourceString("%Error_opening_file_UI_"); //$NON-NLS-1$
+ String msg = SSEUIMessages.Error_opening_file_UI_; //$NON-NLS-1$
status = new Status(IStatus.ERROR, SSEUIPlugin.ID, IStatus.INFO, msg, null);
} else {
validateState(input);
@@ -2713,7 +2715,7 @@
// exception.
}
}
- String msg = SSEUIPlugin.getResourceString("%_UI_File_is_read_only", new Object[]{fname}); //$NON-NLS-1$ = "File {0}is read-only."
+ String msg = NLS.bind(SSEUIMessages._UI_File_is_read_only, new Object[]{fname});
status = new Status(IStatus.ERROR, SSEUIPlugin.ID, IStatus.INFO, msg, null);
}
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextViewer.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextViewer.java
index 6479575..12a7f28 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextViewer.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/StructuredTextViewer.java
@@ -128,14 +128,14 @@
public static final int CLEANUP_DOCUMENT = BASE + 1;
public static final int FORMAT_ACTIVE_ELEMENTS = BASE + 3;
- private static final String FORMAT_ACTIVE_ELEMENTS_TEXT = SSEUIPlugin.getResourceString("%Format_Active_Elements_UI_"); //$NON-NLS-1$
+ private static final String FORMAT_ACTIVE_ELEMENTS_TEXT = SSEUIMessages.Format_Active_Elements_UI_; //$NON-NLS-1$
public static final int FORMAT_DOCUMENT = BASE + 2;
- private static final String FORMAT_DOCUMENT_TEXT = SSEUIPlugin.getResourceString("%Format_Document_UI_"); //$NON-NLS-1$
+ private static final String FORMAT_DOCUMENT_TEXT = SSEUIMessages.Format_Document_UI_; //$NON-NLS-1$
public static final int QUICK_FIX = BASE + 4;
- private static final String TEXT_CUT = SSEUIPlugin.getResourceString("%Text_Cut_UI_"); //$NON-NLS-1$
- private static final String TEXT_PASTE = SSEUIPlugin.getResourceString("%Text_Paste_UI_"); //$NON-NLS-1$
- private static final String TEXT_SHIFT_LEFT = SSEUIPlugin.getResourceString("%Text_Shift_Left_UI_"); //$NON-NLS-1$ = "Text Shift Left"
- private static final String TEXT_SHIFT_RIGHT = SSEUIPlugin.getResourceString("%Text_Shift_Right_UI_"); //$NON-NLS-1$ = "Text Shift Right"
+ private static final String TEXT_CUT = SSEUIMessages.Text_Cut_UI_; //$NON-NLS-1$
+ private static final String TEXT_PASTE = SSEUIMessages.Text_Paste_UI_; //$NON-NLS-1$
+ private static final String TEXT_SHIFT_LEFT = SSEUIMessages.Text_Shift_Left_UI_; //$NON-NLS-1$ = "Text Shift Left"
+ private static final String TEXT_SHIFT_RIGHT = SSEUIMessages.Text_Shift_Right_UI_; //$NON-NLS-1$ = "Text Shift Right"
private boolean fBackgroundupdateInProgress;
protected StructuredContentCleanupHandler fContentCleanupHandler = null;
protected IContentAssistant fCorrectionAssistant;
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/ActionContributor.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/ActionContributor.java
index 2050c95..307191b 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/ActionContributor.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/ActionContributor.java
@@ -38,7 +38,7 @@
import org.eclipse.wst.sse.ui.extension.IExtendedContributor;
import org.eclipse.wst.sse.ui.internal.GotoAnnotationAction;
import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.ui.OffsetStatusLineContributionItem;
/**
@@ -54,7 +54,7 @@
*/
public class ActionContributor extends TextEditorActionContributor implements ISourceViewerActionBarContributor, IExtendedContributor {
- public static final boolean _showDebugStatus = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields"));
+ public static final boolean _showDebugStatus = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields")); //$NON-NLS-1$ //$NON-NLS-2$
private static final String[] EDITOR_IDS = {"org.eclipse.wst.sse.ui.StructuredTextEditor"}; //$NON-NLS-1$
@@ -85,7 +85,7 @@
public ActionContributor() {
super();
- ResourceBundle resourceBundle = SSEUIPlugin.getDefault().getResourceBundle();
+ ResourceBundle resourceBundle = SSEUIMessages.getResourceBundle();
fCommandsSeparator = new Separator();
@@ -102,7 +102,7 @@
fStructureSelectHistoryAction = new RetargetTextEditorAction(resourceBundle, StructuredTextEditorActionConstants.ACTION_NAME_STRUCTURE_SELECT_HISTORY + StructuredTextEditorActionConstants.DOT);
fStructureSelectHistoryAction.setActionDefinitionId(ActionDefinitionIds.STRUCTURE_SELECT_HISTORY);
- fExpandSelectionToMenu = new MenuManager(SSEUIPlugin.getResourceString("%ExpandSelectionToMenu.label")); //$NON-NLS-1$
+ fExpandSelectionToMenu = new MenuManager(SSEUIMessages.ExpandSelectionToMenu_label); //$NON-NLS-1$
fExpandSelectionToMenu.add(fStructureSelectEnclosingAction);
fExpandSelectionToMenu.add(fStructureSelectNextAction);
fExpandSelectionToMenu.add(fStructureSelectPreviousAction);
@@ -161,8 +161,8 @@
}
// source commands
- String sourceMenuLabel = SSEUIPlugin.getResourceString("%SourceMenu.label"); //$NON-NLS-1$
- String sourceMenuId = "sourceMenuId"; // This is just a menu id. No
+ String sourceMenuLabel = SSEUIMessages.SourceMenu_label; //$NON-NLS-1$
+ String sourceMenuId = "sourceMenuId"; // This is just a menu id. No //$NON-NLS-1$
// need to translate.
// //$NON-NLS-1$
IMenuManager sourceMenu = new MenuManager(sourceMenuLabel, sourceMenuId);
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/CleanupAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/CleanupAction.java
index 72eadad..17979a9 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/CleanupAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/CleanupAction.java
@@ -23,7 +23,7 @@
import org.eclipse.ui.texteditor.TextEditorAction;
import org.eclipse.wst.sse.core.IStructuredModel;
import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupProcessor;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;
public abstract class CleanupAction extends TextEditorAction {
@@ -58,7 +58,7 @@
try {
// begin recording
ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
- model.beginRecording(this, SSEUIPlugin.getResourceString("%Cleanup_Document_UI_"), SSEUIPlugin.getResourceString("%Cleanup_Document_UI_"), selection.getOffset(), selection.getLength()); //$NON-NLS-1$ //$NON-NLS-2$
+ model.beginRecording(this, SSEUIMessages.Cleanup_Document_UI_, SSEUIMessages.Cleanup_Document_UI_, selection.getOffset(), selection.getLength()); //$NON-NLS-1$ //$NON-NLS-2$
// tell the model that we are about to make a big
// model change
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/FormatActionDelegate.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/FormatActionDelegate.java
index dbd7796..32f140a 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/FormatActionDelegate.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/actions/FormatActionDelegate.java
@@ -25,10 +25,12 @@
import org.eclipse.core.runtime.content.IContentDescription;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.sse.core.internal.exceptions.MalformedInputExceptionWithDetail;
import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
import org.eclipse.wst.sse.ui.extension.FormatProcessorsExtensionReader;
import org.eclipse.wst.sse.ui.internal.Logger;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
public class FormatActionDelegate extends ResourceActionDelegate {
@@ -99,7 +101,7 @@
if (fErrorStatus.getChildren().length > 0) {
status = fErrorStatus;
- fErrorStatus = new MultiStatus(SSEUIPlugin.ID, IStatus.ERROR, SSEUIPlugin.getResourceString("%FormatActionDelegate.errorStatusMessage"), null); //$NON-NLS-1$
+ fErrorStatus = new MultiStatus(SSEUIPlugin.ID, IStatus.ERROR, SSEUIMessages.FormatActionDelegate_errorStatusMessage, null); //$NON-NLS-1$
}
return status;
@@ -107,7 +109,7 @@
}
- private MultiStatus fErrorStatus = new MultiStatus(SSEUIPlugin.ID, IStatus.ERROR, SSEUIPlugin.getResourceString("%FormatActionDelegate.errorStatusMessage"), null); //$NON-NLS-1$
+ private MultiStatus fErrorStatus = new MultiStatus(SSEUIPlugin.ID, IStatus.ERROR, SSEUIMessages.FormatActionDelegate_errorStatusMessage, null); //$NON-NLS-1$
protected void format(IProgressMonitor monitor, IFile file) {
try {
@@ -119,19 +121,19 @@
IContentType contentType = contentDescription.getContentType();
IStructuredFormatProcessor formatProcessor = getFormatProcessor(contentType.getId());
if (formatProcessor != null && (monitor == null || !monitor.isCanceled())) {
- String message = SSEUIPlugin.getResourceString("%FormatActionDelegate.3", new String[]{file.getFullPath().toString()}); //$NON-NLS-1$
+ String message = NLS.bind(SSEUIMessages.FormatActionDelegate_3, new String[]{file.getFullPath().toString()});
monitor.subTask(message);
formatProcessor.setProgressMonitor(monitor);
formatProcessor.formatFile(file);
}
} catch (MalformedInputExceptionWithDetail e) {
- String message = SSEUIPlugin.getResourceString("%FormatActionDelegate.5", new String[]{file.getFullPath().toString()}); //$NON-NLS-1$
+ String message = NLS.bind(SSEUIMessages.FormatActionDelegate_5, new String[]{file.getFullPath().toString()});
fErrorStatus.add(new Status(IStatus.ERROR, SSEUIPlugin.ID, IStatus.ERROR, message, e));
} catch (IOException e) {
- String message = SSEUIPlugin.getResourceString("%FormatActionDelegate.4", new String[]{file.getFullPath().toString()}); //$NON-NLS-1$
+ String message = NLS.bind(SSEUIMessages.FormatActionDelegate_4, new String[]{file.getFullPath().toString()});
fErrorStatus.add(new Status(IStatus.ERROR, SSEUIPlugin.ID, IStatus.ERROR, message, e));
} catch (CoreException e) {
- String message = SSEUIPlugin.getResourceString("%FormatActionDelegate.4", new String[]{file.getFullPath().toString()}); //$NON-NLS-1$
+ String message = NLS.bind(SSEUIMessages.FormatActionDelegate_4, new String[]{file.getFullPath().toString()});
fErrorStatus.add(new Status(IStatus.ERROR, SSEUIPlugin.ID, IStatus.ERROR, message, e));
}
}
@@ -152,7 +154,7 @@
format(monitor, members[i]);
}
} catch (CoreException e) {
- String message = SSEUIPlugin.getResourceString("%FormatActionDelegate.4", new String[]{resource.getFullPath().toString()}); //$NON-NLS-1$
+ String message = NLS.bind(SSEUIMessages.FormatActionDelegate_4, new String[]{resource.getFullPath().toString()});
fErrorStatus.add(new Status(IStatus.ERROR, SSEUIPlugin.ID, IStatus.ERROR, message, e));
}
}
@@ -163,7 +165,7 @@
}
protected Job getJob() {
- return new FormatJob(SSEUIPlugin.getResourceString("%FormatActionDelegate.jobName")); //$NON-NLS-1$
+ return new FormatJob(SSEUIMessages.FormatActionDelegate_jobName); //$NON-NLS-1$
}
/*
@@ -178,7 +180,7 @@
try {
resource.refreshLocal(IResource.DEPTH_INFINITE, null);
} catch (CoreException e) {
- String message = SSEUIPlugin.getResourceString("%FormatActionDelegate.4", new String[]{resource.getFullPath().toString()}); //$NON-NLS-1$
+ String message = NLS.bind(SSEUIMessages.FormatActionDelegate_4, new String[]{resource.getFullPath().toString()});
fErrorStatus.add(new Status(IStatus.ERROR, SSEUIPlugin.ID, IStatus.ERROR, message, e));
}
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentoutline/PropertyChangeUpdateActionContributionItem.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentoutline/PropertyChangeUpdateActionContributionItem.java
index a537958..5c642ea 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentoutline/PropertyChangeUpdateActionContributionItem.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentoutline/PropertyChangeUpdateActionContributionItem.java
@@ -29,7 +29,7 @@
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(fProperty)) {
if (debug) {
- System.out.println(fProperty + " preference changed, updating " + getAction());
+ System.out.println(fProperty + " preference changed, updating " + getAction()); //$NON-NLS-1$
}
((IUpdate) getAction()).update();
}
@@ -53,7 +53,7 @@
public void connect() {
if (debug) {
- System.out.println("PropertyChangeUpdateActionContributionItem started listening for " + fProperty);
+ System.out.println("PropertyChangeUpdateActionContributionItem started listening for " + fProperty); //$NON-NLS-1$
}
if (fStore != null) {
fStore.addPropertyChangeListener(fListener);
@@ -62,7 +62,7 @@
public void disconnect() {
if (debug) {
- System.out.println("PropertyChangeUpdateActionContributionItem stopped listening for " + fProperty);
+ System.out.println("PropertyChangeUpdateActionContributionItem stopped listening for " + fProperty); //$NON-NLS-1$
}
if (fStore != null) {
fStore.removePropertyChangeListener(fListener);
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/correction/NoModificationCompletionProposal.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/correction/NoModificationCompletionProposal.java
index 8989d94..c98bb53 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/correction/NoModificationCompletionProposal.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/correction/NoModificationCompletionProposal.java
@@ -17,7 +17,7 @@
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
public class NoModificationCompletionProposal implements ICompletionProposal {
@@ -53,7 +53,7 @@
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
*/
public String getDisplayString() {
- return SSEUIPlugin.getResourceString("%NoModificationCompletionProposal.0"); //$NON-NLS-1$
+ return SSEUIMessages.NoModificationCompletionProposal_0; //$NON-NLS-1$
}
/*
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/DebugTextEditor.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/DebugTextEditor.java
index 0a3e967..c3b6e9d 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/DebugTextEditor.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/DebugTextEditor.java
@@ -61,7 +61,7 @@
import org.eclipse.wst.sse.ui.extensions.ConfigurationPointCalculator;
import org.eclipse.wst.sse.ui.extensions.breakpoint.IExtendedStorageEditorInput;
import org.eclipse.wst.sse.ui.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModel;
import org.eclipse.wst.sse.ui.internal.actions.ActionDefinitionIds;
import org.eclipse.wst.sse.ui.internal.extension.BreakpointProviderBuilder;
@@ -375,7 +375,7 @@
menu.add(getAction(ActionDefinitionIds.EDIT_BREAKPOINTS));
menu.add(new Separator());
} else {
- Logger.log(Logger.INFO, getClass().getName() + " could not enable debugging actions");
+ Logger.log(Logger.INFO, getClass().getName() + " could not enable debugging actions"); //$NON-NLS-1$
}
super.rulerContextMenuAboutToShow(menu);
}
@@ -414,7 +414,7 @@
// mapping, but since it relies on the IEditorSite ID, it can't be
// relied on for MultiPageEditorParts. Instead, force the action
// registration manually.
- setAction(ITextEditorActionConstants.RULER_DOUBLE_CLICK, new MarkerRulerAction(SSEUIPlugin.getDefault().getResourceBundle(), "Editor.ManageBookmarks.", this, getVerticalRuler(), IMarker.BOOKMARK, true));
+ setAction(ITextEditorActionConstants.RULER_DOUBLE_CLICK, new MarkerRulerAction(SSEUIMessages.getResourceBundle(), "Editor.ManageBookmarks.", this, getVerticalRuler(), IMarker.BOOKMARK, true)); //$NON-NLS-1$
}
fShowInTargetIds = createShowInTargetIds();
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/EditBreakpointAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/EditBreakpointAction.java
index 0a80c63..843666e 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/EditBreakpointAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/EditBreakpointAction.java
@@ -20,7 +20,7 @@
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.ui.dialogs.PropertyDialogAction;
import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
public class EditBreakpointAction extends BreakpointRulerAction {
protected IBreakpoint[] breakpoints = null;
@@ -31,7 +31,7 @@
*/
public EditBreakpointAction(ITextEditor editor, IVerticalRuler rulerInfo) {
super(editor, rulerInfo);
- setText(SSEUIPlugin.getResourceString("%EditBreakpointAction.0")); //$NON-NLS-1$
+ setText(SSEUIMessages.EditBreakpointAction_0); //$NON-NLS-1$
}
public void run() {
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/ManageBreakpointAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/ManageBreakpointAction.java
index 6635a8c..ddc7ac6 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/ManageBreakpointAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/ManageBreakpointAction.java
@@ -17,7 +17,7 @@
import org.eclipse.jface.text.source.IVerticalRuler;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.wst.sse.ui.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
/**
* ManageBreakpointAction - Enables and Disables
@@ -82,9 +82,9 @@
}
setEnabled(breakpoints != null && breakpoints.length > 0);
if (doEnable)
- setText(SSEUIPlugin.getResourceString("%ManageBreakpointAction.0")); //$NON-NLS-1$
+ setText(SSEUIMessages.ManageBreakpointAction_0); //$NON-NLS-1$
else
- setText(SSEUIPlugin.getResourceString("%ManageBreakpointAction.1")); //$NON-NLS-1$
+ setText(SSEUIMessages.ManageBreakpointAction_1); //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/ToggleBreakpointAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/ToggleBreakpointAction.java
index f8765c4..bec8e10 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/ToggleBreakpointAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/debug/ToggleBreakpointAction.java
@@ -35,6 +35,7 @@
import org.eclipse.wst.sse.ui.extension.IExtendedSimpleEditor;
import org.eclipse.wst.sse.ui.extensions.breakpoint.IBreakpointProvider;
import org.eclipse.wst.sse.ui.internal.Logger;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
import org.eclipse.wst.sse.ui.internal.extension.BreakpointProviderBuilder;
import org.w3c.dom.Document;
@@ -50,7 +51,7 @@
*/
public ToggleBreakpointAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
super(editor, rulerInfo);
- setText(SSEUIPlugin.getResourceString("%ToggleBreakpointAction.0")); //$NON-NLS-1$
+ setText(SSEUIMessages.ToggleBreakpointAction_0); //$NON-NLS-1$
}
protected boolean createBreakpoints(int lineNumber) {
@@ -100,11 +101,11 @@
if (errors.size() > 0) {
Shell shell = editor.getSite().getShell();
- MultiStatus allStatus = new MultiStatus(SSEUIPlugin.ID, IStatus.INFO, (IStatus[]) errors.toArray(new IStatus[0]), SSEUIPlugin.getResourceString("%ManageBreakpoints.error.adding.message1"), null); //$NON-NLS-1$
+ MultiStatus allStatus = new MultiStatus(SSEUIPlugin.ID, IStatus.INFO, (IStatus[]) errors.toArray(new IStatus[0]), SSEUIMessages.ManageBreakpoints_error_adding_message1, null); //$NON-NLS-1$
// show for conditions more severe than INFO or when no
// breakpoints were created
if (allStatus.getSeverity() > IStatus.INFO || getBreakpoints(getMarkers()).length < 1) {
- ErrorDialog.openError(shell, SSEUIPlugin.getResourceString("%ManageBreakpoints.error.adding.title1"), SSEUIPlugin.getResourceString("%ManageBreakpoints.error.adding.message1"), allStatus); //$NON-NLS-1$ //$NON-NLS-2$
+ ErrorDialog.openError(shell, SSEUIMessages.ManageBreakpoints_error_adding_title1, SSEUIMessages.ManageBreakpoints_error_adding_message1, allStatus); //$NON-NLS-1$ //$NON-NLS-2$
return false;
}
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/editor/EditorModelUtil.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/editor/EditorModelUtil.java
index 34a4756..0d493b8 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/editor/EditorModelUtil.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/editor/EditorModelUtil.java
@@ -18,6 +18,7 @@
import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.wst.sse.core.IStructuredModel;
import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
import org.eclipse.wst.sse.ui.internal.Logger;
import org.eclipse.wst.sse.ui.registry.AdapterFactoryProvider;
@@ -46,7 +47,7 @@
}
FactoryRegistry factoryRegistry = structuredModel.getFactoryRegistry();
- Assert.isNotNull(factoryRegistry, "model in invalid state");
+ Assert.isNotNull(factoryRegistry, SSEUIMessages.EditorModelUtil_0); //$NON-NLS-1$
// Add all those appropriate for this particular type of content
while (adapterFactoryProviders.hasNext()) {
try {
@@ -57,7 +58,7 @@
* don't specify a content type
*/
if (provider.isFor(structuredModel.getModelHandler())) {
- Platform.run(new SafeRunnable("There was a problem adding adapter factories") {
+ Platform.run(new SafeRunnable(SSEUIMessages.EditorModelUtil_1) { //$NON-NLS-1$
public void run() {
provider.addAdapterFactories(structuredModel);
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/ImageUtil.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/ImageUtil.java
index 72694d9..b4ec693 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/ImageUtil.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/ImageUtil.java
@@ -72,7 +72,7 @@
*/
public static ImageDescriptor getImageDescriptorFromBundle(Bundle bundle, String subdirectoryAndFilename) {
- URL path = bundle.getEntry("/");
+ URL path = bundle.getEntry("/"); //$NON-NLS-1$
URL fullPathString = null;
try {
fullPathString = new URL(path, subdirectoryAndFilename);
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/EmptyFilePreferencePage.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/EmptyFilePreferencePage.java
index a646a09..79ea149 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/EmptyFilePreferencePage.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/EmptyFilePreferencePage.java
@@ -23,6 +23,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
public class EmptyFilePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
@@ -47,7 +48,7 @@
protected Control createContents(Composite parent) {
Composite composite = createScrolledComposite(parent);
- String description = "Expand the tree to edit preferences for a specific content type.";
+ String description = SSEUIMessages.EmptyFilePreferencePage_0; //$NON-NLS-1$
createLabel(composite, description);
setSize(composite);
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/properties/RemoveAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/properties/RemoveAction.java
index 66e6cb2..488b241 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/properties/RemoveAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/properties/RemoveAction.java
@@ -13,7 +13,7 @@
package org.eclipse.wst.sse.ui.internal.properties;
import org.eclipse.jface.action.Action;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.editor.EditorPluginImageHelper;
import org.eclipse.wst.sse.ui.internal.editor.EditorPluginImages;
@@ -33,7 +33,7 @@
* @see org.eclipse.jface.action.Action#getText()
*/
public String getText() {
- return SSEUIPlugin.getResourceString("%RemoveAction.0"); //$NON-NLS-1$
+ return SSEUIMessages.RemoveAction_0; //$NON-NLS-1$
}
/**
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/properties/ShowPropertiesAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/properties/ShowPropertiesAction.java
index fc0e4ec..4a85934 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/properties/ShowPropertiesAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/properties/ShowPropertiesAction.java
@@ -13,7 +13,7 @@
package org.eclipse.wst.sse.ui.internal.properties;
import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.ShowViewAction;
import org.eclipse.wst.sse.ui.internal.editor.EditorPluginImageHelper;
import org.eclipse.wst.sse.ui.internal.editor.EditorPluginImages;
@@ -28,7 +28,7 @@
private final static String VIEW_ID = "org.eclipse.ui.views.PropertySheet"; //$NON-NLS-1$
public ShowPropertiesAction() {
- super(SSEUIPlugin.getResourceString("%ShowPropertiesAction.0"), EditorPluginImageHelper.getInstance().getImageDescriptor(EditorPluginImages.IMG_OBJ_PROP_PS)); //$NON-NLS-1$
+ super(SSEUIMessages.ShowPropertiesAction_0, EditorPluginImageHelper.getInstance().getImageDescriptor(EditorPluginImages.IMG_OBJ_PROP_PS)); //$NON-NLS-1$
WorkbenchHelp.setHelp(this, IHelpContextIds.CONTMNU_PROPERTIES_HELPID);
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/AbstractStructuredTextReconcilingStrategy.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/AbstractStructuredTextReconcilingStrategy.java
index b275d3c..67d3e44 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/AbstractStructuredTextReconcilingStrategy.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/AbstractStructuredTextReconcilingStrategy.java
@@ -460,7 +460,7 @@
filteredAdditions.remove(addition);
ignore = true;
if(DEBUG)
- System.out.println(" ~ smart process ignoring: " + removal.getPosition().getOffset());
+ System.out.println(" ~ smart process ignoring: " + removal.getPosition().getOffset()); //$NON-NLS-1$
break;
}
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/DirtyRegionProcessor.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/DirtyRegionProcessor.java
index fdbdde6..d7c5cf8 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/DirtyRegionProcessor.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/DirtyRegionProcessor.java
@@ -39,7 +39,7 @@
import org.eclipse.wst.sse.core.events.NewDocumentEvent;
import org.eclipse.wst.sse.core.events.NoChangeEvent;
import org.eclipse.wst.sse.ui.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
/**
* This job holds a queue of updates from the editor (DirtyRegions) to
@@ -94,7 +94,7 @@
public DirtyRegionProcessor() {
// init job stuff
- super(SSEUIPlugin.getResourceString("%proc_dirty_regions.0"));
+ super(SSEUIMessages.proc_dirty_regions_0); //$NON-NLS-1$
setPriority(Job.LONG);
setSystem(true);
// init some fields
@@ -157,7 +157,7 @@
tr = TextUtilities.computePartitioning(doc, getDocumentPartitioning(), drOffset, drLength, true);
}
catch (BadLocationException e) {
- String info = "dr: ["+ drOffset+":"+ drLength + "] doc: [" + docLength + "] ";
+ String info = "dr: ["+ drOffset+":"+ drLength + "] doc: [" + docLength + "] "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
Logger.logException(info, e);
tr = new ITypedRegion[0];
}
@@ -196,7 +196,7 @@
durty = new DirtyRegion(offset, length, type, doc.get(offset, length));
}
catch (BadLocationException e) {
- String info = "dr: ["+ offset+":"+ length + "] doc: [" + docLen + "] ";
+ String info = "dr: ["+ offset+":"+ length + "] doc: [" + docLen + "] "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
Logger.logException(info, e);
}
}
@@ -393,8 +393,8 @@
schedule(getDelay());
if (DEBUG) {
- System.out.println("added request for: [" + dr.getText() + "]");
- System.out.println("queue size is now: " + getDirtyRegionQueue().size());
+ System.out.println("added request for: [" + dr.getText() + "]"); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("queue size is now: " + getDirtyRegionQueue().size()); //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/StructuredReconcileStep.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/StructuredReconcileStep.java
index a54039b..cf8bf16 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/StructuredReconcileStep.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/StructuredReconcileStep.java
@@ -115,7 +115,7 @@
tr = TextUtilities.getPartition(doc, IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING, offset, false);
} catch (BadLocationException e) {
if (DEBUG)
- Logger.logException("problem getting partition at: " + offset, e);
+ Logger.logException("problem getting partition at: " + offset, e); //$NON-NLS-1$
}
}
return tr;
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/StructuredRegionProcessor.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/StructuredRegionProcessor.java
index 1570cb1..6e8cec5 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/StructuredRegionProcessor.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/StructuredRegionProcessor.java
@@ -213,7 +213,7 @@
contains = true;
if (DEBUG)
- System.out.println("checking if [" + rootStart + ":" + rootEnd + "] contains [" + possStart + ":" + possEnd + "] ... " + contains);
+ System.out.println("checking if [" + rootStart + ":" + rootEnd + "] contains [" + possStart + ":" + possEnd + "] ... " + contains); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
}
}
finally {
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ReconcileStepForValidator.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ReconcileStepForValidator.java
index 0a4b8fd..28873a6 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ReconcileStepForValidator.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ReconcileStepForValidator.java
@@ -65,7 +65,7 @@
super();
if(v == null)
- throw new IllegalArgumentException("validator cannot be null");
+ throw new IllegalArgumentException("validator cannot be null"); //$NON-NLS-1$
fValidator = v;
fScope = scope;
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorBuilder.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorBuilder.java
index 2668ff4..75708f0 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorBuilder.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorBuilder.java
@@ -52,7 +52,7 @@
protected String targetContributionTag;
protected String targetID;
- private final String UNKNOWN = "???";
+ private final String UNKNOWN = "???"; //$NON-NLS-1$
/**
* Returns the name of the part ID attribute that is expected in the
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/search/FindOccurrencesActionProvider.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/search/FindOccurrencesActionProvider.java
index ce9aeeb..58597b3 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/search/FindOccurrencesActionProvider.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/search/FindOccurrencesActionProvider.java
@@ -25,7 +25,7 @@
import org.eclipse.search.ui.NewSearchUI;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.TextEditorAction;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.util.PlatformStatusLineUtil;
/**
@@ -113,7 +113,7 @@
public void run() {
BasicFindOccurrencesAction action = getActionForCurrentSelection();
- String errorMessage = SSEUIPlugin.getResourceString("%FindOccurrencesActionProvider.0"); //$NON-NLS-1$
+ String errorMessage = SSEUIMessages.FindOccurrencesActionProvider_0; //$NON-NLS-1$
if (action != null) {
action.update();
if (action.isEnabled()) {
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/search/OccurrencesSearchQuery.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/search/OccurrencesSearchQuery.java
index 54275bb..edba23d 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/search/OccurrencesSearchQuery.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/search/OccurrencesSearchQuery.java
@@ -27,6 +27,7 @@
import org.eclipse.wst.sse.core.text.ITextRegion;
import org.eclipse.wst.sse.core.text.ITextRegionList;
import org.eclipse.wst.sse.ui.internal.Logger;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
/**
@@ -147,14 +148,14 @@
}
private String getFilename() {
- String filename = SSEUIPlugin.getResourceString("%OccurrencesSearchQuery.2"); //$NON-NLS-1$ "file"
+ String filename = SSEUIMessages.OccurrencesSearchQuery_2; //$NON-NLS-1$ "file"
if (getFile() != null)
filename = getFile().getName().toString();
return filename;
}
public String getLabel() {
- String label = SSEUIPlugin.getResourceString("%OccurrencesSearchQuery.0"); //$NON-NLS-1$
+ String label = SSEUIMessages.OccurrencesSearchQuery_0; //$NON-NLS-1$
String[] args = {getSearchText(), getOccurrencesCountText(), getFilename()};
return MessageFormat.format(label, args);
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectEnclosingAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectEnclosingAction.java
index d60ccd1..c914463 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectEnclosingAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectEnclosingAction.java
@@ -14,16 +14,16 @@
import org.eclipse.jface.text.Region;
import org.eclipse.wst.sse.core.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;
import org.w3c.dom.Node;
public class StructureSelectEnclosingAction extends StructureSelectAction {
public StructureSelectEnclosingAction(StructuredTextEditor editor, SelectionHistory history) {
super(editor, history);
- setText(SSEUIPlugin.getResourceString("%StructureSelectEnclosing.label")); //$NON-NLS-1$
- setToolTipText(SSEUIPlugin.getResourceString("%StructureSelectEnclosing.tooltip")); //$NON-NLS-1$
- setDescription(SSEUIPlugin.getResourceString("%StructureSelectEnclosing.description")); //$NON-NLS-1$
+ setText(SSEUIMessages.StructureSelectEnclosing_label); //$NON-NLS-1$
+ setToolTipText(SSEUIMessages.StructureSelectEnclosing_tooltip); //$NON-NLS-1$
+ setDescription(SSEUIMessages.StructureSelectEnclosing_description); //$NON-NLS-1$
}
protected IndexedRegion getCursorIndexedRegion() {
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectHistoryAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectHistoryAction.java
index 4f5c8c0..405c856 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectHistoryAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectHistoryAction.java
@@ -16,16 +16,16 @@
import org.eclipse.jface.text.Region;
import org.eclipse.ui.texteditor.IUpdate;
import org.eclipse.wst.sse.core.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;
import org.w3c.dom.Node;
public class StructureSelectHistoryAction extends StructureSelectAction implements IUpdate {
public StructureSelectHistoryAction(StructuredTextEditor editor, SelectionHistory history) {
super(editor, history);
- setText(SSEUIPlugin.getResourceString("%StructureSelectHistory.label")); //$NON-NLS-1$
- setToolTipText(SSEUIPlugin.getResourceString("%StructureSelectHistory.tooltip")); //$NON-NLS-1$
- setDescription(SSEUIPlugin.getResourceString("%StructureSelectHistory.description")); //$NON-NLS-1$
+ setText(SSEUIMessages.StructureSelectHistory_label); //$NON-NLS-1$
+ setToolTipText(SSEUIMessages.StructureSelectHistory_tooltip); //$NON-NLS-1$
+ setDescription(SSEUIMessages.StructureSelectHistory_description); //$NON-NLS-1$
update();
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectNextAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectNextAction.java
index bb17617..cf969bf 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectNextAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectNextAction.java
@@ -14,16 +14,16 @@
import org.eclipse.jface.text.Region;
import org.eclipse.wst.sse.core.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;
import org.w3c.dom.Node;
public class StructureSelectNextAction extends StructureSelectAction {
public StructureSelectNextAction(StructuredTextEditor editor, SelectionHistory history) {
super(editor, history);
- setText(SSEUIPlugin.getResourceString("%StructureSelectNext.label")); //$NON-NLS-1$
- setToolTipText(SSEUIPlugin.getResourceString("%StructureSelectNext.tooltip")); //$NON-NLS-1$
- setDescription(SSEUIPlugin.getResourceString("%StructureSelectNext.description")); //$NON-NLS-1$
+ setText(SSEUIMessages.StructureSelectNext_label); //$NON-NLS-1$
+ setToolTipText(SSEUIMessages.StructureSelectNext_tooltip); //$NON-NLS-1$
+ setDescription(SSEUIMessages.StructureSelectNext_description); //$NON-NLS-1$
}
protected IndexedRegion getCursorIndexedRegion() {
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectPreviousAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectPreviousAction.java
index 0f676d8..92c2505 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectPreviousAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectPreviousAction.java
@@ -14,16 +14,16 @@
import org.eclipse.jface.text.Region;
import org.eclipse.wst.sse.core.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;
import org.w3c.dom.Node;
public class StructureSelectPreviousAction extends StructureSelectAction {
public StructureSelectPreviousAction(StructuredTextEditor editor, SelectionHistory history) {
super(editor, history);
- setText(SSEUIPlugin.getResourceString("%StructureSelectPrevious.label")); //$NON-NLS-1$
- setToolTipText(SSEUIPlugin.getResourceString("%StructureSelectPrevious.tooltip")); //$NON-NLS-1$
- setDescription(SSEUIPlugin.getResourceString("%StructureSelectPrevious.description")); //$NON-NLS-1$
+ setText(SSEUIMessages.StructureSelectPrevious_label); //$NON-NLS-1$
+ setToolTipText(SSEUIMessages.StructureSelectPrevious_tooltip); //$NON-NLS-1$
+ setDescription(SSEUIMessages.StructureSelectPrevious_description); //$NON-NLS-1$
}
protected IndexedRegion getCursorIndexedRegion() {
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java
index 3b50e5d..b157f16 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java
@@ -69,6 +69,7 @@
import org.eclipse.wst.sse.core.text.ITextRegionContainer;
import org.eclipse.wst.sse.core.text.ITextRegionList;
import org.eclipse.wst.sse.core.util.Utilities;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
/**
* @author nsd A Status Line contribution intended to display the selected
@@ -93,14 +94,14 @@
protected Control createDialogArea(Composite parent) {
ISelection sel = fTextEditor.getSelectionProvider().getSelection();
ITextSelection textSelection = (ITextSelection) sel;
- parent.getShell().setText("Selection Information: " + textSelection.getOffset() + "-" + (textSelection.getOffset() + textSelection.getLength()));
+ parent.getShell().setText(SSEUIMessages.OffsetStatusLineContributionItem_0 + textSelection.getOffset() + "-" + (textSelection.getOffset() + textSelection.getLength())); //$NON-NLS-1$ //$NON-NLS-2$
Composite composite = (Composite) super.createDialogArea(parent);
TabFolder tabfolder = new TabFolder(composite, SWT.NONE);
tabfolder.setLayoutData(new GridData(GridData.FILL_BOTH));
TabItem partitionTab = new TabItem(tabfolder, SWT.BORDER);
- partitionTab.setText("Partitions");
+ partitionTab.setText(SSEUIMessages.OffsetStatusLineContributionItem_2); //$NON-NLS-1$
Composite partitions = new Composite(tabfolder, SWT.NONE);
partitionTab.setControl(partitions);
createPartitionContents(partitions);
@@ -108,7 +109,7 @@
// only create the ITextRegions tab for IStructuredDocuments
if (fDocument instanceof IStructuredDocument) {
TabItem regionTab = new TabItem(tabfolder, SWT.BORDER);
- regionTab.setText("ITextRegions");
+ regionTab.setText(SSEUIMessages.OffsetStatusLineContributionItem_3); //$NON-NLS-1$
SashForm regions = new SashForm(tabfolder, SWT.NONE);
regions.setOrientation(SWT.HORIZONTAL);
regionTab.setControl(regions);
@@ -135,13 +136,13 @@
GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false);
gd.horizontalSpan = 2;
modelContentTypeLabel.setLayoutData(gd);
- modelContentTypeLabel.setText("Content-Type: " + model.getContentTypeIdentifier());
+ modelContentTypeLabel.setText(SSEUIMessages.OffsetStatusLineContributionItem_4 + model.getContentTypeIdentifier()); //$NON-NLS-1$
Text modelHandlerContentTypeLabel = new Text(partioningComposite, SWT.MULTI | SWT.WRAP | SWT.READ_ONLY);
gd = new GridData(SWT.FILL, SWT.FILL, true, false);
gd.horizontalSpan = 2;
modelHandlerContentTypeLabel.setLayoutData(gd);
- modelHandlerContentTypeLabel.setText("Model Handler: " + model.getModelHandler() + " (" + model.getModelHandler().getAssociatedContentTypeId() + ")");
+ modelHandlerContentTypeLabel.setText(SSEUIMessages.OffsetStatusLineContributionItem_5 + model.getModelHandler() + " (" + model.getModelHandler().getAssociatedContentTypeId() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
Label blankRow = new Label(partioningComposite, SWT.NONE);
gd = new GridData(SWT.FILL, SWT.FILL, true, false);
@@ -153,7 +154,7 @@
}
Text label = new Text(partioningComposite, SWT.SINGLE | SWT.READ_ONLY);
- label.setText("Partitioning: ");
+ label.setText(SSEUIMessages.OffsetStatusLineContributionItem_8); //$NON-NLS-1$
label.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
final Combo partitioningCombo = new Combo(partioningComposite, SWT.READ_ONLY);
partitioningCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
@@ -170,7 +171,7 @@
fPartitionTable.setContentProvider(new ArrayContentProvider());
fPartitionTable.getTable().setHeaderVisible(true);
fPartitionTable.getTable().setLinesVisible(true);
- String[] columns = new String[]{"Start", "Length", "Type"};
+ String[] columns = new String[]{SSEUIMessages.OffsetStatusLineContributionItem_9, SSEUIMessages.OffsetStatusLineContributionItem_10, SSEUIMessages.OffsetStatusLineContributionItem_11}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
fPartitionTable.setLabelProvider(new ITableLabelProvider() {
public void addListener(ILabelProviderListener listener) {
@@ -198,7 +199,7 @@
break;
}
if (text == null)
- text = "";
+ text = ""; //$NON-NLS-1$
return text;
}
@@ -229,7 +230,7 @@
ITextSelection textSelection = (ITextSelection) sel;
try {
String partitionerText = fDocument instanceof IDocumentExtension3 ? ((IDocumentExtension3) fDocument).getDocumentPartitioner(partitioningCombo.getItem(partitioningCombo.getSelectionIndex())).toString() : fDocument.getDocumentPartitioner().toString();
- partitionerInstanceLabel.setText("Partitioner: " + partitionerText);
+ partitionerInstanceLabel.setText(SSEUIMessages.OffsetStatusLineContributionItem_13 + partitionerText); //$NON-NLS-1$
fPartitionTable.setInput(TextUtilities.computePartitioning(fDocument, partitioningCombo.getItem(partitioningCombo.getSelectionIndex()), textSelection.getOffset(), textSelection.getLength(), true));
}
catch (BadLocationException e1) {
@@ -254,7 +255,7 @@
ITextSelection textSelection = (ITextSelection) sel;
fPartitionTable.setInput(TextUtilities.computePartitioning(fDocument, selectedPartitioning, textSelection.getOffset(), textSelection.getLength(), true));
String partitionerText = fDocument instanceof IDocumentExtension3 ? ((IDocumentExtension3) fDocument).getDocumentPartitioner(partitioningCombo.getItem(partitioningCombo.getSelectionIndex())).toString() : fDocument.getDocumentPartitioner().toString();
- partitionerInstanceLabel.setText("Partitioner: " + partitionerText);
+ partitionerInstanceLabel.setText(SSEUIMessages.OffsetStatusLineContributionItem_14 + partitionerText); //$NON-NLS-1$
}
catch (BadLocationException e1) {
fPartitionTable.setInput(new ITypedRegion[0]);
@@ -286,10 +287,10 @@
}
final TreeViewer tree = new TreeViewer(sashForm, SWT.V_SCROLL | SWT.H_SCROLL);
- final String START = "Start";
- final String LENGTH = "Length";
- final String TEXTLENGTH = "Text Length";
- final String CONTEXT = "Context";
+ final String START = SSEUIMessages.OffsetStatusLineContributionItem_15; //$NON-NLS-1$
+ final String LENGTH = SSEUIMessages.OffsetStatusLineContributionItem_16; //$NON-NLS-1$
+ final String TEXTLENGTH = SSEUIMessages.OffsetStatusLineContributionItem_17; //$NON-NLS-1$
+ final String CONTEXT = SSEUIMessages.OffsetStatusLineContributionItem_18; //$NON-NLS-1$
tree.setContentProvider(new ITreeContentProvider() {
public void dispose() {
}
@@ -343,14 +344,14 @@
tree.setLabelProvider(new LabelProvider() {
public String getText(Object element) {
if (element instanceof Pair)
- return ((Pair) element).fKey.toString().toLowerCase() + ": " + ((Pair) element).fValue;
+ return ((Pair) element).fKey.toString().toLowerCase() + ": " + ((Pair) element).fValue; //$NON-NLS-1$
if (element instanceof IStructuredDocumentRegion) {
IStructuredDocumentRegion documentRegion = (IStructuredDocumentRegion) element;
int packageNameLength = documentRegion.getClass().getPackage().getName().length();
if (packageNameLength > 0)
packageNameLength++;
String name = documentRegion.getClass().getName().substring(packageNameLength);
- String text = "[" + documentRegion.getStartOffset() + "-" + documentRegion.getEndOffset() + "] " + name + "@" + element.hashCode() + " " + documentRegion.getType();
+ String text = "[" + documentRegion.getStartOffset() + "-" + documentRegion.getEndOffset() + "] " + name + "@" + element.hashCode() + " " + documentRegion.getType(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
return text;
}
if (element instanceof ITextRegion) {
@@ -359,7 +360,7 @@
if (packageNameLength > 0)
packageNameLength++;
String name = textRegion.getClass().getName().substring(packageNameLength);
- String text = "[" + textRegion.getStart() + "-" + textRegion.getEnd() + "] " + name + "@" + element.hashCode() + " " + textRegion.getType();
+ String text = "[" + textRegion.getStart() + "-" + textRegion.getEnd() + "] " + name + "@" + element.hashCode() + " " + textRegion.getType(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
return text;
}
return super.getText(element);
@@ -380,11 +381,11 @@
displayText.setText(fDocument.get(text.getOffset(), text.getLength()));
}
catch (BadLocationException e) {
- displayText.setText("");
+ displayText.setText(""); //$NON-NLS-1$
}
}
else
- displayText.setText("" + o);
+ displayText.setText("" + o); //$NON-NLS-1$
}
}
});
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/openon/AbstractOpenOn.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/openon/AbstractOpenOn.java
index 2b573a8..967c865 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/openon/AbstractOpenOn.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/openon/AbstractOpenOn.java
@@ -34,7 +34,7 @@
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.ui.extensions.openon.IOpenOn;
import org.eclipse.wst.sse.ui.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.openon.ExternalFileEditorInput;
import org.eclipse.wst.sse.ui.util.PlatformStatusLineUtil;
@@ -46,7 +46,7 @@
* @deprecated Use base support for hyperlink navigation
*/
abstract public class AbstractOpenOn implements IOpenOn {
- protected final String CANNOT_OPEN = SSEUIPlugin.getResourceString("%AbstractOpenOn.0"); //$NON-NLS-1$
+ protected final String CANNOT_OPEN = SSEUIMessages.AbstractOpenOn_0; //$NON-NLS-1$
// document currently associated with open
private IDocument fDocument;
protected final String FILE_PROTOCOL = "file:/";//$NON-NLS-1$
@@ -123,7 +123,7 @@
model.releaseFromRead();
}
}
- if (file == null && fileString.startsWith("/")) {
+ if (file == null && fileString.startsWith("/")) { //$NON-NLS-1$
file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fileString));
}
return file;
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 c01e7cf..9d0535e 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
@@ -38,7 +38,7 @@
import org.eclipse.wst.sse.core.preferences.PreferenceChangeListener;
import org.eclipse.wst.sse.ui.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -100,7 +100,7 @@
embeddedMessage = originalException.getClass().getName() + ": " + originalException.getMessage(); //$NON-NLS-1$
// not all exceptions have messages (e.g. many
// NullPointerException)
- String originalError = SSEUIPlugin.getResourceString("%PreferenceManager.0"); //$NON-NLS-1$
+ String originalError = SSEUIMessages.PreferenceManager_0; //$NON-NLS-1$
if (result == null)
result = ""; //$NON-NLS-1$
if (embeddedMessage != null)
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractColorPage.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractColorPage.java
index b02a5f2..fa2e940 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractColorPage.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractColorPage.java
@@ -24,7 +24,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore;
public abstract class AbstractColorPage extends org.eclipse.jface.preference.PreferencePage implements org.eclipse.ui.IWorkbenchPreferencePage {
@@ -68,7 +68,7 @@
Composite pageComponent = createComposite(sc1, 1);
sc1.setContent(pageComponent);
- Label descLabel = createDescriptionLabel(pageComponent, SSEUIPlugin.getResourceString("%AbstractColorPageDescription")); //$NON-NLS-1$
+ Label descLabel = createDescriptionLabel(pageComponent, SSEUIMessages.AbstractColorPageDescription); //$NON-NLS-1$
Composite coloringComposite = createColoringComposite(pageComponent);
createContentsForPicker(coloringComposite);
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractPreferencePage.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractPreferencePage.java
index 9be8fc1..36bb154 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractPreferencePage.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractPreferencePage.java
@@ -14,6 +14,7 @@
import org.eclipse.core.runtime.Preferences;
import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.custom.ScrolledComposite;
@@ -34,6 +35,7 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.wst.sse.core.internal.SSECorePlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
/**
@@ -235,7 +237,7 @@
}
protected void setInvalidInputMessage(String widthText) {
- String msg = SSEUIPlugin.getResourceString("%4concat", (new Object[]{widthText})); //$NON-NLS-1$ = "''{0}'' is not a valid input"
+ String msg = NLS.bind(SSEUIMessages._4concat, (new Object[]{widthText}));
setErrorMessage(msg);
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractPreferenceTab.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractPreferenceTab.java
index 3837e98..4c8cc60 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractPreferenceTab.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/AbstractPreferenceTab.java
@@ -35,7 +35,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore;
/**
@@ -251,14 +251,14 @@
private IStatus validatePositiveNumber(String number) {
StatusInfo status = new StatusInfo();
if (number.length() == 0) {
- status.setError(SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.37")); //$NON-NLS-1$
+ status.setError(SSEUIMessages.StructuredTextEditorPreferencePage_37);
} else {
try {
int value = Integer.parseInt(number);
if (value < 0)
- status.setError(number + SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.38")); //$NON-NLS-1$
+ status.setError(number + SSEUIMessages.StructuredTextEditorPreferencePage_38);
} catch (NumberFormatException e) {
- status.setError(number + SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.39")); //$NON-NLS-1$
+ status.setError(number + SSEUIMessages.StructuredTextEditorPreferencePage_38);
}
}
return status;
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/EditStructuredTextEditorPreferencesAction.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/EditStructuredTextEditorPreferencesAction.java
index 0e0dd6a..49aff4c 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/EditStructuredTextEditorPreferencesAction.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/EditStructuredTextEditorPreferencesAction.java
@@ -36,7 +36,7 @@
import org.eclipse.wst.sse.ui.extension.IExtendedEditorAction;
import org.eclipse.wst.sse.ui.extension.IExtendedSimpleEditor;
import org.eclipse.wst.sse.ui.extensions.ConfigurationPointCalculator;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;
import org.eclipse.wst.sse.ui.internal.editor.EditorPluginImageHelper;
import org.eclipse.wst.sse.ui.internal.editor.EditorPluginImages;
@@ -53,7 +53,7 @@
private IExtendedSimpleEditor fEditor;
public EditStructuredTextEditorPreferencesAction() {
- super(SSEUIPlugin.getResourceString("%EditPreferences.label"), EditorPluginImageHelper.getInstance().getImageDescriptor(EditorPluginImages.IMG_OBJ_PREFERENCES)); //$NON-NLS-1$
+ super(SSEUIMessages.EditPreferences_label, EditorPluginImageHelper.getInstance().getImageDescriptor(EditorPluginImages.IMG_OBJ_PREFERENCES)); //$NON-NLS-1$
WorkbenchHelp.setHelp(this, IHelpContextIds.CONTMNU_PREFERENCES_HELPID);
}
@@ -200,7 +200,7 @@
BusyIndicator.showWhile(shell.getDisplay(), new Runnable() {
public void run() {
dialog.create();
- dialog.setMessage(SSEUIPlugin.getResourceString("%EditStructuredTextEditorPreferencesAction.0")); //$NON-NLS-1$
+ dialog.setMessage(SSEUIMessages.EditStructuredTextEditorPreferencesAction_0); //$NON-NLS-1$
result[0] = (dialog.open() == Window.OK);
}
});
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/FilePreferencePage.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/FilePreferencePage.java
index ea1b963..2675cc8 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/FilePreferencePage.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/FilePreferencePage.java
@@ -24,7 +24,7 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.wst.sse.core.internal.SSECorePlugin;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.preferences.TabFolderLayout;
public class FilePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
@@ -52,7 +52,7 @@
protected Control createContents(Composite parent) {
Composite composite = createComposite(parent, 1);
- String description = SSEUIPlugin.getResourceString("%FilePreferencePage.0"); //$NON-NLS-1$
+ String description = SSEUIMessages.FilePreferencePage_0; //$NON-NLS-1$
createLabel(composite, description);
createLabel(composite, ""); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/StructuredTextEditorPreferencePage.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/StructuredTextEditorPreferencePage.java
index 25c2fd1..b80f8a6 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/StructuredTextEditorPreferencePage.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/StructuredTextEditorPreferencePage.java
@@ -43,6 +43,7 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
import org.eclipse.wst.sse.ui.internal.editor.IHelpContextIds;
import org.eclipse.wst.sse.ui.internal.preferences.EditorPreferenceNames;
@@ -67,7 +68,7 @@
private ColorEditor fAppearanceColorEditor;
private List fAppearanceColorList;
- private final String[][] fAppearanceColorListModel = new String[][]{{SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.2"), EditorPreferenceNames.MATCHING_BRACKETS_COLOR}}; //$NON-NLS-1$
+ private final String[][] fAppearanceColorListModel = new String[][]{{SSEUIMessages.StructuredTextEditorPreferencePage_2, EditorPreferenceNames.MATCHING_BRACKETS_COLOR}}; //$NON-NLS-1$
private Map fCheckBoxes = new HashMap();
private SelectionListener fCheckBoxListener = new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {
@@ -90,7 +91,7 @@
private Map fTextFields = new HashMap();
public StructuredTextEditorPreferencePage() {
- setDescription(SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.6")); //$NON-NLS-1$
+ setDescription(SSEUIMessages.StructuredTextEditorPreferencePage_6); //$NON-NLS-1$
setPreferenceStore(SSEUIPlugin.getDefault().getPreferenceStore());
fOverlayStore = new OverlayPreferenceStore(getPreferenceStore(), createOverlayStoreKeys());
@@ -145,10 +146,10 @@
layout.numColumns = 2;
appearanceComposite.setLayout(layout);
- String label = SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.20"); //$NON-NLS-1$
+ String label = SSEUIMessages.StructuredTextEditorPreferencePage_20; //$NON-NLS-1$
addCheckBox(appearanceComposite, label, EditorPreferenceNames.MATCHING_BRACKETS, 0);
- label = SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.30"); //$NON-NLS-1$
+ label = SSEUIMessages.StructuredTextEditorPreferencePage_30; //$NON-NLS-1$
addCheckBox(appearanceComposite, label, CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, 0);
if (showFoldingPreference) {
@@ -163,7 +164,7 @@
l.setLayoutData(gd);
l = new Label(appearanceComposite, SWT.LEFT);
- l.setText(SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.23")); //$NON-NLS-1$
+ l.setText(SSEUIMessages.StructuredTextEditorPreferencePage_23); //$NON-NLS-1$
gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
gd.horizontalSpan = 2;
l.setLayoutData(gd);
@@ -194,7 +195,7 @@
l = new Label(stylesComposite, SWT.LEFT);
// needs to be made final so label can be set in
// foregroundcolorbutton's acc listener
- final String buttonLabel = SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.24"); //$NON-NLS-1$
+ final String buttonLabel = SSEUIMessages.StructuredTextEditorPreferencePage_24; //$NON-NLS-1$
l.setText(buttonLabel);
gd = new GridData();
gd.horizontalAlignment = GridData.BEGINNING;
@@ -256,7 +257,7 @@
folder.setLayoutData(new GridData(GridData.FILL_BOTH));
TabItem item = new TabItem(folder, SWT.NONE);
- item.setText(SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.0")); //$NON-NLS-1$
+ item.setText(SSEUIMessages.StructuredTextEditorPreferencePage_0); //$NON-NLS-1$
item.setControl(createAppearancePage(folder));
item = new TabItem(folder, SWT.NONE);
@@ -429,14 +430,14 @@
private IStatus validatePositiveNumber(String number) {
StatusInfo status = new StatusInfo();
if (number.length() == 0) {
- status.setError(SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.37")); //$NON-NLS-1$
+ status.setError(SSEUIMessages.StructuredTextEditorPreferencePage_37);
} else {
try {
int value = Integer.parseInt(number);
if (value < 0)
- status.setError(number + SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.38")); //$NON-NLS-1$
+ status.setError(number + SSEUIMessages.StructuredTextEditorPreferencePage_38);
} catch (NumberFormatException e) {
- status.setError(number + SSEUIPlugin.getResourceString("%StructuredTextEditorPreferencePage.39")); //$NON-NLS-1$
+ status.setError(number + SSEUIMessages.StructuredTextEditorPreferencePage_38);
}
}
return status;
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/StyledTextColorPicker.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/StyledTextColorPicker.java
index 0772b92..113b041 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/StyledTextColorPicker.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/StyledTextColorPicker.java
@@ -58,7 +58,7 @@
import org.eclipse.wst.sse.core.text.ITextRegion;
import org.eclipse.wst.sse.core.text.ITextRegionList;
import org.eclipse.wst.sse.core.util.Debug;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.util.EditorUtility;
import org.w3c.dom.Node;
@@ -418,10 +418,10 @@
protected void createControls(Composite parent) {
Composite styleRow = createComposite(parent, 3);
// row 1 - content type label, combo box, restore defaults
- createLabel(styleRow, SSEUIPlugin.getResourceString("%Content_type__UI_")); //$NON-NLS-1$ = "Content type:"
+ createLabel(styleRow, SSEUIMessages.Content_type__UI_); //$NON-NLS-1$ = "Content type:"
// Contexts combo box
fStyleCombo = createCombo(styleRow, new String[0], -1);
- fClearStyle = createPushButton(styleRow, SSEUIPlugin.getResourceString("%Restore_Default_UI_")); //$NON-NLS-1$ = "Restore Default"
+ fClearStyle = createPushButton(styleRow, SSEUIMessages.Restore_Default_UI_); //$NON-NLS-1$ = "Restore Default"
Composite styleRow2;
if (showItalic)
styleRow2 = createComposite(parent, 7);
@@ -429,7 +429,7 @@
styleRow2 = createComposite(parent, 6);
// row 2 - foreground label, button, background label, button, bold,
// italics?
- fForegroundLabel = createLabel(styleRow2, SSEUIPlugin.getResourceString("%Foreground_UI_")); //$NON-NLS-1$ = "Foreground"
+ fForegroundLabel = createLabel(styleRow2, SSEUIMessages.Foreground_UI_); //$NON-NLS-1$ = "Foreground"
fForeground = createPushButton(styleRow2, ""); //$NON-NLS-1$
setAccessible(fForeground, fForegroundLabel.getText());
fForeground.getAccessible().addAccessibleControlListener(foregroundAccListener); // defect
@@ -443,7 +443,7 @@
Point buttonSize = computeImageSize(parent);
((GridData) fForeground.getLayoutData()).widthHint = buttonSize.x;
((GridData) fForeground.getLayoutData()).heightHint = buttonSize.y;
- fBackgroundLabel = createLabel(styleRow2, SSEUIPlugin.getResourceString("%Background_UI_")); //$NON-NLS-1$ = "Background"
+ fBackgroundLabel = createLabel(styleRow2, SSEUIMessages.Background_UI_); //$NON-NLS-1$ = "Background"
fBackground = createPushButton(styleRow2, ""); //$NON-NLS-1$
setAccessible(fBackground, fBackgroundLabel.getText());
fBackground.getAccessible().addAccessibleControlListener(backgroundAccListener); // defect
@@ -457,9 +457,9 @@
((GridData) fBackground.getLayoutData()).widthHint = buttonSize.x;
((GridData) fBackground.getLayoutData()).heightHint = buttonSize.y;
createLabel(styleRow2, ""); //$NON-NLS-1$
- fBold = createCheckBox(styleRow2, SSEUIPlugin.getResourceString("%Bold_UI_")); //$NON-NLS-1$ = "Bold"
+ fBold = createCheckBox(styleRow2, SSEUIMessages.Bold_UI_);
if (showItalic)
- fItalic = createCheckBox(styleRow2, SSEUIPlugin.getResourceString("%Italic")); //$NON-NLS-1$
+ fItalic = createCheckBox(styleRow2, SSEUIMessages.Italics_UI);
// // Defaults checkbox
fForeground.setEnabled(false);
fBackground.setEnabled(false);
@@ -470,7 +470,7 @@
fForegroundLabel.setEnabled(false);
fBackgroundLabel.setEnabled(false);
Composite sample = createComposite(parent, 1);
- createLabel(sample, SSEUIPlugin.getResourceString("%Sample_text__UI_")); //$NON-NLS-1$ = "&Sample text:"
+ createLabel(sample, SSEUIMessages.Sample_text__UI_); //$NON-NLS-1$ = "&Sample text:"
fText = new StyledText(sample, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER | SWT.READ_ONLY);
GridData data = new GridData(GridData.FILL_BOTH);
fText.setLayoutData(data);
@@ -484,7 +484,7 @@
// Provide tab
// traversal for
// fText widget
- setAccessible(fText, SSEUIPlugin.getResourceString("%Sample_text__UI_")); //$NON-NLS-1$ = "&Sample text:"
+ setAccessible(fText, SSEUIMessages.Sample_text__UI_); //$NON-NLS-1$ = "&Sample text:"
fForeground.addSelectionListener(buttonListener);
fBackground.addSelectionListener(buttonListener);
fClearStyle.addSelectionListener(buttonListener);
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 ee050e8..143e4f4 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
@@ -64,6 +64,7 @@
import org.eclipse.wst.sse.core.preferences.CommonModelPreferenceNames;
import org.eclipse.wst.sse.core.util.StringUtils;
import org.eclipse.wst.sse.ui.internal.Logger;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
import org.eclipse.wst.sse.ui.internal.editor.IHelpContextIds;
@@ -84,17 +85,17 @@
for (int i = 0; i < fTags.length; i++) {
if (fTags[i].equals(element)) {
if (fPriorities[i].intValue() == IMarker.PRIORITY_HIGH) {
- return SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.0"); //$NON-NLS-1$
+ return SSEUIMessages.TaskTagPreferenceTab_0; //$NON-NLS-1$
}
else if (fPriorities[i].intValue() == IMarker.PRIORITY_LOW) {
- return SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.1"); //$NON-NLS-1$
+ return SSEUIMessages.TaskTagPreferenceTab_1; //$NON-NLS-1$
}
else {
- return SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.2"); //$NON-NLS-1$
+ return SSEUIMessages.TaskTagPreferenceTab_2; //$NON-NLS-1$
}
}
}
- return SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.3"); //$NON-NLS-1$
+ return SSEUIMessages.TaskTagPreferenceTab_3; //$NON-NLS-1$
}
}
@@ -111,7 +112,7 @@
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.5")); //$NON-NLS-1$
+ newShell.setText(SSEUIMessages.TaskTagPreferenceTab_5); //$NON-NLS-1$
}
protected Control createButtonBar(Composite parent) {
@@ -125,7 +126,7 @@
composite.setLayout(new GridLayout(2, false));
composite.setLayoutData(new GridData(GridData.FILL_BOTH));
Label label = new Label(composite, SWT.NONE);
- label.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.6")); //$NON-NLS-1$
+ label.setText(SSEUIMessages.TaskTagPreferenceTab_6); //$NON-NLS-1$
label.setLayoutData(new GridData());
tagText = new Text(composite, SWT.BORDER);
tagText.setText(text);
@@ -137,10 +138,10 @@
});
label = new Label(composite, SWT.NONE);
- label.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.7")); //$NON-NLS-1$
+ label.setText(SSEUIMessages.TaskTagPreferenceTab_7); //$NON-NLS-1$
label.setLayoutData(new GridData());
priorityCombo = new Combo(composite, SWT.READ_ONLY | SWT.SINGLE);
- priorityCombo.setItems(new String[]{SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.8"), SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.9"), SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.10")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ priorityCombo.setItems(new String[]{SSEUIMessages.TaskTagPreferenceTab_8, SSEUIMessages.TaskTagPreferenceTab_9, SSEUIMessages.TaskTagPreferenceTab_10}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
priorityCombo.select(2 - priority);
priorityCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
priorityCombo.addSelectionListener(new SelectionAdapter() {
@@ -216,15 +217,15 @@
fEnableCheckbox = new Button(composite, SWT.CHECK);
fEnableCheckbox.setSelection(fEnableTaskTags);
- fEnableCheckbox.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.31"));
+ fEnableCheckbox.setText(SSEUIMessages.TaskTagPreferenceTab_31); //$NON-NLS-1$
fEnableCheckbox.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER, GridData.HORIZONTAL_ALIGN_BEGINNING, false, false, 2, 1));
valueTable = new TableViewer(composite, SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
valueTable.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
TableColumn textColumn = new TableColumn(valueTable.getTable(), SWT.NONE, 0);
- textColumn.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.12")); //$NON-NLS-1$
+ textColumn.setText(SSEUIMessages.TaskTagPreferenceTab_12); //$NON-NLS-1$
TableColumn priorityColumn = new TableColumn(valueTable.getTable(), SWT.NONE, 1);
- priorityColumn.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.13")); //$NON-NLS-1$
+ priorityColumn.setText(SSEUIMessages.TaskTagPreferenceTab_13); //$NON-NLS-1$
valueTable.setContentProvider(new ArrayContentProvider());
valueTable.setLabelProvider(new InternalTableLabelProvider());
valueTable.getTable().setLinesVisible(true);
@@ -239,22 +240,22 @@
buttons.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
final Button addButton = new Button(buttons, SWT.PUSH);
- addButton.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.14")); //$NON-NLS-1$
+ addButton.setText(SSEUIMessages.TaskTagPreferenceTab_14); //$NON-NLS-1$
addButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER));
final Button editButton = new Button(buttons, SWT.PUSH);
- editButton.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.15")); //$NON-NLS-1$
+ editButton.setText(SSEUIMessages.TaskTagPreferenceTab_15); //$NON-NLS-1$
editButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER));
final Button removeButton = new Button(buttons, SWT.PUSH);
- removeButton.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.16")); //$NON-NLS-1$
+ removeButton.setText(SSEUIMessages.TaskTagPreferenceTab_16); //$NON-NLS-1$
removeButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER));
Label spacer = new Label(buttons, SWT.NONE);
spacer.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER));
final Button upButton = new Button(buttons, SWT.PUSH);
- upButton.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.17")); //$NON-NLS-1$
+ upButton.setText(SSEUIMessages.TaskTagPreferenceTab_17); //$NON-NLS-1$
upButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER));
final Button downButton = new Button(buttons, SWT.PUSH);
- downButton.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.18")); //$NON-NLS-1$
+ downButton.setText(SSEUIMessages.TaskTagPreferenceTab_18); //$NON-NLS-1$
downButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER));
editButton.setEnabled(false);
@@ -264,7 +265,7 @@
Label warning = new Label(composite, SWT.NONE);
warning.setLayoutData(new GridData());
- warning.setText(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.19")); //$NON-NLS-1$
+ warning.setText(SSEUIMessages.TaskTagPreferenceTab_19); //$NON-NLS-1$
valueTable.addPostSelectionChangedListener(new ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent event) {
@@ -352,7 +353,7 @@
}
public String getTitle() {
- return SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.20"); //$NON-NLS-1$
+ return SSEUIMessages.TaskTagPreferenceTab_20; //$NON-NLS-1$
}
private void loadPreferenceValues() {
@@ -427,10 +428,10 @@
}
}
else if (isDirty) {
- MessageDialog dialog = new MessageDialog(fControl.getShell(), SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.22"), fControl.getShell().getImage(), SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.23"), MessageDialog.QUESTION, new String[]{SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.24"), SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.25"), SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.26")}, 2); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ MessageDialog dialog = new MessageDialog(fControl.getShell(), SSEUIMessages.TaskTagPreferenceTab_22, fControl.getShell().getImage(), SSEUIMessages.TaskTagPreferenceTab_23, MessageDialog.QUESTION, new String[]{SSEUIMessages.TaskTagPreferenceTab_24, SSEUIMessages.TaskTagPreferenceTab_25, SSEUIMessages.TaskTagPreferenceTab_26}, 2); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
int button = dialog.open();
if (button == 0) {
- Job buildJob = new Job(SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.27")) { //$NON-NLS-1$
+ Job buildJob = new Job(SSEUIMessages.TaskTagPreferenceTab_27) { //$NON-NLS-1$
public Object getAdapter(Class adapter) {
return null;
}
@@ -449,13 +450,13 @@
}
}
if (monitor.isCanceled()) {
- status = new Status(IStatus.CANCEL, SSEUIPlugin.ID, IStatus.OK, SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.28"), null); //$NON-NLS-1$
+ status = new Status(IStatus.CANCEL, SSEUIPlugin.ID, IStatus.OK, SSEUIMessages.TaskTagPreferenceTab_28, null); //$NON-NLS-1$
}
else if (errorCount == 0) {
- status = new Status(IStatus.OK, SSEUIPlugin.ID, IStatus.OK, SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.29"), null); //$NON-NLS-1$
+ status = new Status(IStatus.OK, SSEUIPlugin.ID, IStatus.OK, SSEUIMessages.TaskTagPreferenceTab_29, null); //$NON-NLS-1$
}
else {
- status = new Status(IStatus.ERROR, SSEUIPlugin.ID, IStatus.OK, SSEUIPlugin.getResourceString("%TaskTagPreferenceTab.30"), null); //$NON-NLS-1$
+ status = new Status(IStatus.ERROR, SSEUIPlugin.ID, IStatus.OK, SSEUIMessages.TaskTagPreferenceTab_30, null); //$NON-NLS-1$
}
return status;
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TextHoverPreferenceTab.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TextHoverPreferenceTab.java
index 59fb22e..431e27c 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TextHoverPreferenceTab.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TextHoverPreferenceTab.java
@@ -30,6 +30,7 @@
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
@@ -48,6 +49,7 @@
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
import org.eclipse.wst.sse.ui.internal.editor.IHelpContextIds;
import org.eclipse.wst.sse.ui.internal.preferences.EditorPreferenceNames;
@@ -88,7 +90,7 @@
}
}
- private static final String DELIMITER = SSEUIPlugin.getResourceString("%TextHoverPreferenceTab.delimiter"); //$NON-NLS-1$
+ private static final String DELIMITER = SSEUIMessages.TextHoverPreferenceTab_delimiter; //$NON-NLS-1$
private Text fDescription;
private Table fHoverTable;
private TableViewer fHoverTableViewer;
@@ -136,7 +138,7 @@
// CommonEditorPreferenceNames.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE, 0);
Label label = new Label(hoverComposite, SWT.NONE);
- label.setText(SSEUIPlugin.getResourceString("%TextHoverPreferenceTab.hoverPreferences")); //$NON-NLS-1$
+ label.setText(SSEUIMessages.TextHoverPreferenceTab_hoverPreferences); //$NON-NLS-1$
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalAlignment = GridData.BEGINNING;
gd.horizontalSpan = 2;
@@ -168,11 +170,11 @@
});
fNameColumn = new TableColumn(fHoverTable, SWT.NONE);
- fNameColumn.setText(SSEUIPlugin.getResourceString("%TextHoverPreferenceTab.nameColumnTitle")); //$NON-NLS-1$
+ fNameColumn.setText(SSEUIMessages.TextHoverPreferenceTab_nameColumnTitle); //$NON-NLS-1$
fNameColumn.setResizable(true);
fModifierColumn = new TableColumn(fHoverTable, SWT.NONE);
- fModifierColumn.setText(SSEUIPlugin.getResourceString("%TextHoverPreferenceTab.modifierColumnTitle")); //$NON-NLS-1$
+ fModifierColumn.setText(SSEUIMessages.TextHoverPreferenceTab_modifierColumnTitle); //$NON-NLS-1$
fModifierColumn.setResizable(true);
fHoverTableViewer.setUseHashlookup(true);
@@ -207,7 +209,7 @@
// Text field for modifier string
label = new Label(hoverComposite, SWT.LEFT);
- label.setText(SSEUIPlugin.getResourceString("%TextHoverPreferenceTab.keyModifier")); //$NON-NLS-1$
+ label.setText(SSEUIMessages.TextHoverPreferenceTab_keyModifier); //$NON-NLS-1$
fModifierEditor = new Text(hoverComposite, SWT.BORDER);
gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
fModifierEditor.setLayoutData(gd);
@@ -243,11 +245,11 @@
String insertString;
if (needsPrefixDelimiter && needsPostfixDelimiter)
- insertString = SSEUIPlugin.getResourceString("%JavaEditorHoverConfigurationBlock.insertDelimiterAndModifierAndDelimiter", new String[]{Action.findModifierString(e.stateMask)}); //$NON-NLS-1$
+ insertString = NLS.bind(SSEUIMessages.TextHoverPreferenceTab_insertDelimiterAndModifierAndDelimiter, new String[]{Action.findModifierString(e.stateMask)});
else if (needsPrefixDelimiter)
- insertString = SSEUIPlugin.getResourceString("%JavaEditorHoverConfigurationBlock.insertDelimiterAndModifier", new String[]{Action.findModifierString(e.stateMask)}); //$NON-NLS-1$
+ insertString = NLS.bind(SSEUIMessages.TextHoverPreferenceTab_insertDelimiterAndModifier, new String[]{Action.findModifierString(e.stateMask)});
else if (needsPostfixDelimiter)
- insertString = SSEUIPlugin.getResourceString("%JavaEditorHoverConfigurationBlock.insertModifierAndDelimiter", new String[]{Action.findModifierString(e.stateMask)}); //$NON-NLS-1$
+ insertString = NLS.bind(SSEUIMessages.TextHoverPreferenceTab_insertModifierAndDelimiter, new String[]{Action.findModifierString(e.stateMask)});
else
insertString = Action.findModifierString(e.stateMask);
@@ -265,7 +267,7 @@
// Description
Label descriptionLabel = new Label(hoverComposite, SWT.LEFT);
- descriptionLabel.setText(SSEUIPlugin.getResourceString("%TextHoverPreferenceTab.description")); //$NON-NLS-1$
+ descriptionLabel.setText(SSEUIMessages.TextHoverPreferenceTab_description); //$NON-NLS-1$
gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
gd.horizontalSpan = 2;
descriptionLabel.setLayoutData(gd);
@@ -319,7 +321,7 @@
* @see org.eclipse.wst.sse.ui.preferences.ui.IPreferenceTab#getTitle()
*/
public String getTitle() {
- return SSEUIPlugin.getResourceString("%TextHoverPreferenceTab.title"); //$NON-NLS-1$
+ return SSEUIMessages.TextHoverPreferenceTab_title; //$NON-NLS-1$
}
void handleHoverListSelection() {
@@ -420,7 +422,7 @@
IStatus status = new StatusInfo();
if (hoverConfig != null && hoverConfig.isEnabled() && EditorUtility.computeStateMask(hoverConfig.getModifierString()) == -1)
- status = new StatusInfo(IStatus.ERROR, SSEUIPlugin.getResourceString("%TextHoverPreferenceTab.modifierIsNotValid", new String[]{hoverConfig.getModifierString()})); //$NON-NLS-1$
+ status = new StatusInfo(IStatus.ERROR, NLS.bind(SSEUIMessages.TextHoverPreferenceTab_modifierIsNotValid, new String[]{hoverConfig.getModifierString()}));
int i = 0;
HashMap stateMasks = new HashMap(fTextHovers.length);
@@ -429,9 +431,9 @@
String label = fTextHovers[i].getLabel();
Integer stateMask = new Integer(EditorUtility.computeStateMask(fTextHovers[i].getModifierString()));
if (stateMask.intValue() == -1)
- status = new StatusInfo(IStatus.ERROR, SSEUIPlugin.getResourceString("%TextHoverPreferenceTab.modifierIsNotValidForHover", new String[]{fTextHovers[i].getModifierString(), label})); //$NON-NLS-1$
+ status = new StatusInfo(IStatus.ERROR, NLS.bind(SSEUIMessages.TextHoverPreferenceTab_modifierIsNotValidForHover, new String[]{fTextHovers[i].getModifierString(), label}));
else if (stateMasks.containsKey(stateMask))
- status = new StatusInfo(IStatus.ERROR, SSEUIPlugin.getResourceString("%TextHoverPreferenceTab.duplicateModifier", new String[]{label, (String) stateMasks.get(stateMask)})); //$NON-NLS-1$
+ status = new StatusInfo(IStatus.ERROR, NLS.bind(SSEUIMessages.TextHoverPreferenceTab_duplicateModifier, new String[]{label, (String) stateMasks.get(stateMask)}));
else
stateMasks.put(stateMask, label);
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TranslucencyPreferenceTab.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TranslucencyPreferenceTab.java
index 97b794e..91d42f6 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TranslucencyPreferenceTab.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/preferences/ui/TranslucencyPreferenceTab.java
@@ -26,6 +26,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.help.WorkbenchHelp;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
import org.eclipse.wst.sse.ui.internal.editor.IHelpContextIds;
import org.eclipse.wst.sse.ui.internal.preferences.EditorPreferenceNames;
@@ -67,7 +68,7 @@
layout.numColumns = 2;
composite.setLayout(layout);
- String text = SSEUIPlugin.getResourceString("%TranslucencyPreferenceTab.1"); //$NON-NLS-1$
+ String text = SSEUIMessages.TranslucencyPreferenceTab_1; //$NON-NLS-1$
fTranslucencyScale = new IntegerFieldEditor(EditorPreferenceNames.READ_ONLY_FOREGROUND_SCALE, text, composite);
fTranslucencyScale.setErrorMessage(JFaceResources.getString("StringFieldEditor.errorMessage"));//$NON-NLS-1$
@@ -103,7 +104,7 @@
* @see org.eclipse.wst.sse.ui.preferences.ui.IPreferenceTab#getTitle()
*/
public String getTitle() {
- return SSEUIPlugin.getResourceString("%TranslucencyPreferenceTab.0"); //$NON-NLS-1$
+ return SSEUIMessages.TranslucencyPreferenceTab_0; //$NON-NLS-1$
}
/*
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryRegistryImpl.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryRegistryImpl.java
index f111f91..2b10e60 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryRegistryImpl.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryRegistryImpl.java
@@ -72,8 +72,8 @@
public Iterator getAdapterFactories() {
if (DEBUG) {
- System.out.println("====================================================================================");
- System.out.println("GETTING ALL ADAPTER FACTORIES");
+ System.out.println("===================================================================================="); //$NON-NLS-1$
+ System.out.println("GETTING ALL ADAPTER FACTORIES"); //$NON-NLS-1$
}
List results = new ArrayList();
@@ -86,13 +86,13 @@
contentTypeId = (String) it.next();
if (DEBUG)
- System.out.println(" + for: " + contentTypeId);
+ System.out.println(" + for: " + contentTypeId); //$NON-NLS-1$
results.addAll(getAdapterFactoriesAsList(contentTypeId));
}
if (DEBUG) {
- System.out.println("====================================================================================");
+ System.out.println("===================================================================================="); //$NON-NLS-1$
}
return results.iterator();
@@ -100,8 +100,8 @@
public Iterator getAdapterFactories(String contentTypeID) {
if (DEBUG) {
- System.out.println("====================================================================================");
- System.out.println("GETTING ADAPTER FACTORIES for: " + contentTypeID);
+ System.out.println("===================================================================================="); //$NON-NLS-1$
+ System.out.println("GETTING ADAPTER FACTORIES for: " + contentTypeID); //$NON-NLS-1$
}
List results = new ArrayList();
@@ -117,7 +117,7 @@
if (DEBUG) {
- System.out.println("====================================================================================");
+ System.out.println("===================================================================================="); //$NON-NLS-1$
}
return results.iterator();
@@ -164,7 +164,7 @@
if (o != null) {
// this provider has already been created
if (DEBUG)
- System.out.println("already created: " + element.getAttribute(ATT_CLASS));
+ System.out.println("already created: " + element.getAttribute(ATT_CLASS)); //$NON-NLS-1$
results.add(o);
}
@@ -174,7 +174,7 @@
classname = element.getAttribute(ATT_CLASS);
if (DEBUG)
- System.out.println("about to create: " + classname);
+ System.out.println("about to create: " + classname); //$NON-NLS-1$
// check if we created one already
existing = this.adapterProviders.get(classname);
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryRegistryReader.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryRegistryReader.java
index 49d94a9..6381959 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryRegistryReader.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/registry/AdapterFactoryRegistryReader.java
@@ -61,14 +61,14 @@
map.put(contentTypeId, element2provider);
if (DEBUG)
- System.out.println("added " + element.getAttribute(ATT_CLASS) + ", but didn't create exec extension");
+ System.out.println("added " + element.getAttribute(ATT_CLASS) + ", but didn't create exec extension"); //$NON-NLS-1$ //$NON-NLS-2$
} else {
// add element to unknown list (not executable ext yet...)
HashMap element2provider = (HashMap) o;
element2provider.put(element, null);
if (DEBUG)
- System.out.println("added " + element.getAttribute(ATT_CLASS) + " to unknown list, but didn't create exec extension");
+ System.out.println("added " + element.getAttribute(ATT_CLASS) + " to unknown list, but didn't create exec extension"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/style/Highlighter.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/style/Highlighter.java
index b0045e6..cf6a47c 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/style/Highlighter.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/style/Highlighter.java
@@ -246,7 +246,7 @@
private final boolean DEBUG = false;
private final StyleRange[] EMPTY_STYLE_RANGE = new StyleRange[0];
- private static final String LINE_STYLE_PROVIDER_EXTENDED_ID = "linestyleprovider";
+ private static final String LINE_STYLE_PROVIDER_EXTENDED_ID = "linestyleprovider"; //$NON-NLS-1$
private IPropertyChangeListener fForegroundScaleListener = new IPropertyChangeListener() {
public void propertyChange(PropertyChangeEvent event) {
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/taginfo/AnnotationHoverProcessor.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/taginfo/AnnotationHoverProcessor.java
index a896007..fb5880e 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/taginfo/AnnotationHoverProcessor.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/taginfo/AnnotationHoverProcessor.java
@@ -30,6 +30,7 @@
import org.eclipse.ui.texteditor.ChainedPreferenceStore;
import org.eclipse.wst.sse.core.util.StringUtils;
import org.eclipse.wst.sse.ui.internal.ITemporaryAnnotation;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
/**
@@ -77,7 +78,7 @@
protected String formatMessages(List messages) {
StringBuffer buffer = new StringBuffer();
buffer.append(PARAGRAPH_START);
- buffer.append(SSEUIPlugin.getResourceString("%Multiple_errors")); //$NON-NLS-1$
+ buffer.append(SSEUIMessages.Multiple_errors); //$NON-NLS-1$
buffer.append(LIST_BEGIN);
Iterator e = messages.iterator();
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/taginfo/TextHoverManager.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/taginfo/TextHoverManager.java
index 7412fff..1af5fd0 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/taginfo/TextHoverManager.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/taginfo/TextHoverManager.java
@@ -16,6 +16,7 @@
import java.util.StringTokenizer;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
import org.eclipse.wst.sse.ui.internal.preferences.EditorPreferenceNames;
@@ -118,15 +119,15 @@
// list of different types of Source editor hovers
public static final String COMBINATION_HOVER = "combinationHover"; //$NON-NLS-1$
// hover descriptions are in .properties file with the key in the form of
- // "[id].desc"
- private static final String DESCRIPTION_KEY = ".desc"; //$NON-NLS-1$
+ // "[id]_desc"
+ private static final String DESCRIPTION_KEY = "_desc"; //$NON-NLS-1$
public static final String DOCUMENTATION_HOVER = "documentationHover"; //$NON-NLS-1$
public static final String HOVER_ATTRIBUTE_SEPARATOR = "|"; //$NON-NLS-1$
public static final String HOVER_SEPARATOR = ";"; //$NON-NLS-1$
// hover labels are in .properties file with the key in the form of
- // "[id].label"
- private static final String LABEL_KEY = ".label"; //$NON-NLS-1$
+ // "[id]_label"
+ private static final String LABEL_KEY = "_label"; //$NON-NLS-1$
public static final String NO_MODIFIER = "0"; //$NON-NLS-1$
public static final String PROBLEM_HOVER = "problemHover"; //$NON-NLS-1$
@@ -162,7 +163,7 @@
if (modifierString.equals(NO_MODIFIER))
modifierString = ""; //$NON-NLS-1$
- TextHoverDescriptor descriptor = new TextHoverDescriptor(id, SSEUIPlugin.getResourceString("%" + id + LABEL_KEY), SSEUIPlugin.getResourceString("%" + id + DESCRIPTION_KEY), enabled, modifierString);
+ TextHoverDescriptor descriptor = new TextHoverDescriptor(id, SSEUIMessages.getResourceBundle().getString(id + LABEL_KEY), SSEUIMessages.getResourceBundle().getString(id + DESCRIPTION_KEY), enabled, modifierString);
// should check to see if ids appear more than once
idToModifier.put(id, descriptor);
}
@@ -175,7 +176,7 @@
if (desc != null) {
descriptors[i] = desc;
} else {
- descriptors[i] = new TextHoverDescriptor(TEXT_HOVER_IDS[i], SSEUIPlugin.getResourceString("%" + TEXT_HOVER_IDS[i] + LABEL_KEY), SSEUIPlugin.getResourceString("%" + TEXT_HOVER_IDS + DESCRIPTION_KEY));
+ descriptors[i] = new TextHoverDescriptor(TEXT_HOVER_IDS[i], SSEUIMessages.getResourceBundle().getString(TEXT_HOVER_IDS[i] + LABEL_KEY), SSEUIMessages.getResourceBundle().getString(TEXT_HOVER_IDS + DESCRIPTION_KEY));
}
}
return descriptors;
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/views/contentoutline/StructuredContentOutlineConfiguration.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/views/contentoutline/StructuredContentOutlineConfiguration.java
index 6f2ffba..7f928bc 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/views/contentoutline/StructuredContentOutlineConfiguration.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/views/contentoutline/StructuredContentOutlineConfiguration.java
@@ -29,6 +29,7 @@
import org.eclipse.ui.part.ShowInContext;
import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
import org.eclipse.wst.sse.ui.internal.Logger;
+import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;
import org.eclipse.wst.sse.ui.internal.ViewerSelectionManager;
@@ -49,7 +50,7 @@
private TreeViewer fTreeViewer = null;
public CollapseTreeAction(TreeViewer viewer) {
- super(SSEUIPlugin.getResourceString("%StructuredContentOutlineConfiguration.0"), AS_PUSH_BUTTON); //$NON-NLS-1$
+ super(SSEUIMessages.StructuredContentOutlineConfiguration_0, AS_PUSH_BUTTON); //$NON-NLS-1$
setImageDescriptor(COLLAPSE_E);
setDisabledImageDescriptor(COLLAPSE_D);
setToolTipText(getText());
@@ -65,7 +66,7 @@
protected class ToggleLinkAction extends PropertyChangeUpdateAction {
public ToggleLinkAction(IPreferenceStore store, String preference) {
- super(SSEUIPlugin.getResourceString("%StructuredContentOutlineConfiguration.1"), store, preference, true); //$NON-NLS-1$
+ super(SSEUIMessages.StructuredContentOutlineConfiguration_1, store, preference, true); //$NON-NLS-1$
setToolTipText(getText());
setDisabledImageDescriptor(SYNCED_D);
setImageDescriptor(SYNCED_E);
