[jbosstools-commits] JBoss Tools SVN: r20924 - in trunk/ws/plugins: org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils and 5 other directories.

Author: Grid.Qian Date: 2010-03-19 03:29:17 -0400 (Fri, 19 Mar 2010) New Revision: 20924 Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages/ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages/JBossWSCreationUI.properties trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages/JBossWSCreationUIMessages.java Removed: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/Messages.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages.properties Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.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.ui/src/org/jboss/tools/ws/creation/ui/CreationUIPlugin.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.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 Log: JBIDE-6071: to trunk Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties 2010-03-19 07:29:17 UTC (rev 20924) @@ -1,12 +1,15 @@ -Progress_Install_JBossWS_Runtime=JBoss Web Service Runtime -Progress_UnInstall_JBossWS_Runtime=Uninstall JBoss Web Service Runtime +# START NON-TRANSLATABLE Dir_Lib=lib Dir_Client=client -Error_Copy=Exception while copy JBossWS jars WS_Location=jbosswsruntimelocation JBossWS_Runtime_Lib=JBossWS_Runtime JBossWS_Runtime=JBoss WS Runtime -JBossWSCoreUtils_ErrorResourceNotFile=The following path is not a file: {0}. -JBossWSCoreUtils_ErrorResourceNotFolder=Resource {0} is not a folder. +# END NON-TRANSLATABLE + +Progress_Install_JBossWS_Runtime=JBoss Web Service Runtime +Progress_UnInstall_JBossWS_Runtime=Uninstall JBoss Web Service Runtime +Error_Copy=Exception while copy JBossWS jars +Error_JBossWSCoreUtils_ResourceNotFile=The following path is not a file: {0}. +Error_JBossWSCoreUtils_ResourceNotFolder=Resource {0} is not a folder. Error_Add_Facet_JBossWS=Exception while install JBossWS facet Error_Remove_Facet_JBossWS=Exception while uninstall JBossWS facet Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java 2010-03-19 07:29:17 UTC (rev 20924) @@ -28,12 +28,13 @@ public static String Progress_UnInstall_JBossWS_Runtime; public static String Dir_Lib; public static String Dir_Client; - public static String Error_Copy; public static String WS_Location; public static String JBossWS_Runtime_Lib; public static String JBossWS_Runtime; - public static String JBossWSCoreUtils_ErrorResourceNotFile; - public static String JBossWSCoreUtils_ErrorResourceNotFolder; + + public static String Error_JBossWSCoreUtils_ResourceNotFile; + public static String Error_JBossWSCoreUtils_ResourceNotFolder; + public static String Error_Copy; public static String Error_Add_Facet_JBossWS; public static String Error_Remove_Facet_JBossWS; Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.java 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.java 2010-03-19 07:29:17 UTC (rev 20924) @@ -170,7 +170,7 @@ return (IFolder) child; } else { throw new CoreException(new Status(IStatus.ERROR, - "ResourceUtils", 0, NLS.bind(JBossWSCoreMessages.JBossWSCoreUtils_ErrorResourceNotFolder, //$NON-NLS-1$ // EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FOLDER + "ResourceUtils", 0, NLS.bind(JBossWSCoreMessages.Error_JBossWSCoreUtils_ResourceNotFolder, //$NON-NLS-1$ new Object[] { parent.getFullPath().append( folderName).toString() }), null)); } @@ -200,7 +200,7 @@ } else { throw new CoreException(new Status(IStatus.ERROR, - "ResourceUtils", 0, NLS.bind(JBossWSCoreMessages.JBossWSCoreUtils_ErrorResourceNotFile, //$NON-NLS-1$ // EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FILE + "ResourceUtils", 0, NLS.bind(JBossWSCoreMessages.Error_JBossWSCoreUtils_ResourceNotFile, //$NON-NLS-1$ new Object[] { parent.getFullPath().append( fileName) }), null)); } 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 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2010-03-19 07:29:17 UTC (rev 20924) @@ -1,29 +1,6 @@ -Label_Custom_Package_Name=Package name -Label_Catalog_File=Catalog file -Label_Button_Text_Seletion= &Add -Label_Generate_Impelemtation=Generate default Web Service Implementation classes -Label_Generate_WSDL=Generate WSDL file -Label_Binding_File=Binding files -Label_JaxWS_Target=JAX-WS specification -Label_Update_Webxml=Update the default Web.xml -Label_EnableSOAP12_Binding_Extension=Enable SOAP 1.2 binding extension (This option is only available for JBossWS 3.0 or later) # START NON-TRANSLATABLE Value_Target_0=2.0 Value_Target_1=2.1 -# END NON-TRANSLATABLE -Label_Button_Text_Remove=Remove - -Progress_Message_Generating=Generating Web Service resources... - -Error_Message_Invalid_Binding_File={0} is not a valid JAX-WS or JAXB binding file -Error_Message_Failed_To_Generate_Code=Failed to Generate Web Service code, please check the log for more details -Error_Message_Failed_to_Generate_Implementation=Failed to generate implementation class -Error_Message_Command_File_Not_Found=The command file: "{0}" does not exist, please check the JBoss Web Service runtime setting to make sure the location of JBoss Web Service runtime is valid. -Error_Message_No_Runtime_Specified=No JBoss Web Service runtime has been specified. - - -Error_No_Annotation=This class has no required JAXWS Annotation! -# START NON-TRANSLATABLE Separator_Java=/ WebserviceClient_Annotation=@WebServiceClient Webservice_Annotation=WebService @@ -32,16 +9,21 @@ Client_Sample_Package_Name=.clientsample Client_Sample_Class_Name=ClientSample WebEndpoint=WebEndpoint +Command=wsconsume.sh +Bin=bin # END NON-TRANSLATABLE -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. -Error_Create_Client_Sample=When create a client sample, a error comes up. Please check the generated files. -Error_No_Package=The service implementation selected does not follow Java naming conventions. This may result in not being able to generate your WebService. - - -Error_WS_Chose_runtime=Select a JBoss Web Service runtime. If a server supplied JBoss Web Service runtime is chosen ,\n the chosen server adapter must be capable of providing the JBoss Web Service runtime -Error_WS_No_Runtime_Specifed=A JBossWS runtime has not been chosen +Label_Custom_Package_Name=Package name +Label_Catalog_File=Catalog file +Label_Button_Text_Seletion= &Add +Label_Generate_Impelemtation=Generate default Web Service Implementation classes +Label_Generate_WSDL=Generate WSDL file +Label_Binding_File=Binding files +Label_JaxWS_Target=JAX-WS specification +Label_Update_Webxml=Update the default Web.xml +Label_EnableSOAP12_Binding_Extension=Enable SOAP 1.2 binding extension (This option is only available for JBossWS 3.0 or later) +Label_Button_Text_Remove=Remove +Progress_Message_Generating=Generating Web Service resources... JBossWSFacetInstallPage_Title=JBossWS Facet {0} JBossWSFacetInstallPage_Description=Select JBossWS {0} Web Service runtime JBossWSFacetInstallPage_ServerSuppliedJBossWS=Server Supplied JBossWS Runtime @@ -52,6 +34,16 @@ JBossWSRuntimeInstallPage_NoValidJBossWSRuntime=The specified target runtime should be JBoss AS 5.0 or later. Client_Sample_Run_Over= Call Over! -Command=wsconsume.sh -Bin=bin +Error_Message_Invalid_Binding_File={0} is not a valid JAX-WS or JAXB binding file +Error_Message_Failed_To_Generate_Code=Failed to Generate Web Service code, please check the log for more details +Error_Message_Failed_to_Generate_Implementation=Failed to generate implementation class +Error_Message_Command_File_Not_Found=The command file: "{0}" does not exist, please check the JBoss Web Service runtime setting to make sure the location of JBoss Web Service runtime is valid. +Error_Message_No_Runtime_Specified=No JBoss Web Service runtime has been specified. +Error_No_Annotation=This class has no required JAXWS Annotation! +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. +Error_Create_Client_Sample=When create a client sample, a error comes up. Please check the generated files. +Error_No_Package=The service implementation selected does not follow Java naming conventions. This may result in not being able to generate your WebService. +Error_WS_Chose_runtime=Select a JBoss Web Service runtime. If a server supplied JBoss Web Service runtime is chosen ,\n the chosen server adapter must be capable of providing the JBoss Web Service runtime +Error_WS_No_Runtime_Specifed=A JBossWS runtime has not been chosen Error_JBossWS_GenerateWizard_WSName_Same=The Web Service Name has been used in the web.xml of the web project. 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 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2010-03-19 07:29:17 UTC (rev 20924) @@ -5,68 +5,55 @@ 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 Value_Target_0; + public static String Value_Target_1; + public static String Separator_Java; + public static String WebserviceClient_Annotation; + public static String Webservice_Annotation_Check; + public static String Webservice_Annotation; + public static String Webservice_Annotation_Prefix; + public static String WebEndpoint; + public static String Client_Sample_Package_Name; + public static String Client_Sample_Class_Name; + public static String Command; + public static String Bin; + public static String JBossWSFacetInstallPage_Deploy; - public static String JBossWSFacetInstallPage_Description; - public static String JBossWSFacetInstallPage_New; - public static String JBossWSFacetInstallPage_ServerSuppliedJBossWS; - public static String JBossWSFacetInstallPage_Title; - public static String JBossWSRuntimeConfigBlock_Duplicated_Jar; public static String JBossWSRuntimeInstallPage_NoTargetRuntime; public static String JBossWSRuntimeInstallPage_NoValidJBossWSRuntime; - 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_Generate_Impelemtation; - public static String Label_Generate_WSDL; public static String Label_JaxWS_Target; - public static String Label_Update_Webxml; public static String Label_EnableSOAP12_Binding_Extension; - public static String Value_Target_0; - public static String Value_Target_1; public static String Label_Button_Text_Remove; - public static String Progress_Message_Generating; + public static String Progress_Message_Generating; + public static String Client_Sample_Run_Over; public static String Error_Message_Invalid_Binding_File; - - public static String Separator_Java; public static String Error_Message_Failed_To_Generate_Code; - public static String Error_Message_Failed_to_Generate_Implementation; - + public static String Error_Message_Failed_to_Generate_Implementation; public static String Error_Message_Command_File_Not_Found; - - public static String Error_No_Annotation; - public static String WebserviceClient_Annotation; public static String Error_No_Class; public static String Error_No_Package; public static String Error_WS_Location; public static String Error_WS_No_Runtime_Specifed; public static String Error_WS_Chose_runtime; - public static String Webservice_Annotation_Check; - public static String Webservice_Annotation; - public static String Webservice_Annotation_Prefix; - 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; - public static String Error_Message_No_Runtime_Specified; - public static String Client_Sample_Run_Over; - - public static String Command; - public static String Bin; public static String Error_JBossWS_GenerateWizard_WSName_Same; - + + private JBossWSCreationCoreMessages() { } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/CreationUIPlugin.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/CreationUIPlugin.java 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/CreationUIPlugin.java 2010-03-19 07:29:17 UTC (rev 20924) @@ -9,7 +9,7 @@ public class CreationUIPlugin extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.jbossws.creation.ui"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.jboss.tools.ws.creation.ui"; //$NON-NLS-1$ // The shared instance private static CreationUIPlugin plugin; Deleted: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/Messages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/Messages.java 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/Messages.java 2010-03-19 07:29:17 UTC (rev 20924) @@ -1,18 +0,0 @@ -package org.jboss.tools.ws.creation.ui; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.ws.creation.ui.messages"; //$NON-NLS-1$ - public static String JBossWSConfigWidgetFactory_Description; - public static String JBossWSConfigWidgetFactory_Title; - public static String JBossWSProviderInvokeConfigWidgetFactory_Description; - public static String JBossWSProviderInvokeConfigWidgetFactory_Title; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} Copied: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages/JBossWSCreationUI.properties (from rev 20822, trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages.properties) =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages/JBossWSCreationUI.properties (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages/JBossWSCreationUI.properties 2010-03-19 07:29:17 UTC (rev 20924) @@ -0,0 +1,4 @@ +JBossWSConfigWidgetFactory_Description=Please input the appropriate option for the code generation +JBossWSConfigWidgetFactory_Title=JBoss Web Service Code Generation Configuration +JBossWSProviderInvokeConfigWidgetFactory_Description=Please input the appropriate option for the code generation +JBossWSProviderInvokeConfigWidgetFactory_Title=JBoss Web Service Code Generation Configuration Copied: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages/JBossWSCreationUIMessages.java (from rev 20822, trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/Messages.java) =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages/JBossWSCreationUIMessages.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages/JBossWSCreationUIMessages.java 2010-03-19 07:29:17 UTC (rev 20924) @@ -0,0 +1,18 @@ +package org.jboss.tools.ws.creation.ui.messages; + +import org.eclipse.osgi.util.NLS; + +public class JBossWSCreationUIMessages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.ws.creation.ui.messages.JBossWSCreationUI"; //$NON-NLS-1$ + + private JBossWSCreationUIMessages() { + } + public static String JBossWSConfigWidgetFactory_Description; + public static String JBossWSConfigWidgetFactory_Title; + public static String JBossWSProviderInvokeConfigWidgetFactory_Description; + public static String JBossWSProviderInvokeConfigWidgetFactory_Title; + + static { + NLS.initializeMessages(BUNDLE_NAME, JBossWSCreationUIMessages.class); + } +} Deleted: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages.properties 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/messages.properties 2010-03-19 07:29:17 UTC (rev 20924) @@ -1,4 +0,0 @@ -JBossWSConfigWidgetFactory_Description=Please input the appropriate option for the code generation -JBossWSConfigWidgetFactory_Title=JBoss Web Service Code Generation Configuration -JBossWSProviderInvokeConfigWidgetFactory_Description=Please input the appropriate option for the code generation -JBossWSProviderInvokeConfigWidgetFactory_Title=JBoss Web Service Code Generation Configuration Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java 2010-03-19 07:29:17 UTC (rev 20924) @@ -10,7 +10,7 @@ import org.jboss.tools.ws.creation.core.commands.InitialClientCommand; import org.jboss.tools.ws.creation.core.commands.InitialCommand; import org.jboss.tools.ws.creation.core.data.ServiceModel; -import org.jboss.tools.ws.creation.ui.Messages; +import org.jboss.tools.ws.creation.ui.messages.JBossWSCreationUIMessages; import org.jboss.tools.ws.creation.ui.widgets.CodeGenConfigWidget; public class JBossWSConfigWidgetFactory implements @@ -61,8 +61,8 @@ servicesXMLSelectWidget = new CodeGenConfigWidget(model); servicesXMLSelectWidgetContrib = createWidgetContributor( - Messages.JBossWSConfigWidgetFactory_Title, - Messages.JBossWSConfigWidgetFactory_Description, + JBossWSCreationUIMessages.JBossWSConfigWidgetFactory_Title, + JBossWSCreationUIMessages.JBossWSConfigWidgetFactory_Description, servicesXMLSelectWidget); } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.java 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSProviderInvokeConfigWidgetFactory.java 2010-03-19 07:29:17 UTC (rev 20924) @@ -20,7 +20,7 @@ import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataContributor; import org.jboss.tools.ws.creation.core.commands.InitialCommand; import org.jboss.tools.ws.creation.core.data.ServiceModel; -import org.jboss.tools.ws.creation.ui.Messages; +import org.jboss.tools.ws.creation.ui.messages.JBossWSCreationUIMessages; import org.jboss.tools.ws.creation.ui.widgets.ProviderInvokeCodeGenConfigWidget; /** @@ -69,8 +69,8 @@ ProviderInvokeCodeGenConfigWidget java2WSDLWidget = new ProviderInvokeCodeGenConfigWidget( model); servicesXMLSelectWidgetContrib = createWidgetContributor( - Messages.JBossWSProviderInvokeConfigWidgetFactory_Title, - Messages.JBossWSProviderInvokeConfigWidgetFactory_Description, + JBossWSCreationUIMessages.JBossWSProviderInvokeConfigWidgetFactory_Title, + JBossWSCreationUIMessages.JBossWSProviderInvokeConfigWidgetFactory_Description, java2WSDLWidget); } 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 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-03-19 07:29:17 UTC (rev 20924) @@ -1,5 +1,3 @@ -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 @@ -8,9 +6,6 @@ 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 -Error_JBossWS_Basic_Editor_Different=Parent for label is different JBossRuntimeListFieldEditor_ActionAdd=&Add JBossRuntimeListFieldEditor_ActionEdit=&Edit JBossRuntimeListFieldEditor_ActionRemove=&Remove @@ -18,24 +13,16 @@ 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_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}''? JBossWS_Runtime_List_Field_Editor_Edit_Runtime=Edit JBossWS Runtime 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_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 JBossWS_Runtime_List_Field_Editor_Home_Folder=Home Folder: -JBossWS_Composite_Editor_This_Method_Can_Be_Invoked=This metod can be invoked after getEditorControls(parent) only -JBossWS_Button_Field_Editor_Browse=Browse... -Error_JBossWS_Button_Field_Editor_Not_Implemented_Yet=Not implemented yet. Please setup real acion for editor. -JBossWS_SWT_Field_Editor_Factory_Browse=Browse... JBossWS_SWT_Field_Editor_Factory_Select_Home_Folder=Select JBossWS Home Folder JBossWS_Runtime_List_Field_Editor_Name2=Name: JBossWS_Runtime_Check_Field_Default_Classpath=Customize JBoss Web Service runtime jars @@ -52,15 +39,20 @@ JBossWS_GenerateWizard_WizardPage_CheckButton_Label=Use the default value JBossWS_GenerateWizard_GenerateSampleClassPage_Package_Label=Package JBossWS_GenerateWizard_GenerateSampleClassPage_ClassName_Label=Class -Error_JBossWS_GenerateWizard_NotDynamicWebProject=The project must be a Dynamic Web Project and contain a web.xml in a right Location -Error_JBossWS_GenerateWizard_ClassName_Same=The class name has been used in the web project. JBossWS_GenerateWizard_MessageDialog_Title=Error -Error_JBossWS_GenerateWizard_ServiceName_Empty=The Service Name may not be an empty string. -Error_JBossWS_GenerateWizard_ClassName_Empty=The Class Name may not be an empty string. -Error_JBossWS_GenerateWizard_PackageName_Empty=The Package Name may not be an empty string. -Error_JBossWS_GenerateWizard=Problems encountered while creating the web.xml and Java class entries. JBossWS_UI_PLUGIN_NO_MESSAGES=No message JBossWSGenerateWebXmlWizardPage_Project_Group=Dynamic Web Project Name JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip=If no Dynamic Web Project exists, you must create one before creating your sample web service. JBossWSGenerateWebXmlWizardPage_Web_Service_Group=Web Service JBossWSGenerateWizard_NoProjectSelected=No project selected. Please select a Dynamic Web Project to continue. + +Error_JBossWS_Label_Runtime_Load=Error occurred while loading JBossWS Command. Select the correct JBoss Server folder. +Error_JBossWS_Basic_Editor_Composite=Parent control should be Composite +Error_JBossWS_Basic_Editor_Support=Editor supports only Grid layout +Error_JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be_An_Instance_Of_List=inputElement must be an instance of List<JBossWSRuntime>. +Error_JBossWS_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty=Path to JBossWS home directory cannot be empty +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 +Error_JBossWS_GenerateWizard_NotDynamicWebProject=The project must be a Dynamic Web Project and contain a web.xml in a right Location +Error_JBossWS_GenerateWizard_ClassName_Same=The class name has been used in the web project. +Error_JBossWS_GenerateWizard_ServiceName_Empty=The Service Name may not be an empty string. \ No newline at end of file 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 2010-03-19 07:25:42 UTC (rev 20923) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-03-19 07:29:17 UTC (rev 20924) @@ -16,67 +16,44 @@ /** * @author Grid Qian */ -public final class JBossWSUIMessages extends NLS { +public class JBossWSUIMessages extends NLS { - private static final String BUNDLE_NAME = - "org.jboss.tools.ws.ui.messages.JBossWSUI"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.jboss.tools.ws.ui.messages.JBossWSUI"; //$NON-NLS-1$ private JBossWSUIMessages() { // Do not instantiate } - public static String Label_JBossWS_Runtime_Load_Error; - public static String Bin; public static String Command; public static String Client; public static String Lib; public static String Endorsed; - public static String Error_JBossWS_Basic_Editor_Composite; - public static String Error_JBossWS_Basic_Editor_Support; - public static String Error_JBossWS_Basic_Editor_Different; public static String JBossRuntimeListFieldEditor_ActionAdd; - public static String JBossRuntimeListFieldEditor_ActionEdit; - public static String JBossRuntimeListFieldEditor_ActionRemove; - public static String JBossRuntimeListFieldEditor_ErrorMessageAtLeastOneJar; - 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_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; public static String JBossWS_Runtime_List_Field_Editor_Edit_Runtime; 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_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; public static String JBossWS_Runtime_List_Field_Editor_Create_A_Runtime; public static String JBossWS_Runtime_List_Field_Editor_Home_Folder; - public static String JBossWS_Composite_Editor_This_Method_Can_Be_Invoked; - public static String JBossWS_Button_Field_Editor_Browse; - public static String Error_JBossWS_Button_Field_Editor_Not_Implemented_Yet; - public static String JBossWS_SWT_Field_Editor_Factory_Browse; public static String JBossWS_SWT_Field_Editor_Factory_Select_Home_Folder; public static String JBossWS_Runtime_List_Field_Editor_Name2; public static String JBossWS_Runtime_Check_Field_Default_Classpath; public static String JBossWS_Preference_Page_Runtimes; - - public static String JBossWSLibraryListFieldEditor_ActionAdd; - public static String JBossWSLibraryListFieldEditor_ActionRemove; - public static String JBossWSLibraryListFieldEditor_LIBRARY_JARS; - public static String JBossWS_GenerateWizard_Title; public static String JBossWS_GenerateWizard_GenerateWebXmlPage_Title; public static String JBossWS_GenerateWizard_GenerateWebXmlPage_Description; @@ -86,23 +63,25 @@ public static String JBossWS_GenerateWizard_WizardPage_CheckButton_Label; public static String JBossWS_GenerateWizard_GenerateSampleClassPage_Package_Label; public static String JBossWS_GenerateWizard_GenerateSampleClassPage_ClassName_Label; - public static String Error_JBossWS_GenerateWizard_NotDynamicWebProject; - public static String Error_JBossWS_GenerateWizard_ClassName_Same; public static String JBossWS_GenerateWizard_MessageDialog_Title; - public static String Error_JBossWS_GenerateWizard_ServiceName_Empty; - public static String Error_JBossWS_GenerateWizard_ClassName_Empty; - public static String Error_JBossWS_GenerateWizard_PackageName_Empty; - public static String JBossWS_UI_PLUGIN_NO_MESSAGES; - public static String JBossWSGenerateWebXmlWizardPage_Project_Group; - public static String JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip; - public static String JBossWSGenerateWebXmlWizardPage_Web_Service_Group; - public static String JBossWSGenerateWizard_NoProjectSelected; - + + public static String Error_JBossWS_Label_Runtime_Load; + public static String Error_JBossWS_Basic_Editor_Composite; + public static String Error_JBossWS_Basic_Editor_Support; + public static String Error_JBossWS_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty; + 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; + public static String Error_JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be_An_Instance_Of_List; + public static String Error_JBossWS_GenerateWizard_NotDynamicWebProject; + public static String Error_JBossWS_GenerateWizard_ClassName_Same; + public static String Error_JBossWS_GenerateWizard_ServiceName_Empty; + + static { NLS.initializeMessages(BUNDLE_NAME, JBossWSUIMessages.class); }