JBoss Tools SVN: r8593 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
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();
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r8592 - in trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core: messages and 1 other directories.
by jbosstools-commits＠lists.jboss.org
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;
}
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r8591 - trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-06-06 04:15:31 -0400 (Fri, 06 Jun 2008)
New Revision: 8591
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java
Log:
JBIDE-2047: modify for I18n messages
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2008-06-06 08:15:24 UTC (rev 8590)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2008-06-06 08:15:31 UTC (rev 8591)
@@ -41,7 +41,7 @@
//custom package name
Label lblCustomPakage = new Label(configCom, SWT.NONE);
- lblCustomPakage.setText(JBossWSCreationCoreMessages.LABEL_CUSTOM_PACKAGE_NAME); //$NON-NLS-1$
+ lblCustomPakage.setText(JBossWSCreationCoreMessages.Label_Custom_Package_Name); //$NON-NLS-1$
final Text txtCustomPkgName = new Text(configCom, SWT.BORDER);
txtCustomPkgName.setText(model.getCustomPackage());
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -54,11 +54,11 @@
}});
//target
- new Label(configCom, SWT.NONE).setText(JBossWSCreationCoreMessages.LABEL_JAXWS_TARGET); //$NON-NLS-1$
+ new Label(configCom, SWT.NONE).setText(JBossWSCreationCoreMessages.Label_JaxWS_Target); //$NON-NLS-1$
final Combo cbSpec = new Combo(configCom, SWT.BORDER | SWT.READ_ONLY);
- cbSpec.add(JBossWSCreationCoreMessages.VALUE_TARGET_0, 0); //$NON-NLS-1$
- cbSpec.add(JBossWSCreationCoreMessages.VALUE_TARGET_1, 1); //$NON-NLS-1$
- if(JBossWSCreationCoreMessages.VALUE_TARGET_0.equals(model.getTarget())){
+ cbSpec.add(JBossWSCreationCoreMessages.Value_Target_0, 0); //$NON-NLS-1$
+ cbSpec.add(JBossWSCreationCoreMessages.Value_Target_1, 1); //$NON-NLS-1$
+ if(JBossWSCreationCoreMessages.Value_Target_0.equals(model.getTarget())){
cbSpec.select(0);
}
else{
@@ -74,11 +74,11 @@
}});
//catalog file
- new Label(configCom, SWT.NONE).setText(JBossWSCreationCoreMessages.LABEL_CATALOG_FILE); //$NON-NLS-1$
+ new Label(configCom, SWT.NONE).setText(JBossWSCreationCoreMessages.Label_Catalog_File); //$NON-NLS-1$
final Text txtCatlog = new Text(configCom, SWT.BORDER);
txtCatlog.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Button btnCatlog = new Button(configCom, SWT.NONE);
- btnCatlog.setText(JBossWSCreationCoreMessages.LABEL_BUTTON_TEXT_SELECTION); //$NON-NLS-1$
+ btnCatlog.setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion); //$NON-NLS-1$
btnCatlog.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e) {
String fileLocation = new FileDialog(Display.getCurrent().getActiveShell(), SWT.NONE).open();
@@ -88,7 +88,7 @@
});
//binding files
- new Label(configCom, SWT.NONE).setText(JBossWSCreationCoreMessages.LABEL_BINDING_FILE); //$NON-NLS-1$
+ new Label(configCom, SWT.NONE).setText(JBossWSCreationCoreMessages.Label_Binding_File); //$NON-NLS-1$
final List bindingList = new List(configCom, SWT.BORDER | SWT.SCROLL_LINE | SWT.V_SCROLL | SWT.H_SCROLL);
gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -108,7 +108,7 @@
Button btnSelect = new Button(configCom, SWT.NONE);
- btnSelect.setText(JBossWSCreationCoreMessages.LABEL_BUTTON_TEXT_SELECTION); //$NON-NLS-1$
+ btnSelect.setText(JBossWSCreationCoreMessages.Label_Button_Text_Seletion); //$NON-NLS-1$
btnSelect.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e) {
@@ -125,7 +125,7 @@
new Label(configCom, SWT.NONE);
btnRemove = new Button(configCom, SWT.NONE);
btnRemove.setEnabled(false);
- btnRemove.setText(JBossWSCreationCoreMessages.LABEL_BUTTON_TEXT_REMOVE);
+ btnRemove.setText(JBossWSCreationCoreMessages.Label_Button_Text_Remove);
btnRemove.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e) {
model.getBindingFiles().remove(bindingList.getSelectionIndex());
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r8590 - in trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core: command and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-06-06 04:15:24 -0400 (Fri, 06 Jun 2008)
New Revision: 8590
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java
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
Log:
JBIDE-2047: modify for I18n messages
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java 2008-06-06 05:01:35 UTC (rev 8589)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java 2008-06-06 08:15:24 UTC (rev 8590)
@@ -28,7 +28,7 @@
throws CoreException {
if (containerPath.segment(0).equals(
- JbossWSCoreMessages.JBOSSWS_RUNTIME_LIB)) {
+ JbossWSCoreMessages.JBossWS_Runtime_Lib)) {
JbossWSRuntimeClasspathContainer container = new JbossWSRuntimeClasspathContainer(
containerPath);
JavaCore.setClasspathContainer(containerPath,
@@ -51,7 +51,7 @@
}
public String getDescription() {
- return JbossWSCoreMessages.JBOSSWS_RUNTIME;
+ return JbossWSCoreMessages.JBossWS_Runtime;
}
public int getKind() {
@@ -67,9 +67,9 @@
ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
IPath wsPath = JbossWSCoreUtils.getJbossWSRuntimePath(null);
if (wsPath != null) {
- IPath libPath = wsPath.append(JbossWSCoreMessages.DIR_LIB);
+ IPath libPath = wsPath.append(JbossWSCoreMessages.Dir_Lib);
list.addAll(Arrays.asList(getEntries(libPath)));
- libPath = wsPath.append(JbossWSCoreMessages.DIR_CLIENT);
+ libPath = wsPath.append(JbossWSCoreMessages.Dir_Client);
list.addAll(Arrays.asList(getEntries(libPath)));
entries = list.toArray(new IClasspathEntry[list.size()]);
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java 2008-06-06 05:01:35 UTC (rev 8589)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java 2008-06-06 08:15:24 UTC (rev 8590)
@@ -21,12 +21,8 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.preference.IPersistentPreferenceStore;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.jboss.tools.ws.core.JbossWSCorePlugin;
import org.jboss.tools.ws.core.messages.JbossWSCoreMessages;
@@ -45,7 +41,7 @@
private JbossWSRuntimeManager() {
IPreferenceStore ps = JbossWSCorePlugin.getDefault().getPreferenceStore();
- String runtimeListString = ps.getString(JbossWSCoreMessages.WS_LOCATION);
+ String runtimeListString = ps.getString(JbossWSCoreMessages.WS_Location);
runtimes = converter.getMap(runtimeListString);
}
@@ -191,29 +187,6 @@
return null;
}
- /**
- * If project has JbossWS facet then this method returns default JbossWS runtime for proper version of facet.
- * Otherwise return first default runtime.
- * @param project
- * @return
- */
- public static JbossWSRuntime getDefaultRuntimeForProject(IProject project) {
- if(project==null) {
- throw new IllegalArgumentException("Project must not be null.");
- }
- try {
- IProjectFacet facet = ProjectFacetsManager.getProjectFacet("jbossws.core");
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if(facetedProject!=null) {
- return getInstance().getDefaultRuntime();
- }
- } catch (CoreException e) {
- e.printStackTrace();
- } catch (IllegalArgumentException e) {
- e.printStackTrace();
- }
- return getInstance().getDefaultRuntime();
- }
/**
* Return list of available JbossWSRuntime names
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java 2008-06-06 05:01:35 UTC (rev 8589)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java 2008-06-06 08:15:24 UTC (rev 8590)
@@ -58,7 +58,7 @@
IJavaProject javaProject = JavaCore.create(project);
IClasspathEntry newClasspath = JavaCore.newContainerEntry(new Path(
- JbossWSCoreMessages.JBOSSWS_RUNTIME_LIB));
+ JbossWSCoreMessages.JBossWS_Runtime_Lib));
IClasspathEntry[] oldClasspathEntries = javaProject
.readRawClasspath();
@@ -70,7 +70,7 @@
project.getFullPath())
|| oldClasspathEntries[i].getPath().lastSegment()
.toUpperCase().contains(
- JbossWSCoreMessages.JBOSSAS)) {
+ JbossWSCoreMessages.JBossAS)) {
isFolderInClassPathAlready = true;
break;
}
@@ -89,7 +89,7 @@
}
} catch (JavaModelException e) {
status = StatusUtils.errorStatus(NLS.bind(
- JbossWSCoreMessages.ERROR_COPY, new String[] { e
+ JbossWSCoreMessages.Error_Copy, new String[] { e
.getLocalizedMessage() }), e);
return status;
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-06-06 05:01:35 UTC (rev 8589)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-06-06 08:15:24 UTC (rev 8590)
@@ -48,22 +48,22 @@
IPath wsPath = JbossWSCoreUtils.getJbossWSRuntimePath(null);
IPath libPath = null;
try {
- libPath = wsPath.append(JbossWSCoreMessages.DIR_LIB);
+ libPath = wsPath.append(JbossWSCoreMessages.Dir_Lib);
} catch (Exception e) {
status = StatusUtils.errorStatus(NLS.bind(
- JbossWSCoreMessages.ERROR_WS_LOCATION, new String[] { e
+ JbossWSCoreMessages.Error_WS_Location, new String[] { e
.getLocalizedMessage() }), e);
return status;
}
IPath targetPath = JbossWSCoreUtils.pathToWebProjectContainer(project
.toString());
- targetPath = targetPath.append(JbossWSCoreMessages.DIR_WEB_INF).append(
- JbossWSCoreMessages.DIR_LIB);
+ targetPath = targetPath.append(JbossWSCoreMessages.Dir_Web_Inf).append(
+ JbossWSCoreMessages.Dir_Lib);
status = JbossWSCoreUtils.copy(libPath, targetPath);
if (status == Status.OK_STATUS) {
// copy client jars to project's folder
- libPath = wsPath.append(JbossWSCoreMessages.DIR_CLIENT);
+ libPath = wsPath.append(JbossWSCoreMessages.Dir_Client);
status = JbossWSCoreUtils.copy(libPath, targetPath);
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java 2008-06-06 05:01:35 UTC (rev 8589)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java 2008-06-06 08:15:24 UTC (rev 8590)
@@ -26,7 +26,7 @@
public void execute(IProject project, IProjectFacetVersion arg1, Object arg2,
IProgressMonitor monitor) throws CoreException {
- monitor.beginTask(JbossWSCoreMessages.PROGRESS_INSTALL_JBOSSWS_RUNTIME, 2 );
+ monitor.beginTask(JbossWSCoreMessages.Progress_Install_JBossWS_Runtime, 2 );
JbossWSClassPathCommand command = new JbossWSClassPathCommand(project);
command.executeOverride(monitor);
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 2008-06-06 05:01:35 UTC (rev 8589)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties 2008-06-06 08:15:24 UTC (rev 8590)
@@ -1,12 +1,12 @@
-PROGRESS_INSTALL_JBOSSWS_RUNTIME=JBoss Web Service Runtime
-DIR_LIB=lib
-DIR_CLIENT=client
-DIR_WEB_INF=WEB-INF
-DIR_WEB_CONTENT=WebContent
-ERROR_COPY=Exception while copy JBossWS jars
-WS_LOCATION=jbosswsruntimelocation
-JBOSSWS_RUNTIME_LIB=JbossWSRuntimeLib
-JBOSSWS_RUNTIME=JBoss WS Runtime
-JBOSSAS=JBOSS
-ERROR_WS_LOCATION=The JBoss WS Runtime Location is NULL
-ERROR_WS_CLASSPATH=A error comes up when create JBoss WS Classpath
\ No newline at end of file
+Progress_Install_JBossWS_Runtime=JBoss Web Service Runtime
+Dir_Lib=lib
+Dir_Client=client
+Dir_Web_Inf=WEB-INF
+Dir_Web_Content=WebContent
+Error_Copy=Exception while copy JBossWS jars
+WS_Location=jbosswsruntimelocation
+JBossWS_Runtime_Lib=JbossWSRuntimeLib
+JBossWS_Runtime=JBoss WS Runtime
+JBossAS=JBOSS
+Error_WS_Location=The JBoss WS Runtime Location is NULL
+Error_WS_Classpath=A error comes up when create JBoss WS Classpath
\ No newline at end of file
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 2008-06-06 05:01:35 UTC (rev 8589)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCoreMessages.java 2008-06-06 08:15:24 UTC (rev 8590)
@@ -24,18 +24,18 @@
// Do not instantiate
}
- public static String PROGRESS_INSTALL_JBOSSWS_RUNTIME;
- public static String DIR_LIB;
- public static String DIR_CLIENT;
- public static String DIR_WEB_INF;
- public static String DIR_WEB_CONTENT;
- public static String ERROR_COPY;
- public static String WS_LOCATION;
- public static String JBOSSWS_RUNTIME_LIB;
- public static String JBOSSWS_RUNTIME;
- public static String JBOSSAS;
- public static String ERROR_WS_LOCATION;
- public static String ERROR_WS_CLASSPATH;
+ public static String Progress_Install_JBossWS_Runtime;
+ public static String Dir_Lib;
+ public static String Dir_Client;
+ public static String Dir_Web_Inf;
+ public static String Dir_Web_Content;
+ public static String Error_Copy;
+ public static String WS_Location;
+ public static String JBossWS_Runtime_Lib;
+ public static String JBossWS_Runtime;
+ public static String JBossAS;
+ public static String Error_WS_Location;
+ public static String Error_WS_Classpath;
static {
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 2008-06-06 05:01:35 UTC (rev 8589)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-06-06 08:15:24 UTC (rev 8590)
@@ -131,7 +131,7 @@
finStream = new FileInputStream(children[i]);
} catch (FileNotFoundException e) {
status = StatusUtils.errorStatus(NLS.bind(
- JbossWSCoreMessages.ERROR_COPY, new String[] { e
+ JbossWSCoreMessages.Error_Copy, new String[] { e
.getLocalizedMessage() }), e);
}
try {
@@ -139,7 +139,7 @@
targetPath), children[i].getName(), finStream);
} catch (CoreException e) {
status = StatusUtils.errorStatus(NLS.bind(
- JbossWSCoreMessages.ERROR_COPY, new String[] { e
+ JbossWSCoreMessages.Error_Copy, new String[] { e
.getLocalizedMessage() }), e);
}
} else {
@@ -151,7 +151,7 @@
.getLocation());
} catch (CoreException e) {
status = StatusUtils.errorStatus(NLS.bind(
- JbossWSCoreMessages.ERROR_COPY, new String[] { e
+ JbossWSCoreMessages.Error_Copy, new String[] { e
.getLocalizedMessage() }), e);
}
}
@@ -238,7 +238,7 @@
public static Map<String, JbossWSRuntime> getJbossWSRutntimeMap(){
IPreferenceStore ps = JbossWSCorePlugin.getDefault()
.getPreferenceStore();
- String runtimeLocation = ps.getString(JbossWSCoreMessages.WS_LOCATION);
+ String runtimeLocation = ps.getString(JbossWSCoreMessages.WS_Location);
if (runtimeLocation == null || runtimeLocation.equals("")) {
return new HashMap<String, JbossWSRuntime>();
}
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r8589 - in trunk/ws/plugins: org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-06-06 01:01:35 -0400 (Fri, 06 Jun 2008)
New Revision: 8589
Added:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java
Removed:
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/JbossWSRuntimePreferencePage2.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.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/preferences/JbossRuntimeListFieldEditor.java
Log:
JBIDE-2261: add validation for jboss ws runtime location
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2008-06-05 23:33:44 UTC (rev 8588)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2008-06-06 05:01:35 UTC (rev 8589)
@@ -12,9 +12,7 @@
org.eclipse.core.resources,
org.eclipse.jst.ws,
org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.jst.jsf.core,
- org.eclipse.jst.jsf.ui
+ org.eclipse.jdt.launching
Eclipse-LazyStart: true
Bundle-Vendor: %PLUGIN_PROVIDER
Export-Package: org.jboss.tools.ws.core,
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 2008-06-05 23:33:44 UTC (rev 8588)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-06-06 05:01:35 UTC (rev 8589)
@@ -28,13 +28,8 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jst.ws.internal.common.J2EEUtils;
import org.eclipse.osgi.util.NLS;
@@ -225,15 +220,7 @@
}
public static IPath getJbossWSRuntimePath(String runtimeName) {
- Map<String, JbossWSRuntime> runtimes = new HashMap<String, JbossWSRuntime>();
- JbossWSRuntimeListConverter converter = new JbossWSRuntimeListConverter();
- IPreferenceStore ps = JbossWSCorePlugin.getDefault()
- .getPreferenceStore();
- String runtimeLocation = ps.getString(JbossWSCoreMessages.WS_LOCATION);
- runtimes = converter.getMap(runtimeLocation);
- if (runtimeLocation == null || runtimeLocation.equals("")) {
- return null;
- }
+ Map<String, JbossWSRuntime> runtimes = getJbossWSRutntimeMap();
if (runtimeName == null || runtimeName.equals("")) {
for (JbossWSRuntime rt : runtimes.values()) {
if (rt.isDefault()) {
@@ -247,5 +234,18 @@
}
return null;
}
+
+ public static Map<String, JbossWSRuntime> getJbossWSRutntimeMap(){
+ IPreferenceStore ps = JbossWSCorePlugin.getDefault()
+ .getPreferenceStore();
+ String runtimeLocation = ps.getString(JbossWSCoreMessages.WS_LOCATION);
+ if (runtimeLocation == null || runtimeLocation.equals("")) {
+ return new HashMap<String, JbossWSRuntime>();
+ }
+ Map<String, JbossWSRuntime> runtimes = new HashMap<String, JbossWSRuntime>();
+ JbossWSRuntimeListConverter converter = new JbossWSRuntimeListConverter();
+ runtimes = converter.getMap(runtimeLocation);
+ return runtimes;
+ }
}
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-05 23:33:44 UTC (rev 8588)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JbossWSUI.properties 2008-06-06 05:01:35 UTC (rev 8589)
@@ -55,7 +55,7 @@
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=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
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-05 23:33:44 UTC (rev 8588)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-06 05:01:35 UTC (rev 8589)
@@ -56,6 +56,7 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.TableColumn;
import org.jboss.tools.ws.ui.messages.JbossWSUIMessages;
+import org.jboss.tools.ws.ui.utils.UIUtils;
import org.jboss.tools.ws.core.classpath.JbossWSRuntime;
/**
@@ -434,10 +435,10 @@
root.setLayoutData(dg);
GridLayout gl = new GridLayout(GL_CONTENT_COLUMNS, false);
root.setLayout(gl);
+ name.doFillIntoGrid(root);
+ name.addPropertyChangeListener(this);
homeDir.doFillIntoGrid(root);
homeDir.addPropertyChangeListener(this);
- name.doFillIntoGrid(root);
- name.addPropertyChangeListener(this);
setPageComplete(false);
setControl(root);
}
@@ -452,7 +453,8 @@
public void propertyChange(java.beans.PropertyChangeEvent evt) {
if ("homeDir".equals(evt.getPropertyName())) {
if (name.getValueAsString() == null
- || "".equals(name.getValueAsString().trim())) {
+ || "".equals(name.getValueAsString().trim())
+ || this.getErrorMessage() != null) {
String homeDirName = homeDir.getValueAsString();
if (homeDirName != null && !"".equals(homeDirName.trim())) {
File folder = new File(homeDirName);
@@ -503,6 +505,12 @@
return;
}
+ if (!runtimeExist(homeDir.getValueAsString())) {
+ setErrorMessage(JbossWSUIMessages.LABEL_JBOSSWS_RUNTIME_LOAD_ERROR);
+ setPageComplete(false);
+ return;
+ }
+
setErrorMessage(null);
setPageComplete(true);
}
@@ -562,6 +570,21 @@
}
};
}
+
+ private boolean runtimeExist(String path) {
+
+ File jbosswsHomeDir = new File(path);
+ if (!jbosswsHomeDir.isDirectory())
+ return false;
+ String[] newNode = { JbossWSUIMessages.BIN,
+ JbossWSUIMessages.COMMOND };
+ String jbosswsBinPath = UIUtils.addNodesToPath(jbosswsHomeDir
+ .getAbsolutePath(), newNode);
+ if (new File(jbosswsBinPath).isFile()) {
+ return true;
+ }
+ return false;
+ }
}
/**
@@ -599,7 +622,7 @@
}
/**
- * Wizard for editing JbossWS Runrtime parameters: name, version and path to
+ * Wizard for editing JbossWS Runtime parameters: name and path to
* home folder
*
*/
@@ -657,7 +680,7 @@
}
if (added.contains(source) || changed.containsKey(source)) {
source.setName(rt.getName());
- source.setHomeDir(rt.getName());
+ source.setHomeDir(rt.getHomeDir());
} else {
changed.put(rt, source);
int i = value.indexOf(source);
Deleted: 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-05 23:33:44 UTC (rev 8588)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java 2008-06-06 05:01:35 UTC (rev 8589)
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.ws.ui.preferences;
-
-import java.io.File;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.jboss.tools.ws.core.JbossWSCorePlugin;
-import org.jboss.tools.ws.core.messages.JbossWSCoreMessages;
-import org.jboss.tools.ws.ui.JbossWSUIPlugin;
-import org.jboss.tools.ws.ui.messages.JbossWSUIMessages;
-import org.jboss.tools.ws.ui.utils.UIUtils;
-
-/**
- * @author Grid Qian
- */
-public class JbossWSRuntimePreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage {
-
- private Text jbosswsPath;
- private Label statusLabel;
-
- protected Control createContents(Composite superparent) {
-
- IPreferenceStore ps = JbossWSCorePlugin.getDefault()
- .getPreferenceStore();
- this.setPreferenceStore(ps);
-
- UIUtils uiUtils = new UIUtils(JbossWSUIPlugin.PLUGIN_ID);
- final Composite mainComp = uiUtils.createComposite(superparent, 1);
-
- TabFolder jbosswsPreferenceTab = new TabFolder(mainComp, SWT.WRAP);
- jbosswsPreferenceTab.setLayoutData(new GridData(
- GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL
- | GridData.FILL_BOTH));
-
- TabItem runtimeInstalLocationItem = new TabItem(jbosswsPreferenceTab,
- SWT.WRAP);
- runtimeInstalLocationItem.setText(JbossWSUIMessages.JBOSSWS_RUNTIME);
- runtimeInstalLocationItem
- .setToolTipText(JbossWSUIMessages.JBOSSWS_RUNTIME_TOOLTIP);
-
- Composite runtimeTab = uiUtils.createComposite(jbosswsPreferenceTab, 1);
- runtimeTab.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
- | GridData.GRAB_VERTICAL | GridData.FILL_BOTH));
- Composite runtimeGroup = uiUtils.createComposite(runtimeTab, 3);
-
- runtimeInstalLocationItem.setControl(runtimeTab);
- runtimeTab.setToolTipText(JbossWSUIMessages.JBOSSWS_RUNTIME_TOOLTIP);
-
- jbosswsPath = uiUtils.createText(runtimeGroup,
- JbossWSUIMessages.JBOSSWS_RUNTIME_LOCATION, null, null,
- SWT.BORDER);
-
- Button browseButton = uiUtils.createPushButton(runtimeGroup,
- JbossWSUIMessages.LABEL_BROUSE, null, null);
- browseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleBrowse(mainComp.getShell());
- }
- });
-
- jbosswsPath.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- statusUpdate(runtimeExist(jbosswsPath.getText()));
-
- }
- });
- new Label(runtimeTab, SWT.HORIZONTAL);
- statusLabel = new Label(runtimeTab, SWT.BACKGROUND | SWT.READ_ONLY | SWT.CENTER | SWT.WRAP | SWT.H_SCROLL);
- statusLabel.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
- | GridData.GRAB_VERTICAL | GridData.FILL_BOTH));
-
- initializeValues();
- jbosswsPreferenceTab.setEnabled(true);
- jbosswsPreferenceTab.setVisible(true);
- return mainComp;
- }
-
- public void init(IWorkbench workbench) {
- }
-
- /**
- * Pops up the file browse dialog box
- */
- private void handleBrowse(Shell parent) {
- DirectoryDialog fileDialog = new DirectoryDialog(parent);
- String fileName = fileDialog.open();
- if (fileName != null) {
- jbosswsPath.setText(fileName);
- }
- }
-
- private void statusUpdate(boolean status) {
- if (statusLabel != null) {
- if (!jbosswsPath.getText().equals("")) {
- if (status) {
- statusLabel
- .setText(JbossWSUIMessages.LABEL_JBOSSWS_RUNTIME_LOAD);
- } else {
- statusLabel
- .setText(JbossWSUIMessages.LABEL_JBOSSWS_RUNTIME_LOAD_ERROR);
- }
- } else {
- statusLabel
- .setText(JbossWSUIMessages.LABEL_JBOSSWS_RUNTIME_NOT_EXIT);
- }
- }
- }
-
- private boolean runtimeExist(String path) {
-
- File jbosswsHomeDir = new File(path);
- if (!jbosswsHomeDir.isDirectory())
- return false;
- String[] newNode = {JbossWSUIMessages.BIN, JbossWSUIMessages.COMMOND};
- String jbosswsBinPath = UIUtils.addNodesToPath(jbosswsHomeDir.getAbsolutePath(), newNode);
- if(new File(jbosswsBinPath).isFile()){
- return true;
- }
- return false;
- }
-
- /**
- * store the location to the preference
- */
- private void storeValues() {
- IPreferenceStore store = this.getPreferenceStore();
- store.setValue(JbossWSCoreMessages.WS_LOCATION, jbosswsPath.getText());
- }
-
- /**
- * Initializes location using default values in the preference store.
- */
- private void initializeDefaults() {
- IPreferenceStore preferenceStore = this.getPreferenceStore();
- jbosswsPath.setText(preferenceStore
- .getDefaultString("jbosswsruntimelocation"));
- }
-
- /**
- * Initializes the location using default values in the preference
- */
- private void initializeValues() {
- IPreferenceStore preferenceStore = this.getPreferenceStore();
- jbosswsPath
- .setText(preferenceStore.getString("jbosswsruntimelocation"));
-
- }
-
- /**
- * Default button has been pressed.
- */
- protected void performDefaults() {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Apply button has been pressed.
- */
- protected void performApply() {
- performOk();
- }
-
- /**
- * OK button has been pressed.
- */
- public boolean performOk() {
- storeValues();
- return true;
- }
-
-}
Copied: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java (from rev 8556, trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage2.java)
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage.java 2008-06-06 05:01:35 UTC (rev 8589)
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.ws.ui.preferences;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.jboss.tools.ws.core.classpath.JbossWSRuntime;
+import org.jboss.tools.ws.core.classpath.JbossWSRuntimeManager;
+import org.jboss.tools.ws.ui.messages.JbossWSUIMessages;
+
+/**
+ * @author Grid Qian
+ */
+public class JbossWSRuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+
+ public JbossWSRuntimePreferencePage() {
+ super();
+ noDefaultAndApplyButton();
+ }
+
+ 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$
+
+ /**
+ * Create contents of JbossWS preferences page. JbossWSRuntime list editor is
+ * created
+ *
+ * @return Control
+ */
+ @Override
+ protected Control createContents(Composite parent) {
+ Composite root = new Composite(parent, SWT.NONE);
+ GridLayout gl = new GridLayout(COLUMNS, false);
+ root.setLayout(gl);
+ jbossWSRuntimes.doFillIntoGrid(root);
+
+ return root;
+ }
+
+ /**
+ * Inherited from IWorkbenchPreferencePage
+ *
+ * @param workbench
+ * {@link IWorkbench}
+ *
+ */
+ public void init(IWorkbench workbench) {
+ }
+
+ /**
+ * Save JbossWSRuntime list
+ */
+ @Override
+ protected void performApply() {
+ for (JbossWSRuntime rt : jbossWSRuntimes.getAddedJbossWSRuntimes()) {
+ JbossWSRuntimeManager.getInstance().addRuntime(rt);
+ }
+ jbossWSRuntimes.getAddedJbossWSRuntimes().clear();
+ for (JbossWSRuntime rt : jbossWSRuntimes.getRemoved()) {
+ JbossWSRuntimeManager.getInstance().removeRuntime(rt);
+ }
+ jbossWSRuntimes.getRemoved().clear();
+ JbossWSRuntime defaultRuntime = jbossWSRuntimes.getDefaultJbossWSRuntime();
+ // reset default runtime
+ for (JbossWSRuntime jbossWSRuntime : JbossWSRuntimeManager.getInstance().getRuntimes()) {
+ jbossWSRuntime.setDefault(false);
+ }
+ // set deafult runtime
+ defaultRuntime.setDefault(true);
+ jbossWSRuntimes.setDefaultJbossWSRuntime(null);
+ Map<JbossWSRuntime, JbossWSRuntime> changed = jbossWSRuntimes.getChangedJbossWSRuntimes();
+ for (JbossWSRuntime c : changed.keySet()) {
+ JbossWSRuntime o = changed.get(c);
+ o.setHomeDir(c.getHomeDir());
+ String oldName = o.getName();
+ String newName = c.getName();
+ if (!oldName.equals(newName)) {
+ JbossWSRuntimeManager.getInstance().changeRuntimeName(oldName, newName);
+ }
+ }
+ jbossWSRuntimes.getChangedJbossWSRuntimes().clear();
+
+ JbossWSRuntimeManager.getInstance().save();
+ }
+
+ /**
+ * Restore original preferences values
+ */
+ @Override
+ protected void performDefaults() {
+ setValid(true);
+ setMessage(null);
+ performApply();
+ }
+
+ /**
+ * See {@link PreferencePage} for details
+ *
+ * @return Boolean
+ */
+ @Override
+ public boolean performOk() {
+ performApply();
+ return super.performOk();
+ }
+}
Deleted: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage2.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage2.java 2008-06-05 23:33:44 UTC (rev 8588)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimePreferencePage2.java 2008-06-06 05:01:35 UTC (rev 8589)
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.ws.ui.preferences;
-
-import java.io.File;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.jboss.tools.ws.core.JbossWSCorePlugin;
-import org.jboss.tools.ws.core.messages.JbossWSCoreMessages;
-import org.jboss.tools.ws.ui.JbossWSUIPlugin;
-import org.jboss.tools.ws.ui.messages.JbossWSUIMessages;
-import org.jboss.tools.ws.ui.utils.UIUtils;
-
-/**
- * @author Grid Qian
- */
-public class JbossWSRuntimePreferencePage2 extends PreferencePage implements
- IWorkbenchPreferencePage {
-
- private Text jbosswsPath;
- private Label statusLabel;
-
- protected Control createContents(Composite superparent) {
-
- IPreferenceStore ps = JbossWSCorePlugin.getDefault()
- .getPreferenceStore();
- this.setPreferenceStore(ps);
-
- UIUtils uiUtils = new UIUtils(JbossWSUIPlugin.PLUGIN_ID);
- final Composite mainComp = uiUtils.createComposite(superparent, 1);
-
- TabFolder jbosswsPreferenceTab = new TabFolder(mainComp, SWT.WRAP);
- jbosswsPreferenceTab.setLayoutData(new GridData(
- GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL
- | GridData.FILL_BOTH));
-
- TabItem runtimeInstalLocationItem = new TabItem(jbosswsPreferenceTab,
- SWT.WRAP);
- runtimeInstalLocationItem.setText(JbossWSUIMessages.JBOSSWS_RUNTIME);
- runtimeInstalLocationItem
- .setToolTipText(JbossWSUIMessages.JBOSSWS_RUNTIME_TOOLTIP);
-
- Composite runtimeTab = uiUtils.createComposite(jbosswsPreferenceTab, 1);
- runtimeTab.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
- | GridData.GRAB_VERTICAL | GridData.FILL_BOTH));
- Composite runtimeGroup = uiUtils.createComposite(runtimeTab, 3);
-
- runtimeInstalLocationItem.setControl(runtimeTab);
- runtimeTab.setToolTipText(JbossWSUIMessages.JBOSSWS_RUNTIME_TOOLTIP);
-
- jbosswsPath = uiUtils.createText(runtimeGroup,
- JbossWSUIMessages.JBOSSWS_RUNTIME_LOCATION, null, null,
- SWT.BORDER);
-
- Button browseButton = uiUtils.createPushButton(runtimeGroup,
- JbossWSUIMessages.LABEL_BROUSE, null, null);
- browseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleBrowse(mainComp.getShell());
- }
- });
-
- jbosswsPath.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- statusUpdate(runtimeExist(jbosswsPath.getText()));
-
- }
- });
- new Label(runtimeTab, SWT.HORIZONTAL);
- statusLabel = new Label(runtimeTab, SWT.BACKGROUND | SWT.READ_ONLY | SWT.CENTER | SWT.WRAP | SWT.H_SCROLL);
- statusLabel.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
- | GridData.GRAB_VERTICAL | GridData.FILL_BOTH));
-
- initializeValues();
- jbosswsPreferenceTab.setEnabled(true);
- jbosswsPreferenceTab.setVisible(true);
- return mainComp;
- }
-
- public void init(IWorkbench workbench) {
- }
-
- /**
- * Pops up the file browse dialog box
- */
- private void handleBrowse(Shell parent) {
- DirectoryDialog fileDialog = new DirectoryDialog(parent);
- String fileName = fileDialog.open();
- if (fileName != null) {
- jbosswsPath.setText(fileName);
- }
- }
-
- private void statusUpdate(boolean status) {
- if (statusLabel != null) {
- if (!jbosswsPath.getText().equals("")) {
- if (status) {
- statusLabel
- .setText(JbossWSUIMessages.LABEL_JBOSSWS_RUNTIME_LOAD);
- } else {
- statusLabel
- .setText(JbossWSUIMessages.LABEL_JBOSSWS_RUNTIME_LOAD_ERROR);
- }
- } else {
- statusLabel
- .setText(JbossWSUIMessages.LABEL_JBOSSWS_RUNTIME_NOT_EXIT);
- }
- }
- }
-
- private boolean runtimeExist(String path) {
-
- File jbosswsHomeDir = new File(path);
- if (!jbosswsHomeDir.isDirectory())
- return false;
- String[] newNode = {JbossWSUIMessages.BIN, JbossWSUIMessages.COMMOND};
- String jbosswsBinPath = UIUtils.addNodesToPath(jbosswsHomeDir.getAbsolutePath(), newNode);
- if(new File(jbosswsBinPath).isFile()){
- return true;
- }
- return false;
- }
-
- /**
- * store the location to the preference
- */
- private void storeValues() {
- IPreferenceStore store = this.getPreferenceStore();
- store.setValue(JbossWSCoreMessages.WS_LOCATION, jbosswsPath.getText());
- }
-
- /**
- * Initializes location using default values in the preference store.
- */
- private void initializeDefaults() {
- IPreferenceStore preferenceStore = this.getPreferenceStore();
- jbosswsPath.setText(preferenceStore
- .getDefaultString("jbosswsruntimelocation"));
- }
-
- /**
- * Initializes the location using default values in the preference
- */
- private void initializeValues() {
- IPreferenceStore preferenceStore = this.getPreferenceStore();
- jbosswsPath
- .setText(preferenceStore.getString("jbosswsruntimelocation"));
-
- }
-
- /**
- * Default button has been pressed.
- */
- protected void performDefaults() {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Apply button has been pressed.
- */
- protected void performApply() {
- performOk();
- }
-
- /**
- * OK button has been pressed.
- */
- public boolean performOk() {
- storeValues();
- return true;
- }
-
-}
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r8588 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-06-05 19:33:44 -0400 (Thu, 05 Jun 2008)
New Revision: 8588
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
Log:
JBIDE-2292 Seam facet doesn't use the WTP API
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-06-05 15:54:03 UTC (rev 8587)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-06-05 23:33:44 UTC (rev 8588)
@@ -62,7 +62,7 @@
IDelegate,ISeamFacetDataModelProperties {
public static String ORG_RICHFACES_SKIN = "org.richfaces.SKIN";
- public static String ORG_RICHFACES_SKIN_VALUE = "@skin@";
+ public static String ORG_RICHFACES_SKIN_VALUE = "blueSky";
public static String ORG_JBOSS_SEAM_SERVLET_SEAMLISTENER = "org.jboss.seam.servlet.SeamListener";
public static String ORG_JBOSS_SEAM_SERVLET_SEAMFILTER = "org.jboss.seam.servlet.SeamFilter";
public static String ORG_JBOSS_SEAM_SERVLET_SEAMFILTER_NAME = "Seam Filter";
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r8587 - workspace/rstryker/viewRefactor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-05 11:54:03 -0400 (Thu, 05 Jun 2008)
New Revision: 8587
Added:
workspace/rstryker/viewRefactor/as/
Log:
branching
Copied: workspace/rstryker/viewRefactor/as (from rev 8584, trunk/as)
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r8586 - workspace/rstryker.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-05 11:50:27 -0400 (Thu, 05 Jun 2008)
New Revision: 8586
Added:
workspace/rstryker/viewRefactor/
Log:
adding
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r8585 - workspace.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-05 11:46:49 -0400 (Thu, 05 Jun 2008)
New Revision: 8585
Added:
workspace/rstryker/
Log:
Adding folder
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r8584 - in trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model: helpers and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-05 10:44:36 -0400 (Thu, 05 Jun 2008)
New Revision: 8584
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPageRedirectImpl.java
Log:
JBIDE-2284
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java 2008-06-05 13:28:01 UTC (rev 8583)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java 2008-06-05 14:44:36 UTC (rev 8584)
@@ -208,18 +208,22 @@
if(path != null) path = path.trim();
if(path == null || path.length() == 0) return path;
if(!path.startsWith("/") && !path.startsWith("*")) path = "/" + path;
- if(path.indexOf('*') >= 0) return path;
+ if(hasWildCard(path)) return path;
if(path.indexOf('.') < 0 && !path.endsWith("/")) {
path += getExtension();
}
return path;
}
+
+ static boolean hasWildCard(String path) {
+ return path.indexOf('*') >= 0 || path.indexOf("#{") >= 0;
+ }
String revalidatePath(String path, String template) {
if(path != null) path = path.trim();
if(path == null || path.length() == 0) return path;
if(!path.startsWith("/") && !path.startsWith("*")) path = "/" + path;
- if(path.indexOf('*') >= 0) return path;
+ if(hasWildCard(path)) return path;
if(path.indexOf('.') < 0 && !path.endsWith("/")) {
path += getExtension(template);
}
@@ -230,7 +234,8 @@
XModelObject fs = getTarget().getModel().getByPath("FileSystems/WEB-ROOT");
if(fs == null) return false;
path = revalidatePath(path, getAttributeValue(0, "template"));
- if(path == null || path.length() == 0 || path.indexOf('*') >= 0) return false;
+ if(path == null || path.length() == 0
+ || hasWildCard(path)) return false;
return isCorrectPath(path) && !fileExists(path);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-06-05 13:28:01 UTC (rev 8583)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-06-05 14:44:36 UTC (rev 8584)
@@ -364,12 +364,12 @@
}
public static String toNavigationRulePathPart(String path) {
- return "" + path.replace('/', '#');
+ return "" + encode(path);
}
public static String toFromViewId(String pathpart) {
- if(!pathpart.startsWith("rules:")) return pathpart.replace('#', '/');
- pathpart = pathpart.substring(6).replace('#', '/');
+ if(!pathpart.startsWith("rules:")) return decode(pathpart);
+ pathpart = decode(pathpart.substring(6));
int i = pathpart.lastIndexOf(':');
return (i < 0) ? pathpart : pathpart.substring(0, i);
}
@@ -378,4 +378,41 @@
return path != null && (path.length() == 0 || path.indexOf('*') >= 0);
}
+ static String encode(String s) {
+ StringBuffer result = new StringBuffer();
+ for (int i = 0; i < s.length(); i++) {
+ char c = s.charAt(i);
+ if(c == '/') {
+ result.append("#x");
+ } else if(c == '#') {
+ result.append("##");
+ } else {
+ result.append(c);
+ }
+ }
+ return result.toString();
+ }
+
+ static String decode(String s) {
+ StringBuffer result = new StringBuffer();
+ for (int i = 0; i < s.length(); i++) {
+ char c = s.charAt(i);
+ if(c == '#') {
+ char c1 = i + 1 < s.length() ? s.charAt(i + 1) : '\0';
+ if(c1 == 'x') {
+ result.append('/');
+ i++;
+ } else if(c1 == '#') {
+ result.append("#");
+ i++;
+ } else {
+ result.append("#");
+ }
+ } else {
+ result.append(c);
+ }
+ }
+ return result.toString();
+ }
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPageRedirectImpl.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPageRedirectImpl.java 2008-06-05 13:28:01 UTC (rev 8583)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPageRedirectImpl.java 2008-06-05 14:44:36 UTC (rev 8584)
@@ -1,12 +1,17 @@
package org.jboss.tools.seam.pages.xml.model.impl;
import org.jboss.tools.common.model.impl.CustomizedObjectImpl;
+import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
public class SeamPageRedirectImpl extends CustomizedObjectImpl {
private static final long serialVersionUID = 1L;
+ public String getPathPart() {
+ return super.getPathPart();
+ }
+
public String getPresentationString() {
- String v1 = getAttributeValue("view id");
+ String v1 = getAttributeValue(SeamPagesConstants.ATTR_VIEW_ID);
if(v1 != null && v1.length() > 0) return v1;
return getModelEntity().getXMLSubPath();
}
15 years, 11 months
- 1
- 0