Author: Grid.Qian Date: 2008-06-06 04:15:51 -0400 (Fri, 06 Jun 2008) New Revision: 8592 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/BindingFilesValidationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java Log: JBIDE-2047: modify for I18n messages Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/BindingFilesValidationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/BindingFilesValidationCommand.java 2008-06-06 08:15:31 UTC (rev 8591) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/BindingFilesValidationCommand.java 2008-06-06 08:15:51 UTC (rev 8592) @@ -66,13 +66,13 @@ } catch (SAXException e) { return JBossStatusUtils .errorStatus( - NLS.bind(JBossWSCreationCoreMessages.ERROR_MESSAGE_INVALID_BINDING_FILE, + NLS.bind(JBossWSCreationCoreMessages.Error_Message_Invalid_Binding_File, new String[] {filename, e.getLocalizedMessage() }), e); } catch (IOException e) { return JBossStatusUtils .errorStatus( - NLS.bind(JBossWSCreationCoreMessages.ERROR_MESSAGE_INVALID_BINDING_FILE, + NLS.bind(JBossWSCreationCoreMessages.Error_Message_Invalid_Binding_File, new String[] {filename, e.getLocalizedMessage() }), e); } return Status.OK_STATUS; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2008-06-06 08:15:31 UTC (rev 8591) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2008-06-06 08:15:51 UTC (rev 8592) @@ -66,24 +66,24 @@ project = JBossWSCreationUtils.getJavaProjectByName(model .getWebProjectName()); } catch (JavaModelException e) { - return StatusUtils.errorStatus(JBossWSCreationCoreMessages.ERROR_CREATECLIENTSAMPLE); + return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample); } // find web service client classes List<ICompilationUnit> clientUnits = findJavaUnitsByAnnotation(project, - JBossWSCreationCoreMessages.WEBSERVICEClient_ANNOTATION); + JBossWSCreationCoreMessages.WebserviceClient_Annotation); // find web service classes List<ICompilationUnit> serviceUnits = findJavaUnitsByAnnotation( - project, JBossWSCreationCoreMessages.WEBSERVICE_ANNOTATION_CHECK); + project, JBossWSCreationCoreMessages.Webservice_Annotation_Check); // create a client sample class ICompilationUnit clientCls = createJavaClass(model.getCustomPackage() - + JBossWSCreationCoreMessages.CLIENTSAMPLEPACKAGENAME, - JBossWSCreationCoreMessages.CLIENTSAMPLECLASSNAME, false, null, + + JBossWSCreationCoreMessages.Client_Sample_Package_Name, + JBossWSCreationCoreMessages.Client_Sample_Class_Name, false, null, project); if(clientCls == null){ - return StatusUtils.errorStatus(JBossWSCreationCoreMessages.ERROR_CREATECLIENTSAMPLE); + return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample); } // add imports to client sample class @@ -92,7 +92,7 @@ null); clientCls.save(null, true); } catch (Exception e1) { - return StatusUtils.errorStatus(JBossWSCreationCoreMessages.ERROR_CREATECLIENTSAMPLE); + return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample); } // create main method @@ -111,7 +111,7 @@ clientClsType.createMethod(sb.toString(), null, true, null); clientCls.save(null, true); } catch (JavaModelException e) { - return StatusUtils.errorStatus(JBossWSCreationCoreMessages.ERROR_CREATECLIENTSAMPLE); + return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample); } return status; @@ -222,7 +222,7 @@ NormalAnnotation anno = (NormalAnnotation) method .modifiers().get(0); if (anno.getTypeName().getFullyQualifiedName().equals( - JBossWSCreationCoreMessages.WEBENDPOINT)) { + JBossWSCreationCoreMessages.WebEndpoint)) { createWebService(serviceUnits, method, sb, i); } } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2008-06-06 08:15:31 UTC (rev 8591) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2008-06-06 08:15:51 UTC (rev 8592) @@ -107,17 +107,17 @@ } catch (CoreException e) { status = JBossStatusUtils .errorStatus( - JBossWSCreationCoreMessages.ERROR_MESSAGE_INVALID_BINDING_FILE, + JBossWSCreationCoreMessages.Error_Message_Invalid_Binding_File, e); } catch (MalformedTreeException e) { status = JBossStatusUtils .errorStatus( - JBossWSCreationCoreMessages.ERROR_MESSAGE_INVALID_BINDING_FILE, + JBossWSCreationCoreMessages.Error_Message_Invalid_Binding_File, e); } catch (BadLocationException e) { status = JBossStatusUtils .errorStatus( - JBossWSCreationCoreMessages.ERROR_MESSAGE_INVALID_BINDING_FILE, + JBossWSCreationCoreMessages.Error_Message_Invalid_Binding_File, e); } return status; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2008-06-06 08:15:31 UTC (rev 8591) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2008-06-06 08:15:51 UTC (rev 8592) @@ -49,9 +49,9 @@ if (!JBossWSCreationUtils.validateJBossWSLocation()) { return StatusUtils - .errorStatus(JBossWSCreationCoreMessages.ERROR_WS_LOCATION); + .errorStatus(JBossWSCreationCoreMessages.Error_WS_Location); } - model.setTarget(JBossWSCreationCoreMessages.VALUE_TARGET_0); + model.setTarget(JBossWSCreationCoreMessages.Value_Target_0); if (scenario == WebServiceScenario.CLIENT) { try { model.setWsdlURI(wsClient.getWebServiceClientInfo() Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2008-06-06 08:15:31 UTC (rev 8591) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2008-06-06 08:15:51 UTC (rev 8592) @@ -35,9 +35,9 @@ if (!JBossWSCreationUtils.validateJBossWSLocation()) { return StatusUtils - .errorStatus(JBossWSCreationCoreMessages.ERROR_WS_LOCATION); + .errorStatus(JBossWSCreationCoreMessages.Error_WS_Location); } - model.setTarget(JBossWSCreationCoreMessages.VALUE_TARGET_0); + model.setTarget(JBossWSCreationCoreMessages.Value_Target_0); if (scenario == WebServiceScenario.TOPDOWN) { try { model.setWsdlURI(ws.getWebServiceInfo().getWsdlURL()); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java 2008-06-06 08:15:31 UTC (rev 8591) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java 2008-06-06 08:15:51 UTC (rev 8592) @@ -135,7 +135,7 @@ sd._name = JBossWSCreationUtils.classNameFromQualifiedName(clsName); sd._displayName = sd._name; sd._className = clsName; - sd._mappings = JBossWSCreationCoreMessages.SEPARATOR_JAVA + sd._name; + sd._mappings = JBossWSCreationCoreMessages.Separator_Java + sd._name; return sd; } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java 2008-06-06 08:15:31 UTC (rev 8591) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java 2008-06-06 08:15:51 UTC (rev 8592) @@ -56,7 +56,7 @@ project = JBossWSCreationUtils.getJavaProjectByName(model .getWebProjectName()); } catch (JavaModelException e) { - return StatusUtils.errorStatus(JBossWSCreationCoreMessages.ERROR_CREATECLIENTSAMPLE); + return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample); } status = removeClassPath(project); return status; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java 2008-06-06 08:15:31 UTC (rev 8591) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java 2008-06-06 08:15:51 UTC (rev 8592) @@ -50,17 +50,17 @@ .findType(implClass).getCompilationUnit(); } else { return StatusUtils.errorStatus(NLS.bind( - JBossWSCreationCoreMessages.ERROR_NO_CLASS, + JBossWSCreationCoreMessages.Error_No_Class, new String[] { implClass, project })); } if (!unit.getSource().contains( - JBossWSCreationCoreMessages.WEBSERVICE_ANNOTATION)) { + JBossWSCreationCoreMessages.Webservice_Annotation)) { return StatusUtils - .errorStatus(JBossWSCreationCoreMessages.ERROR_NO_ANNOTATION); + .errorStatus(JBossWSCreationCoreMessages.Error_No_Annotation); } } catch (JavaModelException e) { return StatusUtils.errorStatus(NLS.bind( - JBossWSCreationCoreMessages.ERROR_NO_CLASS, new String[] { + JBossWSCreationCoreMessages.Error_No_Class, new String[] { implClass, project })); } return Status.OK_STATUS; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-06-06 08:15:31 UTC (rev 8591) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-06-06 08:15:51 UTC (rev 8592) @@ -1,24 +1,24 @@ -LABEL_CUSTOM_PACKAGE_NAME=Custom package name -LABEL_CATALOG_FILE=Catalog file -LABEL_BUTTON_TEXT_SELECTION= &Add -LABEL_BINDING_FILE=Binding files -LABEL_JAXWS_TARGET=JAX-WS specification -VALUE_TARGET_0=2.0 -VALUE_TARGET_1=2.1 -LABEL_BUTTON_TEXT_REMOVE=Remove +Label_Custom_Package_Name=Custom package name +Label_Catalog_File=Catalog file +Label_Button_Text_Seletion= &Add +Label_Binding_File=Binding files +Label_JaxWS_Target=JAX-WS specification +Value_Target_0=2.0 +Value_Target_1=2.1 +Label_Button_Text_Remove=Remove -ERROR_MESSAGE_INVALID_BINDING_FILE={0} is not a valid JAX-WS or JAXB binding file -ERROR_READ_BINDING_FILE=Exception occurred while reading binding file -SEPARATOR_JAVA=/ +Error_Message_Invalid_Binding_File={0} is not a valid JAX-WS or JAXB binding file +Error_Read_Binding_File=Exception occurred while reading binding file +Separator_Java=/ -ERROR_IMPLEMENTATION_CODE_GENERATION=Exception occurred while generating implementation class -ERROR_NO_ANNOTATION=This class has no required JAXWS Annotation! -WEBSERVICE_ANNOTATION_CHECK=@WebService( -WEBSERVICE_ANNOTATION=@WebService -ERROR_NO_CLASS= The class {0} cannot be loaded via project {1}.Check that the project contains the class, or that the class is loadable according to the Java Build Path of the project. -ERROR_WS_LOCATION=The JBoss WS Runtime Location is NULL. Please set the location on JBoss WS preferences page. -WEBSERVICEClient_ANNOTATION=@WebServiceClient -CLIENTSAMPLEPACKAGENAME=.clientsample -CLIENTSAMPLECLASSNAME=ClientSample -ERROR_CREATECLIENTSAMPLE=When create a client sample, a error comes up. Please check the generated files. -WEBENDPOINT=WebEndpoint \ No newline at end of file +Error_Implemetation_Code_Generation=Exception occurred while generating implementation class +Error_No_Annotation=This class has no required JAXWS Annotation! +WebserviceClient_Annotation=@WebServiceClient +Webservice_Annotation=@WebService +Error_No_Class= The class {0} cannot be loaded via project {1}.Check that the project contains the class, or that the class is loadable according to the Java Build Path of the project. +Error_WS_Location=The JBoss WS Runtime Location is NULL. Please set the location on JBoss WS preferences page. +Webservice_Annotation_Check=@WebService( +Client_Sample_Package_Name=.clientsample +Client_Sample_Class_Name=ClientSample +Error_Create_Client_Sample=When create a client sample, a error comes up. Please check the generated files. +WebEndpoint=WebEndpoint \ No newline at end of file Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-06-06 08:15:31 UTC (rev 8591) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-06-06 08:15:51 UTC (rev 8592) @@ -5,30 +5,30 @@ public class JBossWSCreationCoreMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.ws.creation.core.messages.JBossWSCreationCore"; //$NON-NLS-1$ - public static String LABEL_CUSTOM_PACKAGE_NAME; - public static String LABEL_CATALOG_FILE; - public static String LABEL_BUTTON_TEXT_SELECTION; - public static String LABEL_BINDING_FILE; - public static String LABEL_JAXWS_TARGET; - public static String VALUE_TARGET_0; - public static String VALUE_TARGET_1; - public static String LABEL_BUTTON_TEXT_REMOVE; + public static String Label_Custom_Package_Name; + public static String Label_Catalog_File; + public static String Label_Button_Text_Seletion; + public static String Label_Binding_File; + public static String Label_JaxWS_Target; + public static String Value_Target_0; + public static String Value_Target_1; + public static String Label_Button_Text_Remove; - public static String ERROR_MESSAGE_INVALID_BINDING_FILE; - public static String ERROR_READ_BINDING_FILE; - public static String SEPARATOR_JAVA; + public static String Error_Message_Invalid_Binding_File; + public static String Error_Read_Binding_File; + public static String Separator_Java; - public static String ERROR_IMPLEMENTATION_CODE_GENERATION; - public static String ERROR_NO_ANNOTATION; - public static String WEBSERVICEClient_ANNOTATION; - public static String ERROR_NO_CLASS; - public static String ERROR_WS_LOCATION; - public static String WEBSERVICE_ANNOTATION_CHECK; - public static String WEBSERVICE_ANNOTATION; - public static String CLIENTSAMPLEPACKAGENAME; - public static String CLIENTSAMPLECLASSNAME; - public static String ERROR_CREATECLIENTSAMPLE; - public static String WEBENDPOINT; + public static String Error_Implemetation_Code_Generation; + public static String Error_No_Annotation; + public static String WebserviceClient_Annotation; + public static String Error_No_Class; + public static String Error_WS_Location; + public static String Webservice_Annotation_Check; + public static String Webservice_Annotation; + public static String Client_Sample_Package_Name; + public static String Client_Sample_Class_Name; + public static String Error_Create_Client_Sample; + public static String WebEndpoint; private JBossWSCreationCoreMessages() { } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2008-06-06 08:15:31 UTC (rev 8591) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2008-06-06 08:15:51 UTC (rev 8592) @@ -264,7 +264,7 @@ public static boolean validateJBossWSLocation() { String location = JbossWSCorePlugin.getDefault().getPreferenceStore() - .getString(JbossWSCoreMessages.WS_LOCATION); + .getString(JbossWSCoreMessages.WS_Location); if (location == null || location.equals("")) { return false; }