Author: Grid.Qian Date: 2008-06-06 04:16:03 -0400 (Fri, 06 Jun 2008) New Revision: 8593 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/JbossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseFieldEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/ButtonFieldEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/CompositeEditor.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/JbossWSRuntimePreferencePage.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextFieldEditor.java Log: JBIDE-2047: modify for I18n messages 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 2008-06-06 08:15:51 UTC (rev 8592) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties 2008-06-06 08:16:03 UTC (rev 8593) @@ -1,69 +1,32 @@ -LABEL_BROUSE=Browse... -LABEL_WEB_SERVICE_CODEGEN=Web service code generation options -LABEL_WEB_SERVICE_CLIENT_CODEGEN=Web service client code generation options -LABEL_WEB_SERVICE_AAR=Web service archive options -LABEL_DATABINDING=Default Databinding: -LABEL_AAR_EXTENTION=AAR default extension: -LABEL_JBOSSWS_RUNTIME_LOAD=JBossWS runtime loaded successfully LABEL_JBOSSWS_RUNTIME_LOAD_ERROR=Error occurred while loading JBossWS runtime. Select the correct JBossWS runtime folder. -LABEL_GENERATE_TESTCASE_CAPTION=Generate a JUnit test case to test the service -LABEL_GENERATE_SERVERSIDE_INTERFACE=Generate an interface for the skeleton -LABEL_GENERATE_ALL=Generate all types for all elements referred to by schemas -LABEL_CLIENT_SIDE=Client mode -LABEL_SYNC_AND_ASYNC=Generate a client which supports both synchronous and asynchronous invocation -LABEL_SYNC=Generate a synchronous client -LABEL_ASYNC=Generate an asynchronous client -JBOSSWS_LOCATION=JBossWS Runtime -JBOSSWS_RUNTIME=JBossWS Runtime -JBOSSWS_PREFERENCES=JBossWS Preferences -JBOSSWS_RUNTIME_TOOLTIP=Select the JBossWS binary distribution folder -JBOSSWS_PREFERENCES_TOOLTIP=Select the default preferences for JBossWS runtime -JBOSSWS_RUNTIME_LOCATION=JBossWS runtime location: -JBOSSWS_RUNTIME_PREFERENCES=JBossWS Runtime Preferences -LABEL_JBOSSWS_RUNTIME_NOT_EXIT=Select the location of the JBossWS binary distribution or the folder which contains the JBossWS war distribution. -ERROR_INVALID_JBOSSWS_SERVER_LOCATION=Invalid JBossWS runtime location - -ERROR_INVALID_FILE_READ_WRITEL=Exception occurred while reading or writing file {0} -ERROR_SERVER_IS_NOT_SET=The JBossWS facets cannot be installed since the JBossWS runtime location has not been set. \nGo to the Web Services preference page and set the JBossWS runtime location under JBossWS Preferences. - -PROGRESS_INSTALL_JBOSSWS_RUNTIME=Installing JBossWS Runtime -PROGRESS_UNINSTALL_JBOSSWS_RUNTIME=Uninstalling the JBossWS Runtime - -DIR_DOT_METADATA=.metadata -DIR_DOT_PLUGINS=.plugins -TEMP_JBOSSWS_FACET_DIR=org.jboss.tools.ws.facet -WEBAPP_EXPLODED_SERVER_LOCATION_FILE=server.properties -SERVER_STATUS_LOCATION_FILE=status.properties -WAR_STATUS_LOCATION_FILE=war.properties - COMMOND=wsconsume.sh BIN=bin -JBOSSWS_BASIC_EDITOR_COMPOSITE=Parent control should be Composite -JBOSSWS_BASIC_EDITOR_SUPPORT=Editor supports only grid layout -JBOSSWS_BASE_EDITOR_DIFFERENT=Parent for label is different -JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NAME=Name -JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_PATH=Path -JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE=inputElement must be -JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_AN_INSTANCEOF_OF_LIST=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 -JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_HOME_DIRECTORY_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_NAME_IS_NOT_CORRECT=Runtime name is not correct -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_METOD_CAN_BE_INVOKED=This metod can be invoked after getEditorControls(parent) only -JBOSSWS_BUTTON_FIELD_EDITOR_BROWSE=Browse... -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_PREFERENCE_PAGE_RUNTIMES=JBossWS Runtimes \ No newline at end of file +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 +JBossWS_Runtime_List_Field_Editor_Name=Name +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_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_Already_Exists=' 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_Preference_Page_Runtimes=JBossWS Runtimes \ 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 2008-06-06 08:15:51 UTC (rev 8592) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUIMessages.java 2008-06-06 08:16:03 UTC (rev 8593) @@ -25,78 +25,40 @@ // Do not instantiate } - public static String LABEL_BROUSE; - public static String LABEL_WEB_SERVICE_CODEGEN; - public static String LABEL_WEB_SERVICE_CLIENT_CODEGEN; - public static String LABEL_WEB_SERVICE_AAR; - public static String LABEL_AAR_EXTENTION; - public static String LABEL_DATABINDING; - public static String LABEL_JBOSSWS_RUNTIME_LOAD; - public static String LABEL_JBOSSWS_RUNTIME_LOAD_ERROR; - public static String LABEL_JBOSSWS_RUNTIME_NOT_EXIT; - public static String LABEL_GENERATE_TESTCASE_CAPTION; - public static String LABEL_GENERATE_SERVERSIDE_INTERFACE; - public static String LABEL_GENERATE_ALL; - public static String LABEL_CLIENT_SIDE; - public static String LABEL_SYNC_AND_ASYNC; - public static String LABEL_SYNC; - public static String LABEL_ASYNC; - - public static String JBOSSWS_LOCATION; - public static String JBOSSWS_RUNTIME; - public static String JBOSSWS_PREFERENCES; - public static String JBOSSWS_RUNTIME_TOOLTIP; - public static String JBOSSWS_PREFERENCES_TOOLTIP; - public static String JBOSSWS_RUNTIME_LOCATION; - public static String JBOSSWS_RUNTIME_PREFERENCES; + public static String Label_JBOSSWS_Runtime_Load_Error; - public static String ERROR_INVALID_JBOSSWS_SERVER_LOCATION; - public static String ERROR_INVALID_FILE_READ_WRITEL; - public static String ERROR_SERVER_IS_NOT_SET; - - public static String PROGRESS_INSTALL_JBOSSWS_RUNTIME; - public static String PROGRESS_UNINSTALL_JBOSSWS_RUNTIME; - - //generate for jbossws lib - public static String DIR_DOT_METADATA; - public static String DIR_DOT_PLUGINS; - public static String TEMP_JBOSSWS_FACET_DIR; - public static String WEBAPP_EXPLODED_SERVER_LOCATION_FILE; - public static String SERVER_STATUS_LOCATION_FILE; - public static String WAR_STATUS_LOCATION_FILE; + public static String Bin; + public static String Commond; - public static String BIN; - public static String COMMOND; + 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 JBossWS_Runtime_List_Field_Editor_Name; + 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_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_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_Preference_Page_Runtimes; - public static String JBOSSWS_BASIC_EDITOR_COMPOSITE; - public static String JBOSSWS_BASIC_EDITOR_SUPPORT; - public static String JBOSSWS_BASE_EDITOR_DIFFERENT; - public static String JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NAME; - 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_INSTANCEOF_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 JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_HOME_DIRECTORY_CANNOT_BE_EMPTY; - public static String JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_ALREADY_EXISTS; - public static String JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_RUNTIME; - public static String JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT; - public static String 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_METOD_CAN_BE_INVOKED; - public static String JBOSSWS_BUTTON_FIELD_EDITOR_BROWSE; - public static String 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_PREFERENCE_PAGE_RUNTIMES; - static { NLS.initializeMessages(BUNDLE_NAME, JbossWSUIMessages.class); } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseFieldEditor.java 2008-06-06 08:15:51 UTC (rev 8592) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseFieldEditor.java 2008-06-06 08:16:03 UTC (rev 8593) @@ -66,8 +66,8 @@ * @param parent */ public void doFillIntoGrid(Object parent) { - Assert.isTrue(parent instanceof Composite, JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_COMPOSITE); - Assert.isTrue(((Composite)parent).getLayout() instanceof GridLayout,JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_SUPPORT); + Assert.isTrue(parent instanceof Composite, JbossWSUIMessages.Error_JBossWS_Basic_Editor_Composite); + Assert.isTrue(((Composite)parent).getLayout() instanceof GridLayout,JbossWSUIMessages.Error_JBossWS_Basic_Editor_Support); Composite aComposite = (Composite) parent; final Control[] controls = (Control[])getEditorControls(aComposite); GridLayout gl = (GridLayout)((Composite)parent).getLayout(); @@ -110,7 +110,7 @@ labelControl.setText(this.labelText); } else if(parent!=null) { if(labelControl.getParent()!=parent) - throw new IllegalArgumentException(JbossWSUIMessages.JBOSSWS_BASE_EDITOR_DIFFERENT); + throw new IllegalArgumentException(JbossWSUIMessages.Error_JBossWS_Basic_Editor_Different); } return labelControl; } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/ButtonFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/ButtonFieldEditor.java 2008-06-06 08:15:51 UTC (rev 8592) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/ButtonFieldEditor.java 2008-06-06 08:16:03 UTC (rev 8593) @@ -25,10 +25,10 @@ PushButtonField button= null; - private ButtonPressedAction buttonAction = new ButtonPressedAction(JbossWSUIMessages.JBOSSWS_BUTTON_FIELD_EDITOR_BROWSE) { + private ButtonPressedAction buttonAction = new ButtonPressedAction(JbossWSUIMessages.JBossWS_Button_Field_Editor_Browse) { @Override public void run() { - throw new RuntimeException(JbossWSUIMessages.JBOSSWS_BUTTON_FIELD_EDITOR_NOT_IMPLEMENTED_YET); + throw new RuntimeException(JbossWSUIMessages.Error_JBossWS_Button_Field_Editor_Not_Implemented_Yet); } }; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/CompositeEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/CompositeEditor.java 2008-06-06 08:15:51 UTC (rev 8592) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/CompositeEditor.java 2008-06-06 08:16:03 UTC (rev 8593) @@ -41,9 +41,9 @@ @Override public void doFillIntoGrid(Object parent) { Assert.isTrue(parent instanceof Composite, - JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_COMPOSITE); + JbossWSUIMessages.Error_JBossWS_Basic_Editor_Composite); Assert.isTrue(((Composite) parent).getLayout() instanceof GridLayout, - JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_SUPPORT); + JbossWSUIMessages.Error_JBossWS_Basic_Editor_Support); Composite aComposite = (Composite) parent; final Control[] controls = (Control[]) getEditorControls(aComposite); @@ -78,7 +78,7 @@ @Override public Object[] getEditorControls() { if(controls.size()>0) return controls.toArray(); - else throw new IllegalStateException(JbossWSUIMessages.JBOSSWS_COMPOSITE_EDITOR_THIS_METOD_CAN_BE_INVOKED); + else throw new IllegalStateException(JbossWSUIMessages.JBossWS_Composite_Editor_This_Method_Can_Be_Invoked); } @Override 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 2008-06-06 08:15:51 UTC (rev 8592) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-06 08:16:03 UTC (rev 8593) @@ -198,11 +198,11 @@ TableColumn tc2 = new TableColumn(tableView.getTable(), SWT.LEFT); tc2.setWidth(TC_NAME_WIDTH); - tc2.setText(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NAME); + tc2.setText(JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Name); TableColumn tc3 = new TableColumn(tableView.getTable(), SWT.LEFT); tc3.setWidth(TC_PATH_WIDTH); - tc3.setText(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_PATH); + tc3.setText(JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Path); tableView.setContentProvider(new IStructuredContentProvider() { @@ -212,8 +212,8 @@ 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_INSTANCEOF_OF_LIST); + JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be + + JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_An_Instance_Of_List); } } @@ -371,9 +371,9 @@ @Override public void doFillIntoGrid(Object parent) { Assert.isTrue(parent instanceof Composite, - JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_COMPOSITE); + JbossWSUIMessages.Error_JBossWS_Basic_Editor_Composite); Assert.isTrue(((Composite) parent).getLayout() instanceof GridLayout, - JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_SUPPORT); + JbossWSUIMessages.Error_JBossWS_Basic_Editor_Support); Composite aComposite = (Composite) parent; getEditorControls(aComposite); GridLayout gl = (GridLayout) ((Composite) parent).getLayout(); @@ -402,21 +402,21 @@ List<JbossWSRuntime> value = null; IFieldEditor name = createTextEditor(SRT_NAME, - JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NAME2, ""); //$NON-NLS-1$ + JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Name2, ""); //$NON-NLS-1$ IFieldEditor homeDir = createBrowseFolderEditor( SRT_HOMEDIR, - JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER, + JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Home_Folder, ""); //$NON-NLS-1$ JbossWSRuntime current = null; public JbossWSRuntimeWizardPage(List<JbossWSRuntime> editedList) { super( - JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NEW_RUNTIME); + JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_New_Runtime); - setMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_RUNTIME); - setTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_RUNTIME); + setMessage(JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Create_A_Runtime); + setTitle(JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Runtime); value = editedList; } @@ -466,14 +466,14 @@ if (name.getValueAsString() == null || "".equals(//$NON-NLS-1$ name.getValueAsString().toString().trim())) { - setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY); + setErrorMessage(JbossWSUIMessages.Error_JBossWS_Runtime_List_Field_Editor_Name_Cannot_Be_Empty); setPageComplete(false); return; } if (!name.getValueAsString().matches( "[a-zA-Z_][a-zA-Z0-9_\\-\\. ]*")) { //$NON-NLS-1$ - setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT); + setErrorMessage(JbossWSUIMessages.Error_JBossWS_Runtime_List_Field_Editor_Runtime_Name_Is_Not_Correct); setPageComplete(false); return; } @@ -482,9 +482,9 @@ continue; } if (rt.getName().equals(name.getValueAsString())) { - setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_RUNTIME + setErrorMessage(JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Runtime + name.getValueAsString() - + JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_ALREADY_EXISTS); + + JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Already_Exists); setPageComplete(false); return; } @@ -500,13 +500,13 @@ if (homeDir.getValueAsString() == null || "".equals(homeDir.getValueAsString().trim())) { //$NON-NLS-1$ - setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_HOME_DIRECTORY_CANNOT_BE_EMPTY); + setErrorMessage(JbossWSUIMessages.Error_JBossWS_Runtime_List_Field_Editor_Path_To_Home_Diretory_Cannot_Be_Empty); setPageComplete(false); return; } if (!runtimeExist(homeDir.getValueAsString())) { - setErrorMessage(JbossWSUIMessages.LABEL_JBOSSWS_RUNTIME_LOAD_ERROR); + setErrorMessage(JbossWSUIMessages.Label_JBOSSWS_Runtime_Load_Error); setPageComplete(false); return; } @@ -547,7 +547,7 @@ new TextFieldEditor(name, label, defaultValue), new ButtonFieldEditor( name, - createSelectFolderAction(JbossWSUIMessages.JBOSSWS_SWT_FIELD_EDITOR_FACTORY_BROWSE), + createSelectFolderAction(JbossWSUIMessages.JBossWS_SWT_Field_Editor_Factory_Browse), defaultValue) }); return editor; } @@ -561,7 +561,7 @@ .getCurrent().getActiveShell()); dialog.setFilterPath(getFieldEditor().getValueAsString()); dialog - .setMessage(JbossWSUIMessages.JBOSSWS_SWT_FIELD_EDITOR_FACTORY_SELECT_HOME_FOLDER); + .setMessage(JbossWSUIMessages.JBossWS_SWT_Field_Editor_Factory_Select_Home_Folder); dialog.setFilterPath(getFieldEditor().getValueAsString()); String directory = dialog.open(); if (directory != null) { @@ -576,8 +576,8 @@ File jbosswsHomeDir = new File(path); if (!jbosswsHomeDir.isDirectory()) return false; - String[] newNode = { JbossWSUIMessages.BIN, - JbossWSUIMessages.COMMOND }; + String[] newNode = { JbossWSUIMessages.Bin, + JbossWSUIMessages.Commond }; String jbosswsBinPath = UIUtils.addNodesToPath(jbosswsHomeDir .getAbsolutePath(), newNode); if (new File(jbosswsBinPath).isFile()) { @@ -600,7 +600,7 @@ public JbossWSRuntimeNewWizard(List<JbossWSRuntime> exist, List<JbossWSRuntime> added) { super(); - setWindowTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NEW_RUNTIME); + setWindowTitle(JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_New_Runtime); page1 = new JbossWSRuntimeWizardPage(exist); addPage(page1); this.value = exist; @@ -650,12 +650,12 @@ JbossWSRuntime source, List<JbossWSRuntime> added, Map<JbossWSRuntime, JbossWSRuntime> changed) { super(); - setWindowTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_EDIT_RUNTIME); + setWindowTitle(JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Edit_Runtime); page1 = new JbossWSRuntimeWizardPage(existing); page1 - .setMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_MODIFY_RUNTIME); + .setMessage(JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Modify_Runtime); page1 - .setTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_EDIT_RUNTIME); + .setTitle(JbossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Edit_Runtime); addPage(page1); this.value = existing; this.added = added; @@ -1006,11 +1006,11 @@ @SuppressWarnings("unchecked") private void removeRuntime(JbossWSRuntime r) { boolean used = isRuntimeUsed(r.getName()); - String title = JbossWSUIMessages.JBOSSWS_RUNTIME_DELETE_CONFIRM_TITLE; + String title = JbossWSUIMessages.JBossWS_Runtime_Delete_Confirm_Title; String message = (used) ? NLS.bind( - JbossWSUIMessages.JBOSSWS_RUNTIME_DELETE_USED_CONFIRM, r + JbossWSUIMessages.JBossWS_Runtime_Delete_Used_Confirm, r .getName()) : NLS.bind( - JbossWSUIMessages.JBOSSWS_RUNTIME_DELETE_NOT_USED_CONFIRM, + JbossWSUIMessages.JBossWS_Runtime_Delete_Not_Used_Confirm, r.getName()); boolean b = MessageDialog.openConfirm(tableView.getControl() .getShell(), title, message); Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java 2008-06-06 08:15:51 UTC (rev 8592) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java 2008-06-06 08:16:03 UTC (rev 8593) @@ -39,7 +39,7 @@ private static final int COLUMNS = 3; JbossRuntimeListFieldEditor jbossWSRuntimes = new JbossRuntimeListFieldEditor( - "rtlist", JbossWSUIMessages.JBOSSWS_PREFERENCE_PAGE_RUNTIMES, new ArrayList<JbossWSRuntime>(Arrays.asList(JbossWSRuntimeManager.getInstance().getRuntimes()))); //$NON-NLS-1$ + "rtlist", JbossWSUIMessages.JBossWS_Preference_Page_Runtimes, new ArrayList<JbossWSRuntime>(Arrays.asList(JbossWSRuntimeManager.getInstance().getRuntimes()))); //$NON-NLS-1$ /** * Create contents of JbossWS preferences page. JbossWSRuntime list editor is Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextFieldEditor.java 2008-06-06 08:15:51 UTC (rev 8592) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextFieldEditor.java 2008-06-06 08:16:03 UTC (rev 8593) @@ -68,8 +68,8 @@ @Override public void doFillIntoGrid(Object aParent) { - Assert.isTrue(aParent instanceof Composite, JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_COMPOSITE); - Assert.isTrue(((Composite)aParent).getLayout() instanceof GridLayout,JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_SUPPORT); + Assert.isTrue(aParent instanceof Composite, JbossWSUIMessages.Error_JBossWS_Basic_Editor_Composite); + Assert.isTrue(((Composite)aParent).getLayout() instanceof GridLayout,JbossWSUIMessages.Error_JBossWS_Basic_Editor_Support); Composite aComposite = (Composite) aParent; getEditorControls(aComposite); GridLayout gl = (GridLayout)((Composite)aParent).getLayout();