Author: sflanigan Date: 2009-04-14 03:53:42 -0400 (Tue, 14 Apr 2009) New Revision: 14726 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePathDiagramChange.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFPageUpdateManager.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenKeyHelper.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteDefinitionLinkHandler.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteTilesHandler.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/xpl/WebUIMessages.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/version/ProjectVersions.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/CreateProjectAction.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.validator.ui/src/org/jboss/tools/struts/validator/ui/global/GlobalEditor.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/messages/StrutsUIMessages.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/messages/messages.properties trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenFileInWebRoot.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenForwardTargetHelper.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenObjectByPath.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossRuntimeListFieldEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSLibraryListFieldEditor.java Log: JBIDE-3557 Externalise English strings (eliminating string concatenation) Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -38,6 +38,7 @@ public static String THE_VIEW_EXISTS; public static String CONFIRMATION; public static String DELETE; + public static String DELETE_TITLE_QUESTION; public static String DELETE_FILE_FROM_DISK; public static String PASTE; public static String SELECT_BEAN; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 2009-04-14 07:53:42 UTC (rev 14726) @@ -14,27 +14,28 @@ TEMPLATE_DOES_NOT_EXIST = Template does not exist. THE_VIEW_EXISTS = The view exists. CONFIRMATION = Confirmation -DELETE = Delete +DELETE = Delete +DELETE_TITLE_QUESTION = Delete {0}? DELETE_FILE_FROM_DISK = Delete file from disk PASTE = Paste SELECT_BEAN = Select Bean CLASS_IS_REFERENCED_BY_SEVERAL_BEANS = Class {0} is referenced by several beans.\n Please select one of them. -ADD_GETTER_FOR_PROPERTY = Do you want to add getter for property -ADD_SETTER_FOR_PROPERTY = Do you want to add setter for property -ADD_GETTER_SETTER_FOR_PROPERTY = Do you want to add getter/setter for property +ADD_GETTER_FOR_PROPERTY = Do you want to add getter for property {0}? +ADD_SETTER_FOR_PROPERTY = Do you want to add setter for property {0}? +ADD_GETTER_SETTER_FOR_PROPERTY = Do you want to add getter/setter for property {0}? APPLY_FOR_ALL_PROPERTIES = Apply for All Properties REFERENCES = References UPDATE_FIELD_REFERENCE = Update field reference MANAGED_PROPERTY_RENAME = Managed Property Rename UPDATE_WEB_XML = Update web.xml FACES_CONFIG_CHANGES = Faces Config Changes -UPDATE_REFERENCE_TO_PAGE = Update reference to page -JSF_PAGE_UPDATE = JSF Page Update - +UPDATE_REFERENCE_TO_PAGE = Update reference to page {0} +JSF_PAGE_UPDATE = JSF Page Update - {0} CONVERTER_ID_IS_NOT_SPECIFIED = Converter id is not specified. CANNOT_FIND_CONVERTER = Cannot find converter {0}. ATTRIBUTE_CONVERTER_CLASS_FOR_CONVERTER_ISNOT_SPECIFIED = Attribute converter-class for converter {0} is not specified. BUNDLE_IS_NOT_SPECIFIED = Bundle is not specified. -CANNOT_FIND_BUNDLE = Cannot find bundle +CANNOT_FIND_BUNDLE = Cannot find bundle {0} KEY_ISNOT_SPECIFIED = Key is not specified. CANNOT_FIND_PROPERTY = Cannot find property {0}. CANNOT_FIND_RENDER_KIT = Cannot find render-kit {0}. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteRuleHandler.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -10,9 +10,14 @@ ******************************************************************************/ package org.jboss.tools.jsf.model.handlers; -import java.util.*; -import org.jboss.tools.common.meta.action.impl.handlers.*; -import org.jboss.tools.common.model.*; +import java.util.Properties; + +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; +import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler; +import org.jboss.tools.common.model.ServiceDialog; +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.impl.DeleteFileHandler; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.model.JSFConstants; @@ -38,7 +43,7 @@ } ServiceDialog d = object.getModel().getService(); Properties dp = new Properties(); - dp.setProperty(ServiceDialog.DIALOG_MESSAGE, JSFUIMessages.DELETE + DefaultCreateHandler.title(object, false) + "?"); + dp.setProperty(ServiceDialog.DIALOG_MESSAGE, NLS.bind(JSFUIMessages.DELETE_TITLE_QUESTION, DefaultCreateHandler.title(object, false))); dp.put(ServiceDialog.CHECKED, Boolean.FALSE); dp.setProperty(ServiceDialog.CHECKBOX_MESSAGE, JSFUIMessages.DELETE_FILE_FROM_DISK); if(!d.openConfirm(dp)) return; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/AddManagedBeanPropertiesContext.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -10,18 +10,26 @@ ******************************************************************************/ package org.jboss.tools.jsf.model.handlers.bean; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; import org.eclipse.core.runtime.CoreException; -import org.eclipse.jdt.core.*; - -import org.jboss.tools.common.java.generation.*; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMember; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.common.java.generation.JavaPropertyGenerator; import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseJavaUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; -import org.jboss.tools.jsf.model.helpers.bean.*; +import org.jboss.tools.jsf.model.helpers.bean.BeanHelper; public class AddManagedBeanPropertiesContext { IType type = null; @@ -129,12 +137,12 @@ private String getMessage(boolean getter, boolean setter, String name){ if(!getter && !setter) { - return JSFUIMessages.ADD_GETTER_SETTER_FOR_PROPERTY + names; + return NLS.bind(JSFUIMessages.ADD_GETTER_SETTER_FOR_PROPERTY, names); } if (!getter && setter){ - return JSFUIMessages.ADD_GETTER_FOR_PROPERTY + names; + return NLS.bind(JSFUIMessages.ADD_GETTER_FOR_PROPERTY, names); } - return JSFUIMessages.ADD_SETTER_FOR_PROPERTY + names; + return NLS.bind(JSFUIMessages.ADD_SETTER_FOR_PROPERTY, names); } class PropertyData { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePathDiagramChange.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePathDiagramChange.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/refactoring/JSFRenamePathDiagramChange.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -11,9 +11,13 @@ package org.jboss.tools.jsf.model.handlers.refactoring; import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.*; -import org.eclipse.ltk.core.refactoring.*; - +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.CompositeChange; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -39,7 +43,7 @@ final XModelObject page = pages[i]; add(new Change() { public String getName() { - return JSFUIMessages.UPDATE_REFERENCE_TO_PAGE + page.getAttributeValue("path"); + return NLS.bind(JSFUIMessages.UPDATE_REFERENCE_TO_PAGE, page.getAttributeValue("path")); } public void initializeValidationData(IProgressMonitor pm) { } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFPageUpdateManager.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFPageUpdateManager.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/JSFPageUpdateManager.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -10,10 +10,16 @@ ******************************************************************************/ package org.jboss.tools.jsf.model.helpers; -import java.util.*; -import org.jboss.tools.common.model.*; -import org.jboss.tools.common.model.event.*; -import org.jboss.tools.jsf.JSFModelPlugin; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.common.model.XJob; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelConstants; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.event.XModelTreeEvent; +import org.jboss.tools.common.model.event.XModelTreeListener; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.model.FacesProcessImpl; import org.jboss.tools.jsf.model.JSFConstants; @@ -155,7 +161,7 @@ class PageUpdateRunnable implements XJob.XRunnable { public String getId() { - return JSFUIMessages.JSF_PAGE_UPDATE + XModelConstants.getWorkspace(model); + return NLS.bind(JSFUIMessages.JSF_PAGE_UPDATE, XModelConstants.getWorkspace(model)); } public void run() { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenKeyHelper.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenKeyHelper.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenKeyHelper.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -29,7 +29,7 @@ if(model == null) return null; if(bundle == null || bundle.length() == 0) return JSFUIMessages.BUNDLE_IS_NOT_SPECIFIED; XModelObject[] bs = findBundles(model, bundle, locale); - if(bs.length == 0) return JSFUIMessages.CANNOT_FIND_BUNDLE + bundle; + if(bs.length == 0) return NLS.bind(JSFUIMessages.CANNOT_FIND_BUNDLE, bundle); FindObjectHelper.findModelObject(bs[0], FindObjectHelper.EVERY_WHERE); return null; } @@ -39,7 +39,7 @@ if(key == null || key.length() == 0) return JSFUIMessages.KEY_ISNOT_SPECIFIED; if(bundle == null || bundle.length() == 0) return JSFUIMessages.BUNDLE_IS_NOT_SPECIFIED; XModelObject[] bs = findBundles(model, bundle, locale); - if(bs.length == 0) return JSFUIMessages.CANNOT_FIND_BUNDLE + bundle; + if(bs.length == 0) return NLS.bind(JSFUIMessages.CANNOT_FIND_BUNDLE, bundle); XModelObject c = null; for (int i = 0; i < bs.length && c == null; i++) { c = findKey(model, bs[i], key); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -28,11 +28,10 @@ public static String Converter; public static String OpenConverterForId; - public static String OpenTagLibrary; - public static String Tag; - public static String TagAttribute; - public static String ForTag; - public static String ForTagAttribute; + public static String OpenTagLibraryForATag; + public static String OpenTagLibraryForTagName; + public static String OpenTagLibraryForAnAttribute; + public static String OpenTagLibraryForAttributeName; public static String NavigationRule; public static String OpenBeanProperty; public static String BeanProperty; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties 2009-04-14 07:53:42 UTC (rev 14726) @@ -11,11 +11,10 @@ Converter=Converter OpenConverterForId=Open converter definition for ID ''{0}'' -OpenTagLibrary=Open a Tag Library for {0} -Tag=a tag -TagAttribute=an attribute -ForTag=tag ''{0}'' -ForTagAttribute=attribute ''{0}'' of tag ''{1}'' +OpenTagLibraryForATag=Open a Tag Library for a tag +OpenTagLibraryForTagName=Open a Tag Library for tag ''{0}'' +OpenTagLibraryForAnAttribute=Open a Tag Library for an attribute +OpenTagLibraryForAttributeName=Open a Tag Library for attribute ''{0}'' of tag ''{1}'' NavigationRule=Navigation Rule OpenBeanProperty=Open bean ''{0}'' for the property ''{1}'' BeanProperty=Bean Property Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -217,11 +217,9 @@ String tagName = getTagName(fLastRegion); String attrName = getTagAttributeName(fLastRegion); if (tagName == null || attrName == null) - return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, JSFTextExtMessages.TagAttribute); + return JSFTextExtMessages.OpenTagLibraryForAnAttribute; - String tagAttr = MessageFormat.format(JSFTextExtMessages.ForTagAttribute, attrName, tagName); - - return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, tagAttr); + return MessageFormat.format(JSFTextExtMessages.OpenTagLibraryForAttributeName, attrName, tagName); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -169,11 +169,9 @@ public String getHyperlinkText() { String tagName = getTagName(fLastRegion); if (tagName == null) - return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, JSFTextExtMessages.Tag); + return JSFTextExtMessages.OpenTagLibraryForATag; - String tag = MessageFormat.format(JSFTextExtMessages.ForTag, tagName); - - return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, tag); + return MessageFormat.format(JSFTextExtMessages.OpenTagLibraryForTagName, tagName); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/messages.properties 2009-04-14 07:53:42 UTC (rev 14726) @@ -1,7 +1,7 @@ CANNOT_RUN_SELECTION_WITHOUT_AVAILABLE_SERVER=Cannot run selection without available server -CANNOT_FIND_PROJECT_VERSIONS_DESCRIPTORFILE=Cannot find project versions descriptor file -CANNOT_PARSE_PROJECT_VERSIONS_DESCRIPTORFILE=Cannot parse project versions descriptor file -CANNOT_READ_PROJECT_VERSIONS_DESCRIPTORFILE=Cannot read project versions descriptor file +CANNOT_FIND_PROJECT_VERSIONS_DESCRIPTORFILE=Cannot find project versions descriptor file {0} +CANNOT_PARSE_PROJECT_VERSIONS_DESCRIPTORFILE=Cannot parse project versions descriptor file {0} +CANNOT_READ_PROJECT_VERSIONS_DESCRIPTORFILE=Cannot read project versions descriptor file {0} PLEASE_CREATE_A_SERVER_AND_SELECT_IT_ON_TOOLBAR=Please create a server and select it on toolbar. WARNING=Warning CLOSE=Close @@ -35,7 +35,7 @@ CANCEL=Cancel DELETE_REFERENCE_FROM_WEBDESCRIPTOR=Delete reference from web descriptor DELETE_REFERENCE_FROM_STRUTS_CONFIGURATION_FILE=Delete reference from struts configuration file -DELETE=Delete +DELETE_FILENAME=Delete {0} MESSAGE=Message LIBRARY_SET_IS_ALREADY_ADDED=Library set {0} is already added. LIBRARY_SET_ALREADY_EXISTS=Library set {0} already exists. @@ -62,7 +62,7 @@ YOU_WANT_TO_DELETE_IMPLEMENTATION=Do you want to delete implementation {0}? YOU_WANT_TO_DELETE_LIBRARYSET=Do you want to delete library set {0}? YOU_WANT_TO_DELETE_LIBRARY=Do you want to delete library {0}? -YOU_WANT_TO_DELETE_LINK_TO=Do you want to delete link to +YOU_WANT_TO_DELETE_LINK_TO=Do you want to delete link to {0}? YOU_WANT_TO_REARRANGE_THE_DIAGRAM_ELEMENTS=Are you sure, you want to rearrange the diagram elements? CONFIRMATION=Confirmation CORE_LIBRARY_LOCATION_ISNOT_SET_FOR_VERSION=Core library location is not set for version {0}. Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/xpl/WebUIMessages.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/xpl/WebUIMessages.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/messages/xpl/WebUIMessages.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -51,7 +51,7 @@ public static String CANCEL; public static String YOU_WANT_TO_REARRANGE_THE_DIAGRAM_ELEMENTS; public static String DELETE_REFERENCE_FROM_WEBDESCRIPTOR; - public static String DELETE; + public static String DELETE_FILENAME; public static String APPLICATION_HAS_BEEN_UNREGISTERED_FROM; public static String MESSAGE; public static String LIBRARY_SET_IS_ALREADY_ADDED; Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/DeleteTLDHandler.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -11,6 +11,8 @@ package org.jboss.tools.jst.web.model.handlers; import java.util.Properties; + +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.filesystems.impl.*; import org.jboss.tools.jst.web.messages.xpl.WebUIMessages; @@ -25,7 +27,7 @@ String checkboxMessage = WebUIMessages.DELETE_REFERENCE_FROM_WEBDESCRIPTOR; ServiceDialog d = object.getModel().getService(); Properties pd = new Properties(); - String message = WebUIMessages.DELETE + FileAnyImpl.toFileName(object); + String message = NLS.bind(WebUIMessages.DELETE_FILENAME, FileAnyImpl.toFileName(object)); pd.setProperty(ServiceDialog.DIALOG_MESSAGE, message); pd.setProperty(ServiceDialog.CHECKBOX_MESSAGE, checkboxMessage); pd.put(ServiceDialog.CHECKED, Boolean.TRUE); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/version/ProjectVersions.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/version/ProjectVersions.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/version/ProjectVersions.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -55,7 +55,7 @@ versions.clear(); errorMessage = null; if(!file.isFile()) { - errorMessage = WebUIMessages.CANNOT_FIND_PROJECT_VERSIONS_DESCRIPTORFILE + file.getAbsolutePath(); + errorMessage = NLS.bind(WebUIMessages.CANNOT_FIND_PROJECT_VERSIONS_DESCRIPTORFILE, file.getAbsolutePath()); return; } Element e = XMLUtil.getElement(file); @@ -64,11 +64,11 @@ try { FileReader reader = new FileReader(file); String[] errors = XMLUtil.getXMLErrors(reader, false); - errorMessage = (errors == null || errors.length == 0) ? WebUIMessages.CANNOT_PARSE_PROJECT_VERSIONS_DESCRIPTORFILE + file.getAbsolutePath() - : WebUIMessages.CANNOT_PARSE_PROJECT_VERSIONS_DESCRIPTORFILE + file.getAbsolutePath() + ":\n" + errors[0]; //$NON-NLS-2$ + errorMessage = (errors == null || errors.length == 0) ? NLS.bind(WebUIMessages.CANNOT_PARSE_PROJECT_VERSIONS_DESCRIPTORFILE, file.getAbsolutePath()) + : NLS.bind(WebUIMessages.CANNOT_PARSE_PROJECT_VERSIONS_DESCRIPTORFILE, file.getAbsolutePath()) + ":\n" + errors[0]; //$NON-NLS-1$ } catch (Exception exc) { WebModelPlugin.getPluginLog().logError(exc); - errorMessage = WebUIMessages.CANNOT_READ_PROJECT_VERSIONS_DESCRIPTORFILE + file.getAbsolutePath(); + errorMessage = NLS.bind(WebUIMessages.CANNOT_READ_PROJECT_VERSIONS_DESCRIPTORFILE, file.getAbsolutePath()); } } else { Element[] vs = XMLUtil.getChildren(e, "version"); //$NON-NLS-1$ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteDefinitionLinkHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteDefinitionLinkHandler.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteDefinitionLinkHandler.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -12,6 +12,7 @@ import java.util.Properties; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.meta.action.impl.AbstractHandler; import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.XModelException; @@ -24,7 +25,7 @@ String s = object.getAttributeValue("extends"); //$NON-NLS-1$ if(s == null || s.length() == 0) return; ServiceDialog d = object.getModel().getService(); - int i = d.showDialog(WebUIMessages.CONFIRMATION, WebUIMessages.YOU_WANT_TO_DELETE_LINK_TO + s, new String[]{WebUIMessages.OK, WebUIMessages.CANCEL}, null, ServiceDialog.QUESTION); + int i = d.showDialog(WebUIMessages.CONFIRMATION, NLS.bind(WebUIMessages.YOU_WANT_TO_DELETE_LINK_TO, s), new String[]{WebUIMessages.OK, WebUIMessages.CANCEL}, null, ServiceDialog.QUESTION); if(i != 0) return; object.getModel().editObjectAttribute(object, "extends", ""); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteTilesHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteTilesHandler.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/handlers/DeleteTilesHandler.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -11,6 +11,8 @@ package org.jboss.tools.jst.web.tiles.model.handlers; import java.util.Properties; + +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; @@ -26,14 +28,14 @@ if(TilesRegistrationHelper.isRegistered(object.getModel(), object)) { String nature = TilesRegistrationHelper.getRegistratorNature(object.getModel()); String checkboxMessage = null; - if(nature != null && nature.indexOf("jsf") >= 0) { + if(nature != null && nature.indexOf("jsf") >= 0) { //$NON-NLS-1$ checkboxMessage = WebUIMessages.DELETE_REFERENCE_FROM_WEBDESCRIPTOR; } else { checkboxMessage = WebUIMessages.DELETE_REFERENCE_FROM_STRUTS_CONFIGURATION_FILE; } ServiceDialog d = object.getModel().getService(); Properties pd = new Properties(); - String message = WebUIMessages.DELETE + FileAnyImpl.toFileName(object); + String message = NLS.bind(WebUIMessages.DELETE_FILENAME, FileAnyImpl.toFileName(object)); pd.setProperty(ServiceDialog.DIALOG_MESSAGE, message); pd.setProperty(ServiceDialog.CHECKBOX_MESSAGE, checkboxMessage); pd.put(ServiceDialog.CHECKED, Boolean.TRUE); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -133,11 +133,9 @@ public static String SEAM_INSTALL_WIZARD_PAGE_GENERAL; - public static String SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID; - public static String SEAM_INSTALL_WIZARD_PAGE_NEW; - public static String SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR; + public static String SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_NOT_VALID; public static String SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY; @@ -169,16 +167,10 @@ public static String SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT; - public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_ALREADY_EXISTS; - - public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_AN_INSTANCEOF_OF_LIST; - public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_FIND_JBOSS_SEAM_JAR; public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_OBTAIN_SEAM_VERSION_NUMBER; - public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_READ_JAR_FILE; - public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME; public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_MODIFY_SEAM_RUNTIME; @@ -187,7 +179,7 @@ public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER; - public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE; + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE_LIST; public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME; @@ -205,14 +197,12 @@ public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_SEAM_HOME_DIRECTORY_CANNOT_BE_EMPTY; - public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME; + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_ALREADY_EXISTS; public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT; public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME; - public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_VERSION; - public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION; public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION; @@ -275,45 +265,30 @@ public static String VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID; - public static String VALIDATOR_FACTORY_CONNECTION_PROFILE; public static String VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED; - public static String VALIDATOR_FACTORY_DOES_NOT_EXIST; + public static String VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED_CONNECTION_PROFILE; - public static String VALIDATOR_FACTORY_DOES_NOT_EXISTS; + public static String VALIDATOR_FACTORY_FOLDER_DOES_NOT_EXIST; - public static String VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED; + public static String VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER; - public static String VALIDATOR_FACTORY_FOLDER; - - public static String VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO; - - public static String VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT; - public static String VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST; - public static String VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT; + public static String VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_JBOSS_AS_HOME_FOLDER; public static String VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID; - public static String VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER; - - public static String VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER; - public static String VALIDATOR_FACTORY_NAME_IS_NOT_VALID; - public static String VALIDATOR_FACTORY_NAME_IS_NOT_VALID2; + public static String VALIDATOR_FACTORY_PATH_POINTS_TO_FILE; - public static String VALIDATOR_FACTORY_PATH; - public static String VALIDATOR_FACTORY_PATH_TO_A_FOLDER_CANNOT_BE_NULL; - public static String VALIDATOR_FACTORY_POINTS_TO_FILE; - public static String VALIDATOR_FACTORY_PRJ_NOT_SELECTED; - public static String VALIDATOR_FACTORY_PROJECT; + public static String VALIDATOR_FACTORY_PROJECT_DOES_NOT_EXIST; public static String VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS; @@ -343,16 +318,14 @@ public static String VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED; - public static String VALIDATOR_FACTORY_SELECTED_PROJECT; + public static String VALIDATOR_FACTORY_SELECTED_PROJECT_IS_NOT_A_SEAM_WEB_PROJECT; - public static String VALIDATOR_FACTORY_TEST_PROJECT; + public static String VALIDATOR_FACTORY_TEST_PROJECT_ALREADY_EXISTS; - public static String VALIDATOR_FACTORY_EAR_PROJECT; + public static String VALIDATOR_FACTORY_EAR_PROJECT_ALREADY_EXISTS; - public static String VALIDATOR_FACTORY_EJB_PROJECT; + public static String VALIDATOR_FACTORY_EJB_PROJECT_ALREADY_EXISTS; - public static String VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS; - public static String VALIDATOR_INVALID_SETTINGS; public static String SEAM_TARGET_SERVER; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/CreateProjectAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/CreateProjectAction.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/CreateProjectAction.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -11,20 +11,20 @@ package org.jboss.tools.seam.ui.actions; -import org.jboss.tools.common.model.ui.util.ExtensionPointUtils; -import org.jboss.tools.seam.ui.SeamGuiPlugin; -import org.jboss.tools.seam.ui.SeamUIMessages; -import org.jboss.tools.seam.ui.SeamUiImages; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.PlatformUI; - -import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.internal.ide.IIDEHelpContextIds; +import org.jboss.tools.common.model.ui.util.ExtensionPointUtils; +import org.jboss.tools.seam.ui.SeamGuiPlugin; +import org.jboss.tools.seam.ui.SeamUIMessages; +import org.jboss.tools.seam.ui.SeamUiImages; /** * @author Jeremy @@ -72,8 +72,8 @@ SeamGuiPlugin .getPluginLog() .logError( - SeamUIMessages.CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD - + SEAM_CREATE_PROJECT_WIZARD_ID + "'"); //$NON-NLS-1$ + NLS.bind(SeamUIMessages.CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD, + SEAM_CREATE_PROJECT_WIZARD_ID)); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -607,9 +607,8 @@ new Status( IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, - SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR - + targetName - + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID)); + NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_NOT_VALID, + targetName))); } else if (status.getSeverity() == IStatus.WARNING) { return ValidatorFactory .createErrormessage( @@ -617,9 +616,8 @@ new Status( IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, - SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR - + targetName - + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID)); + NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_NOT_VALID, + targetName))); } return ValidatorFactory.NO_ERRORS; } @@ -674,9 +672,8 @@ new Status( IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, - SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT - + testProjectName - + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS)); + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT_ALREADY_EXISTS, + testProjectName))); } else if (status.getSeverity() == IStatus.WARNING) { return ValidatorFactory .createErrormessage( @@ -684,9 +681,8 @@ new Status( IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, - SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT - + testProjectName - + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS)); + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT_ALREADY_EXISTS, + testProjectName))); } if (ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(deployAs)) { final String earProjectName = projectName + "-ear"; //$NON-NLS-1$ @@ -699,9 +695,8 @@ new Status( IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, - SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT - + earProjectName - + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS)); + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT_ALREADY_EXISTS, + earProjectName))); } else if (status.getSeverity() == IStatus.WARNING) { return ValidatorFactory .createErrormessage( @@ -709,9 +704,8 @@ new Status( IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, - SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT - + earProjectName - + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS)); + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT_ALREADY_EXISTS, + earProjectName))); } final String ejbProjectName = projectName + "-ejb"; //$NON-NLS-1$ @@ -724,9 +718,8 @@ new Status( IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, - SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT - + ejbProjectName - + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS)); + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT_ALREADY_EXISTS, + ejbProjectName))); } else if (status.getSeverity() == IStatus.WARNING) { return ValidatorFactory .createErrormessage( @@ -734,9 +727,8 @@ new Status( IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, - SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT - + ejbProjectName - + SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS)); + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT_ALREADY_EXISTS, + ejbProjectName))); } } return ValidatorFactory.NO_ERRORS; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -123,13 +123,13 @@ File folder = new File(folderPath); if (!folder.exists()) - return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_FOLDER - + folderPath - + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXISTS)); + return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_FOLDER_DOES_NOT_EXIST, + folderPath))); if (!folder.isDirectory()) - return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PATH - + folderPath - + SeamUIMessages.VALIDATOR_FACTORY_POINTS_TO_FILE)); + return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_PATH_POINTS_TO_FILE, + folderPath))); return NO_ERRORS; } }; @@ -156,8 +156,7 @@ errors = createErrorMap(); errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, - SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO - + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER)); + SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER)); } } else { File seamJarFile = new File(value.toString(), "jboss-seam.jar"); //$NON-NLS-1$ @@ -165,8 +164,7 @@ errors = createErrorMap(); errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, - SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO - + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER)); + SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER)); } } @@ -191,8 +189,7 @@ if (!new File(value.toString(), "bin/twiddle.jar").isFile()) { //$NON-NLS-1$ errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME, new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, - SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT - + SeamUIMessages.VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER)); + SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_JBOSS_AS_HOME_FOLDER)); } return errors; } @@ -311,8 +308,8 @@ IProblem[] problems = compilationUnit.getProblems(); if (problems.length > 0) { - return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, targetName - + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2)); + return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID, targetName))); } return NO_ERRORS; @@ -333,8 +330,8 @@ if ("".equals(value) //$NON-NLS-1$ || !project.getLocation().isValidSegment(value.toString())) - return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, targetName - + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2)); + return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID, targetName))); return NO_ERRORS; } @@ -351,9 +348,9 @@ if (project == null || !(project instanceof IProject) || !project.exists()) { - return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PROJECT - + value - + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXIST)); + return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_PROJECT_DOES_NOT_EXIST, + value))); } else { IProject selection = (IProject) project; try { @@ -366,9 +363,9 @@ // .class)).hasProjectFacet(ProjectFacetsManager // .getProjectFacet("jst.web")) || "" .equals(SeamCorePlugin.getSeamPreferences(selection).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ""))) { //$NON-NLS-1$ - return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT - + project.getName() - + SeamUIMessages.VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT)); + return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT_IS_NOT_A_SEAM_WEB_PROJECT, + project.getName()))); } else { // TODO validate project(s) structure } @@ -408,9 +405,9 @@ if (driverClass == null || "".equals(driverClass)) { //$NON-NLS-1$ return createErrormessage( ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, - new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED - + value - + SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE)); + new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, + NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED_CONNECTION_PROFILE, + value))); } } return NO_ERRORS; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2009-04-14 07:53:42 UTC (rev 14726) @@ -19,13 +19,11 @@ SEAM_INSTALL_WIZARD_PAGE_CONNECTION_PROFILE=Connection profile: SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES=Seam Packages SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME=Seam Runtime -SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_VERSION=Seam-Version SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE=Database Type: SEAM_BASE_WIZARD_PAGE_LOCAL_CLASS_NAME=Local interface: SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION=Version -SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME=Runtime ' +SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_ALREADY_EXISTS=Runtime ''{0}'' already exists SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME=Database Schema Name: -SEAM_RUNTIME_LIST_FIELD_EDITOR_ALREADY_EXISTS=' already exists SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME=Database Catalog Name: SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT=Seam Web Projects SEAM_PROJECT_SELECTION_DIALOG_SHOW_ALL_PROJECTS=Show all projects @@ -41,11 +39,9 @@ SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_OBTAIN_SEAM_VERSION_NUMBER=Cannot obtain Seam version number from jboss-seam.jar file. SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME=Session Bean Package Name: SEAM_CONVERSATION_WIZARD_ENTITY_CREATING_OPERATION=Entity creating operation -SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE=inputElement must be +SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE_LIST=inputElement must be an instance of List<SeamRuntime>. SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY=Name cannot be empty -SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_READ_JAR_FILE=Cannot read jboss-seam.jar file SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_FIND_JBOSS_SEAM_JAR=Cannot find jboss-seam.jar file -SEAM_RUNTIME_LIST_FIELD_EDITOR_AN_INSTANCEOF_OF_LIST=an instance of List<SeamRuntime>. SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME=Create a Seam Runtime SEAM_RUNTIME_LIST_FIELD_EDITOR_MODIFY_SEAM_RUNTIME=Input new values SEAM_BASE_WIZARD_OPERATION_IS_NOT_DEFINED_FOR_WIZARD=Operation is not defined for wizard @@ -86,8 +82,7 @@ SEAM_FORM_WIZARD_PAGE1_SEAM_FORM=Seam Form SEAM_WIZARD_FACTORY_METHOD_NAME=Method name: SEAM_INSTALL_WIZARD_PAGE_NEW=New... -SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR=Package name for -SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID=\ is not valid +SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_NOT_VALID=Package name for {0} is not valid SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME=POJO class name: SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS=Seam component SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE=Local interface @@ -98,13 +93,11 @@ SEAM_WIZARD_FACTORY_MASTER_PAGE_NAME=Master page name: SEAM_ENTITY_WIZARD_NEW_SEAM_ENTITY=New Seam Entity SEAM_INSTALL_WIZARD_PAGE_ADD=Add... -CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD=Unable to create wizard ' +CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD=Unable to create wizard ''{0}'' CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT=Create Seam Project VALIDATOR_FACTORY_PATH_TO_A_FOLDER_CANNOT_BE_NULL=Path to a folder cannot be null -VALIDATOR_FACTORY_FOLDER=Folder ' -VALIDATOR_FACTORY_DOES_NOT_EXISTS=' doesn't exists -VALIDATOR_FACTORY_PATH=Path ' -VALIDATOR_FACTORY_POINTS_TO_FILE=' points to file +VALIDATOR_FACTORY_FOLDER_DOES_NOT_EXIST=Folder ''{0}'' doesn''t exist +VALIDATOR_FACTORY_PATH_POINTS_TO_FILE=Path ''{0}'' points to file VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS=Seam Home folder doesn't exist VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST=Seam Runtime ''{0}'' home directory doesn't exist for selected Seam Web Project VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING=Seam Runtime ''{0}'' home directory doesn't exist @@ -112,41 +105,35 @@ VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST=Seam Runtime ''{0}'' templates directory doesn't exist for selected Seam Web Project VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING=Seam Runtime ''{0}'' templates directory doesn't exist VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST=Seam Runtime ''{0}'' view templates directory doesn't exist for selected Seam Web Project -VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO=Home folder points to -VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER=location that does not look like seam home folder ('jboss-seam.jar' is missing) +VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER=Home folder points to location that does not look like seam home folder ('jboss-seam.jar' is missing) VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST=JBoss AS Home folder doesn't exist -VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT=JBoss AS Home Folde field points to location that doesn't -VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER=look like JBoss AS home folder +VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_JBOSS_AS_HOME_FOLDER=JBoss AS Home Folder field points to location that doesn't look like JBoss AS home folder VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID=Component name is not invalid. VALIDATOR_FACTORY_NAME_IS_NOT_VALID={0} name is not valid. VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID=Local Interface name is not valid.\n VALIDATOR_FACTORY_NAME_IS_NOT_VALID2=\ name is not valid. -VALIDATOR_FACTORY_PROJECT=Project ' -VALIDATOR_FACTORY_DOES_NOT_EXIST=' doesn't exist. -VALIDATOR_FACTORY_SELECTED_PROJECT=Selected project ' +VALIDATOR_FACTORY_PROJECT_DOES_NOT_EXIST=Project ''{0}'' doesn''t exist. +VALIDATOR_FACTORY_SELECTED_PROJECT_IS_NOT_A_SEAM_WEB_PROJECT=Selected project ''{0}'' is not a Seam Project VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED=Selected project ''{0}'' is closed VALIDATOR_FACTORY_PRJ_NOT_SELECTED=Project is not selected -VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT=' is not a Seam Project VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED=Connection profile is not selected -VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED=Driver Class property is empty for selected ' +VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED_CONNECTION_PROFILE=Driver Class property is empty for selected ''{0}'' connection profile VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST=Seam Runtime ''{0}'' source templates directory doesn't exist for selected Seam Web Project -VALIDATOR_FACTORY_CONNECTION_PROFILE=' connection profile VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED=Seam Runtime is not selected VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING=Seam Runtime ''{0}'' view templates directory doesn't exist VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND=Cannot find ''{0}'' Seam Runtime for selected Seam Web Project VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME=Cannot find Seam Runtime ''{0}'' VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING=Seam Runtime ''{0}'' source templates directory doesn't exist -VALIDATOR_FACTORY_TEST_PROJECT=Test project ' -VALIDATOR_FACTORY_EAR_PROJECT=EAR project ' -VALIDATOR_FACTORY_EJB_PROJECT=EJB project ' -VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS=' already exists. Please select other name for new Seam project. +VALIDATOR_FACTORY_TEST_PROJECT_ALREADY_EXISTS=Test project ''{0}'' already exists. Please select other name for new Seam project. +VALIDATOR_FACTORY_EAR_PROJECT_ALREADY_EXISTS=EAR project ''{0}'' already exists. Please select other name for new Seam project. +VALIDATOR_FACTORY_EJB_PROJECT_ALREADY_EXISTS=EJB project ''{0}'' already exists. Please select other name for new Seam project. VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED=Seam Runtime is not configured for selected Seam Web Project VALIDATOR_INVALID_SETTINGS=Selected seam project has some invalid settings. Please press "Settings..." and correct them. SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT=Runtime name is not correct SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_GENERATE_SEAM_ENTITIES=Can't generate seam entities SEAM_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL=Base url for image registry cannot be null. SEAM_GENERATE_ENTITIES_WIZARD_ACTION_CREATING_OPERATION=Action creating operation -SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME=Can't find seam runtime for project +SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME=Can't find seam runtime for project {0} ABSTRACT_SEAM_CONTENT_PROVIDER_SEAM_PROJECT_CHANGE_EVENT_OCCURS_BUT_NO_SORCE_OF_PROJECT_PROVIDED=Seam Project change event occurs, but no soyrce of project provided SEAM_OPEN_ACTION_OPEN=Open TEXT_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE=Parent control should be Composite @@ -166,7 +153,7 @@ COMPOSITE_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT=Editor supports only grid layout COMPOSITE_EDITOR_THIS_METOD_CAN_BE_INVOKED=This metod can be invoked after getEditorControls(parent) only SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_SEAM_HOME_DIRECTORY_CANNOT_BE_EMPTY=Path to seam home directory cannot be empty -SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION=The selected seam appears to be of an incompatible version ' +SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION=The selected seam appears to be of an incompatible version ''{0}'' SEAM_TARGET_SERVER=Target Server RUNTIME_DELETE_CONFIRM_TITLE=Confirm Runtime Delete RUNTIME_DELETE_NOT_USED_CONFIRM=Are you sure you want to delete runtime ''{0}''? Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -230,8 +230,7 @@ return ((List<SeamRuntime>) inputElement).toArray(); } else { throw new IllegalArgumentException( - SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE - + SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_AN_INSTANCEOF_OF_LIST); + SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE_LIST); } } @@ -594,9 +593,8 @@ continue; } if (rt.getName().equals(name.getValueAsString())) { - setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME - + name.getValueAsString() - + SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_ALREADY_EXISTS); + setErrorMessage(NLS.bind(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_ALREADY_EXISTS, + name.getValueAsString())); setPageComplete(false); return; } @@ -631,8 +629,8 @@ setPageComplete(true); return; } else if(!SeamUtil.areSeamVersionsMatched(version.getValueAsString(), seamVersion)) { - setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION - + seamVersion + "'"); //$NON-NLS-1$ + setErrorMessage(NLS.bind(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION, + seamVersion)); setPageComplete(false); return; } else { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -33,6 +33,7 @@ import org.eclipse.debug.core.ILaunchManager; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.INewWizard; import org.eclipse.ui.PlatformUI; @@ -132,7 +133,8 @@ seamRt = getRuntime(project); } if(seamRt == null) { - throw new CoreException(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME + project.getName())); + throw new CoreException(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, + NLS.bind(SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME, project.getName()))); } String seamTemplatesRoot = seamRt.getTemplatesDir(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/messages/StrutsUIMessages.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/messages/StrutsUIMessages.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/messages/StrutsUIMessages.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -39,6 +39,7 @@ public static String DELETE_REFERENCE_FROM_WEBXML; public static String ACTION_IS_REFERENCED_REMOVE_REFERENCES; public static String DELETE; + public static String DELETE_NAME; public static String WARNING; public static String CANNOT_FIND_OBJECT_BY_PATH; public static String MODULE_NAME; @@ -114,6 +115,7 @@ public static String ALREADY_EXISTS; public static String ADD_FORMSET; public static String ADD; + public static String ADD_NAME; public static String ADD_MESSAGES_FROM_TEMPLATE; public static String ADD_PLUGIN_BY_TEMPLATE; public static String PLUGIN_FOR_CLASS_EXISTS; @@ -121,6 +123,7 @@ public static String WRONG_TEXT_IN_PLUGIN_OPTION; public static String DELETE_MODULE; public static String DELETE_STRUTS_CONFIGFILE; + public static String DELETE_STRUTS_CONFIGFILE_NAME; public static String LINK_IS_CONFIRMED_1; public static String LINK_IS_CONFIRMED_2; public static String BUNDLE_ID_ISNOT_SPECIFIED; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/messages/messages.properties =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/messages/messages.properties 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/messages/messages.properties 2009-04-14 07:53:42 UTC (rev 14726) @@ -9,27 +9,30 @@ STEP_3_FORMBEANS=Step 3 - FormBeans STEP_4_FORWARDS=Step 4 - Forwards STEP_5_EXCEPTIONS=Step 5 - Exceptions -DELETE_STRUTS_CONFIGFILE=Delete struts-config file +# we don't have support for multilingual plurals yet... +DELETE_STRUTS_CONFIGFILE=Delete struts-config file/files +DELETE_STRUTS_CONFIGFILE_NAME=Delete struts-config file {0} DELETE_REFERENCE_FROM_WEBXML=Delete reference from web.xml DELETE_REFERENCE=Delete reference from struts configuration file ACTION_IS_REFERENCED_REMOVE_REFERENCES=Action {0} is referenced.\nPlease remove references first. WARNING=Warning OK=Ok DELETE=Delete +DELETE_NAME=Delete {0} CANNOT_FIND_OBJECT_BY_PATH=Cannot find object by path {0}. CANNOT_FIND_TAG_IN_LIBRARY=Cannot find tag {0} in library {1}. CANNOT_FIND_ATTRIBUTE_IN_TAG=Cannot find attribute {0} in tag {1}. CANNOT_FIND_FORM_PROPERTY=Cannot find form property {0}. CANNOT_FIND_FORM_BEAN_FOR_ACTION=Cannot find form-bean for action {0}. CANNOT_FIND_BUNDLE=Cannot find bundle {0}. -CANNOT_FIND_OBJECT=Cannot find object +CANNOT_FIND_OBJECT=Cannot find object {0} CANNOT_FIND_ACTION=Cannot find action {0}. CANNOT_FIND_PAGE=Cannot find page {0}. CANNOT_FIND_FORWARD=Cannot find forward {0}. CANNOT_FIND_FORMBEAN=Cannot find form bean {0}. CANNOT_FIND_PARAMETER=Cannot find parameter {0}. CANNOT_FIND_TAGLIBRARY=Cannot find tag library {0}. -CANNOT_FIND_RESOURCE=Cannot find resource +CANNOT_FIND_RESOURCE=Cannot find resource {0} CANNOT_FIND_PROPERTY=Cannot find property {0}. MODULE_NAME=Module name must start with '/' FILE_SYSTEM_IS_USED_AS_ROOT_FOR_STRUTS_MODULE=File system is used as root for struts module ''{0}''. Unmark file system as module root?" @@ -60,8 +63,8 @@ FORMBEAN_ISNOT_SPECIFIED=Form bean is not specified. EXCEPTION_GENERATED=Exception generated. EXCEPTION_ISNOT_GENERATED=Exception is not generated. -CLEAN_ATTRIBUTE=Clean Attribute -CREATE_STRUTS_CONFIG=Create struts config 1.1 in +CLEAN_ATTRIBUTE=Clean Attribute {0} +CREATE_STRUTS_CONFIG=Create struts config 1.1 in {0} CREATE_NEW_STRUTS_PROJECT=Create New Struts Project CREATE_WEB_PROJECT=Create Web Project PAGE_IS_REFERENCED=Page {0} is referenced.\nPlease remove references first. @@ -117,6 +120,7 @@ ADD_VALIDATOR=Add Validator ADD_PLUGIN=Add Plug-in ADD=Add +ADD_NAME=Add {0} ADD_MESSAGES_FROM_TEMPLATE=Add Messages From Template ADD_PLUGIN_BY_TEMPLATE=Add Plugin by Template PLUGIN_FOR_CLASS_EXISTS=Plugin for class {0} exists.\nDo you want to override it? Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CleanActionForwardAttrHandler.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -11,6 +11,8 @@ package org.jboss.tools.struts.model.handlers; import java.util.*; + +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.meta.action.impl.*; import org.jboss.tools.common.model.*; import org.jboss.tools.struts.StrutsConstants; @@ -33,7 +35,7 @@ if(object == null) return false; String attr = getAttribute(object); if(attr == null) return false; - ((XActionImpl)action).setDisplayName(StrutsUIMessages.CLEAN_ATTRIBUTE + attr); + ((XActionImpl)action).setDisplayName(NLS.bind(StrutsUIMessages.CLEAN_ATTRIBUTE, attr)); return true; } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateStrutsConfigSupport.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -11,6 +11,8 @@ package org.jboss.tools.struts.model.handlers; import java.util.*; + +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator; import org.jboss.tools.common.model.XModelException; @@ -80,7 +82,10 @@ protected void execute() throws XModelException { Properties p0 = extractStepData(0); XUndoManager undo = getTarget().getModel().getUndoManager(); - XTransactionUndo u = new XTransactionUndo(StrutsUIMessages.CREATE_STRUTS_CONFIG + getTarget().getAttributeValue("element type")+" "+getTarget().getPresentationString(), XTransactionUndo.ADD); //$NON-NLS-2$ //$NON-NLS-3$ + XTransactionUndo u = new XTransactionUndo( + NLS.bind(StrutsUIMessages.CREATE_STRUTS_CONFIG, + getTarget().getAttributeValue("element type")+" "+getTarget().getPresentationString()), //$NON-NLS-1$//$NON-NLS-2$ + XTransactionUndo.ADD); undo.addUndoable(u); try { doExecute(p0); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/DeleteStrutsConfigHandler.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -11,8 +11,13 @@ package org.jboss.tools.struts.model.handlers; import java.util.Properties; -import org.jboss.tools.common.model.*; -import org.jboss.tools.common.model.filesystems.impl.*; + +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.common.model.ServiceDialog; +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.filesystems.impl.DeleteFileHandler; +import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; import org.jboss.tools.common.model.impl.XModelImpl; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.struts.messages.StrutsUIMessages; @@ -27,7 +32,8 @@ if(StrutsWebHelper.isConfigRegistered(object.getModel(), uri)) { ServiceDialog d = object.getModel().getService(); Properties pd = new Properties(); - String message = StrutsUIMessages.DELETE_STRUTS_CONFIGFILE + FileAnyImpl.toFileName(object); + String message = NLS.bind(StrutsUIMessages.DELETE_STRUTS_CONFIGFILE_NAME, + FileAnyImpl.toFileName(object)); pd.setProperty(ServiceDialog.DIALOG_MESSAGE, message); pd.setProperty(ServiceDialog.CHECKBOX_MESSAGE, StrutsUIMessages.DELETE_REFERENCE_FROM_WEBXML); pd.put(ServiceDialog.CHECKED, new Boolean(true)); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -77,7 +77,9 @@ return; } XUndoManager undo = object.getModel().getUndoManager(); - XTransactionUndo u = new XTransactionUndo(StrutsUIMessages.DELETE + DefaultCreateHandler.title(object, false), XTransactionUndo.REMOVE); + XTransactionUndo u = new XTransactionUndo( + NLS.bind(StrutsUIMessages.DELETE_NAME, + DefaultCreateHandler.title(object, false)), XTransactionUndo.REMOVE); undo.addUndoable(u); try { if (referers != null && referers.size() > 0) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenFileInWebRoot.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenFileInWebRoot.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenFileInWebRoot.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.model.helpers.open; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.impl.XModelImpl; import org.jboss.tools.common.model.util.FindObjectHelper; @@ -19,7 +20,7 @@ public String run(XModel model, String path) { XModelObject f = XModelImpl.getByRelativePath(model, path); - if(f == null) return StrutsUIMessages.CANNOT_FIND_RESOURCE + path; + if(f == null) return NLS.bind(StrutsUIMessages.CANNOT_FIND_RESOURCE, path); FindObjectHelper.findModelObject(f, FindObjectHelper.EVERY_WHERE); return null; } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenForwardTargetHelper.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenForwardTargetHelper.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenForwardTargetHelper.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -11,7 +11,7 @@ package org.jboss.tools.struts.model.helpers.open; import org.eclipse.core.resources.IFile; - +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.struts.messages.StrutsUIMessages; @@ -23,9 +23,9 @@ XModelObject f = EclipseResourceUtil.getObjectByResource(file); if(f == null) return null; // XModelObject context = f.getChildByPath(objectPath); - if(context == null) return StrutsUIMessages.CANNOT_FIND_OBJECT + objectPath; + if(context == null) return NLS.bind(StrutsUIMessages.CANNOT_FIND_OBJECT, objectPath); XModelObject target = JumpByForwardPathHandler.findWithContext(targetPath, context); - if(target == null) return StrutsUIMessages.CANNOT_FIND_RESOURCE + targetPath; + if(target == null) return NLS.bind(StrutsUIMessages.CANNOT_FIND_RESOURCE, targetPath); JumpByForwardPathHandler.doOpenTarget(target); return null; } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenObjectByPath.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenObjectByPath.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/open/OpenObjectByPath.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -11,6 +11,7 @@ package org.jboss.tools.struts.model.helpers.open; import org.eclipse.core.resources.IFile; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.*; import org.jboss.tools.struts.messages.StrutsUIMessages; @@ -22,7 +23,7 @@ XModelObject f = EclipseResourceUtil.getObjectByResource(file); if(f == null) return null; // XModelObject o = f.getChildByPath(objectPath); - if(o == null) return StrutsUIMessages.CANNOT_FIND_OBJECT + objectPath; + if(o == null) return NLS.bind(StrutsUIMessages.CANNOT_FIND_OBJECT, objectPath); FindObjectHelper.findModelObject(o, FindObjectHelper.IN_EDITOR_ONLY); return null; } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/handler/DeleteModuleHandler.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -41,7 +41,6 @@ String message = NLS.bind(StrutsUIMessages.DELETE_MODULE,SyncProjectContext.getModuleDisplayName(modulename)); //$NON-NLS-2$ if(cs.length > 0) { String cbm = StrutsUIMessages.DELETE_STRUTS_CONFIGFILE; - if(cs.length > 1) cbm += "s"; //$NON-NLS-1$ Properties dp = new Properties(); dp.setProperty(ServiceDialog.DIALOG_MESSAGE, message); dp.setProperty(ServiceDialog.CHECKBOX_MESSAGE, cbm); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesThroughStrutsResourcesHandler.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -10,13 +10,17 @@ ******************************************************************************/ package org.jboss.tools.struts.plugins.model.handlers; -import java.util.*; -import org.jboss.tools.common.model.*; +import java.util.Properties; + +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.common.meta.action.XActionInvoker; +import org.jboss.tools.common.meta.action.impl.AbstractHandler; +import org.jboss.tools.common.meta.action.impl.XActionImpl; +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.options.PreferenceModelUtilities; -import org.jboss.tools.common.meta.action.XActionInvoker; -import org.jboss.tools.common.meta.action.impl.*; import org.jboss.tools.struts.messages.StrutsUIMessages; -import org.jboss.tools.struts.model.handlers.*; +import org.jboss.tools.struts.model.handlers.OpenMessageResourcesHandler; public class AddMessagesThroughStrutsResourcesHandler extends AbstractHandler { @@ -29,7 +33,7 @@ boolean validateActionName() { XModelObject rs = AddMessagesHandler.getTemplate(PreferenceModelUtilities.getPreferenceModel(), 0); - String dn = (rs != null) ? StrutsUIMessages.ADD + AddMessagesHandler.getTemplateName(rs) + String dn = (rs != null) ? NLS.bind(StrutsUIMessages.ADD_NAME, AddMessagesHandler.getTemplateName(rs)) : StrutsUIMessages.ADD_MESSAGES_FROM_TEMPLATE; ((XActionImpl)action).setDisplayName(dn); return rs != null; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/handlers/DeleteValidationFileHandler.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -11,6 +11,8 @@ package org.jboss.tools.struts.validators.model.handlers; import java.util.Properties; + +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; @@ -28,7 +30,7 @@ ServiceDialog d = object.getModel().getService(); Properties pd = new Properties(); - String message = StrutsUIMessages.DELETE + FileAnyImpl.toFileName(object); + String message = NLS.bind(StrutsUIMessages.DELETE_NAME, FileAnyImpl.toFileName(object)); pd.setProperty(ServiceDialog.DIALOG_MESSAGE, message); pd.setProperty(ServiceDialog.CHECKBOX_MESSAGE, checkboxMessage); pd.put(ServiceDialog.CHECKED, new Boolean(true)); Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -26,11 +26,10 @@ NLS.initializeMessages(BUNDLE_NAME, StrutsTextExtMessages.class); } - public static String OpenTagLibrary; - public static String Tag; - public static String TagAttribute; - public static String ForTag; - public static String ForTagAttribute; + public static String OpenTagLibraryForATag; + public static String OpenTagLibraryForTagName; + public static String OpenTagLibraryForAnAttribute; + public static String OpenTagLibraryForAttributeName; public static String OpenAction; public static String Action; public static String OpenActionMapping; Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties 2009-04-14 07:53:42 UTC (rev 14726) @@ -9,11 +9,10 @@ # Exadel, Inc. and Red Hat, Inc. - initial API and implementation # ****************************************************************************** -OpenTagLibrary=Open a Tag Library for {0} -Tag=a tag -TagAttribute=an attribute -ForTag=tag ''{0}'' -ForTagAttribute=attribute ''{0}'' of tag ''{1}'' +OpenTagLibraryForATag=Open a Tag Library for a tag +OpenTagLibraryForTagName=Open a Tag Library for tag ''{0}'' +OpenTagLibraryForAnAttribute=Open a Tag Library for an attribute +OpenTagLibraryForAttributeName=Open a Tag Library for attribute ''{0}'' of tag ''{1}'' OpenAction=Open Action ''{0}'' Action=Action OpenActionMapping=Open Action Mapping ''{0}'' Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -242,11 +242,9 @@ String tagName = getTagName(fLastRegion); String attrName = getTagAttributeName(fLastRegion); if (tagName == null || attrName == null) - return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, StrutsTextExtMessages.TagAttribute); - - String tagAttr = MessageFormat.format(StrutsTextExtMessages.ForTagAttribute, attrName, tagName); - - return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, tagAttr); + return StrutsTextExtMessages.OpenTagLibraryForAnAttribute; + + return MessageFormat.format(StrutsTextExtMessages.OpenTagLibraryForAttributeName, attrName, tagName); } } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -208,11 +208,9 @@ public String getHyperlinkText() { String tagName = getTagName(fLastRegion); if (tagName == null) - return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, StrutsTextExtMessages.Tag); + return StrutsTextExtMessages.OpenTagLibraryForATag; - String tag = MessageFormat.format(StrutsTextExtMessages.ForTag, tagName); - - return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, tag); + return MessageFormat.format(StrutsTextExtMessages.OpenTagLibraryForTagName, tagName); } } Modified: trunk/struts/plugins/org.jboss.tools.struts.validator.ui/src/org/jboss/tools/struts/validator/ui/global/GlobalEditor.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.validator.ui/src/org/jboss/tools/struts/validator/ui/global/GlobalEditor.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/struts/plugins/org.jboss.tools.struts.validator.ui/src/org/jboss/tools/struts/validator/ui/global/GlobalEditor.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -29,8 +29,6 @@ import org.jboss.tools.struts.validator.ui.internal.ValidatorCommand; public class GlobalEditor implements SelectionListener, CommandBarListener { - static String ADD = StrutsUIMessages.ADD; - static String DELETE = StrutsUIMessages.DELETE; protected Composite control; protected ComboModel combomodel = new ComboModel(); protected Combo combo; @@ -102,9 +100,9 @@ protected void createCommadBar() { bar.getLayout().asToolBar = true; bar.getLayout().iconsOnly = true; - bar.setCommands(new String[]{ADD, DELETE}); - bar.setImage(ADD, FEditorConstants.IMAGE_CREATE); - bar.setImage(DELETE, FEditorConstants.IMAGE_DELETE); + bar.setCommands(new String[]{StrutsUIMessages.ADD, StrutsUIMessages.DELETE}); + bar.setImage(StrutsUIMessages.ADD, FEditorConstants.IMAGE_CREATE); + bar.setImage(StrutsUIMessages.DELETE, FEditorConstants.IMAGE_DELETE); bar.createControl(control); bar.addCommandBarListener(this); } @@ -158,7 +156,7 @@ public void action(String name) { if(root == null || !root.isActive()) return; - if(ADD.equals(name)) { + if(StrutsUIMessages.ADD.equals(name)) { Set set = getKeys(); invoke("CreateActions.AddGlobal", root); //$NON-NLS-1$ Object added = getAddedKey(set); @@ -166,7 +164,7 @@ combomodel.setSelectedItem(added); widgetSelected(null); } - } else if(DELETE.equals(name)) { + } else if(StrutsUIMessages.DELETE.equals(name)) { if(selected != null) invoke("DeleteActions.Delete", selected); //$NON-NLS-1$ } @@ -216,8 +214,8 @@ public void updateCommandsEnabled() { boolean enabled = root != null && root.isObjectEditable(); - bar.setEnabled(ADD, enabled); - bar.setEnabled(DELETE, enabled); + bar.setEnabled(StrutsUIMessages.ADD, enabled); + bar.setEnabled(StrutsUIMessages.DELETE, enabled); } public ValidatorCommand getCommand(int cmd) { Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2009-04-14 07:53:42 UTC (rev 14726) @@ -1,10 +1,12 @@ Label_JBossWS_Runtime_Load_Error=Error occurred while loading JBossWS Command. Select the correct JBoss Server folder. +# START NON-TRANSLATABLE Command=wsconsume.sh Bin=bin Client=client Lib=lib Endorsed=endorsed +# END NON-TRANSLATABLE Error_JBossWS_Basic_Editor_Composite=Parent control should be Composite Error_JBossWS_Basic_Editor_Support=Editor supports only grid layout @@ -16,8 +18,7 @@ JBossWS_Runtime_List_Field_Editor_Name=Name JBossWS_Runtime_List_Field_Editor_Version=Version JBossWS_Runtime_List_Field_Editor_Path=Path -JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be=inputElement must be -JBossWS_Runtime_List_Field_Editor_An_Instance_Of_List=an instance of List<JBossWSRuntime>. +JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be_An_Instance_Of_List=inputElement must be an instance of List<JBossWSRuntime>. JBossWS_Runtime_Delete_Confirm_Title=Confirm Runtime Delete JBossWS_Runtime_Delete_Used_Confirm=Runtime ''{0}'' is used by JBossWS projects. Are you sure you want to delete it? JBossWS_Runtime_Delete_Not_Used_Confirm=Are you sure you want to delete runtime ''{0}''? @@ -25,8 +26,8 @@ JBossWS_Runtime_List_Field_Editor_Modify_Runtime=Input new values JBossWS_Runtime_List_Field_Editor_New_Runtime=New JBossWS Runtime Error_JBossWS_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty=Path to JBossWS home directory cannot be empty -JBossWS_Runtime_List_Field_Editor_Already_Exists=' already exists -JBossWS_Runtime_List_Field_Editor_Runtime=JBossWS Runtime +JBossWS_Runtime_List_Field_Editor_Runtime_Already_Exists=JBossWS Runtime ' already exists +JBossWS_Runtime_List_Field_Editor_Runtime=JBossWS Runtime Error_JBossWS_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct=Runtime name is not correct Error_JBossWS_Runtime_List_Field_Editor_Name_Cannot_Be_Empty=Name cannot be empty JBossWS_Runtime_List_Field_Editor_Create_A_Runtime=Create a JBossWS Runtime Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -47,8 +47,7 @@ public static String JBossWS_Runtime_List_Field_Editor_Name; public static String JBossWS_Runtime_List_Field_Editor_Version; public static String JBossWS_Runtime_List_Field_Editor_Path; - public static String JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be; - public static String JBossWS_Runtime_List_Field_Editor_An_Instance_Of_List; + public static String JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be_An_Instance_Of_List; public static String JBossWS_Runtime_Delete_Confirm_Title; public static String JBossWS_Runtime_Delete_Used_Confirm; public static String JBossWS_Runtime_Delete_Not_Used_Confirm; @@ -56,7 +55,7 @@ public static String JBossWS_Runtime_List_Field_Editor_Modify_Runtime; public static String JBossWS_Runtime_List_Field_Editor_New_Runtime; public static String Error_JBossWS_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty; - public static String JBossWS_Runtime_List_Field_Editor_Already_Exists; + public static String JBossWS_Runtime_List_Field_Editor_Runtime_Already_Exists; public static String JBossWS_Runtime_List_Field_Editor_Runtime; public static String Error_JBossWS_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct; public static String Error_JBossWS_Runtime_List_Field_Editor_Name_Cannot_Be_Empty; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossRuntimeListFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossRuntimeListFieldEditor.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossRuntimeListFieldEditor.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -220,8 +220,7 @@ return ((List<JBossWSRuntime>) inputElement).toArray(); } else { throw new IllegalArgumentException( - JBossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be - + JBossWSUIMessages.JBossWS_Runtime_List_Field_Editor_An_Instance_Of_List); + JBossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be_An_Instance_Of_List); } } @@ -510,9 +509,9 @@ continue; } if (rt.getName().equals(name.getValueAsString())) { - setErrorMessage(JBossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Runtime - + name.getValueAsString() - + JBossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Already_Exists); + setErrorMessage( + NLS.bind(JBossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Runtime_Already_Exists, + name.getValueAsString())); setPageComplete(false); return; } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSLibraryListFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSLibraryListFieldEditor.java 2009-04-14 07:12:47 UTC (rev 14725) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSLibraryListFieldEditor.java 2009-04-14 07:53:42 UTC (rev 14726) @@ -206,8 +206,7 @@ .toArray(); } else { throw new IllegalArgumentException( - JBossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be - + JBossWSUIMessages.JBossWS_Runtime_List_Field_Editor_An_Instance_Of_List); + JBossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be_An_Instance_Of_List); } }