Author: sflanigan Date: 2009-04-07 22:47:57 -0400 (Tue, 07 Apr 2009) New Revision: 14583 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/TemplateMessages.java trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/SelectionListenerWithSMManager.java trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.java trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.properties trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/text/xpl/DefaultStructuredTextOccurrenceStructureProvider.java trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/ESBUIMessages.java trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/ESBUiPlugin.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/AttributeValueLabelProvider.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.properties trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/TLDEditorMessages.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/Messages.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/SeamPagesXMLMessages.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/SeamPagesXMLPlugin.java trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/SeamXMLMessages.java trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/SeamXMLPlugin.java trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/preferences.properties Log: JBIDE-3557 Externalise English strings - converted some Eclipse message bundles to new-style, marked apparently obsolete messages as non-translatable. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties 2009-04-08 02:47:57 UTC (rev 14583) @@ -1,6 +1,10 @@ # PD (PREFERENCE DESCRIPTION) +# START NON-TRANSLATABLE +# suspected OBSOLETE +# see /org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/preferences.properties XSTUDIO_PD=JBoss Tools allows you to set preferences for default text, editor behavior, new project defaults, and the built-in Tomcat engine. AUTOMATION_PD=Here you can modify default text for the Tiles Struts plug-in element, the Validator Struts plug-in element, and error message resource files. LIBRARY_SETS_PD=Here you can modify what libraries get included in the project file systems for new Struts projects. You can modify this specifically for different versions of the Servlet and Struts technologies that might be used with a project. EDITORS_PD=Here you can control the behavior of the JBoss Tools JSP, XML, and Web Flow Configuration editors. +# END NON-TRANSLATABLE REDHAT=JBoss Tools Web preferences. \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/TemplateMessages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/TemplateMessages.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/templates/TemplateMessages.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -7,35 +7,23 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.common.model.ui.templates; -import java.text.MessageFormat; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import org.eclipse.osgi.util.NLS; -/** - * @author au - */ -public class TemplateMessages { - /* - * implements singelton pattern - */ - private static final String RESOURCE_BUNDLE= "org.jboss.tools.common.model.ui.templates.messages"; +public final class TemplateMessages extends NLS { - private static ResourceBundle resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE); + private static final String BUNDLE_NAME = "org.jboss.tools.common.model.ui.templates.messages";//$NON-NLS-1$ - private TemplateMessages() {} - - public static String getString(String key) { - try { - return resourceBundle.getString(key); - } catch (MissingResourceException e) { - return "%"+key+"%"; - } + private TemplateMessages() { + // Do not instantiate } - public static String getString(String key, String[] args) { - return MessageFormat.format(getString(key), args); - } -} + public static String preferenceTextLabel; + public static String propertyTextLabel; + + static { + NLS.initializeMessages(BUNDLE_NAME, TemplateMessages.class); + } +} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/SelectionListenerWithSMManager.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/SelectionListenerWithSMManager.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/SelectionListenerWithSMManager.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -123,7 +123,7 @@ return; } - fCurrentJob= new Job(UIMessages.getString("SelectionListenerWithSMManager.job.title")) { //$NON-NLS-1$ + fCurrentJob= new Job(UIMessages.SelectionListenerWithSMManager_job_title) { public IStatus run(IProgressMonitor monitor) { if (monitor == null) { monitor= new NullProgressMonitor(); Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -12,37 +12,20 @@ *******************************************************************************/ package org.jboss.tools.common.text.xml.ui.xpl; -import java.text.MessageFormat; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import org.eclipse.osgi.util.NLS; -/** - * @author Jeremy - * - */ -public class UIMessages { +public final class UIMessages extends NLS { - private static final String RESOURCE_BUNDLE= "org.jboss.tools.common.text.xml.ui.xpl.UIMessages";//$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.jboss.tools.common.text.xml.ui.xpl.UIMessages";//$NON-NLS-1$ - private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE); - private UIMessages() { + // Do not instantiate } - public static String getString(String key) { - try { - return fgResourceBundle.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } - - public static String getFormattedString(String key, String arg) { - return getFormattedString(key, new String[] { arg }); - } - - public static String getFormattedString(String key, String[] args) { - return MessageFormat.format(getString(key), (Object[])args); - } + public static String SelectionListenerWithSMManager_job_title; + public static String RedHatStructuredTextEditor_markOccurrences_job_name; -} + static { + NLS.initializeMessages(BUNDLE_NAME, UIMessages.class); + } +} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.properties 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/ui/xpl/UIMessages.properties 2009-04-08 02:47:57 UTC (rev 14583) @@ -11,5 +11,5 @@ # Red Hat, Inc. # ****************************************************************************** -SelectionListenerWithSMManager.job.title=JBoss tools SM creation -RedHatStructuredTextEditor.markOccurrences.job.name \ No newline at end of file +SelectionListenerWithSMManager_job_title=JBoss tools SM creation +RedHatStructuredTextEditor_markOccurrences_job_name \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/text/xpl/DefaultStructuredTextOccurrenceStructureProvider.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/text/xpl/DefaultStructuredTextOccurrenceStructureProvider.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/text/xpl/DefaultStructuredTextOccurrenceStructureProvider.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -166,7 +166,7 @@ private Position[] fPositions; public OccurrencesFinderJob(IDocument document, Position[] positions, ISelection selection) { - super(UIMessages.getString("RedHatStructuredTextEditor.markOccurrences.job.name")); //$NON-NLS-1$ + super(UIMessages.RedHatStructuredTextEditor_markOccurrences_job_name); fDocument= document; fSelection= selection; fPositions= positions; Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/ESBUIMessages.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/ESBUIMessages.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/ESBUIMessages.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -10,26 +10,19 @@ ******************************************************************************/ package org.jboss.tools.esb.ui; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import org.eclipse.osgi.util.NLS; -/** - * @author Viacheslav Kabanovich - */ -public class ESBUIMessages { - private static final String BUNDLE_NAME = "org.jboss.tools.esb.ui.messages"; //$NON-NLS-1$ +public final class ESBUIMessages extends NLS { - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); + private static final String BUNDLE_NAME = "org.jboss.tools.esb.ui.messages";//$NON-NLS-1$ private ESBUIMessages() { + // Do not instantiate } - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } + public static String ESB_UI_PLUGIN_NO_MESSAGES; + + static { + NLS.initializeMessages(BUNDLE_NAME, ESBUIMessages.class); } -} +} \ No newline at end of file Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/ESBUiPlugin.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/ESBUiPlugin.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/ESBUiPlugin.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -52,7 +52,7 @@ } public static void log(Throwable ex) { - INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, ESBUIMessages.getString("ESB_UI_PLUGIN_NO_MESSAGES"), ex)); //$NON-NLS-1$ + INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, ESBUIMessages.ESB_UI_PLUGIN_NO_MESSAGES, ex)); } public static Shell getShell() { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/AttributeValueLabelProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/AttributeValueLabelProvider.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/AttributeValueLabelProvider.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -88,13 +88,13 @@ private static Map texts = new HashMap(); static { - texts.put(BundlesNameResourceElement.class, TreeViewerMessages.getString("BundlesNameResourceElement.name")); - texts.put(BundlesPropertiesResourceElement.class, TreeViewerMessages.getString("BundlesPropertiesResourceElement.name")); - texts.put(EnumerationResourceElement.class, TreeViewerMessages.getString("EnumerationResourceElement.name")); - texts.put(JsfVariablesResourceElement.class, TreeViewerMessages.getString("JsfVariablesResourceElement.name")); - texts.put(ManagedBeanMethodResourceElement.class, TreeViewerMessages.getString("ManagedBeanMethodResourceElement.name")); - texts.put(ManagedBeansPropertiesResourceElement.class, TreeViewerMessages.getString("ManagedBeansPropertiesResourceElement.name")); - texts.put(ViewActionsResorceElement.class, TreeViewerMessages.getString("ViewActionsResorceElement.name")); + texts.put(BundlesNameResourceElement.class, TreeViewerMessages.BundlesNameResourceElement_name); + texts.put(BundlesPropertiesResourceElement.class, TreeViewerMessages.BundlesPropertiesResourceElement_name); + texts.put(EnumerationResourceElement.class, TreeViewerMessages.EnumerationResourceElement_name); + texts.put(JsfVariablesResourceElement.class, TreeViewerMessages.JsfVariablesResourceElement_name); + texts.put(ManagedBeanMethodResourceElement.class, TreeViewerMessages.ManagedBeanMethodResourceElement_name); + texts.put(ManagedBeansPropertiesResourceElement.class, TreeViewerMessages.ManagedBeansPropertiesResourceElement_name); + texts.put(ViewActionsResorceElement.class, TreeViewerMessages.ViewActionsResorceElement_name); } private Map imageCache = new HashMap(); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -7,30 +7,40 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.jst.jsp.drop.treeviewer.ui; -import java.util.MissingResourceException; import java.util.ResourceBundle; -import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.eclipse.osgi.util.NLS; -public class TreeViewerMessages { +public final class TreeViewerMessages extends NLS { - private static final String RESOURCE_BUNDLE = "org.jboss.tools.jst.jsp.drop.treeviewer.ui.TreeViewerMessages"; + private static final String BUNDLE_NAME = "org.jboss.tools.jst.jsp.drop.treeviewer.ui.TreeViewerMessages";//$NON-NLS-1$ - private static ResourceBundle resourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE); + private TreeViewerMessages() { + // Do not instantiate + } - public static String getString(String key) { - try { - return resourceBundle.getString(key); - } catch (MissingResourceException e) { - JspEditorPlugin.getPluginLog().logError(e); - return "%" + key + "%"; - } + public static String BundlesNameResourceElement_name; + public static String BundlesPropertiesResourceElement_name; + public static String EnumerationResourceElement_name; + public static String JsfVariablesResourceElement_name; + public static String ManagedBeanMethodResourceElement_name; + public static String ManagedBeansPropertiesResourceElement_name; + public static String ViewActionsResorceElement_name; + + static { + NLS.initializeMessages(BUNDLE_NAME, TreeViewerMessages.class); } + + /** + * @deprecated use the string fields + * @return + */ public static ResourceBundle getResourceBundle() { - return resourceBundle; + return ResourceBundle.getBundle(BUNDLE_NAME); } + } \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.properties 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/TreeViewerMessages.properties 2009-04-08 02:47:57 UTC (rev 14583) @@ -1,8 +1,8 @@ -BundlesNameResourceElement.name = Resource Bundles -BundlesPropertiesResourceElement.name = Resource Bundles -EnumerationResourceElement.name = Enumeration -JsfVariablesResourceElement.name = JSF Variables -ManagedBeanMethodResourceElement.name = Managed Beans -ManagedBeansPropertiesResourceElement.name = Managed Beans -ViewActionsResorceElement.name = View Actions \ No newline at end of file +BundlesNameResourceElement_name = Resource Bundles +BundlesPropertiesResourceElement_name = Resource Bundles +EnumerationResourceElement_name = Enumeration +JsfVariablesResourceElement_name = JSF Variables +ManagedBeanMethodResourceElement_name = Managed Beans +ManagedBeansPropertiesResourceElement_name = Managed Beans +ViewActionsResorceElement_name = View Actions Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/TLDEditorMessages.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/TLDEditorMessages.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editors/TLDEditorMessages.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -15,6 +15,11 @@ import org.jboss.tools.jst.web.ui.WebUiPlugin; +/* + * NB: The only reference to this file is an xclass in plugin.xml, + * and TLDEditorMessages.properties is empty. + */ + public class TLDEditorMessages { private static final String RESOURCE_BUNDLE= "org.jboss.tools.jst.web.ui.editors.TLDEditorMessages"; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/Messages.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/Messages.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/Messages.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -1,22 +1,23 @@ -package org.jboss.tools.jst.web.ui.operation; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -public class Messages { - private static final String BUNDLE_NAME = "org.jboss.tools.jst.web.ui.operation.WebProjectCreationOperation"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - - private Messages() { - } - - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} +package org.jboss.tools.jst.web.ui.operation; + +import org.eclipse.osgi.util.NLS; + +public final class Messages extends NLS { + + private static final String BUNDLE_NAME = "org.jboss.tools.jst.web.ui.operation.WebProjectCreationOperation";//$NON-NLS-1$ + + private Messages() { + // Do not instantiate + } + + public static String COD_MESSAGE; + public static String COD_TITLE; + public static String BTN_CANCEL; + public static String BTN_OK; + public static String ADOPT_WILL_OVERWRITE_DOT_FILES_MESSAGE; + public static String ADOPT_WILL_CLEAR_WORKSPACE_MESSAGE; + + static { + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } +} Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -149,7 +149,7 @@ ServiceDialog d = PreferenceModelUtilities.getPreferenceModel().getService(); String message = MessageFormat.format( - Messages.getString("ADOPT_WILL_OVERWRITE_DOT_FILES_MESSAGE"),new Object[]{dots} //$NON-NLS-1$ + Messages.ADOPT_WILL_OVERWRITE_DOT_FILES_MESSAGE,new Object[]{dots} ); int q = d.showDialog("Warning", message, new String[]{"Continue", "Cancel"}, null, ServiceDialog.WARNING); if(q != 0) return false; @@ -173,7 +173,7 @@ ServiceDialog d = PreferenceModelUtilities.getPreferenceModel().getService(); String message = MessageFormat.format( - Messages.getString("ADOPT_WILL_CLEAR_WORKSPACE_MESSAGE"),new Object[]{getProject().getName()} //$NON-NLS-1$ + Messages.ADOPT_WILL_CLEAR_WORKSPACE_MESSAGE,new Object[]{getProject().getName()} ); int q = d.showDialog("Warning", message, new String[]{"Continue", "Cancel"}, null, ServiceDialog.WARNING); if(q != 0) return false; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectCreationOperation.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -183,13 +183,13 @@ String message = MessageFormat.format( - Messages.getString("COD_MESSAGE"),new Object[]{location} //$NON-NLS-1$ + Messages.COD_MESSAGE,new Object[]{location} ); int selAction = dlg.showDialog( - Messages.getString("COD_TITLE"), //$NON-NLS-1$ + Messages.COD_TITLE, message, - new String[]{Messages.getString("BTN_OK"),Messages.getString("BTN_CANCEL")}, //$NON-NLS-1$//$NON-NLS-2$ + new String[]{Messages.BTN_OK,Messages.BTN_CANCEL}, null, ServiceDialog.WARNING ); Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/SeamPagesXMLMessages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/SeamPagesXMLMessages.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/SeamPagesXMLMessages.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -1,37 +1,23 @@ package org.jboss.tools.seam.pages.xml; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - import org.eclipse.osgi.util.NLS; public class SeamPagesXMLMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.seam.pages.xml.messages"; //$NON-NLS-1$ - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - + public static String SEAM_PAGES_XML_PLUGIN_NO_MESSAGE; public static String WARNING; public static String ATTRIBUTE_VIEW_ID_IS_NOT_CORRECT; public static String TEMPLATE_IS_NOT_SPECIFIED; public static String TEMPLATE_DOES_NOT_EXIST; public static String THE_VIEW_WITH_PATH_IS_ALREADY_CREATED; public static String TEMPLATE_IS_NOT_FOUND; - public static String PAGES_CONFIG_CHANGES; public static String UPDATE_REFERENCE_TO_PAGE; private SeamPagesXMLMessages() { } - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } - static { // load message values from bundle file NLS.initializeMessages(BUNDLE_NAME, SeamPagesXMLMessages.class); Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/SeamPagesXMLPlugin.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/SeamPagesXMLPlugin.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/SeamPagesXMLPlugin.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -37,7 +37,7 @@ } public static void log(Exception ex) { - INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, SeamPagesXMLMessages.getString("SEAM_PAGES_XML_PLUGIN_NO_MESSAGE"), ex)); //$NON-NLS-1$ + INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, SeamPagesXMLMessages.SEAM_PAGES_XML_PLUGIN_NO_MESSAGE, ex)); } public static boolean isDebugEnabled() { Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/SeamXMLMessages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/SeamXMLMessages.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/SeamXMLMessages.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -1,22 +1,18 @@ package org.jboss.tools.seam.xml; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import org.eclipse.osgi.util.NLS; -public class SeamXMLMessages { - private static final String BUNDLE_NAME = "org.jboss.tools.seam.xml.messages"; //$NON-NLS-1$ +public final class SeamXMLMessages extends NLS { - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); + private static final String BUNDLE_NAME = "org.jboss.tools.seam.xml.messages";//$NON-NLS-1$ private SeamXMLMessages() { + // Do not instantiate } - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } + public static String SEAM_XML_PLUGIN_NO_MESSAGE; + + static { + NLS.initializeMessages(BUNDLE_NAME, SeamXMLMessages.class); } -} +} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/SeamXMLPlugin.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/SeamXMLPlugin.java 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/SeamXMLPlugin.java 2009-04-08 02:47:57 UTC (rev 14583) @@ -37,7 +37,7 @@ } public static void log(Exception ex) { - INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, SeamXMLMessages.getString("SEAM_XML_PLUGIN_NO_MESSAGE"), ex)); //$NON-NLS-1$ + INSTANCE.getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, SeamXMLMessages.SEAM_XML_PLUGIN_NO_MESSAGE, ex)); } public static boolean isDebugEnabled() { Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/preferences.properties =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/preferences.properties 2009-04-08 01:56:28 UTC (rev 14582) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/preferences.properties 2009-04-08 02:47:57 UTC (rev 14583) @@ -1,5 +1,10 @@ # PD (PREFERENCE DESCRIPTION) +# AutomationPreferencePage AUTOMATION_PD=Here you can modify default text for the Tiles Struts plug-in element,\n\ the Validator Struts plug-in element, and error message resource files. +# StrutsStudioPreferencesPage XSTUDIO_PD=Struts Projects specific preferences. +# START NON-TRANSLATABLE +# suspected OBSOLETE EDITORS_PD=Here you can control the behavior of the JBoss Tools JSP, XML, and Web Flow Configuration editors. +# END NON-TRANSLATABLE