changed messages to new NLS support
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
index 5c79348..2b2c407 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
@@ -127,7 +127,7 @@
{
RuntimeDelegate dl = getRuntimeDelegate();
IRuntimeType runtimeType = dl.getRuntime().getRuntimeType();
- String name = GenericServerUIMessages.getFormattedString("runtimeName", new String[] {runtimeType.getName()});
+ String name = GenericServerUIMessages.bind(GenericServerUIMessages.runtimeName,runtimeType.getName());
IRuntime[] list = ServerCore.getRuntimes();
int suffix = 1;
String suffixName=name;
@@ -161,7 +161,7 @@
String rName = getRuntimeName();
if(rName == null || rName.length()<1)
rName="Generic";
- return GenericServerUIMessages.getFormattedString("runtimeWizardDescription",new String[] {rName});
+ return GenericServerUIMessages.bind(GenericServerUIMessages.runtimeWizardDescription,rName);
}
/* (non-Javadoc)
* @see org.eclipse.jst.server.generic.internal.ui.ServerDefinitionTypeAwareWizardFragment#title()
@@ -170,7 +170,7 @@
String rName = getRuntimeName();
if(rName == null || rName.length()<1)
rName="Generic";
- return GenericServerUIMessages.getFormattedString("runtimeWizardTitle",new String[]{rName});
+ return GenericServerUIMessages.bind(GenericServerUIMessages.runtimeWizardTitle,rName);
}
private String getRuntimeName()
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
index 03eb33f..1e0385f 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
@@ -1,63 +1,29 @@
package org.eclipse.jst.server.generic.ui.internal;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.eclipse.osgi.util.NLS;
/**
* Helper class to get messages
*
* @author Gorkem Ercan
*/
-public class GenericServerUIMessages {
+public class GenericServerUIMessages extends NLS{
private static final String RESOURCE_BUNDLE= "org.eclipse.jst.server.generic.ui.internal.GenericServerUIMessages";//$NON-NLS-1$
-
- private static ResourceBundle fResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
-
- private GenericServerUIMessages() {
- }
-
- /**
- * Return string from the resource bundle.
- *
- * @param key the string used to get the bundle value, must not be <code>null</code>
- * @return the string from the resource bundle
- */
- public static String getString(String key) {
- try {
- return fResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";
- }
- }
+ public static String serverTypeGroup_label_browse;
+ public static String runtimeName;
+ public static String runtimeWizardDescription;
+ public static String runtimeWizardTitle;
+ public static String serverName;
+ public static String serverWizardDescription;
+ public static String serverWizardTitle;
+ public static String installed_jre_link;
+ public static String jre_select_label;
+ public static String defaultJRE;
+ public static String invalidPath;
- /**
- * Gets a string from the resource bundle that is
- * formatted it with the given argument.
- *
- * @param key the string used to get the bundle value, must not be null
- * @param arg the argument used to format the string
- * @return the formatted string
- */
- public static String getFormattedString(String key, Object[] arg) {
- String format= null;
- try {
- format= fResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";
- }
- if (arg == null)
- arg= new Object[0];
- return MessageFormat.format(format,arg );
+ static{
+ NLS.initializeMessages(RESOURCE_BUNDLE, GenericServerUIMessages.class);
}
-
- /**
- * Returns a resource bundle.
- *
- * @return the resource bundle
- */
- public static ResourceBundle getResourceBundle() {
- return fResourceBundle;
- }
+
}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
index 987124f..0fb6fdf 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
@@ -2,6 +2,10 @@
serverWizardDescription=Create a new {0} server
runtimeWizardTitle=New {0} Runtime
runtimeWizardDescription=Define a new {0} runtime
-serverTypeGroup.label.browse=Browse...
+serverTypeGroup_label_browse=Browse...
serverName = {0}(Generic)
-runtimeName= {0}(Generic)
\ No newline at end of file
+runtimeName= {0}(Generic)
+installed_jre_link = You can use <a>Installed JRE preferences</a> to create a new JRE
+jre_select_label= JRE:
+defaultJRE = Default JRE
+invalidPath = {0} is not valid
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
index 694322b..1dd060d 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
@@ -100,7 +100,8 @@
}
public void enter() {
- getServer().setName(GenericServerUIMessages.getFormattedString("serverName",new String[] {getServerTypeDefinitionFor(getServer()).getName()}));
+ getServer().setName(GenericServerUIMessages.bind(GenericServerUIMessages.serverName,getServerTypeDefinitionFor(getServer()).getName()));
+
}
public void exit(){
@@ -115,7 +116,7 @@
String sName = getServerName();
if(sName==null || sName.length()<1)
sName="Generic";
- return GenericServerUIMessages.getFormattedString("serverWizardDescription",new String[] {sName});
+ return GenericServerUIMessages.bind(GenericServerUIMessages.serverWizardDescription,sName);
}
private String getServerName()
@@ -131,6 +132,6 @@
String sName= getServerName();
if(sName==null || sName.length()<1)
sName="Generic";
- return GenericServerUIMessages.getFormattedString("serverWizardTitle",new String[]{sName});
+ return GenericServerUIMessages.bind(GenericServerUIMessages.serverWizardTitle,sName);
}
}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java
index dbefd1d..b19e1d2 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java
@@ -35,10 +35,10 @@
updateJREs();
Link link = new Link(composite,SWT.NONE);
link.setLayoutData(new GridData(SWT.FILL,SWT.NONE,true,false,3,1));
- link.setText("You can use <a>Installed JRE preferences</a> to create a new JRE");
+ link.setText(GenericServerUIMessages.installed_jre_link);
Label label = new Label(composite, SWT.NONE);
- label.setText("JRE:");
+ label.setText(GenericServerUIMessages.jre_select_label);
final Combo combo = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
combo.setItems(jreNames);
@@ -111,7 +111,7 @@
size = installedJREs.size();
jreNames = new String[size+1];
- jreNames[0] = "Default JRE";
+ jreNames[0] = GenericServerUIMessages.defaultJRE;
for (int i = 0; i < size; i++) {
IVMInstall vmInstall = (IVMInstall) installedJREs.get(i);
jreNames[i+1] = vmInstall.getName();
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
index 7d7b15b..e8a5d6f 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
@@ -46,7 +46,7 @@
public void modifyText(ModifyEvent e) {
String path = ((Text) e.widget).getText();
if(!pathExist(path)){
- fLastMessage = path+" is not valid";
+ fLastMessage = GenericServerUIMessages.bind(GenericServerUIMessages.invalidPath,path);
fWizard.setMessage(fLastMessage,IMessageProvider.ERROR);
}else{
if(fLastMessage!=null && fLastMessage.equals(fWizard.getMessage())){
@@ -155,7 +155,7 @@
fText.setLayoutData(gridData);
fText.setText(value);
fText.addModifyListener(new PathModifyListener());
- Button fButton = SWTUtil.createButton(defPanel,GenericServerUIMessages.getString("serverTypeGroup.label.browse") );
+ Button fButton = SWTUtil.createButton(defPanel,GenericServerUIMessages.serverTypeGroup_label_browse);
fButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
@@ -191,7 +191,7 @@
fText.setLayoutData(gridData);
fText.setText(value);
fText.addModifyListener(new PathModifyListener());
- Button fButton = SWTUtil.createButton(parent,GenericServerUIMessages.getString("serverTypeGroup.label.browse"));
+ Button fButton = SWTUtil.createButton(parent,GenericServerUIMessages.serverTypeGroup_label_browse);
fButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
DirectoryDialog dlg = new DirectoryDialog(parent.getShell());
