Author: dazarov Date: 2007-10-05 06:58:43 -0400 (Fri, 05 Oct 2007) New Revision: 4022 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/ISeamUiConstants.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUiImages.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/CreateProjectAction.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencePage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorPreferencePage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/AbstractSeamContentProvider.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamJarFilter.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLinkHelper.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamProjectLabelProvider.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/ViewConstants.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamOpenAction.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamViewLayoutActionGroup.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamComponentProperties.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamElementProperties.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BaseFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ButtonFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TaggedComboFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/BaseField.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/ComboBoxField.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/CreateSeamWebProjectAction.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/IParameter.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectSelectionDialog.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizardPage1.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SelectSeamProjectAction.java Log: http://jira.jboss.com/jira/browse/JBIDE-990 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/ISeamUiConstants.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/ISeamUiConstants.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/ISeamUiConstants.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -17,8 +17,8 @@ */ public class ISeamUiConstants { public static final String - NEW_SEAM_PROJECT_WIZARD_ID = "org.jboss.tools.seam.ui.wizards.SeamProjectWizard", - NEW_SEAM_FORM_WIZARD_ID = "org.jboss.tools.seam.ui.wizard.SeamFormWizard", - NEW_SEAM_ACTION_WIZARD_ID = "org.jboss.tools.seam.ui.wizard.SeamActionWizard", - SEAM_COMPONENTS_VIEW_ID = "org.jboss.tools.seam.ui.views.SeamComponentsNavigator"; + NEW_SEAM_PROJECT_WIZARD_ID = "org.jboss.tools.seam.ui.wizards.SeamProjectWizard", //$NON-NLS-1$ + NEW_SEAM_FORM_WIZARD_ID = "org.jboss.tools.seam.ui.wizard.SeamFormWizard", //$NON-NLS-1$ + NEW_SEAM_ACTION_WIZARD_ID = "org.jboss.tools.seam.ui.wizard.SeamActionWizard", //$NON-NLS-1$ + SEAM_COMPONENTS_VIEW_ID = "org.jboss.tools.seam.ui.views.SeamComponentsNavigator"; //$NON-NLS-1$ } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -37,7 +37,7 @@ public class SeamGuiPlugin extends BaseUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.seam.ui"; + public static final String PLUGIN_ID = "org.jboss.tools.seam.ui"; //$NON-NLS-1$ // The shared instance private static SeamGuiPlugin plugin; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -8,11 +8,11 @@ public class SeamPerspectiveFactory implements IPerspectiveFactory { - private static final String SEAM_COMPONENTS_NAVIGATOR = "org.jboss.tools.seam.ui.views.SeamComponentsNavigator"; - private static String JBOSS_SERVERS_VIEW = "org.jboss.ide.eclipse.as.ui.views.JBossServerView"; - private static String WTP_SERVERS_VIEW = "org.eclipse.wst.server.ui.ServersView"; + private static final String SEAM_COMPONENTS_NAVIGATOR = "org.jboss.tools.seam.ui.views.SeamComponentsNavigator"; //$NON-NLS-1$ + private static String JBOSS_SERVERS_VIEW = "org.jboss.ide.eclipse.as.ui.views.JBossServerView"; //$NON-NLS-1$ + private static String WTP_SERVERS_VIEW = "org.eclipse.wst.server.ui.ServersView"; //$NON-NLS-1$ - public static final String PERSPECTIVE_ID = "org.jboss.tools.seam.ui.SeamPerspective"; + public static final String PERSPECTIVE_ID = "org.jboss.tools.seam.ui.SeamPerspective"; //$NON-NLS-1$ public void createInitialLayout(IPageLayout layout) { String editorArea = layout.getEditorArea(); @@ -23,7 +23,7 @@ leftTop.addPlaceholder(IPageLayout.ID_RES_NAV); - IFolderLayout leftBottom = layout.createFolder("leftBottom", IPageLayout.BOTTOM, 0.64f, "leftTop"); + IFolderLayout leftBottom = layout.createFolder("leftBottom", IPageLayout.BOTTOM, 0.64f, "leftTop"); //$NON-NLS-1$ //$NON-NLS-2$ //leftBottom.addView(IPageLayout.ID_OUTLINE); leftBottom.addView(IPageLayout.ID_PROP_SHEET); @@ -36,8 +36,8 @@ bottom.addView(WTP_SERVERS_VIEW); IFolderLayout rightTop = layout.createFolder("right", IPageLayout.RIGHT, (float)0.8, editorArea); //$NON-NLS-1$ - rightTop.addView("org.jboss.tools.common.model.ui.views.palette.PaletteView"); - IFolderLayout rightBottom = layout.createFolder("rightBottom", IPageLayout.BOTTOM, (float)0.64, "right"); //$NON-NLS-1$ + rightTop.addView("org.jboss.tools.common.model.ui.views.palette.PaletteView"); //$NON-NLS-1$ + IFolderLayout rightBottom = layout.createFolder("rightBottom", IPageLayout.BOTTOM, (float)0.64, "right"); //$NON-NLS-1$ //$NON-NLS-2$ rightBottom.addView(IPageLayout.ID_OUTLINE); layout.addActionSet(JavaUI.ID_ACTION_SET); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -11,7 +11,31 @@ private static ResourceBundle fResourceBundle; + public static String ABSTRACT_SEAM_CONTENT_PROVIDER_SEAM_PROJECT_CHANGE_EVENT_OCCURS_BUT_NO_SORCE_OF_PROJECT_PROVIDED; + + public static String BASE_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT; + + public static String BASE_FIELD_EDITOR_NO_LABEL; + + public static String BASE_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE; + + public static String BASE_FIELD_EDITOR_PARENT_FOR_LABEL_IS_DIFFERENT; + + public static String BUTTON_FIELD_EDITOR_BROWSE; + + public static String BUTTON_FIELD_EDITOR_NOT_IMPLEMENTED_YET; + + public static String COMPOSITE_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT; + + public static String COMPOSITE_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE; + + public static String COMPOSITE_EDITOR_THIS_METOD_CAN_BE_INVOKED; + public static String CREATE_NEW_SEAM_PROJECT; + + public static String CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD; + + public static String CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT; public static String GENERATE_SEAM_ENTITIES_WIZARD_TITLE; public static String GENERATE_SEAM_ENTITIES_WIZARD_PAGE_MESSAGE; public static String GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_LABEL; @@ -21,6 +45,304 @@ public static String GENERATE_SEAM_ENTITIES_WIZARD_REVERSE_ENGINEER_LABEL; public static String GENERATE_SEAM_ENTITIES_WIZARD_EXISTING_ENTITIES_LABEL; + public static String SEAM_ACTION_WIZARD_ACTION_CREATING_OPERATION; + + public static String SEAM_ACTION_WIZARD_NEW_SEAM_ACTION; + + public static String SEAM_ACTION_WIZARD_PAGE1_SEAM_ACTION; + + public static String SEAM_ACTION_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_SEAM_CONVERSATION; + + public static String SEAM_ACTION_WIZARD_PAGE1_WITH_KEY_SEAM_EJB_ANNOTATIONS_WILL_BE_CREATED; + + public static String SEAM_BASE_WIZARD_OPERATION_IS_NOT_DEFINED_FOR_WIZARD; + + public static String SEAM_BASE_WIZARD_PAGE_LOCAL_CLASS_NAME; + + public static String SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE; + + public static String SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME; + + public static String SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS; + + public static String SEAM_CONVERSATION_WIZARD_CREATE_NEW_CONVERSATION; + + public static String SEAM_CONVERSATION_WIZARD_ENTITY_CREATING_OPERATION; + + public static String SEAM_CONVERSATION_WIZARD_PAGE1_MANAGING_A_CONVERSATION_WILL_BE_CREATED; + + public static String SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION; + + public static String SEAM_CONVERSATION_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_NEW_SEAM_CONVERSATION; + + public static String SEAM_ENTITY_WIZARD_ENTITY_CREATING_OPERATION; + + public static String SEAM_ENTITY_WIZARD_NEW_SEAM_ENTITY; + + public static String SEAM_ENTITY_WIZARD_PAGE1_ANNOTATIONS_AND_EXAMPLES_ATTRIBUTES_WILL_BE_CREATED; + + public static String SEAM_ENTITY_WIZARD_PAGE1_ENTITY_CLASS_NAME; + + public static String SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE; + + public static String SEAM_ENTITY_WIZARD_PAGE1_LIST; + + public static String SEAM_ENTITY_WIZARD_PAGE1_PAGE; + + public static String SEAM_ENTITY_WIZARD_PAGE1_SEAM_ENTITY; + + public static String SEAM_ENTITY_WIZARD_PAGE1_SELECT_THE_NAME_OF_NEW_SEAM_ENTITY; + + public static String SEAM_FORM_WIZARD_FORM_CREATING_OPERATION; + + public static String SEAM_FORM_WIZARD_NEW_SEAM_FORM; + + public static String SEAM_FORM_WIZARD_PAGE1_JAVA_INTERFACE_SLSB_AND_KEY_SEAMEJB3_ANNOTATIONS_WILL_BE_CREATED; + + public static String SEAM_FORM_WIZARD_PAGE1_SEAM_FORM; + + public static String SEAM_FORM_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_NEW_SEAM_FORM; + + public static String SEAM_GENERATE_ENTITIES_WIZARD_54; + + public static String SEAM_GENERATE_ENTITIES_WIZARD_ACTION_CREATING_OPERATION; + + public static String SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME; + + public static String SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_GENERATE_SEAM_ENTITIES; + + public static String SEAM_GENERATE_ENTITIES_WIZARD_THIS_METHOD_IS_NOT_RELEVANT_IN_GENERATING_SEAM_ENTITIES; + + public static String SEAM_INSTALL_WIZARD_PAGE_ADD; + + public static String SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION; + + public static String SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_SEAM_FACET_SETTINGS; + + public static String SEAM_INSTALL_WIZARD_PAGE_CONNECTION_PROFILE; + + public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE; + + public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME; + + public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME; + + public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE; + + public static String SEAM_INSTALL_WIZARD_PAGE_DB_TABLES_ALREADY_EXISTS; + + public static String SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS; + + public static String SEAM_INSTALL_WIZARD_PAGE_EAR; + + public static String SEAM_INSTALL_WIZARD_PAGE_EDIT; + + public static String SEAM_INSTALL_WIZARD_PAGE_ENTITY_BEAN_PACKAGE_NAME; + + public static String SEAM_INSTALL_WIZARD_PAGE_GENERAL; + + public static String SEAM_INSTALL_WIZARD_PAGE_HIBERNATE_DIALECT; + + public static String SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID; + + public static String SEAM_INSTALL_WIZARD_PAGE_NEW; + + public static String SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR; + + public static String SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY; + + public static String SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET; + + public static String SEAM_INSTALL_WIZARD_PAGE_SEAM_RUNTIME; + + public static String SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME; + + public static String SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME; + + public static String SEAM_INSTALL_WIZARD_PAGE_WAR; + + public static String SEAM_OPEN_ACTION_OPEN; + + public static String SEAM_PROJECT_LABEL_PROVIDER_SEAM_COMPONENTS; + + public static String SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT; + + public static String SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT; + + public static String SEAM_PROJECT_WIZARD_CREATE_STANDALONE_SEAM_WEB_PROJECT; + + public static String SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP; + + public static String SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT; + + public static String SEAM_PROJECT_WIZARD_PAGE1_BROWSE; + + public static String SEAM_PROJECT_WIZARD_PAGE1_CONTAINER; + + public static String SEAM_PROJECT_WIZARD_PAGE1_FILE_CONTAINER_MUST_BE_SPECIFIED; + + public static String SEAM_PROJECT_WIZARD_PAGE1_FILE_CONTAINER_MUST_EXIST; + + public static String SEAM_PROJECT_WIZARD_PAGE1_FILE_EXTENSION_MUST_BE_MPE; + + public static String SEAM_PROJECT_WIZARD_PAGE1_FILE_NAME; + + public static String SEAM_PROJECT_WIZARD_PAGE1_FILE_NAME_MUST_BE_SPECIFIED; + + public static String SEAM_PROJECT_WIZARD_PAGE1_FILE_NAME_MUST_BE_VALID; + + public static String SEAM_PROJECT_WIZARD_PAGE1_MULTIPAGE_EDITOR_FILE; + + public static String SEAM_PROJECT_WIZARD_PAGE1_PROJECT_MUST_BE_WRITABLE; + + public static String SEAM_PROJECT_WIZARD_PAGE1_SELECT_NEW_FILE_CONTAINER; + + public static String SEAM_PROJECT_WIZARD_PAGE1_THIS_WIZARD_CREATES_A_NEW_FILE; + + public static String SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_ADD; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_ALREADY_EXISTS; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_AN_INSTANCEOF_OF_LIST; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_OBTAIN_SEAM_VERSION_NUMBER; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_READ_JAR_FILE; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME2; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_SEAM_HOME_DIRECTORY_CANNOT_BE_EMPTY; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_VERSION; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_USE_AS_DEFAULT; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION; + + public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2; + + public static String SEAM_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL; + + public static String SEAM_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL; + + public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_FLAT; + + public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_HIERARCHICAL; + + public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_LABEL; + + public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_NODE; + + public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION; + + public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES; + + public static String SEAM_WIZARD_FACTORY_BEAN_NAME; + + public static String SEAM_WIZARD_FACTORY_LOCAL_INTERFACE_NAME; + + public static String SEAM_WIZARD_FACTORY_MASTER_PAGE_NAME; + + public static String SEAM_WIZARD_FACTORY_METHOD_NAME; + + public static String SEAM_WIZARD_FACTORY_PAGE_NAME; + + public static String SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME; + + public static String SEAM_WIZARD_FACTORY_SEAM_ENTITY_CLASS_NAME; + + public static String SEAM_WIZARD_FACTORY_SEAM_PROJECT; + + public static String SELECT_SEAM_PROJECT_ACTION_BROWSE; + + public static String SWT_FIELD_EDITOR_FACTORY_BROWS; + + public static String SWT_FIELD_EDITOR_FACTORY_ERROR; + + public static String SWT_FIELD_EDITOR_FACTORY_NOT_IMPLEMENTED_YET; + + public static String SWT_FIELD_EDITOR_FACTORY_OK; + + public static String SWT_FIELD_EDITOR_FACTORY_SELECT_SEAM_HOME_FOLDER; + + public static String TEXT_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT; + + public static String TEXT_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE; + + public static String VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID; + + public static String VALIDATOR_FACTORY_CONNECTION_PROFILE; + + public static String VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED; + + public static String VALIDATOR_FACTORY_DOES_NOT_EXIST; + + public static String VALIDATOR_FACTORY_DOES_NOT_EXISTS; + + public static String VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED; + + public static String VALIDATOR_FACTORY_FOLDER; + + public static String VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO; + + public static String VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT; + + public static String VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST; + + public static String VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT; + + public static String VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID; + + public static String VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER; + + public static String VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER; + + public static String VALIDATOR_FACTORY_NAME_IS_NOT_VALID; + + public static String VALIDATOR_FACTORY_NAME_IS_NOT_VALID2; + + public static String VALIDATOR_FACTORY_PATH; + + public static String VALIDATOR_FACTORY_PATH_TO_A_FOLDER_CANNOT_BE_NULL; + + public static String VALIDATOR_FACTORY_POINTS_TO_FILE; + + public static String VALIDATOR_FACTORY_PROJECT; + + public static String VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS; + + public static String VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED; + + public static String VALIDATOR_FACTORY_SELECTED_PROJECT; + static { // load message values from bundle file NLS.initializeMessages(BUNDLE_NAME, SeamUIMessages.class); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUiImages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUiImages.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUiImages.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -24,21 +24,21 @@ static { try { - INSTANCE = new SeamUiImages(new URL(SeamGuiPlugin.getDefault().getBundle().getEntry("/"), "icons/")); + INSTANCE = new SeamUiImages(new URL(SeamGuiPlugin.getDefault().getBundle().getEntry("/"), "icons/")); //$NON-NLS-1$ //$NON-NLS-2$ } catch (MalformedURLException e) { SeamGuiPlugin.getPluginLog().logError(e); } } - public static Image SCOPE_IMAGE = getImage("view/scope.gif"); - public static Image PROJECT_IMAGE = getImage("view/seam_project.gif"); - public static Image COMPONENT_IMAGE = getImage("view/component.gif"); - public static Image ROLE_IMAGE = getImage("view/role.gif"); - public static Image JAVA_IMAGE = getImage("view/java.gif"); - public static Image JAVA_BINARY_IMAGE = getImage("view/java_binary.gif"); - public static Image PACKAGE_IMAGE = getImage("view/package.gif"); + public static Image SCOPE_IMAGE = getImage("view/scope.gif"); //$NON-NLS-1$ + public static Image PROJECT_IMAGE = getImage("view/seam_project.gif"); //$NON-NLS-1$ + public static Image COMPONENT_IMAGE = getImage("view/component.gif"); //$NON-NLS-1$ + public static Image ROLE_IMAGE = getImage("view/role.gif"); //$NON-NLS-1$ + public static Image JAVA_IMAGE = getImage("view/java.gif"); //$NON-NLS-1$ + public static Image JAVA_BINARY_IMAGE = getImage("view/java_binary.gif"); //$NON-NLS-1$ + public static Image PACKAGE_IMAGE = getImage("view/package.gif"); //$NON-NLS-1$ - public static String SEAM_CREATE_PROJECT_ACTION = "view/seam_project_new.gif"; + public static String SEAM_CREATE_PROJECT_ACTION = "view/seam_project_new.gif"; //$NON-NLS-1$ public static Image getImage(String key) { @@ -62,7 +62,7 @@ protected SeamUiImages(URL registryUrl, SeamUiImages parent){ - if(registryUrl == null) throw new NullPointerException("Base url for image registry cannot be null."); + if(registryUrl == null) throw new NullPointerException(SeamUIMessages.SEAM_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL); baseUrl = registryUrl; parentRegistry = parent; } @@ -89,7 +89,7 @@ } private URL makeIconFileURL(String name) throws MalformedURLException { - if (name == null) throw new MalformedURLException("Image name cannot be null."); + if (name == null) throw new MalformedURLException(SeamUIMessages.SEAM_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL); return new URL(baseUrl, name); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/CreateProjectAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/CreateProjectAction.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/CreateProjectAction.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -28,56 +28,66 @@ /** * @author Jeremy - * + * */ -public class CreateProjectAction extends Action implements IWorkbenchWindowActionDelegate { +public class CreateProjectAction extends Action implements + IWorkbenchWindowActionDelegate { - private final static String SEAM_CREATE_PROJECT_WIZARD_ID = "org.jboss.tools.seam.ui.wizards.SeamProjectWizard"; - /** - * The wizard dialog width - */ - private static final int SIZING_WIZARD_WIDTH = 500; + private final static String SEAM_CREATE_PROJECT_WIZARD_ID = "org.jboss.tools.seam.ui.wizards.SeamProjectWizard"; //$NON-NLS-1$ + /** + * The wizard dialog width + */ + private static final int SIZING_WIZARD_WIDTH = 500; - /** - * The wizard dialog height - */ - private static final int SIZING_WIZARD_HEIGHT = 500; - + /** + * The wizard dialog height + */ + private static final int SIZING_WIZARD_HEIGHT = 500; + public CreateProjectAction() { super(SeamUIMessages.CREATE_NEW_SEAM_PROJECT); setToolTipText(SeamUIMessages.CREATE_NEW_SEAM_PROJECT); - setImageDescriptor(SeamUiImages.getImageDescriptor(SeamUiImages.SEAM_CREATE_PROJECT_ACTION)); + setImageDescriptor(SeamUiImages + .getImageDescriptor(SeamUiImages.SEAM_CREATE_PROJECT_ACTION)); } public void run() { INewWizard wizard = ExtensionPointUtils.findNewWizardsItem( - SeamGuiPlugin.PLUGIN_ID, - SEAM_CREATE_PROJECT_WIZARD_ID - ); + SeamGuiPlugin.PLUGIN_ID, SEAM_CREATE_PROJECT_WIZARD_ID); if (wizard != null) { wizard.init(PlatformUI.getWorkbench(), null); - WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard); + WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(), wizard); dialog.create(); - dialog.getShell().setSize( - Math.max(SIZING_WIZARD_WIDTH, dialog.getShell().getSize().x), - SIZING_WIZARD_HEIGHT); - PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), - IIDEHelpContextIds.NEW_PROJECT_WIZARD); + dialog.getShell().setSize( + Math + .max(SIZING_WIZARD_WIDTH, dialog.getShell() + .getSize().x), SIZING_WIZARD_HEIGHT); + PlatformUI.getWorkbench().getHelpSystem().setHelp( + dialog.getShell(), IIDEHelpContextIds.NEW_PROJECT_WIZARD); - dialog.open(); + dialog.open(); } else { - SeamGuiPlugin.getPluginLog().logError("Unable to create wizard '" + SEAM_CREATE_PROJECT_WIZARD_ID + "'"); + SeamGuiPlugin + .getPluginLog() + .logError( + SeamUIMessages.CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD + + SEAM_CREATE_PROJECT_WIZARD_ID + "'"); //$NON-NLS-1$ + } } - public void dispose() {} + public void dispose() { + } - public void init(IWorkbenchWindow window) {} + public void init(IWorkbenchWindow window) { + } public void run(IAction action) { run(); } - - public void selectionChanged(IAction action, ISelection selection) {} + public void selectionChanged(IAction action, ISelection selection) { + } + } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -21,7 +21,7 @@ */ public interface IValidator { - public static final String DEFAULT_ERROR = "default.error"; + public static final String DEFAULT_ERROR = "default.error"; //$NON-NLS-1$ /** * Method perform validation of given value against a provided context. Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -55,6 +55,7 @@ import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; import org.jboss.tools.seam.core.project.facet.SeamVersion; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.widget.editor.ButtonFieldEditor; import org.jboss.tools.seam.ui.widget.editor.CompositeEditor; import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; @@ -70,7 +71,7 @@ public class SeamInstallWizardPage extends AbstractFacetWizardPage implements IFacetWizardPage, IDataModelListener { - public static final String PAGE_DESCRIPTION = "Configure Seam Facet Settings"; + public static final String PAGE_DESCRIPTION = SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_SEAM_FACET_SETTINGS; /** * @@ -89,23 +90,23 @@ private IFieldEditor jBossSeamHomeEditor = IFieldEditorFactory.INSTANCE .createComboWithButton(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, - "Seam Runtime", getRuntimeNames(), + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_RUNTIME, getRuntimeNames(), getSeamRuntimeDefaultValue(), true, new NewSeamRuntimeAction(), (IValidator)null); private IFieldEditor jBossAsDeployAsEditor = IFieldEditorFactory.INSTANCE .createComboEditor( ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, - "Deploy as:", Arrays.asList(new String[] { "war", "ear" }), + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS, Arrays.asList(new String[] { SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_WAR, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_EAR }), getDeployAsDefaultValue(), true); - String lastCreatedCPName = ""; + String lastCreatedCPName = ""; //$NON-NLS-1$ // Database group private IFieldEditor connProfileSelEditor = IFieldEditorFactory.INSTANCE .createComboWithTwoButtons( ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, - "Connection profile:", + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CONNECTION_PROFILE, getProfileNameList(), getConnectionProfileDefaultValue(), false, new EditConnectionProfileAction(), @@ -114,57 +115,57 @@ private IFieldEditor jBossHibernateDbTypeEditor = IFieldEditorFactory.INSTANCE .createComboEditor(ISeamFacetDataModelProperties.DB_TYPE, - "Database Type:", Arrays.asList(HIBERNATE_HELPER + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE, Arrays.asList(HIBERNATE_HELPER .getDialectNames()), getDefaultDbType(), false); private IFieldEditor jBossHibernateDialectEditor = IFieldEditorFactory.INSTANCE .createUneditableTextEditor( ISeamFacetDataModelProperties.HIBERNATE_DIALECT, - "Hibernate Dialect:", HIBERNATE_HELPER + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_HIBERNATE_DIALECT, HIBERNATE_HELPER .getDialectClass(getDefaultDbType())); private IFieldEditor dbSchemaName = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.DB_SCHEMA_NAME, - "Database Schema Name:", ""); + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME, ""); //$NON-NLS-1$ private IFieldEditor dbCatalogName = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.DB_CATALOG_NAME, - "Database Catalog Name:", ""); + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME, ""); //$NON-NLS-1$ private IFieldEditor dbTablesExists = IFieldEditorFactory.INSTANCE .createCheckboxEditor( ISeamFacetDataModelProperties.DB_ALREADY_EXISTS, - "DB Tables already exists in database:", false); + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DB_TABLES_ALREADY_EXISTS, false); private IFieldEditor recreateTablesOnDeploy = IFieldEditorFactory.INSTANCE .createCheckboxEditor( ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY, - "Recreate database tables and data on deploy:", false); + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY, false); private IFieldEditor sessionBeanPkgNameditor = IFieldEditorFactory.INSTANCE .createTextEditor( ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME, - "Session Bean Package Name:", ""); + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME, ""); //$NON-NLS-1$ private IFieldEditor entityBeanPkgNameditor = IFieldEditorFactory.INSTANCE .createTextEditor( ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, - "Entity Bean Package Name:", - "com.mydomain.projectname.entity"); + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_ENTITY_BEAN_PACKAGE_NAME, + "com.mydomain.projectname.entity"); //$NON-NLS-1$ private IFieldEditor testsPkgNameditor = IFieldEditorFactory.INSTANCE .createTextEditor( ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, - "Test Package Name:", "com.mydomain.projectname.test"); + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME, "com.mydomain.projectname.test"); //$NON-NLS-1$ /** * */ public SeamInstallWizardPage() { - super("Seam Facet"); - setTitle("Seam Facet"); + super(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET); + setTitle(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET); setImageDescriptor(ImageDescriptor.createFromFile(SeamFormWizard.class, - "SeamWebProjectWizBan.png")); + "SeamWebProjectWizBan.png")); //$NON-NLS-1$ setDescription(PAGE_DESCRIPTION); } @@ -191,7 +192,7 @@ private Object getConnectionProfileDefaultValue() { String defaultDs = SeamFacetPreference.getStringPreference( SeamFacetPreference.SEAM_DEFAULT_CONNECTION_PROFILE); - return getProfileNameList().contains(defaultDs)?defaultDs:""; + return getProfileNameList().contains(defaultDs)?defaultDs:""; //$NON-NLS-1$ } /** @@ -199,10 +200,10 @@ * @return */ private Object getSeamRuntimeDefaultValue() { - return ("".equals(SeamFacetPreference + return ("".equals(SeamFacetPreference //$NON-NLS-1$ .getStringPreference(SeamFacetPreference.SEAM_DEFAULT_RUNTIME_NAME)) ? (SeamRuntimeManager.getInstance().getDefaultRuntime()==null? - "":SeamRuntimeManager.getInstance().getDefaultRuntime().getName()) : + "":SeamRuntimeManager.getInstance().getDefaultRuntime().getName()) : //$NON-NLS-1$ SeamFacetPreference .getStringPreference(SeamFacetPreference.SEAM_DEFAULT_RUNTIME_NAME)); } @@ -293,7 +294,7 @@ root.setLayout(gridLayout); Group generalGroup = new Group(root, SWT.NONE); generalGroup.setLayoutData(gd); - generalGroup.setText("General"); + generalGroup.setText(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_GENERAL); gridLayout = new GridLayout(3, false); generalGroup.setLayout(gridLayout); @@ -308,7 +309,7 @@ Group databaseGroup = new Group(root, SWT.NONE); databaseGroup.setLayoutData(gd); - databaseGroup.setText("Database"); + databaseGroup.setText(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE); gridLayout = new GridLayout(4, false); databaseGroup.setLayout(gridLayout); registerEditor(jBossHibernateDbTypeEditor, databaseGroup, 4); @@ -328,7 +329,7 @@ gd.grabExcessVerticalSpace = false; generationGroup.setLayoutData(gd); - generationGroup.setText("Code Generation"); + generationGroup.setText(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION); gridLayout = new GridLayout(3, false); generationGroup.setLayout(gridLayout); registerEditor(sessionBeanPkgNameditor, generationGroup, 3); @@ -350,13 +351,13 @@ ValidatorFactory.CONNECTION_PROFILE_VALIDATOR); validatorDelegate.addValidatorForProperty(testsPkgNameditor .getName(), new PackageNameValidator(testsPkgNameditor - .getName(), "tests")); + .getName(), "tests")); //$NON-NLS-1$ validatorDelegate.addValidatorForProperty(entityBeanPkgNameditor .getName(), new PackageNameValidator(entityBeanPkgNameditor - .getName(), "entity beans")); + .getName(), "entity beans")); //$NON-NLS-1$ validatorDelegate.addValidatorForProperty(sessionBeanPkgNameditor .getName(), new PackageNameValidator( - sessionBeanPkgNameditor.getName(), "session beans")); + sessionBeanPkgNameditor.getName(), "session beans")); //$NON-NLS-1$ } jBossHibernateDbTypeEditor @@ -386,7 +387,7 @@ */ private List<String> getProfileNameList() { IConnectionProfile[] profiles = ProfileManager.getInstance() - .getProfilesByCategory("org.eclipse.datatools.connectivity.db.category"); + .getProfilesByCategory("org.eclipse.datatools.connectivity.db.category"); //$NON-NLS-1$ List<String> names = new ArrayList<String>(); for (IConnectionProfile connectionProfile : profiles) { names.add(connectionProfile.getName()); @@ -404,7 +405,7 @@ * @param label */ public EditConnectionProfileAction() { - super("Edit..."); + super(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_EDIT); } /** @@ -421,7 +422,7 @@ PropertyDialog .createDialogOn( Display.getCurrent().getActiveShell(), - "org.eclipse.datatools.connectivity.db.generic.profileProperties", + "org.eclipse.datatools.connectivity.db.generic.profileProperties", //$NON-NLS-1$ selectedProfile).open(); if (!oldName.equals(selectedProfile.getName())) { @@ -448,7 +449,7 @@ * @param label */ public NewConnectionProfileAction() { - super("New..."); + super(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_NEW); } @Override @@ -456,20 +457,20 @@ IProfileListener listener = new ConnectionProfileChangeListener(); ProfileManager.getInstance().addProfileListener(listener); - NewCPWizardCategoryFilter filter = new NewCPWizardCategoryFilter("org.eclipse.datatools.connectivity.db.category"); + NewCPWizardCategoryFilter filter = new NewCPWizardCategoryFilter("org.eclipse.datatools.connectivity.db.category"); //$NON-NLS-1$ NewCPWizard wizard = new NewCPWizard(filter, null); new NewConnectionProfileWizard() { public boolean performFinish() { // create profile only try { ProfileManager.getInstance().createProfile( - getProfileName() == null ? "" + getProfileName() == null ? "" //$NON-NLS-1$ : getProfileName(), - getProfileDescription() == null ? "" + getProfileDescription() == null ? "" //$NON-NLS-1$ : getProfileDescription(), mProviderID, getProfileProperties(), - mProfilePage.getRepository() == null ? "" + mProfilePage.getRepository() == null ? "" //$NON-NLS-1$ : mProfilePage.getRepository() .getName(), false); lastCreatedCPName = getProfileName(); @@ -494,20 +495,20 @@ @Override public void setVisible(boolean visible) { sessionBeanPkgNameditor - .setValue("org.domain." + .setValue("org.domain." //$NON-NLS-1$ + model .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) - + ".session"); + + ".session"); //$NON-NLS-1$ entityBeanPkgNameditor - .setValue("org.domain." + .setValue("org.domain." //$NON-NLS-1$ + model .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) - + ".entity"); + + ".entity"); //$NON-NLS-1$ testsPkgNameditor - .setValue("org.domain." + .setValue("org.domain." //$NON-NLS-1$ + model .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) - + ".test"); + + ".test"); //$NON-NLS-1$ if (visible) { validate(); } @@ -546,7 +547,7 @@ CompilerOptions.VERSION_1_5); if (!status.isOK()) { return ValidatorFactory.createErrormessage(fieldName, - "Package name for " + targetName + " is not valid"); + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID); } return ValidatorFactory.NO_ERRORS; } @@ -558,7 +559,7 @@ * @param label */ public NewSeamRuntimeAction() { - super("Add"); + super(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_ADD); } public void run() { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -45,6 +45,7 @@ import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.internal.core.SeamProject; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.wizard.IParameter; /** @@ -125,16 +126,16 @@ public Map<String, String> validate(Object value, Object context) { if (value == null) throw new IllegalArgumentException( - "Path to a folder cannot be null"); + SeamUIMessages.VALIDATOR_FACTORY_PATH_TO_A_FOLDER_CANNOT_BE_NULL); String folderPath = value.toString(); File folder = new File(folderPath); if (!folder.exists()) - return createErrormessage("Folder '" + folderPath - + "' doesn't exists"); + return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_FOLDER + folderPath + + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXISTS); if (!folder.isDirectory()) - return createErrormessage("Path '" + folderPath - + "' points to file"); + return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PATH + folderPath + + SeamUIMessages.VALIDATOR_FACTORY_POINTS_TO_FILE); return NO_ERRORS; } }; @@ -149,15 +150,15 @@ if (errors.size() > 0) { errors = createErrorMap(); errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, - "Seam Home folder doesn't exist"); + SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS); return errors; } - File seamJarFile = new File(value.toString(), "jboss-seam.jar"); + File seamJarFile = new File(value.toString(), "jboss-seam.jar"); //$NON-NLS-1$ if (!seamJarFile.isFile()) { errors = createErrorMap(); errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, - "Home folder points to " + - "location that does not look like seam home folder ('jboss-seam.jar' is missing)"); + SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO + + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER); } return errors; } @@ -173,14 +174,14 @@ if (errors.size() > 0) { errors = createErrorMap(); errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME, - "JBoss AS Home folder doesn't exist"); + SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST); return errors; } - if (!new File(value.toString(), "bin/twiddle.jar").isFile()) { + if (!new File(value.toString(), "bin/twiddle.jar").isFile()) { //$NON-NLS-1$ errors.put( ISeamFacetDataModelProperties.JBOSS_AS_HOME, - "JBoss AS Home Folde field points to location that doesn't " + - "look like JBoss AS home folder"); + SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT + + SeamUIMessages.VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER); } return errors; } @@ -191,7 +192,7 @@ */ public static IValidator CLASS_QNAME_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { - String classDecl = "class " + value.toString() + " {}"; + String classDecl = "class " + value.toString() + " {}"; //$NON-NLS-1$ //$NON-NLS-2$ ASTParser parser = ASTParser.newParser(AST.JLS3); parser.setSource(classDecl.toCharArray()); parser.setProject((IJavaProject) context); @@ -200,7 +201,7 @@ IProblem[] problems = compilationUnit.getProblems(); if (problems.length > 0) { return createErrormessage(Messages.format( - "Component name is not invalid.", problems[0] + SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID, problems[0] .getMessage())); } return ValidatorFactory.NO_ERRORS; @@ -224,9 +225,9 @@ public static IValidator SEAM_COMPONENT_NAME_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { - IStatus status = JavaConventions.validateClassFileName(value.toString()+".class", "5.0", "5.0"); + IStatus status = JavaConventions.validateClassFileName(value.toString()+".class", "5.0", "5.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if (!status.isOK()) { - return createErrormessage("{0} name is not valid."); + return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID); } return NO_ERRORS; @@ -257,7 +258,7 @@ IStatus status = JavaConventions.validateJavaTypeName(value .toString(), sourceLevel, compliance); if (status.getSeverity() == IStatus.WARNING) { - return createErrormessage("Local Interface name is not valid.\n" + return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID + status.getMessage()); } return NO_ERRORS; @@ -277,13 +278,13 @@ } CompilationUnit compilationUnit = createCompilationUnit( - "class ClassName {public void " - + value.toString() + "() {}}",project); + "class ClassName {public void " //$NON-NLS-1$ + + value.toString() + "() {}}",project); //$NON-NLS-1$ IProblem[] problems = compilationUnit.getProblems(); if (problems.length > 0) { - return createErrormessage(targetName + " name is not valid."); + return createErrormessage(targetName + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2); } return NO_ERRORS; @@ -301,9 +302,9 @@ targetName = contextArray[0].toString(); project = (IProject) contextArray[1]; } - if ("".equals(value) + if ("".equals(value) //$NON-NLS-1$ || !project.getLocation().isValidSegment(value.toString())) - return createErrormessage(targetName + " name is not valid."); + return createErrormessage(targetName + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2); return NO_ERRORS; } @@ -318,16 +319,16 @@ if (project == null || !(project instanceof IProject) || !project.exists()) { return createErrormessage( - "Project '" + value + "' does'n exist."); + SeamUIMessages.VALIDATOR_FACTORY_PROJECT + value + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXIST); } else { IProject selection = (IProject)project; try { if (!selection.hasNature(SeamProject.NATURE_ID) || SeamCorePlugin.getSeamPreferences(selection)==null || selection.getAdapter(IFacetedProject.class)==null - || !((IFacetedProject)selection.getAdapter(IFacetedProject.class)).hasProjectFacet(ProjectFacetsManager.getProjectFacet("jst.web"))) { + || !((IFacetedProject)selection.getAdapter(IFacetedProject.class)).hasProjectFacet(ProjectFacetsManager.getProjectFacet("jst.web"))) { //$NON-NLS-1$ return createErrormessage( - "Selected project '" + project.getName() + "' is not a Seam Web Project"); + SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT + project.getName() + SeamUIMessages.VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT); } } catch (CoreException e) { SeamCorePlugin.getPluginLog().logError(e); @@ -340,22 +341,22 @@ public static IValidator CONNECTION_PROFILE_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { - if (value == null || "".equals(value.toString().trim())) { + if (value == null || "".equals(value.toString().trim())) { //$NON-NLS-1$ return createErrormessage( ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, - "Connection profile is not selected"); + SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED); } else { IConnectionProfile connProfile = ProfileManager.getInstance().getProfileByName(value.toString()); Properties props = connProfile.getBaseProperties(); Object driverClass - = props.get("org.eclipse.datatools.connectivity.db.driverClass"); + = props.get("org.eclipse.datatools.connectivity.db.driverClass"); //$NON-NLS-1$ - if(driverClass==null || "".equals(driverClass)) { + if(driverClass==null || "".equals(driverClass)) { //$NON-NLS-1$ return createErrormessage( ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, - "Driver Class proberty is empty for selected '" - + value + "' connection profile"); + SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED + + value + SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE); } } return NO_ERRORS; @@ -364,10 +365,10 @@ public static IValidator JBOSS_SEAM_HOME_IS_NOT_SELECTED = new IValidator() { public Map<String, String> validate(Object value, Object context) { - if (value == null || "".equals(value.toString().trim())) { + if (value == null || "".equals(value.toString().trim())) { //$NON-NLS-1$ return createErrormessage( ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, - "Seam Runtime is not selected"); + SeamUIMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED); } return NO_ERRORS; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2007-10-05 10:58:43 UTC (rev 4022) @@ -6,4 +6,165 @@ GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_ERROR = Hibernate console configuration name is empty GENERATE_SEAM_ENTITIES_WIZARD_GROUP_LABEL = Generation Mode GENERATE_SEAM_ENTITIES_WIZARD_REVERSE_ENGINEER_LABEL = Reverse Engineer from database -GENERATE_SEAM_ENTITIES_WIZARD_EXISTING_ENTITIES_LABEL = Use existing entities \ No newline at end of file +GENERATE_SEAM_ENTITIES_WIZARD_EXISTING_ENTITIES_LABEL = Use existing entities +SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_SEAM_FACET_SETTINGS=Configure Seam Facet Settings +SEAM_PROJECT_WIZARD_PAGE1_FILE_NAME_MUST_BE_SPECIFIED=File name must be specified +SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT=Select Seam Web Project +SEAM_PROJECT_WIZARD_CREATE_STANDALONE_SEAM_WEB_PROJECT=Create standalone Seam Web Project +SEAM_INSTALL_WIZARD_PAGE_SEAM_RUNTIME=Seam Runtime +SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS=Deploy as: +SEAM_VIEW_LAYOUT_ACTION_GROUP_FLAT=Flat +SEAM_VIEW_LAYOUT_ACTION_GROUP_NODE=Node +SEAM_RUNTIME_LIST_FIELD_EDITOR_ADD=Add +SEAM_INSTALL_WIZARD_PAGE_WAR=war +SEAM_INSTALL_WIZARD_PAGE_EAR=ear +SEAM_INSTALL_WIZARD_PAGE_CONNECTION_PROFILE=Connection profile: +SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES=Seam Packages +SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME=Seam Runtime +SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_VERSION=Seam-Version +SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE=Database Type: +SEAM_BASE_WIZARD_PAGE_LOCAL_CLASS_NAME=Local interface: +SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION=Version +SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME=Runtime ' +SEAM_INSTALL_WIZARD_PAGE_HIBERNATE_DIALECT=Hibernate Dialect: +SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME=Database Schema Name: +SEAM_RUNTIME_LIST_FIELD_EDITOR_USE_AS_DEFAULT=Use as default: +SEAM_RUNTIME_LIST_FIELD_EDITOR_ALREADY_EXISTS=' already exists +SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME=Database Catalog Name: +SEAM_PROJECT_WIZARD_PAGE1_MULTIPAGE_EDITOR_FILE=Multi-page Editor File +SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT=Seam Web Projects +SEAM_PROJECT_LABEL_PROVIDER_SEAM_COMPONENTS=Seam Components +SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE=Entity master page +SEAM_ENTITY_WIZARD_ENTITY_CREATING_OPERATION=Entity creating operation +SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME=New Seam Runtime +SEAM_INSTALL_WIZARD_PAGE_DB_TABLES_ALREADY_EXISTS=DB Tables already exists in database: +SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY=Recreate database tables and data on deploy: +SEAM_ACTION_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_SEAM_CONVERSATION=Select the name of the new Seam Conversation. A new Java interface and SLSB +SEAM_RUNTIME_LIST_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE=Parent control should be Composite +SEAM_RUNTIME_LIST_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT=Editor supports only grid layout +SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_OBTAIN_SEAM_VERSION_NUMBER=Cannot obtain Seam version number from jboss-seam.jar file. +SEAM_ACTION_WIZARD_PAGE1_WITH_KEY_SEAM_EJB_ANNOTATIONS_WILL_BE_CREATED=with key Seam/EJB annotations will be created. +SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME=Session Bean Package Name: +SEAM_CONVERSATION_WIZARD_ENTITY_CREATING_OPERATION=Entity creating operation +SEAM_CONVERSATION_WIZARD_PAGE1_MANAGING_A_CONVERSATION_WILL_BE_CREATED=managing a coversation will be created. +SEAM_PROJECT_WIZARD_PAGE1_PROJECT_MUST_BE_WRITABLE=Project must be writable +SEAM_PROJECT_WIZARD_PAGE1_SELECT_NEW_FILE_CONTAINER=Select new file container +SEAM_PROJECT_WIZARD_PAGE1_FILE_CONTAINER_MUST_EXIST=File container must exist +SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE=inputElement must be +SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY=Name cannot be empty +SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_READ_JAR_FILE=Cannot read jboss-seam.jar file +SEAM_PROJECT_WIZARD_PAGE1_FILE_EXTENSION_MUST_BE_MPE=File extension must be "mpe" +SEAM_RUNTIME_LIST_FIELD_EDITOR_AN_INSTANCEOF_OF_LIST=an instance of List<SeamRuntime>. +SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME=Create a Seam Runtime +SEAM_BASE_WIZARD_OPERATION_IS_NOT_DEFINED_FOR_WIZARD=Operation is not defined for wizard +SEAM_INSTALL_WIZARD_PAGE_ENTITY_BEAN_PACKAGE_NAME=Entity Bean Package Name: +SEAM_PROJECT_WIZARD_PAGE1_FILE_NAME_MUST_BE_VALID=File name must be valid +SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION=Scope Presentation +SEAM_CONVERSATION_WIZARD_CREATE_NEW_CONVERSATION=reate New Conversation +SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION=Seam Conversation +SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME=Test Package Name: +SEAM_VIEW_LAYOUT_ACTION_GROUP_HIERARCHICAL=Hierarchical +SEAM_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER=Home Folder: +SEAM_WIZARD_FACTORY_SEAM_ENTITY_CLASS_NAME=Seam entity class name: +SEAM_ENTITY_WIZARD_PAGE1_ENTITY_CLASS_NAME=Entity class name +SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET=Seam Facet +SEAM_VIEW_LAYOUT_ACTION_GROUP_LABEL=Label +SEAM_PROJECT_WIZARD_PAGE1_CONTAINER=&Container: +SEAM_PROJECT_WIZARD_PAGE1_FILE_NAME=&File name: +SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT=New Seam Project +SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT=Seam Web Project +SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP=EAR Membership +SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME=Name +SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH=Path +SEAM_INSTALL_WIZARD_PAGE_GENERAL=General +SEAM_PROJECT_WIZARD_PAGE1_BROWSE=Browse... +SEAM_GENERATE_ENTITIES_WIZARD_54=org.hibernate.eclipse.launch.SeamUtil +SEAM_WIZARD_FACTORY_SEAM_PROJECT=Seam Project: +SEAM_INSTALL_WIZARD_PAGE_DATABASE=Database +SELECT_SEAM_PROJECT_ACTION_BROWSE=Browse +SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION=Code Generation +SEAM_FORM_WIZARD_FORM_CREATING_OPERATION=Form creating operation +SEAM_WIZARD_FACTORY_LOCAL_INTERFACE_NAME=Local interface name: +SEAM_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL=Image name cannot be null. +SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2=Version: +SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME=Seam component name: +SEAM_INSTALL_WIZARD_PAGE_EDIT=Edit... +SEAM_WIZARD_FACTORY_BEAN_NAME=Bean name: +SEAM_WIZARD_FACTORY_PAGE_NAME=Page name: +SEAM_ENTITY_WIZARD_PAGE1_LIST=List +SEAM_ENTITY_WIZARD_PAGE1_PAGE=Page +SEAM_FORM_WIZARD_NEW_SEAM_FORM=New Seam Form +SEAM_FORM_WIZARD_PAGE1_SEAM_FORM=Seam Form +SEAM_WIZARD_FACTORY_METHOD_NAME=Method name: +SEAM_INSTALL_WIZARD_PAGE_NEW=New... +SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR=Package name for +SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID=\ is not valid +SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME=POJO class name: +SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS=Seam component +SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE=Local interface +SEAM_ACTION_WIZARD_PAGE1_SEAM_ACTION=Seam Action +SEAM_ACTION_WIZARD_NEW_SEAM_ACTION=New Seam Action +SEAM_ACTION_WIZARD_ACTION_CREATING_OPERATION=Action creating operation +SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME2=Name: +SEAM_WIZARD_FACTORY_MASTER_PAGE_NAME=Master page name: +SEAM_ENTITY_WIZARD_PAGE1_SEAM_ENTITY=Seam Entity +SEAM_ENTITY_WIZARD_NEW_SEAM_ENTITY=New Seam Entity +SEAM_INSTALL_WIZARD_PAGE_ADD=Add +CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD=Unable to create wizard ' +CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT=Create Seam Project +VALIDATOR_FACTORY_PATH_TO_A_FOLDER_CANNOT_BE_NULL=Path to a folder cannot be null +VALIDATOR_FACTORY_FOLDER=Folder ' +VALIDATOR_FACTORY_DOES_NOT_EXISTS=' doesn't exists +VALIDATOR_FACTORY_PATH=Path ' +VALIDATOR_FACTORY_POINTS_TO_FILE=' points to file +VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS=Seam Home folder doesn't exist +VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO=Home folder points to +VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER=location that does not look like seam home folder ('jboss-seam.jar' is missing) +VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST=JBoss AS Home folder doesn't exist +VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT=JBoss AS Home Folde field points to location that doesn't +VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER=look like JBoss AS home folder +VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID=Component name is not invalid. +VALIDATOR_FACTORY_NAME_IS_NOT_VALID={0} name is not valid. +VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID=Local Interface name is not valid.\n +VALIDATOR_FACTORY_NAME_IS_NOT_VALID2=\ name is not valid. +VALIDATOR_FACTORY_PROJECT=Project ' +VALIDATOR_FACTORY_DOES_NOT_EXIST=' does'n exist. +VALIDATOR_FACTORY_SELECTED_PROJECT=Selected project ' +VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT=' is not a Seam Web Project +VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED=Connection profile is not selected +VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED=Driver Class proberty is empty for selected ' +VALIDATOR_FACTORY_CONNECTION_PROFILE=' connection profile +VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED=Seam Runtime is not selected +SEAM_PROJECT_WIZARD_PAGE1_FILE_CONTAINER_MUST_BE_SPECIFIED=File container must be specified +SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT=Runtime name is not correct +SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_GENERATE_SEAM_ENTITIES=Can't generate seam entities +SEAM_FORM_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_NEW_SEAM_FORM=Select the name of the new Seam Form. A new Seam Form with a single input field and related +SEAM_ENTITY_WIZARD_PAGE1_SELECT_THE_NAME_OF_NEW_SEAM_ENTITY=Select the name of the new Seam Entity. A new Seam Entity Bean with key Seam/EJB3 +SEAM_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL=Base url for image registry cannot be null. +SEAM_PROJECT_WIZARD_PAGE1_THIS_WIZARD_CREATES_A_NEW_FILE=This wizard creates a new file with *.mpe extension that can be opened by a multi-page editor. +SEAM_GENERATE_ENTITIES_WIZARD_ACTION_CREATING_OPERATION=Action creating operation +SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME=Can't find seam runtime for project +ABSTRACT_SEAM_CONTENT_PROVIDER_SEAM_PROJECT_CHANGE_EVENT_OCCURS_BUT_NO_SORCE_OF_PROJECT_PROVIDED=Seam Project change event occurs, but no soyrce of project provided +SEAM_OPEN_ACTION_OPEN=Open +TEXT_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE=Parent control should be Composite +TEXT_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT=Editor supports only grid layout +BUTTON_FIELD_EDITOR_BROWSE=Browse +BUTTON_FIELD_EDITOR_NOT_IMPLEMENTED_YET=Not implemented yet. Please setup real acion for editor. +SWT_FIELD_EDITOR_FACTORY_BROWS=Browse +SWT_FIELD_EDITOR_FACTORY_SELECT_SEAM_HOME_FOLDER=Select Seam Home Folder +SWT_FIELD_EDITOR_FACTORY_ERROR=Error +SWT_FIELD_EDITOR_FACTORY_NOT_IMPLEMENTED_YET=Not implemented yet +SWT_FIELD_EDITOR_FACTORY_OK=Ok +BASE_FIELD_EDITOR_NO_LABEL=No label +BASE_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE=Parent control should be Composite +BASE_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT=Editor supports only grid layout +BASE_FIELD_EDITOR_PARENT_FOR_LABEL_IS_DIFFERENT=Parent for label is different +COMPOSITE_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE=Parent control should be Composite +COMPOSITE_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT=Editor supports only grid layout +COMPOSITE_EDITOR_THIS_METOD_CAN_BE_INVOKED=This metod can be invoked after getEditorControls(parent) only +SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_SEAM_HOME_DIRECTORY_CANNOT_BE_EMPTY=Path to seam home directory cannot be empty +SEAM_CONVERSATION_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_NEW_SEAM_CONVERSATION=Select the name of the new Seam Conversation. A set of classes +SEAM_ENTITY_WIZARD_PAGE1_ANNOTATIONS_AND_EXAMPLES_ATTRIBUTES_WILL_BE_CREATED=annotations and wxample attributes will be created. +SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION=The selected seam appears to be of an incompatible version ' +SEAM_GENERATE_ENTITIES_WIZARD_THIS_METHOD_IS_NOT_RELEVANT_IN_GENERATING_SEAM_ENTITIES=This method is not relevant in generating seam entities. +SEAM_FORM_WIZARD_PAGE1_JAVA_INTERFACE_SLSB_AND_KEY_SEAMEJB3_ANNOTATIONS_WILL_BE_CREATED=Java Interface, SLSB and key Seam/EJB3 annotations will be created. Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencePage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencePage.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencePage.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -46,7 +46,7 @@ * */ SeamRuntimeListFieldEditor seamRuntimes - = new SeamRuntimeListFieldEditor("rtlist","Seam Runtimes",new ArrayList<SeamRuntime>(Arrays.asList(SeamRuntimeManager.getInstance().getRuntimes()))); + = new SeamRuntimeListFieldEditor("rtlist",SeamPreferencesMessages.SEAM_PREFERENCE_PAGE_SEAM_RUNTIMES,new ArrayList<SeamRuntime>(Arrays.asList(SeamRuntimeManager.getInstance().getRuntimes()))); //$NON-NLS-1$ SeamRuntime initialDefault; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -19,6 +19,26 @@ public class SeamPreferencesMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.seam.ui.preferences.SeamPreferencesMessages"; //$NON-NLS-1$ + public static String SEAM_PREFERENCE_PAGE_SEAM_RUNTIMES; + + public static String SEAM_SETTINGS_PREFERENCE_PAGE_ADD; + + public static String SEAM_SETTINGS_PREFERENCE_PAGE_RUNTIME; + + public static String SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED; + + public static String SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT; + + public static String SEAM_VALIDATOR_CONFIGURATION_BLOCK_ERROR; + + public static String SEAM_VALIDATOR_CONFIGURATION_BLOCK_IGNORE; + + public static String SEAM_VALIDATOR_CONFIGURATION_BLOCK_SEAM_VALIDATOR_CONFIGURATION_BLOCK; + + public static String SEAM_VALIDATOR_CONFIGURATION_BLOCK_WARNING; + + public static String SEAM_VALIDATOR_PREFERENCE_PAGE_SEAM_VALIDATOR; + //Validator Preference page public static String SeamValidatorConfigurationBlock_common_description; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamPreferencesMessages.properties 2007-10-05 10:58:43 UTC (rev 4022) @@ -57,4 +57,14 @@ ##Seam Expression language SeamValidatorConfigurationBlock_section_el=Expression language SeamValidatorConfigurationBlock_pb_invalidExpression_label=Invalid Expression: -SeamValidatorConfigurationBlock_pb_unpairedGetterOrSetter_label=Unpaired Getter/Setter: \ No newline at end of file +SeamValidatorConfigurationBlock_pb_unpairedGetterOrSetter_label=Unpaired Getter/Setter: +SEAM_VALIDATOR_CONFIGURATION_BLOCK_SEAM_VALIDATOR_CONFIGURATION_BLOCK=SeamValidatorConfigurationBlock +SEAM_VALIDATOR_CONFIGURATION_BLOCK_ERROR=Error +SEAM_SETTINGS_PREFERENCE_PAGE_RUNTIME=Runtime +SEAM_VALIDATOR_CONFIGURATION_BLOCK_WARNING=Warning +SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT=Seam support +SEAM_VALIDATOR_PREFERENCE_PAGE_SEAM_VALIDATOR=Seam Validator +SEAM_VALIDATOR_CONFIGURATION_BLOCK_IGNORE=Ignore +SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED=Seam runtime is not selected +SEAM_SETTINGS_PREFERENCE_PAGE_ADD=Add +SEAM_PREFERENCE_PAGE_SEAM_RUNTIMES=Seam Runtimes Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -64,14 +64,14 @@ .getSeamProject(project, false); boolean hasSeamSupport = seamProject != null; seamEnablement = SwtFieldEditorFactory.INSTANCE.createCheckboxEditor( - "Seam support", "Seam support", false); + SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT, false); seamEnablement.setValue(hasSeamSupport); SeamRuntime rs = SeamRuntimeManager.getInstance().getDefaultRuntime(); - runtime = SwtFieldEditorFactory.INSTANCE.createComboWithButton("Runtime", - "Runtime", SeamRuntimeManager.getInstance().getRuntimeNames(), - rs==null?"":rs.getName(),true,new NewSeamRuntimeAction(),(IValidator)null); + runtime = SwtFieldEditorFactory.INSTANCE.createComboWithButton(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_RUNTIME, + SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_RUNTIME, SeamRuntimeManager.getInstance().getRuntimeNames(), + rs==null?"":rs.getName(),true,new NewSeamRuntimeAction(),(IValidator)null); //$NON-NLS-1$ List<IFieldEditor> editorOrder = new ArrayList<IFieldEditor>(); editorOrder.add(seamEnablement); @@ -182,9 +182,9 @@ } private void validate() { - if(getSeamSupport() && (runtime.getValue()== null || "".equals(runtime.getValue()))) { + if(getSeamSupport() && (runtime.getValue()== null || "".equals(runtime.getValue()))) { //$NON-NLS-1$ setValid(false); - setErrorMessage("Seam runtime is not selected"); + setErrorMessage(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED); } else { setValid(true); setErrorMessage(null); @@ -197,7 +197,7 @@ * @param label */ public NewSeamRuntimeAction() { - super("Add"); + super(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_ADD); } public void run() { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -52,7 +52,7 @@ * @author Viacheslav Kabanovich */ public class SeamValidatorConfigurationBlock extends OptionsConfigurationBlock { - private static final String SETTINGS_SECTION_NAME = "SeamValidatorConfigurationBlock"; + private static final String SETTINGS_SECTION_NAME = SeamPreferencesMessages.SEAM_VALIDATOR_CONFIGURATION_BLOCK_SEAM_VALIDATOR_CONFIGURATION_BLOCK; private static SectionDescription SECTION_COMPONENT = new SectionDescription( SeamPreferencesMessages.SeamValidatorConfigurationBlock_section_component, @@ -178,9 +178,9 @@ String[] errorWarningIgnore = new String[] {ERROR, WARNING, IGNORE}; String[] errorWarningIgnoreLabels = new String[] { - "Error", - "Warning", - "Ignore" + SeamPreferencesMessages.SEAM_VALIDATOR_CONFIGURATION_BLOCK_ERROR, + SeamPreferencesMessages.SEAM_VALIDATOR_CONFIGURATION_BLOCK_WARNING, + SeamPreferencesMessages.SEAM_VALIDATOR_CONFIGURATION_BLOCK_IGNORE }; int nColumns = 3; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorPreferencePage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorPreferencePage.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorPreferencePage.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -22,14 +22,14 @@ * @author Viacheslav Kabanovich */ public class SeamValidatorPreferencePage extends PropertyAndPreferencePage { - public static final String PREF_ID = "org.jboss.tools.seam.ui.preferences.SeamValidatorPreferencePage"; - public static final String PROP_ID = "org.jboss.tools.seam.ui.propertyPages.SeamValidatorPreferencePage"; + public static final String PREF_ID = "org.jboss.tools.seam.ui.preferences.SeamValidatorPreferencePage"; //$NON-NLS-1$ + public static final String PROP_ID = "org.jboss.tools.seam.ui.propertyPages.SeamValidatorPreferencePage"; //$NON-NLS-1$ private SeamValidatorConfigurationBlock fConfigurationBlock; public SeamValidatorPreferencePage() { setPreferenceStore(SeamCorePlugin.getDefault().getPreferenceStore()); - setTitle("Seam Validator"); + setTitle(SeamPreferencesMessages.SEAM_VALIDATOR_PREFERENCE_PAGE_SEAM_VALIDATOR); } @Override Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -238,7 +238,7 @@ return NO_PROPOSALS; String prefix= SeamELCompletionEngine.getPrefix(viewer, offset); - prefix = (prefix == null ? "" : prefix); + prefix = (prefix == null ? "" : prefix); //$NON-NLS-1$ if (!checkStartPositionInEL(viewer, offset)) return NO_PROPOSALS; @@ -259,8 +259,8 @@ public int compare(ICompletionProposal arg0, ICompletionProposal arg1) { - String str0 = (arg0 == null ? "" : arg0.getDisplayString()); - String str1 = (arg1 == null ? "" : arg1.getDisplayString()); + String str0 = (arg0 == null ? "" : arg0.getDisplayString()); //$NON-NLS-1$ + String str1 = (arg1 == null ? "" : arg1.getDisplayString()); //$NON-NLS-1$ return str0.compareTo(str1); }}); return resultArray; @@ -300,10 +300,10 @@ IPreferenceStore store= EditorsUI.getPreferenceStore(); String superDefaultChars = store.getDefaultString(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA); StringBuffer redhatDefaultChars = new StringBuffer(superDefaultChars); - if(superDefaultChars.indexOf("{")<0) { + if(superDefaultChars.indexOf("{")<0) { //$NON-NLS-1$ redhatDefaultChars.append('{'); } - if(superDefaultChars.indexOf(".")<0) { + if(superDefaultChars.indexOf(".")<0) { //$NON-NLS-1$ redhatDefaultChars.append('.'); } autoActivChars = new char[redhatDefaultChars.length()]; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/AbstractSeamContentProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/AbstractSeamContentProvider.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/AbstractSeamContentProvider.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -46,6 +46,7 @@ import org.jboss.tools.seam.core.event.ISeamProjectChangeListener; import org.jboss.tools.seam.core.event.SeamProjectChangeEvent; import org.jboss.tools.seam.ui.SeamGuiPlugin; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.views.actions.ScopePresentationActionProvider; /** @@ -209,7 +210,7 @@ if(o instanceof ISeamElement) { refresh(o); } else { - SeamGuiPlugin.getPluginLog().logError("Seam Project change event occurs, but no soyrce of project provided"); + SeamGuiPlugin.getPluginLog().logError(SeamUIMessages.ABSTRACT_SEAM_CONTENT_PROVIDER_SEAM_PROJECT_CHANGE_EVENT_OCCURS_BUT_NO_SORCE_OF_PROJECT_PROVIDED); } } @@ -261,7 +262,7 @@ IResourceDelta[] cs = delta.getAffectedChildren(); if(cs != null) for (int i = 0; i < cs.length; i++) { IResource c = cs[i].getResource(); - if(c instanceof IFile && c.getName().endsWith(".project")) { + if(c instanceof IFile && c.getName().endsWith(".project")) { //$NON-NLS-1$ refresh(null); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamJarFilter.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamJarFilter.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamJarFilter.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -41,7 +41,7 @@ Set<ISeamComponentDeclaration> ds = c.getAllDeclarations(); for (ISeamComponentDeclaration d : ds) { IPath path = d.getSourcePath(); - if(path != null && !path.toString().endsWith(".jar")) { + if(path != null && !path.toString().endsWith(".jar")) { //$NON-NLS-1$ return true; } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -94,7 +94,7 @@ public String getText(Object element) { if(element instanceof IWorkspaceRoot) { - return ""; + return ""; //$NON-NLS-1$ } else if(element instanceof ISeamProject) { return ((IProjectNature)element).getProject().getName(); } else if(element instanceof ISeamScope) { @@ -115,26 +115,26 @@ } if(isScopeLable /* ScopePresentationActionProvider.isScopePresentedAsLabel()*/) { - name += " (" + ((ISeamScope)c.getParent()).getType().getLabel() + ")"; + name += " (" + ((ISeamScope)c.getParent()).getType().getLabel() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } return name; } else if (element instanceof IRole) { - return "" + ((IRole)element).getName(); + return "" + ((IRole)element).getName(); //$NON-NLS-1$ } else if(element instanceof ISeamJavaSourceReference) { ISeamJavaSourceReference d = (ISeamJavaSourceReference)element; IMember m = d.getSourceMember(); IType type = (m instanceof IType) ? (IType)m : m.getTypeRoot().findPrimaryType(); if(type.isBinary()) { IResource r = ((ISeamElement)element).getResource(); - String s = (r == null) ? "<no name>" : r.getName(); - return s + "/" + type.getFullyQualifiedName(); + String s = (r == null) ? "<no name>" : r.getName(); //$NON-NLS-1$ + return s + "/" + type.getFullyQualifiedName(); //$NON-NLS-1$ } else { return type.getFullyQualifiedName(); } } else if(element instanceof ISeamComponentDeclaration) { IResource r = ((ISeamComponentDeclaration)element).getResource(); - return r == null ? "???" : r.getName(); + return r == null ? "???" : r.getName(); //$NON-NLS-1$ } return element == null ? "" : element.toString();//$NON-NLS-1$ } @@ -176,7 +176,7 @@ } public String getDescription(Object anElement) { - return ""; + return ""; //$NON-NLS-1$ } public void dispose() { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLinkHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLinkHelper.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLinkHelper.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -52,7 +52,7 @@ ISeamElement e = (ISeamElement)o; IPath path = e.getSourcePath(); IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(path); - if(f != null && f.exists() && !"jar".equals(path.getFileExtension())) { + if(f != null && f.exists() && !"jar".equals(path.getFileExtension())) { //$NON-NLS-1$ IEditorInput fileInput = new FileEditorInput(f); IEditorPart editor = null; if ((editor = page.findEditor(fileInput)) != null) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamProjectLabelProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamProjectLabelProvider.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamProjectLabelProvider.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -11,6 +11,7 @@ package org.jboss.tools.seam.ui.views; import org.jboss.tools.seam.core.ISeamProject; +import org.jboss.tools.seam.ui.SeamUIMessages; /** * This implementation is designed for standard Projects Explorer @@ -26,7 +27,7 @@ @Override public String getText(Object element) { if(element instanceof ISeamProject) { - return "Seam Components"; + return SeamUIMessages.SEAM_PROJECT_LABEL_PROVIDER_SEAM_COMPONENTS; } return super.getText(element); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/ViewConstants.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/ViewConstants.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/ViewConstants.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -15,12 +15,12 @@ * @author Viacheslav Kabanovich */ public interface ViewConstants { - public String SCOPE_PRESENTATION = "seam.scopePresentation"; - public String PACKAGE_STRUCTURE = "seam.packageStructure"; + public String SCOPE_PRESENTATION = "seam.scopePresentation"; //$NON-NLS-1$ + public String PACKAGE_STRUCTURE = "seam.packageStructure"; //$NON-NLS-1$ - public String SCOPE_AS_LABEL = "label"; - public String SCOPE_AS_NODE = "node"; - public String PACKAGES_FLAT = "editable"; - public String PACKAGES_HIERARCHICAL = "hierarchical"; + public String SCOPE_AS_LABEL = "label"; //$NON-NLS-1$ + public String SCOPE_AS_NODE = "node"; //$NON-NLS-1$ + public String PACKAGES_FLAT = "editable"; //$NON-NLS-1$ + public String PACKAGES_HIERARCHICAL = "hierarchical"; //$NON-NLS-1$ } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -131,7 +131,7 @@ boolean isCurrentLayoutFlat = true; String state = null; if (memento != null) - state = memento.getString("seam-isFlatLayout"); + state = memento.getString("seam-isFlatLayout"); //$NON-NLS-1$ if (state == null) { state = SeamPreferences.getInstancePreference(PACKAGE_STRUCTURE); @@ -144,7 +144,7 @@ boolean isCurrentScopeLabel = false; state = null; if (memento != null) - state = memento.getString("seam-isScopeLabel"); + state = memento.getString("seam-isScopeLabel"); //$NON-NLS-1$ if (state == null) { state = SeamPreferences.getInstancePreference(SCOPE_PRESENTATION); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamOpenAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamOpenAction.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamOpenAction.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -12,6 +12,7 @@ import org.eclipse.jface.action.Action; import org.jboss.tools.seam.core.IOpenableElement; +import org.jboss.tools.seam.ui.SeamUIMessages; /** * @author Viacheslav Kabanovich @@ -20,7 +21,7 @@ IOpenableElement element; public SeamOpenAction(IOpenableElement element) { - setText("Open"); + setText(SeamUIMessages.SEAM_OPEN_ACTION_OPEN); this.element = element; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamViewLayoutActionGroup.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamViewLayoutActionGroup.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamViewLayoutActionGroup.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -26,6 +26,7 @@ import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.navigator.IExtensionStateModel; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.views.ViewConstants; /** @@ -63,7 +64,7 @@ private final boolean value; public CommonLayoutAction(String property, boolean value, String id) { - super("", AS_RADIO_BUTTON); + super("", AS_RADIO_BUTTON); //$NON-NLS-1$ this.property = property; this.value = value; this.setId(id); @@ -88,13 +89,13 @@ IMenuManager viewMenu = actionBars.getMenuManager(); // Create layout sub menu if (layoutSubMenu == null) { - layoutSubMenu = new MenuManager("Seam Packages", "Seam Packages"); + layoutSubMenu = new MenuManager(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES, SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES); addLayoutActions(layoutSubMenu); viewMenu.insertAfter(IWorkbenchActionConstants.MB_ADDITIONS, new Separator(LAYOUT_GROUP_NAME)); } if(scopeSubMenu == null) { - scopeSubMenu = new MenuManager("Scope Presentation", "Scope Presentation"); + scopeSubMenu = new MenuManager(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION, SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION); addScopeActions(scopeSubMenu); } @@ -146,10 +147,10 @@ } private void createActions() { - flatLayoutAction = new CommonLayoutAction(PACKAGE_STRUCTURE, true, "package.flat"); - hierarchicalLayoutAction = new CommonLayoutAction(PACKAGE_STRUCTURE, false,"package.hierarchical"); - labelScopeAction = new CommonLayoutAction(SCOPE_PRESENTATION, true,"layout.label"); - nodeScopeAction = new CommonLayoutAction(SCOPE_PRESENTATION, false,"layout.node"); + flatLayoutAction = new CommonLayoutAction(PACKAGE_STRUCTURE, true, "package.flat"); //$NON-NLS-1$ + hierarchicalLayoutAction = new CommonLayoutAction(PACKAGE_STRUCTURE, false,"package.hierarchical"); //$NON-NLS-1$ + labelScopeAction = new CommonLayoutAction(SCOPE_PRESENTATION, true,"layout.label"); //$NON-NLS-1$ + nodeScopeAction = new CommonLayoutAction(SCOPE_PRESENTATION, false,"layout.node"); //$NON-NLS-1$ } protected void addLayoutActions(IMenuManager viewMenu) { @@ -158,7 +159,7 @@ int style = SWT.RADIO; MenuItem mi = new MenuItem(menu, style, index); flatLayoutItem = mi; - mi.setText("Flat"); + mi.setText(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_FLAT); mi.setSelection(isFlatLayout); mi.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -185,7 +186,7 @@ int style = SWT.RADIO; MenuItem mi = new MenuItem(menu, style, index); hierarchicalLayoutItem = mi; - mi.setText("Hierarchical"); + mi.setText(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_HIERARCHICAL); mi.setSelection(!isFlatLayout); mi.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -215,7 +216,7 @@ int style = SWT.RADIO; MenuItem mi = new MenuItem(menu, style, index); labelScopeItem = mi; - mi.setText("Label"); + mi.setText(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_LABEL); mi.setSelection(isScopeLable); mi.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -242,7 +243,7 @@ int style = SWT.RADIO; MenuItem mi = new MenuItem(menu, style, index); nodeScopeItem = mi; - mi.setText("Node"); + mi.setText(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_NODE); mi.setSelection(!isScopeLable); mi.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamComponentProperties.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamComponentProperties.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamComponentProperties.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -34,7 +34,7 @@ for (int i = 0; i < Precedence.values().length; i++) { if(v == Precedence.values()[i].value) return Precedence.values()[i].toString(); } - return "" + v; + return "" + v; //$NON-NLS-1$ } } @@ -69,9 +69,9 @@ } else if(PRECEDENCE.equals(id)) { return Precedence.getStringValue(element.getPrecedence()); } if(ENTITY.equals(id)) { - return "" + element.isEntity(); + return "" + element.isEntity(); //$NON-NLS-1$ } if(STATEFUL.equals(id)) { - return "" + element.isStateful(); + return "" + element.isStateful(); //$NON-NLS-1$ } return null; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamElementProperties.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamElementProperties.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamElementProperties.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -18,14 +18,14 @@ * @author Viacheslav Kabanovich */ public class SeamElementProperties implements IPropertySource { - static String NAME = "name"; - static String SCOPE = "scope"; - static String CLASS = "class"; - static String PRECEDENCE = "precedence"; - static String INSTALLED = "installed"; + static String NAME = "name"; //$NON-NLS-1$ + static String SCOPE = "scope"; //$NON-NLS-1$ + static String CLASS = "class"; //$NON-NLS-1$ + static String PRECEDENCE = "precedence"; //$NON-NLS-1$ + static String INSTALLED = "installed"; //$NON-NLS-1$ - static String ENTITY = "entity"; - static String STATEFUL = "stateful"; + static String ENTITY = "entity"; //$NON-NLS-1$ + static String STATEFUL = "stateful"; //$NON-NLS-1$ static IPropertyDescriptor NAME_DESCRIPTOR = new PropertyDescriptor(NAME, NAME); static IPropertyDescriptor SCOPE_DESCRIPTOR = new PropertyDescriptor(SCOPE, SCOPE); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BaseFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BaseFieldEditor.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BaseFieldEditor.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -21,6 +21,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; +import org.jboss.tools.seam.ui.SeamUIMessages; /** * @@ -33,7 +34,7 @@ private Object value = new Object(); - private String labelText = "No label"; + private String labelText = SeamUIMessages.BASE_FIELD_EDITOR_NO_LABEL; private String nameText = null; @@ -56,8 +57,8 @@ * @param parent */ public void doFillIntoGrid(Object parent) { - Assert.isTrue(parent instanceof Composite, "Parent control should be Composite"); - Assert.isTrue(((Composite)parent).getLayout() instanceof GridLayout,"Editor supports only grid layout"); + Assert.isTrue(parent instanceof Composite, SeamUIMessages.BASE_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE); + Assert.isTrue(((Composite)parent).getLayout() instanceof GridLayout,SeamUIMessages.BASE_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT); Composite aComposite = (Composite) parent; Control[] controls = (Control[])getEditorControls(aComposite); GridLayout gl = (GridLayout)((Composite)parent).getLayout(); @@ -98,7 +99,7 @@ labelControl.setText(this.labelText); } else if(parent!=null) { if(labelControl.getParent()!=parent) - throw new IllegalArgumentException("Parent for label is different"); + throw new IllegalArgumentException(SeamUIMessages.BASE_FIELD_EDITOR_PARENT_FOR_LABEL_IS_DIFFERENT); } return labelControl; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ButtonFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ButtonFieldEditor.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ButtonFieldEditor.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.widget.field.PushButtonField; /** @@ -30,10 +31,10 @@ PushButtonField button= null; - private ButtonPressedAction buttonAction = new ButtonPressedAction("Browse") { + private ButtonPressedAction buttonAction = new ButtonPressedAction(SeamUIMessages.BUTTON_FIELD_EDITOR_BROWSE) { @Override public void run() { - throw new RuntimeException("Not implemented yet. Please setup real acion for editor."); + throw new RuntimeException(SeamUIMessages.BUTTON_FIELD_EDITOR_NOT_IMPLEMENTED_YET); } }; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -26,6 +26,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.jboss.tools.seam.ui.SeamUIMessages; /** * @author eskimo @@ -41,8 +42,8 @@ @Override public void doFillIntoGrid(Object parent) { - Assert.isTrue(parent instanceof Composite, "Parent control should be Composite"); - Assert.isTrue(((Composite)parent).getLayout() instanceof GridLayout,"Editor supports only grid layout"); + Assert.isTrue(parent instanceof Composite, SeamUIMessages.COMPOSITE_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE); + Assert.isTrue(((Composite)parent).getLayout() instanceof GridLayout,SeamUIMessages.COMPOSITE_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT); Composite aComposite = (Composite) parent; Control[] controls = (Control[])getEditorControls(aComposite); GridLayout gl = (GridLayout)((Composite)parent).getLayout(); @@ -61,7 +62,7 @@ @Override public Object[] getEditorControls() { if(controls.size()>0) return controls.toArray(); - else throw new IllegalStateException("This metod can be invoked after getEditorControls(parent) only"); + else throw new IllegalStateException(SeamUIMessages.COMPOSITE_EDITOR_THIS_METOD_CAN_BE_INVOKED); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/LabelFieldEditor.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -21,7 +21,7 @@ public class LabelFieldEditor extends BaseFieldEditor { public LabelFieldEditor(String name, String label) { - super(name, label, ""); + super(name, label, ""); //$NON-NLS-1$ } /* (non-Javadoc) Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -57,6 +57,7 @@ import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; import org.jboss.tools.seam.core.project.facet.SeamVersion; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory; import org.jboss.tools.seam.ui.wizard.SeamFormWizard; @@ -150,7 +151,7 @@ buttons.setLayoutData(gd); addBtn = new Button(buttons,SWT.PUSH); - addBtn.setText("Add"); + addBtn.setText(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_ADD); gd = new GridData(GridData.FILL_HORIZONTAL,GridData.CENTER,false,false); gd.horizontalAlignment = GridData.FILL; gd.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING; @@ -180,15 +181,15 @@ TableColumn tc2 = new TableColumn(tableView.getTable(),SWT.LEFT); tc2.setWidth(100); - tc2.setText("Name"); + tc2.setText(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME); TableColumn tc3 = new TableColumn(tableView.getTable(),SWT.LEFT); tc3.setWidth(50); - tc3.setText("Version"); + tc3.setText(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION); TableColumn tc4 = new TableColumn(tableView.getTable(),SWT.LEFT); tc4.setWidth(100); - tc4.setText("Path"); + tc4.setText(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH); tableView.setContentProvider(new IStructuredContentProvider() { @@ -196,8 +197,8 @@ if(inputElement instanceof List) return ((List<SeamRuntime>)inputElement).toArray(); else - throw new IllegalArgumentException("inputElement must be " + - "an instance of List<SeamRuntime>."); + throw new IllegalArgumentException(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE + + SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_AN_INSTANCEOF_OF_LIST); } public void dispose() { @@ -227,11 +228,11 @@ public String getColumnText(Object element, int columnIndex) { SeamRuntime rt = (SeamRuntime)element; - if(columnIndex==0) return ""; + if(columnIndex==0) return ""; //$NON-NLS-1$ if(columnIndex==1) return rt.getName(); if(columnIndex==2) return rt.getVersion().toString(); if(columnIndex==3) return rt.getHomeDir(); - return ""; + return ""; //$NON-NLS-1$ } }); @@ -279,9 +280,9 @@ */ public void doFillIntoGrid(Object parent) { Assert.isTrue(parent instanceof Composite, - "Parent control should be Composite"); + SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE); Assert.isTrue(((Composite)parent).getLayout() - instanceof GridLayout,"Editor supports only grid layout"); + instanceof GridLayout,SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT); Composite aComposite = (Composite) parent; Control[] controls = (Control[])getEditorControls(aComposite); GridLayout gl = (GridLayout)((Composite)parent).getLayout(); @@ -299,29 +300,29 @@ List<SeamRuntime> value = null; IFieldEditor name = SwtFieldEditorFactory.INSTANCE.createTextEditor( - "name", "Name:", ""); + "name", SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME2, ""); //$NON-NLS-1$ //$NON-NLS-2$ IFieldEditor version = SwtFieldEditorFactory.INSTANCE.createComboEditor( - "version", "Version:", Arrays.asList( + "version", SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2, Arrays.asList( //$NON-NLS-1$ new Object[]{SeamVersion.SEAM_1_2.toString()}), SeamVersion.SEAM_1_2.toString(), false); IFieldEditor homeDir = SwtFieldEditorFactory.INSTANCE.createBrowseFolderEditor( - "homeDir", "Home Folder:", ""); + "homeDir", SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER, ""); //$NON-NLS-1$ //$NON-NLS-2$ IFieldEditor dflt = SwtFieldEditorFactory.INSTANCE.createCheckboxEditor( - "default", "Use as default:", false); + "default", SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_USE_AS_DEFAULT, false); //$NON-NLS-1$ /** * @param parent * @param style */ public SeamRuntimeWizardPage(List<SeamRuntime> editedList) { - super("New Seam Runtime"); - setMessage("Create a Seam Runtime"); - setTitle("Seam Runtime"); + super(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME); + setMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME); + setTitle(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME); setImageDescriptor(ImageDescriptor.createFromFile( - SeamFormWizard.class, "SeamWebProjectWizBan.png")); + SeamFormWizard.class, "SeamWebProjectWizBan.png")); //$NON-NLS-1$ value = editedList; } /** @@ -351,28 +352,28 @@ */ public void propertyChange(PropertyChangeEvent evt) { - if(name.getValueAsString()==null || "".equals( + if(name.getValueAsString()==null || "".equals( //$NON-NLS-1$ name.getValueAsString().toString().trim())) { - setErrorMessage("Name cannot be empty"); + setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY); setPageComplete(false); return; } - if(!name.getValueAsString().matches("[a-zA-Z_][a-zA-Z0-9_\\-\\. ]*")) { - setErrorMessage("Runtime name is not correct"); + if(!name.getValueAsString().matches("[a-zA-Z_][a-zA-Z0-9_\\-\\. ]*")) { //$NON-NLS-1$ + setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT); setPageComplete(false); return; } for (SeamRuntime rt : value) { if(rt.getName().equals(name.getValueAsString())) { - setErrorMessage("Runtime '"+name.getValueAsString()+ "' already exists"); + setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME+name.getValueAsString()+ SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_ALREADY_EXISTS); setPageComplete(false); return; } } - if(homeDir.getValueAsString()==null || "".equals(homeDir.getValueAsString().trim())) { - setErrorMessage("Path to seam home directory cannot be empty"); + if(homeDir.getValueAsString()==null || "".equals(homeDir.getValueAsString().trim())) { //$NON-NLS-1$ + setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_SEAM_HOME_DIRECTORY_CANNOT_BE_EMPTY); setPageComplete(false); return; } @@ -385,12 +386,12 @@ return; } String seamVersion = getSeamVersion(homeDir.getValueAsString()); - if("".equals(seamVersion)) { - setErrorMessage("Cannot obtain Seam version number from jboss-seam.jar file."); + if("".equals(seamVersion)) { //$NON-NLS-1$ + setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_OBTAIN_SEAM_VERSION_NUMBER); setPageComplete(false); return; - } else if(!seamVersion.matches(version.getValueAsString().replace(".","\\.")+".*")) { - setErrorMessage("The selected seam appears to be of an incompatible version '" + seamVersion + "'"); + } else if(!seamVersion.matches(version.getValueAsString().replace(".","\\.")+".*")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION + seamVersion + "'"); //$NON-NLS-1$ setPageComplete(false); return; } @@ -400,23 +401,23 @@ } public static String getSeamVersion(String path) { - File seamJarFile = new File(path, "jboss-seam.jar"); + File seamJarFile = new File(path, "jboss-seam.jar"); //$NON-NLS-1$ InputStream str=null; ZipFile seamJar; try { seamJar = new ZipFile(seamJarFile); ZipFileStructureProvider provider = new ZipFileStructureProvider(seamJar); - ZipEntry entry = seamJar.getEntry("META-INF/MANIFEST.MF"); + ZipEntry entry = seamJar.getEntry("META-INF/MANIFEST.MF"); //$NON-NLS-1$ str = provider.getContents(entry); Properties manifest = new Properties(); manifest.load(str); - Object sv = manifest.get("Seam-Version"); - return sv==null?"":sv.toString(); + Object sv = manifest.get(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_VERSION); + return sv==null?"":sv.toString(); //$NON-NLS-1$ } catch (IOException e) { - SeamCorePlugin.getPluginLog().logError("Cannot read jboss-seam.jar file",e); + SeamCorePlugin.getPluginLog().logError(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_READ_JAR_FILE,e); } finally { if(str!=null) try { @@ -425,7 +426,7 @@ // nothing to do with that } } - return ""; + return ""; //$NON-NLS-1$ } /** @@ -449,7 +450,7 @@ List<SeamRuntime> value = null; public SeamRuntimeNewWizard(List<SeamRuntime> value, List<SeamRuntime> added) { super(); - setWindowTitle("New Seam Runtime"); + setWindowTitle(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME); page1 = new SeamRuntimeWizardPage(value); addPage(page1); this.value = value; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -24,6 +24,7 @@ import org.eclipse.swt.widgets.FileDialog; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.project.facet.SeamRuntime; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.internal.project.facet.IValidator; import org.jboss.tools.seam.ui.widget.editor.ButtonFieldEditor.ButtonPressedAction; import org.jboss.tools.seam.ui.widget.editor.SeamRuntimeListFieldEditor.SeamRuntimeNewWizard; @@ -91,7 +92,7 @@ CompositeEditor editor = new CompositeEditor(name,label, defaultValue); editor.addFieldEditors(new IFieldEditor[]{new LabelFieldEditor(name,label), new TextFieldEditor(name,label, defaultValue), - new ButtonFieldEditor(name,createSelectFolderAction("Browse"),defaultValue)}); + new ButtonFieldEditor(name,createSelectFolderAction(SeamUIMessages.SWT_FIELD_EDITOR_FACTORY_BROWS),defaultValue)}); return editor; } @@ -103,7 +104,7 @@ CompositeEditor editor = new CompositeEditor(name,label, defaultValue); editor.addFieldEditors(new IFieldEditor[]{new LabelFieldEditor(name,label), new TextFieldEditor(name,label, defaultValue), - new ButtonFieldEditor(name,createSelectFileAction("Browse"),defaultValue)}); + new ButtonFieldEditor(name,createSelectFileAction(SeamUIMessages.SWT_FIELD_EDITOR_FACTORY_BROWS),defaultValue)}); return editor; } @@ -126,7 +127,7 @@ public void run() { DirectoryDialog dialog = new DirectoryDialog(Display.getCurrent().getActiveShell()); dialog.setFilterPath(getFieldEditor().getValueAsString()); - dialog.setMessage("Select Seam Home Folder"); + dialog.setMessage(SeamUIMessages.SWT_FIELD_EDITOR_FACTORY_SELECT_SEAM_HOME_FOLDER); dialog.setFilterPath(getFieldEditor().getValueAsString()); String directory = dialog.open(); if(directory!=null) { @@ -147,7 +148,7 @@ public void run() { FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell()); dialog.setFilterPath(getFieldEditor().getValueAsString()); - dialog.setText("Select Seam Home Folder"); + dialog.setText(SeamUIMessages.SWT_FIELD_EDITOR_FACTORY_SELECT_SEAM_HOME_FOLDER); dialog.setFilterPath(getFieldEditor().getValueAsString()); String directory = dialog.open(); if(directory!=null) { @@ -164,8 +165,8 @@ return new ButtonFieldEditor.ButtonPressedAction(buttonName) { @Override public void run() { - new MessageDialog(Display.getCurrent().getActiveShell(), "Error", - null, "Not implemented yet", MessageDialog.ERROR, new String[]{"Ok"},1) + new MessageDialog(Display.getCurrent().getActiveShell(), SeamUIMessages.SWT_FIELD_EDITOR_FACTORY_ERROR, + null, SeamUIMessages.SWT_FIELD_EDITOR_FACTORY_NOT_IMPLEMENTED_YET, MessageDialog.ERROR, new String[]{SeamUIMessages.SWT_FIELD_EDITOR_FACTORY_OK},1) .open(); } }; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TaggedComboFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TaggedComboFieldEditor.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TaggedComboFieldEditor.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -30,7 +30,7 @@ public TaggedComboFieldEditor(String name, String label, List values, Object defaultValue, boolean editable) { - super(name, label, defaultValue==null?"":defaultValue.toString()); + super(name, label, defaultValue==null?"":defaultValue.toString()); //$NON-NLS-1$ this.values = Collections.unmodifiableList(values); this.floatStyle = editable; combo = new ComboFieldEditor( Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -26,6 +26,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Text; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.widget.field.TextField; /** @@ -86,8 +87,8 @@ * @see com.kabira.ide.ex.workbench.ui.feature.IFeatureFieldEditor#doFillIntoGrid(java.lang.Object) */ public void doFillIntoGrid(Object aParent) { - Assert.isTrue(aParent instanceof Composite, "Parent control should be Composite"); - Assert.isTrue(((Composite)aParent).getLayout() instanceof GridLayout,"Editor supports only grid layout"); + Assert.isTrue(aParent instanceof Composite, SeamUIMessages.TEXT_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE); + Assert.isTrue(((Composite)aParent).getLayout() instanceof GridLayout,SeamUIMessages.TEXT_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT); Composite aComposite = (Composite) aParent; Control[] controls = (Control[])getEditorControls(aComposite); GridLayout gl = (GridLayout)((Composite)aParent).getLayout(); @@ -144,7 +145,7 @@ */ private String checkCollection(Object value){ - return value != null && (((Collection)value).size() > 0) ? prepareCollectionToString((Collection)value) : new String(""); + return value != null && (((Collection)value).size() > 0) ? prepareCollectionToString((Collection)value) : new String(""); //$NON-NLS-1$ } /* @@ -153,12 +154,12 @@ */ private String prepareCollectionToString(Collection collection) { - String stringValue = ""; + String stringValue = ""; //$NON-NLS-1$ Object[] objects = collection.toArray(); for(int i = 0; i < objects.length; i++){ stringValue += objects[i]; if(i < objects.length - 1) - stringValue += " "; + stringValue += " "; //$NON-NLS-1$ } return stringValue; } @@ -169,7 +170,7 @@ * @return */ private String checkSimple(Object value){ - return (value != null) ? value.toString() : new String(""); + return (value != null) ? value.toString() : new String(""); //$NON-NLS-1$ } /** Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/BaseField.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/BaseField.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/BaseField.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -17,7 +17,7 @@ public abstract class BaseField { - public static final String PROPERTY_NAME = "value"; + public static final String PROPERTY_NAME = "value"; //$NON-NLS-1$ private PropertyChangeSupport pcs = new PropertyChangeSupport(this); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/ComboBoxField.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/ComboBoxField.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/ComboBoxField.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -102,7 +102,7 @@ } public void selectionChanged(SelectionChangedEvent event) { - firePropertyChange("", ((StructuredSelection)event.getSelection()).getFirstElement()); + firePropertyChange("", ((StructuredSelection)event.getSelection()).getFirstElement()); //$NON-NLS-1$ } public CCombo getComboControl() { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -72,7 +72,7 @@ */ public void widgetSelected(SelectionEvent event) { value = event.widget.getData(); - firePropertyChange("", value); + firePropertyChange("", value); //$NON-NLS-1$ } /** Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/CreateSeamWebProjectAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/CreateSeamWebProjectAction.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/CreateSeamWebProjectAction.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -21,11 +21,12 @@ import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.util.ExtensionPointUtils; import org.jboss.tools.seam.ui.SeamGuiPlugin; +import org.jboss.tools.seam.ui.SeamUIMessages; public class CreateSeamWebProjectAction extends Action implements IWorkbenchWindowActionDelegate { public CreateSeamWebProjectAction() { - super("Create Seam Project"); - setToolTipText("Create Seam Project"); + super(SeamUIMessages.CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT); + setToolTipText(SeamUIMessages.CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT); ModelUIImages.setImageDescriptors(this, ModelUIImages.ACT_CREATE_PROJECT); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/IParameter.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/IParameter.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/IParameter.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -11,27 +11,29 @@ package org.jboss.tools.seam.ui.wizard; +import org.jboss.tools.seam.ui.SeamUIMessages; + /** * @author eskimo * */ public interface IParameter { - public static String SEAM_PROJECT_NAME = "seam.project.name"; - public static String SEAM_COMPONENT_NAME = "component.name"; - public static String SEAM_LOCAL_INTERFACE_NAME = "interface.name"; - public static String SEAM_BEAN_NAME = "bean.name"; - public static String SEAM_METHOD_NAME = "method.name"; - public static String SEAM_PAGE_NAME = "page.name"; - public static String SEAM_MASTER_PAGE_NAME = "masterPage.name"; - public static String SEAM_ENTITY_CLASS_NAME = "entity.name"; - public static String SEAM_PROJECT_LOCATION_PATH = "seam.project.location"; - public static String SEAM_PROJECT_WEBCONTENT_PATH = "seam.project.webcontent"; - public static String HIBERNATE_CONFIGURATION_NAME = "hibernate.configuratrion.name"; + public static String SEAM_PROJECT_NAME = "seam.project.name"; //$NON-NLS-1$ + public static String SEAM_COMPONENT_NAME = "component.name"; //$NON-NLS-1$ + public static String SEAM_LOCAL_INTERFACE_NAME = "interface.name"; //$NON-NLS-1$ + public static String SEAM_BEAN_NAME = "bean.name"; //$NON-NLS-1$ + public static String SEAM_METHOD_NAME = "method.name"; //$NON-NLS-1$ + public static String SEAM_PAGE_NAME = "page.name"; //$NON-NLS-1$ + public static String SEAM_MASTER_PAGE_NAME = "masterPage.name"; //$NON-NLS-1$ + public static String SEAM_ENTITY_CLASS_NAME = "entity.name"; //$NON-NLS-1$ + public static String SEAM_PROJECT_LOCATION_PATH = "seam.project.location"; //$NON-NLS-1$ + public static String SEAM_PROJECT_WEBCONTENT_PATH = "seam.project.webcontent"; //$NON-NLS-1$ + public static String HIBERNATE_CONFIGURATION_NAME = "hibernate.configuratrion.name"; //$NON-NLS-1$ - public static String SEAM_EAR_PROJECT_LOCATION_PATH = "seam.ear.project.location"; - public static String SEAM_TEST_PROJECT_LOCATION_PATH = "seam.test.project.location"; - public static String SEAM_EJB_PROJECT_LOCATION_PATH = "seam.ejb.project.location"; + public static String SEAM_EAR_PROJECT_LOCATION_PATH = "seam.ear.project.location"; //$NON-NLS-1$ + public static String SEAM_TEST_PROJECT_LOCATION_PATH = "seam.test.project.location"; //$NON-NLS-1$ + public static String SEAM_EJB_PROJECT_LOCATION_PATH = "seam.ejb.project.location"; //$NON-NLS-1$ } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -18,6 +18,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.INewWizard; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; +import org.jboss.tools.seam.ui.SeamUIMessages; /** * @@ -31,8 +32,8 @@ */ public SeamActionWizard() { super(CREATE_SEAM_ACTION); - setWindowTitle("New Seam Action"); - setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamActionWizard.class, "SeamFormWizBan.png")); + setWindowTitle(SeamUIMessages.SEAM_ACTION_WIZARD_NEW_SEAM_ACTION); + setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamActionWizard.class, "SeamFormWizBan.png")); //$NON-NLS-1$ addPage(new SeamActionWizardPage1()); } @@ -48,12 +49,12 @@ * @param label */ public SeamActionCreateOperation() { - super(("Action creating operation")); + super((SeamUIMessages.SEAM_ACTION_WIZARD_ACTION_CREATING_OPERATION)); } @Override public List<String[]> getFileMappings(Map<String, Object> vars) { - if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) + if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) //$NON-NLS-1$ return ACTION_WAR_MAPPING; else return ACTION_EAR_MAPPING; @@ -66,31 +67,31 @@ static { // initialize war files mapping ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ActionJavaBean.java", - "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ActionJavaBean.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/ActionTest.java", - "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/ActionTest.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", - "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/action.xhtml", - "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/action.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // initialize ear files mapping ACTION_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ActionBean.java", - "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ActionBean.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Action.java", - "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Action.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/ActionTest.java", - "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/ActionTest.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", - "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_EAR_MAPPING.add(ACTION_WAR_MAPPING.get(3)); } }; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -12,6 +12,7 @@ import java.beans.PropertyChangeEvent; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; /** @@ -26,9 +27,9 @@ * @param titleImage */ public SeamActionWizardPage1() { - super("seam.new.action.page1", "Seam Action", null); - setMessage("Select the name of the new Seam Conversation. A new Java interface and SLSB " + - "with key Seam/EJB annotations will be created."); + super("seam.new.action.page1", SeamUIMessages.SEAM_ACTION_WIZARD_PAGE1_SEAM_ACTION, null); //$NON-NLS-1$ + setMessage(SeamUIMessages.SEAM_ACTION_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_SEAM_CONVERSATION + + SeamUIMessages.SEAM_ACTION_WIZARD_PAGE1_WITH_KEY_SEAM_EJB_ANNOTATIONS_WILL_BE_CREATED); } protected void createEditors() { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -40,6 +40,7 @@ import org.jboss.tools.seam.internal.core.project.facet.AntCopyUtils; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; import org.jboss.tools.seam.internal.core.project.facet.SeamFacetFilterSetFactory; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.widget.editor.INamedElement; import org.osgi.service.prefs.BackingStoreException; @@ -73,7 +74,7 @@ try { for (String key : seamFacetPrefs.keys()) { - vars.put(key, seamFacetPrefs.get(key, "")); + vars.put(key, seamFacetPrefs.get(key, "")); //$NON-NLS-1$ } for (Object valueHolder : params.values()) { @@ -88,15 +89,15 @@ String testFolder = vars.get(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME).toString(); IVirtualComponent com = ComponentCore.createComponent(project); - IVirtualFolder webRootFolder = com.getRootFolder().getFolder(new Path("/")); + IVirtualFolder webRootFolder = com.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$ IContainer webRootContainer = webRootFolder.getUnderlyingFolder(); vars.put(ISeamFacetDataModelProperties.SEAM_PROJECT_INSTANCE,project); vars.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, SeamRuntimeManager.getInstance().getRuntimeForProject(project).getHomeDir()); vars.put(IParameter.SEAM_PROJECT_LOCATION_PATH,project.getLocation().toFile().toString()); vars.put(IParameter.SEAM_PROJECT_WEBCONTENT_PATH,webRootContainer.getLocation().toFile().toString()); - vars.put(IParameter.SEAM_EJB_PROJECT_LOCATION_PATH,project.getLocation().removeLastSegments(1).append(project.getName()+"-ejb").toFile().toString()); - vars.put(IParameter.SEAM_TEST_PROJECT_LOCATION_PATH,project.getLocation().removeLastSegments(1).append(project.getName()+"-test").toFile().toString()); + vars.put(IParameter.SEAM_EJB_PROJECT_LOCATION_PATH,project.getLocation().removeLastSegments(1).append(project.getName()+"-ejb").toFile().toString()); //$NON-NLS-1$ + vars.put(IParameter.SEAM_TEST_PROJECT_LOCATION_PATH,project.getLocation().removeLastSegments(1).append(project.getName()+"-test").toFile().toString()); //$NON-NLS-1$ vars.put(ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH, actionFolder.replace('.','/')); vars.put(ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME, actionFolder); vars.put(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH, testFolder.replace('.','/')); @@ -132,14 +133,14 @@ for (String[] filter : fileMapping) { String source = filter[0]; for (Object property : vars.keySet()){ - if(source.contains("${"+property.toString()+"}")) { - source = source.replace("${"+property.toString()+"}",vars.get(property.toString()).toString()); + if(source.contains("${"+property.toString()+"}")) { //$NON-NLS-1$ //$NON-NLS-2$ + source = source.replace("${"+property.toString()+"}",vars.get(property.toString()).toString()); //$NON-NLS-1$ //$NON-NLS-2$ } } String dest = filter[1]; for (Object property : vars.keySet()){ - if(dest.contains("${"+property.toString()+"}")) { - dest = dest.replace("${"+property.toString()+"}",vars.get(property.toString()).toString()); + if(dest.contains("${"+property.toString()+"}")) { //$NON-NLS-1$ //$NON-NLS-2$ + dest = dest.replace("${"+property.toString()+"}",vars.get(property.toString()).toString()); //$NON-NLS-1$ //$NON-NLS-2$ } } result.add(new String[]{source,dest}); @@ -191,7 +192,7 @@ } public File getSeamFolder(Map<String, Object> vars) { - return new File(vars.get(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME).toString(),"seam-gen"); + return new File(vars.get(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME).toString(),"seam-gen"); //$NON-NLS-1$ } protected void loadCustomVariables(Map<String, Object> vars) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -27,6 +27,7 @@ import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.seam.core.SeamCorePlugin; +import org.jboss.tools.seam.ui.SeamUIMessages; /** * @author eskimo @@ -85,7 +86,7 @@ */ public IUndoableOperation getOperation() { if(operation!=null) return operation; - throw new IllegalStateException("Operation is not defined for wizard"); + throw new IllegalStateException(SeamUIMessages.SEAM_BASE_WIZARD_OPERATION_IS_NOT_DEFINED_FOR_WIZARD); } /** Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -34,6 +34,7 @@ import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.internal.project.facet.IValidator; import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory; import org.jboss.tools.seam.ui.widget.editor.CompositeEditor; @@ -80,7 +81,7 @@ public void createControl(Composite parent) { setControl(new GridLayoutComposite(parent)); - if (!"".equals(editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue())){ + if (!"".equals(editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue())){ //$NON-NLS-1$ Map errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate( getEditor(IParameter.SEAM_PROJECT_NAME).getValue(), null); @@ -90,7 +91,7 @@ } else if(isWar()) { getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(false); LabelFieldEditor label = (LabelFieldEditor)((CompositeEditor)getEditor(IParameter.SEAM_LOCAL_INTERFACE_NAME)).getEditors().get(0); - label.getLabelControl().setText("POJO class name:"); + label.getLabelControl().setText(SeamUIMessages.SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME); } else { getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(true); } @@ -201,18 +202,18 @@ IResource project = getSelectedProject(); - String type = SeamCorePlugin.getSeamPreferences(project.getProject()).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,"war"); + String type = SeamCorePlugin.getSeamPreferences(project.getProject()).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,"war"); //$NON-NLS-1$ getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(!isWar()); LabelFieldEditor label = (LabelFieldEditor)((CompositeEditor)getEditor(IParameter.SEAM_LOCAL_INTERFACE_NAME)).getEditors().get(0); - label.getLabelControl().setText(isWar()?"POJO class name:": "Local interface:"); + label.getLabelControl().setText(isWar()?SeamUIMessages.SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME: SeamUIMessages.SEAM_BASE_WIZARD_PAGE_LOCAL_CLASS_NAME); errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate( editorRegistry.get(IParameter.SEAM_COMPONENT_NAME).getValue(), null); if(errors.size()>0) { - setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),"Seam component")); + setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),SeamUIMessages.SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS)); setPageComplete(false); return; } @@ -221,7 +222,7 @@ editorRegistry.get(IParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), null); if(errors.size()>0) { - setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),"Local interface")); + setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),SeamUIMessages.SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE)); setPageComplete(false); return; } @@ -231,7 +232,7 @@ editorRegistry.get(IParameter.SEAM_BEAN_NAME).getValue(), null); if(errors.size()>0) { - setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),"Bean")); + setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),"Bean")); //$NON-NLS-1$ setPageComplete(false); return; } @@ -240,7 +241,7 @@ } errors = ValidatorFactory.SEAM_METHOD_NAME_VALIDATOR.validate( - editorRegistry.get(IParameter.SEAM_METHOD_NAME).getValue(), new Object[]{"Method",project}); + editorRegistry.get(IParameter.SEAM_METHOD_NAME).getValue(), new Object[]{"Method",project}); //$NON-NLS-1$ if(errors.size()>0) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString()); @@ -249,7 +250,7 @@ } errors = ValidatorFactory.FILE_NAME_VALIDATOR.validate( - editorRegistry.get(IParameter.SEAM_PAGE_NAME).getValue(), (Object)new Object[]{"Page",project}); + editorRegistry.get(IParameter.SEAM_PAGE_NAME).getValue(), (Object)new Object[]{"Page",project}); //$NON-NLS-1$ if(errors.size()>0) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString()); @@ -258,7 +259,7 @@ } errors = ValidatorFactory.SEAM_JAVA_INTEFACE_NAME_CONVENTION_VALIDATOR.validate( - editorRegistry.get(IParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), new Object[]{"Local interface",project}); + editorRegistry.get(IParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), new Object[]{SeamUIMessages.SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE,project}); if(errors.size()>0) { setErrorMessage(null); @@ -278,16 +279,16 @@ protected void doFillDefaults(PropertyChangeEvent event) { if(event.getPropertyName().equals(IParameter.SEAM_COMPONENT_NAME) || event.getPropertyName().equals(IParameter.SEAM_PROJECT_NAME)) { String value = getEditor(IParameter.SEAM_COMPONENT_NAME).getValueAsString(); - if(value==null||"".equals(value)) { - setDefaultValue(IParameter.SEAM_COMPONENT_NAME, ""); - setDefaultValue(IParameter.SEAM_LOCAL_INTERFACE_NAME, ""); - setDefaultValue(IParameter.SEAM_BEAN_NAME, ""); - setDefaultValue(IParameter.SEAM_METHOD_NAME, ""); - setDefaultValue(IParameter.SEAM_PAGE_NAME, ""); + if(value==null||"".equals(value)) { //$NON-NLS-1$ + setDefaultValue(IParameter.SEAM_COMPONENT_NAME, ""); //$NON-NLS-1$ + setDefaultValue(IParameter.SEAM_LOCAL_INTERFACE_NAME, ""); //$NON-NLS-1$ + setDefaultValue(IParameter.SEAM_BEAN_NAME, ""); //$NON-NLS-1$ + setDefaultValue(IParameter.SEAM_METHOD_NAME, ""); //$NON-NLS-1$ + setDefaultValue(IParameter.SEAM_PAGE_NAME, ""); //$NON-NLS-1$ } else { String valueU = value.substring(0,1).toUpperCase() + value.substring(1); setDefaultValue(IParameter.SEAM_LOCAL_INTERFACE_NAME, valueU); - setDefaultValue(IParameter.SEAM_BEAN_NAME, valueU+"Bean"); + setDefaultValue(IParameter.SEAM_BEAN_NAME, valueU+"Bean"); //$NON-NLS-1$ String valueL = value.substring(0,1).toLowerCase() + value.substring(1); setDefaultValue(IParameter.SEAM_METHOD_NAME, valueL); setDefaultValue(IParameter.SEAM_PAGE_NAME, valueL); @@ -307,6 +308,6 @@ public boolean isWar() { if(getSelectedProject()==null || SeamCorePlugin.getSeamPreferences(getSelectedProject().getProject())==null) return true; - return "war".equals(SeamCorePlugin.getSeamPreferences(getSelectedProject().getProject()).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,"war")); + return "war".equals(SeamCorePlugin.getSeamPreferences(getSelectedProject().getProject()).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,"war")); //$NON-NLS-1$ //$NON-NLS-2$ } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -23,13 +23,14 @@ import org.eclipse.core.runtime.Status; import org.eclipse.ui.INewWizard; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.wizard.SeamEntityWizard.SeamEntityCreateOperation; public class SeamConversationWizard extends SeamBaseWizard implements INewWizard { public SeamConversationWizard() { super(CREATE_SEAM_CONVERSATION); - setWindowTitle("reate New Conversation"); + setWindowTitle(SeamUIMessages.SEAM_CONVERSATION_WIZARD_CREATE_NEW_CONVERSATION); addPage(new SeamConversationWizardPage1()); } @@ -44,12 +45,12 @@ * @param label */ public SeamConversationCreateOperation() { - super(("Entity creating operation")); + super((SeamUIMessages.SEAM_CONVERSATION_WIZARD_ENTITY_CREATING_OPERATION)); } @Override public List<String[]> getFileMappings(Map<String, Object> vars) { - if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) + if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) //$NON-NLS-1$ return ACTION_WAR_MAPPING; else return ACTION_EAR_MAPPING; @@ -62,22 +63,22 @@ static { // initialize war files mapping ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ConversationBean.java", - "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ConversationBean.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Conversation.java", - "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Conversation.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/conversation.xhtml", - "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/conversation.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // initialize ear files mapping ACTION_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ConversationBean.java", - "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ConversationBean.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Conversation.java", - "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Conversation.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_EAR_MAPPING.add(ACTION_WAR_MAPPING.get(2)); } }; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -15,6 +15,7 @@ import java.util.Map; import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.internal.project.facet.IValidator; import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory; import org.jboss.tools.seam.ui.widget.editor.CompositeEditor; @@ -28,9 +29,9 @@ public class SeamConversationWizardPage1 extends SeamBaseWizardPage { public SeamConversationWizardPage1() { - super("seam.new.conversation.page1","Seam Conversation",null); - setMessage("Select the name of the new Seam Conversation. A set of classes " + - "managing a coversation will be created."); + super("seam.new.conversation.page1",SeamUIMessages.SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION,null); //$NON-NLS-1$ + setMessage(SeamUIMessages.SEAM_CONVERSATION_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_NEW_SEAM_CONVERSATION + + SeamUIMessages.SEAM_CONVERSATION_WIZARD_PAGE1_MANAGING_A_CONVERSATION_WILL_BE_CREATED); } /** @@ -39,7 +40,7 @@ public void createControl(Composite parent) { setControl(new GridLayoutComposite(parent)); - if (!"".equals(editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue())){ + if (!"".equals(editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue())){ //$NON-NLS-1$ Map errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate( getEditor(IParameter.SEAM_PROJECT_NAME).getValue(), null); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -23,6 +23,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.ui.INewWizard; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.widget.editor.INamedElement; /** @@ -36,7 +37,7 @@ */ public SeamEntityWizard() { super(CREATE_SEAM_ENTITY); - setWindowTitle("New Seam Entity"); + setWindowTitle(SeamUIMessages.SEAM_ENTITY_WIZARD_NEW_SEAM_ENTITY); addPage(new SeamEntityWizardPage1()); } @@ -60,12 +61,12 @@ * @param label */ public SeamEntityCreateOperation() { - super(("Entity creating operation")); + super((SeamUIMessages.SEAM_ENTITY_WIZARD_ENTITY_CREATING_OPERATION)); } @Override public List<String[]> getFileMappings(Map<String, Object> vars) { - if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) + if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) //$NON-NLS-1$ return ACTION_WAR_MAPPING; else return ACTION_EAR_MAPPING; @@ -78,32 +79,32 @@ static { // initialize war files mapping ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Entity.java", - "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/model/${" + ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Entity.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/model/${" + ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityHome.java", - "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}Home.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityHome.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}Home.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityList.java", - "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}List.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityList.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}List.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/edit.xhtml", - "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/edit.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ACTION_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/list.xhtml", - "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_MASTER_PAGE_NAME +"}.xhtml"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/list.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_MASTER_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ACTION_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Entity.java", - "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Entity.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityHome.java", - "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}Home.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityHome.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}Home.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityList.java", - "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}List.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityList.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}List.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ACTION_EAR_MAPPING.add(ACTION_WAR_MAPPING.get(3)); ACTION_EAR_MAPPING.add(ACTION_WAR_MAPPING.get(4)); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Composite; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.internal.project.facet.IValidator; import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory; import org.jboss.tools.seam.ui.widget.editor.CompositeEditor; @@ -36,9 +37,9 @@ * */ public SeamEntityWizardPage1() { - super("seam.new.entity.page1","Seam Entity", null); - setMessage("Select the name of the new Seam Entity. A new Seam Entity Bean with key Seam/EJB3 " + - "annotations and wxample attributes will be created."); + super("seam.new.entity.page1",SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_SEAM_ENTITY, null); //$NON-NLS-1$ + setMessage(SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_SELECT_THE_NAME_OF_NEW_SEAM_ENTITY + + SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_ANNOTATIONS_AND_EXAMPLES_ATTRIBUTES_WILL_BE_CREATED); } /** @@ -58,16 +59,16 @@ public void doFillDefaults(PropertyChangeEvent event) { if(event.getPropertyName().equals(IParameter.SEAM_ENTITY_CLASS_NAME)) { - if(event.getNewValue()==null||"".equals(event.getNewValue().toString().trim())) { - setDefaultValue(IParameter.SEAM_COMPONENT_NAME, ""); - setDefaultValue(IParameter.SEAM_LOCAL_INTERFACE_NAME, ""); - setDefaultValue(IParameter.SEAM_METHOD_NAME, ""); - setDefaultValue(IParameter.SEAM_PAGE_NAME, ""); + if(event.getNewValue()==null||"".equals(event.getNewValue().toString().trim())) { //$NON-NLS-1$ + setDefaultValue(IParameter.SEAM_COMPONENT_NAME, ""); //$NON-NLS-1$ + setDefaultValue(IParameter.SEAM_LOCAL_INTERFACE_NAME, ""); //$NON-NLS-1$ + setDefaultValue(IParameter.SEAM_METHOD_NAME, ""); //$NON-NLS-1$ + setDefaultValue(IParameter.SEAM_PAGE_NAME, ""); //$NON-NLS-1$ } else { String value = event.getNewValue().toString(); String valueU = value.substring(0,1).toUpperCase() + value.substring(1); String valueL = value.substring(0,1).toLowerCase() + value.substring(1); - setDefaultValue(IParameter.SEAM_MASTER_PAGE_NAME, valueL+"List"); + setDefaultValue(IParameter.SEAM_MASTER_PAGE_NAME, valueL+SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_LIST); setDefaultValue(IParameter.SEAM_PAGE_NAME, valueL); } } @@ -90,13 +91,13 @@ editorRegistry.get(IParameter.SEAM_ENTITY_CLASS_NAME).getValue(), null); if(errors.size()>0) { - setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),"Entity class name")); + setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_ENTITY_CLASS_NAME)); setPageComplete(false); return; } errors = ValidatorFactory.FILE_NAME_VALIDATOR.validate( - editorRegistry.get(IParameter.SEAM_MASTER_PAGE_NAME).getValue(), (Object)new Object[]{"Entity master page",project}); + editorRegistry.get(IParameter.SEAM_MASTER_PAGE_NAME).getValue(), (Object)new Object[]{SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE,project}); if(errors.size()>0) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString()); @@ -105,7 +106,7 @@ } errors = ValidatorFactory.FILE_NAME_VALIDATOR.validate( - editorRegistry.get(IParameter.SEAM_PAGE_NAME).getValue(), (Object)new Object[]{"Page",project}); + editorRegistry.get(IParameter.SEAM_PAGE_NAME).getValue(), (Object)new Object[]{SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_PAGE,project}); if(errors.size()>0) { setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString()); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -24,6 +24,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.INewWizard; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; +import org.jboss.tools.seam.ui.SeamUIMessages; /** * @@ -37,8 +38,8 @@ */ public SeamFormWizard() { super(CREATE_SEAM_FORM); - setWindowTitle("New Seam Form"); - setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamActionWizard.class, "SeamFormWizBan.png")); + setWindowTitle(SeamUIMessages.SEAM_FORM_WIZARD_NEW_SEAM_FORM); + setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamActionWizard.class, "SeamFormWizBan.png")); //$NON-NLS-1$ addPage(new SeamFormWizardPage1()); } @@ -47,23 +48,23 @@ public static class SeamFormCreateOperation extends SeamBaseOperation { public SeamFormCreateOperation() { - super("Form creating operation"); + super(SeamUIMessages.SEAM_FORM_WIZARD_FORM_CREATING_OPERATION); } public File getBeanFile(Map<String, Object> vars) { - return new File(getSeamFolder(vars),"src/FormActionJavaBean.java"); + return new File(getSeamFolder(vars),"src/FormActionJavaBean.java"); //$NON-NLS-1$ } public File getTestClassFile(Map<String, Object> vars) { - return new File(getSeamFolder(vars),"test/FormTest.java"); + return new File(getSeamFolder(vars),"test/FormTest.java"); //$NON-NLS-1$ } public File getTestngXmlFile(Map<String, Object> vars) { - return new File(getSeamFolder(vars),"test/testng.xml"); + return new File(getSeamFolder(vars),"test/testng.xml"); //$NON-NLS-1$ } public File getPageXhtml(Map<String, Object> vars) { - return new File(getSeamFolder(vars),"view/form.xhtml"); + return new File(getSeamFolder(vars),"view/form.xhtml"); //$NON-NLS-1$ } /* (non-Javadoc) @@ -71,7 +72,7 @@ */ @Override public List<String[]> getFileMappings(Map<String, Object> vars) { - if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) + if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) //$NON-NLS-1$ return FORM_WAR_MAPPING; else return FORM_EAR_MAPPING; @@ -83,31 +84,31 @@ static { FORM_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/FormActionJavaBean.java", - "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/FormActionJavaBean.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ FORM_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/FormTest.java", - "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/FormTest.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ FORM_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", - "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ FORM_WAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/form.xhtml", - "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/form.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // initialize ear files mapping FORM_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/FormActionBean.java", - "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/FormActionBean.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ FORM_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/FormAction.java", - "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/FormAction.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH + "}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ FORM_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/FormTest.java", - "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/FormTest.java", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ FORM_EAR_MAPPING.add(new String[]{ - "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", - "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); + "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", //$NON-NLS-1$ //$NON-NLS-2$ + "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ FORM_EAR_MAPPING.add(FORM_WAR_MAPPING.get(3)); } }; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -12,6 +12,7 @@ import java.beans.PropertyChangeEvent; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; @@ -25,9 +26,9 @@ * @param pageName */ public SeamFormWizardPage1() { - super("seam.new.form.page1","Seam Form",null); - setMessage("Select the name of the new Seam Form. A new Seam Form with a single input field and related " + - "Java Interface, SLSB and key Seam/EJB3 annotations will be created."); + super("seam.new.form.page1",SeamUIMessages.SEAM_FORM_WIZARD_PAGE1_SEAM_FORM,null); //$NON-NLS-1$ + setMessage(SeamUIMessages.SEAM_FORM_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_NEW_SEAM_FORM + + SeamUIMessages.SEAM_FORM_WIZARD_PAGE1_JAVA_INTERFACE_SLSB_AND_KEY_SEAMEJB3_ANNOTATIONS_WILL_BE_CREATED); } protected void createEditors() { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -52,7 +52,7 @@ addPage(new SeamGenerateEnitiesWizardPage()); } - public static final IUndoableOperation GENERATE_SEAM_ENTITIES = new SeamBaseOperation("Action creating operation") { + public static final IUndoableOperation GENERATE_SEAM_ENTITIES = new SeamBaseOperation(SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_ACTION_CREATING_OPERATION) { @Override public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { @@ -63,10 +63,10 @@ try { ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType launchConfigurationType = - launchManager.getLaunchConfigurationType("org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"); + launchManager.getLaunchConfigurationType("org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"); //$NON-NLS-1$ // we put null in location to avoid it being inside the project by default since the launch config currenlty will be machine independent with respect to the paths. ILaunchConfigurationWorkingCopy wc = - launchConfigurationType.newInstance(null, project.getName() + "-generate-entities"); + launchConfigurationType.newInstance(null, project.getName() + "-generate-entities"); //$NON-NLS-1$ //Main @@ -78,9 +78,9 @@ wc.setAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR, seamProjectsSet.getBeansFolder()==null? - "":seamProjectsSet.getBeansFolder().getFullPath().toString()); + "":seamProjectsSet.getBeansFolder().getFullPath().toString()); //$NON-NLS-1$ - boolean isReverseEngineer = "true".equals(params.get(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER)); + boolean isReverseEngineer = "true".equals(params.get(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER)); //$NON-NLS-1$ wc.setAttribute(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER, isReverseEngineer); if(isReverseEngineer) { @@ -97,7 +97,7 @@ seamRt = getRuntime(project); } if(seamRt == null) { - throw new CoreException(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, "Can't find seam runtime for project " + project.getName())); + throw new CoreException(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME + project.getName())); } String seamTemplatesRoot = seamRt.getTemplatesDir(); @@ -111,37 +111,37 @@ // TODO Add others exporters List<String> exporters = new ArrayList<String>(); - exporters.add("hbmtemplate0"); - exporters.add("hbmtemplate1"); - exporters.add("hbmtemplate2"); - exporters.add("hbmtemplate3"); - exporters.add("hbmtemplate4"); - exporters.add("hbmtemplate5"); - exporters.add("hbmtemplate6"); - exporters.add("hbmtemplate7"); - exporters.add("hbmtemplate8"); - exporters.add("hbmtemplate9"); + exporters.add("hbmtemplate0"); //$NON-NLS-1$ + exporters.add("hbmtemplate1"); //$NON-NLS-1$ + exporters.add("hbmtemplate2"); //$NON-NLS-1$ + exporters.add("hbmtemplate3"); //$NON-NLS-1$ + exporters.add("hbmtemplate4"); //$NON-NLS-1$ + exporters.add("hbmtemplate5"); //$NON-NLS-1$ + exporters.add("hbmtemplate6"); //$NON-NLS-1$ + exporters.add("hbmtemplate7"); //$NON-NLS-1$ + exporters.add("hbmtemplate8"); //$NON-NLS-1$ + exporters.add("hbmtemplate9"); //$NON-NLS-1$ wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS, exporters); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate0", true); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate0.extension_id", "org.hibernate.tools.hbm2java"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate1", true); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate1.extension_id", "org.hibernate.tools.hbmtemplate"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate2", true); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate2.extension_id", "org.hibernate.tools.hbmtemplate"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate3", true); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate3.extension_id", "org.hibernate.tools.hbmtemplate"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate4", true); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate4.extension_id", "org.hibernate.tools.hbmtemplate"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate5", true); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate5.extension_id", "org.hibernate.tools.hbmtemplate"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate6", true); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate6.extension_id", "org.hibernate.tools.hbmtemplate"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate7", true); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate7.extension_id", "org.hibernate.tools.hbmtemplate"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate8", true); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate8.extension_id", "org.hibernate.tools.hbmtemplate"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate9", true); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate9.extension_id", "org.hibernate.tools.hbmtemplate"); + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate0", true); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate0.extension_id", "org.hibernate.tools.hbm2java"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate1", true); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate1.extension_id", "org.hibernate.tools.hbmtemplate"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate2", true); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate2.extension_id", "org.hibernate.tools.hbmtemplate"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate3", true); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate3.extension_id", "org.hibernate.tools.hbmtemplate"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate4", true); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate4.extension_id", "org.hibernate.tools.hbmtemplate"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate5", true); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate5.extension_id", "org.hibernate.tools.hbmtemplate"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate6", true); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate6.extension_id", "org.hibernate.tools.hbmtemplate"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate7", true); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate7.extension_id", "org.hibernate.tools.hbmtemplate"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate8", true); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate8.extension_id", "org.hibernate.tools.hbmtemplate"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate9", true); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate9.extension_id", "org.hibernate.tools.hbmtemplate"); //$NON-NLS-1$ //$NON-NLS-2$ Map<String, String> hbmtemplateAttributes = new HashMap<String, String>(); @@ -150,12 +150,12 @@ // destdir="${project.home}/view" // foreach="entity"/> - hbmtemplateAttributes.put("file_pattern", "{class-name}List.xhtml"); - hbmtemplateAttributes.put("template_name", "view/list.xhtml.ftl"); - hbmtemplateAttributes.put("outputdir", seamProjectsSet.getViewsFolder().getFullPath().toString()); - hbmtemplateAttributes.put("for_each", "entity"); - hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate1.properties", hbmtemplateAttributes); + hbmtemplateAttributes.put("file_pattern", "{class-name}List.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("template_name", "view/list.xhtml.ftl"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("outputdir", seamProjectsSet.getViewsFolder().getFullPath().toString()); //$NON-NLS-1$ + hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("hibernatetool.util.toolclass",SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_54); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate1.properties", hbmtemplateAttributes); //$NON-NLS-1$ // <hbmtemplate filepattern="{class-name}.xhtml" // template="view/view.xhtml.ftl" @@ -163,12 +163,12 @@ // foreach="entity"/> hbmtemplateAttributes = new HashMap<String, String>(); - hbmtemplateAttributes.put("file_pattern", "{class-name}.xhtml"); - hbmtemplateAttributes.put("template_name", "view/view.xhtml.ftl"); - hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()); - hbmtemplateAttributes.put("for_each", "entity"); - hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate2.properties", hbmtemplateAttributes); + hbmtemplateAttributes.put("file_pattern", "{class-name}.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("template_name", "view/view.xhtml.ftl"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()); //$NON-NLS-1$ + hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate2.properties", hbmtemplateAttributes); //$NON-NLS-1$ // <hbmtemplate filepattern="{class-name}.page.xml" // template="view/view.page.xml.ftl" @@ -176,12 +176,12 @@ // foreach="entity"/> hbmtemplateAttributes = new HashMap<String, String>(); - hbmtemplateAttributes.put("file_pattern", "{class-name}.page.xml"); - hbmtemplateAttributes.put("template_name", "view/view.page.xml.ftl"); - hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()); - hbmtemplateAttributes.put("for_each", "entity"); - hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate3.properties", hbmtemplateAttributes); + hbmtemplateAttributes.put("file_pattern", "{class-name}.page.xml"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("template_name", "view/view.page.xml.ftl"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()); //$NON-NLS-1$ + hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate3.properties", hbmtemplateAttributes); //$NON-NLS-1$ // <hbmtemplate filepattern="{class-name}Edit.xhtml" // template="view/edit.xhtml.ftl" @@ -189,12 +189,12 @@ // foreach="entity"/> hbmtemplateAttributes = new HashMap<String, String>(); - hbmtemplateAttributes.put("file_pattern", "{class-name}Edit.xhtml"); - hbmtemplateAttributes.put("template_name", "view/edit.xhtml.ftl"); - hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()); - hbmtemplateAttributes.put("for_each", "entity"); - hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate4.properties", hbmtemplateAttributes); + hbmtemplateAttributes.put("file_pattern", "{class-name}Edit.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("template_name", "view/edit.xhtml.ftl"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()); //$NON-NLS-1$ + hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate4.properties", hbmtemplateAttributes); //$NON-NLS-1$ // <hbmtemplate filepattern="{class-name}Edit.page.xml" // template="view/edit.page.xml.ftl" @@ -203,12 +203,12 @@ hbmtemplateAttributes = new HashMap<String, String>(); - hbmtemplateAttributes.put("file_pattern", "{class-name}Edit.page.xml"); - hbmtemplateAttributes.put("template_name", "view/edit.page.xml.ftl"); - hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()); - hbmtemplateAttributes.put("for_each", "entity"); - hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate5.properties", hbmtemplateAttributes); + hbmtemplateAttributes.put("file_pattern", "{class-name}Edit.page.xml"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("template_name", "view/edit.page.xml.ftl"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()); //$NON-NLS-1$ + hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate5.properties", hbmtemplateAttributes); //$NON-NLS-1$ // <hbmtemplate filepattern="{package-name}/{class-name}List.java" // template="src/EntityList.java.ftl" @@ -216,12 +216,12 @@ // foreach="entity"/> hbmtemplateAttributes = new HashMap<String, String>(); - hbmtemplateAttributes.put("file_pattern", "{package-name}/{class-name}List.java"); - hbmtemplateAttributes.put("template_name", "src/EntityList.java.ftl"); - hbmtemplateAttributes.put("outputdir",seamProjectsSet.getBeansFolder().getFullPath().toString()); - hbmtemplateAttributes.put("for_each", "entity"); - hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate6.properties", hbmtemplateAttributes); + hbmtemplateAttributes.put("file_pattern", "{package-name}/{class-name}List.java"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("template_name", "src/EntityList.java.ftl"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("outputdir",seamProjectsSet.getBeansFolder().getFullPath().toString()); //$NON-NLS-1$ + hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate6.properties", hbmtemplateAttributes); //$NON-NLS-1$ // <hbmtemplate filepattern="{class-name}List.page.xml" // template="view/list.page.xml.ftl" @@ -230,12 +230,12 @@ hbmtemplateAttributes = new HashMap<String, String>(); - hbmtemplateAttributes.put("file_pattern", "{class-name}List.page.xml"); - hbmtemplateAttributes.put("template_name", "view/list.page.xml.ftl"); - hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()); - hbmtemplateAttributes.put("for_each", "entity"); - hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate7.properties", hbmtemplateAttributes); + hbmtemplateAttributes.put("file_pattern", "{class-name}List.page.xml"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("template_name", "view/list.page.xml.ftl"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()); //$NON-NLS-1$ + hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate7.properties", hbmtemplateAttributes); //$NON-NLS-1$ // <hbmtemplate filepattern="{package-name}/{class-name}Home.java" // template="src/EntityHome.java.ftl" @@ -243,12 +243,12 @@ // foreach="entity"/> hbmtemplateAttributes = new HashMap<String, String>(); - hbmtemplateAttributes.put("file_pattern", "{package-name}/{class-name}Home.java"); - hbmtemplateAttributes.put("template_name", "src/EntityHome.java.ftl"); - hbmtemplateAttributes.put("outputdir",seamProjectsSet.getBeansFolder().getFullPath().toString()); - hbmtemplateAttributes.put("for_each", "entity"); - hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate8.properties", hbmtemplateAttributes); + hbmtemplateAttributes.put("file_pattern", "{package-name}/{class-name}Home.java"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("template_name", "src/EntityHome.java.ftl"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("outputdir",seamProjectsSet.getBeansFolder().getFullPath().toString()); //$NON-NLS-1$ + hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate8.properties", hbmtemplateAttributes); //$NON-NLS-1$ // <hbmtemplate filepattern="menu.xhtml" // template="view/layout/menu.xhtml.ftl" @@ -256,23 +256,23 @@ // foreach="entity"/> hbmtemplateAttributes = new HashMap<String, String>(); - hbmtemplateAttributes.put("file_pattern", "menu.xhtml"); - hbmtemplateAttributes.put("template_name", "view/layout/menu.xhtml.ftl"); - hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()+"/layout"); - hbmtemplateAttributes.put("for_each", "entity"); - hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate9.properties", hbmtemplateAttributes); + hbmtemplateAttributes.put("file_pattern", "menu.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("template_name", "view/layout/menu.xhtml.ftl"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("outputdir",seamProjectsSet.getViewsFolder().getFullPath().toString()+"/layout"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("for_each", "entity"); //$NON-NLS-1$ //$NON-NLS-2$ + hbmtemplateAttributes.put("hibernatetool.util.toolclass","org.hibernate.eclipse.launch.SeamUtil"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate9.properties", hbmtemplateAttributes); //$NON-NLS-1$ wc.doSave(); launchManager.addLaunch(wc.launch(ILaunchManager.RUN_MODE, monitor)); } catch (CoreException e) { - SeamCorePlugin.getDefault().showError("Can't generate seam entities", e); + SeamCorePlugin.getDefault().showError(SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_GENERATE_SEAM_ENTITIES, e); } return Status.OK_STATUS; } @Override public List<String[]> getFileMappings(Map<String, Object> vars) { - throw new UnsupportedOperationException("This method is not relevant in generating seam entities."); + throw new UnsupportedOperationException(SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_THIS_METHOD_IS_NOT_RELEVANT_IN_GENERATING_SEAM_ENTITIES); } }; @@ -283,9 +283,9 @@ SeamRuntime seamRt = SeamRuntimeManager.getInstance().getDefaultRuntime(); String runtimeName = SeamCorePlugin.getSeamPreferences(project) - .get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,""); + .get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,""); //$NON-NLS-1$ - if(!"".equals(runtimeName)) { + if(!"".equals(runtimeName)) { //$NON-NLS-1$ seamRt = SeamRuntimeManager.getInstance().findRuntimeByName(runtimeName); } return seamRt; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -40,7 +40,7 @@ private RadioField radios; public SeamGenerateEnitiesWizardPage() { - super("seam.generate.entities.page", SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_TITLE, null); + super("seam.generate.entities.page", SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_TITLE, null); //$NON-NLS-1$ setMessage(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_PAGE_MESSAGE); } @@ -89,8 +89,8 @@ Composite radioComposite = new GridLayoutComposite(group, SWT.NONE, 2); ArrayList<Object> values = new ArrayList<Object>(); - values.add("reverse"); - values.add("existing"); + values.add("reverse"); //$NON-NLS-1$ + values.add("existing"); //$NON-NLS-1$ ArrayList<String> labels = new ArrayList<String>(); labels.add(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_REVERSE_ENGINEER_LABEL); labels.add(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_EXISTING_ENTITIES_LABEL); @@ -143,7 +143,7 @@ values.put(projectEditor.getName(), projectEditor.getValueAsString()); values.put(configEditor.getName(), configEditor.getValueAsString()); String mode = radios.getValue().toString(); - values.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER, ("reverse".equals(mode) ? "true" : "false")); + values.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER, ("reverse".equals(mode) ? "true" : "false")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return values; } return null; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectSelectionDialog.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectSelectionDialog.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectSelectionDialog.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -29,6 +29,7 @@ import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.project.facet.SeamFacetPreference; import org.jboss.tools.seam.internal.core.SeamProject; +import org.jboss.tools.seam.ui.SeamUIMessages; /** * @author eskimo @@ -41,8 +42,8 @@ */ public SeamProjectSelectionDialog(Shell parent) { super(parent); - setTitle("Seam Web Projects"); - setMessage("Select Seam Web Project"); + setTitle(SeamUIMessages.SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT); + setMessage(SeamUIMessages.SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT); setLabelProvider(new WorkbenchLabelProvider()); setInput(new Object()); setContentProvider(new IStructuredContentProvider() { @@ -53,7 +54,7 @@ if(project.hasNature(SeamProject.NATURE_ID) && SeamCorePlugin.getSeamPreferences(project)!=null && project.getAdapter(IFacetedProject.class)!=null - && ((IFacetedProject)project.getAdapter(IFacetedProject.class)).hasProjectFacet(ProjectFacetsManager.getProjectFacet("jst.web"))) { + && ((IFacetedProject)project.getAdapter(IFacetedProject.class)).hasProjectFacet(ProjectFacetsManager.getProjectFacet("jst.web"))) { //$NON-NLS-1$ seamProjects.add(project); } } catch (CoreException e) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -24,6 +24,7 @@ import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.common.project.facet.ui.PresetSelectionPanel; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.osgi.framework.Bundle; /** @@ -36,27 +37,27 @@ public SeamProjectWizard() { super(); - setWindowTitle("New Seam Project"); + setWindowTitle(SeamUIMessages.SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT); } public SeamProjectWizard(IDataModel model) { super(model); - setWindowTitle("New Seam Project"); + setWindowTitle(SeamUIMessages.SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT); } @Override protected IWizardPage createFirstPage() { IWizardPage page = super.createFirstPage(); - page.setImageDescriptor(ImageDescriptor.createFromFile(SeamFormWizard.class, "SeamWebProjectWizBan.png")); - page.setTitle("Seam Web Project"); - page.setDescription("Create standalone Seam Web Project"); + page.setImageDescriptor(ImageDescriptor.createFromFile(SeamFormWizard.class, "SeamWebProjectWizBan.png")); //$NON-NLS-1$ + page.setTitle(SeamUIMessages.SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT); + page.setDescription(SeamUIMessages.SEAM_PROJECT_WIZARD_CREATE_STANDALONE_SEAM_WEB_PROJECT); return page; } @Override public void createPageControls(Composite container) { super.createPageControls(container); - Control control = findGroupByText((Composite)getShell(), "EAR Membership"); + Control control = findGroupByText((Composite)getShell(), SeamUIMessages.SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP); control.setVisible(false); } @@ -90,7 +91,7 @@ @Override protected String getFinalPerspectiveID() { // TODO Auto-generated method stub - return "org.jboss.tools.seam.ui.SeamPerspective"; + return "org.jboss.tools.seam.ui.SeamPerspective"; //$NON-NLS-1$ } protected IFacetedProjectTemplate getTemplate() { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizardPage1.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizardPage1.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizardPage1.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.ContainerSelectionDialog; +import org.jboss.tools.seam.ui.SeamUIMessages; /** * The "New" wizard page allows setting the container for the new file as well @@ -50,9 +51,9 @@ * @param pageName */ public SeamProjectWizardPage1(ISelection selection) { - super("wizardPage"); - setTitle("Multi-page Editor File"); - setDescription("This wizard creates a new file with *.mpe extension that can be opened by a multi-page editor."); + super("wizardPage"); //$NON-NLS-1$ + setTitle(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_MULTIPAGE_EDITOR_FILE); + setDescription(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_THIS_WIZARD_CREATES_A_NEW_FILE); this.selection = selection; } @@ -66,7 +67,7 @@ layout.numColumns = 3; layout.verticalSpacing = 9; Label label = new Label(container, SWT.NULL); - label.setText("&Container:"); + label.setText(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_CONTAINER); containerText = new Text(container, SWT.BORDER | SWT.SINGLE); GridData gd = new GridData(GridData.FILL_HORIZONTAL); @@ -78,14 +79,14 @@ }); Button button = new Button(container, SWT.PUSH); - button.setText("Browse..."); + button.setText(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_BROWSE); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { handleBrowse(); } }); label = new Label(container, SWT.NULL); - label.setText("&File name:"); + label.setText(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_FILE_NAME); fileText = new Text(container, SWT.BORDER | SWT.SINGLE); gd = new GridData(GridData.FILL_HORIZONTAL); @@ -120,7 +121,7 @@ containerText.setText(container.getFullPath().toString()); } } - fileText.setText("new_file.mpe"); + fileText.setText("new_file.mpe"); //$NON-NLS-1$ } /** @@ -131,7 +132,7 @@ private void handleBrowse() { ContainerSelectionDialog dialog = new ContainerSelectionDialog( getShell(), ResourcesPlugin.getWorkspace().getRoot(), false, - "Select new file container"); + SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_SELECT_NEW_FILE_CONTAINER); if (dialog.open() == ContainerSelectionDialog.OK) { Object[] result = dialog.getResult(); if (result.length == 1) { @@ -150,31 +151,31 @@ String fileName = getFileName(); if (getContainerName().length() == 0) { - updateStatus("File container must be specified"); + updateStatus(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_FILE_CONTAINER_MUST_BE_SPECIFIED); return; } if (container == null || (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) { - updateStatus("File container must exist"); + updateStatus(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_FILE_CONTAINER_MUST_EXIST); return; } if (!container.isAccessible()) { - updateStatus("Project must be writable"); + updateStatus(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_PROJECT_MUST_BE_WRITABLE); return; } if (fileName.length() == 0) { - updateStatus("File name must be specified"); + updateStatus(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_FILE_NAME_MUST_BE_SPECIFIED); return; } if (fileName.replace('\\', '/').indexOf('/', 1) > 0) { - updateStatus("File name must be valid"); + updateStatus(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_FILE_NAME_MUST_BE_VALID); return; } int dotLoc = fileName.lastIndexOf('.'); if (dotLoc != -1) { String ext = fileName.substring(dotLoc + 1); - if (ext.equalsIgnoreCase("mpe") == false) { - updateStatus("File extension must be \"mpe\""); + if (ext.equalsIgnoreCase("mpe") == false) { //$NON-NLS-1$ + updateStatus(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_FILE_EXTENSION_MUST_BE_MPE); return; } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -30,7 +30,7 @@ public static IFieldEditor createSeamProjectSelectionFieldEditor( String defaultSelection) { return SwtFieldEditorFactory.INSTANCE.createButtonFieldEditor( - IParameter.SEAM_PROJECT_NAME, "Seam Project:", defaultSelection, + IParameter.SEAM_PROJECT_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_SEAM_PROJECT, defaultSelection, new SelectSeamProjectAction(), ValidatorFactory.NO_ERRORS_VALIDATOR); } @@ -40,7 +40,7 @@ public static IFieldEditor createSeamLocalInterfaceNameFieldEditor() { // TODO Auto-generated method stub return SwtFieldEditorFactory.INSTANCE.createTextEditor( - IParameter.SEAM_LOCAL_INTERFACE_NAME, "Local interface name:", ""); + IParameter.SEAM_LOCAL_INTERFACE_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_LOCAL_INTERFACE_NAME, ""); //$NON-NLS-1$ } /** @@ -48,7 +48,7 @@ */ public static IFieldEditor createSeamBeanNameFieldEditor() { return SwtFieldEditorFactory.INSTANCE.createTextEditor( - IParameter.SEAM_BEAN_NAME, "Bean name:", ""); + IParameter.SEAM_BEAN_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_BEAN_NAME, ""); //$NON-NLS-1$ } @@ -57,7 +57,7 @@ */ public static IFieldEditor createSeamMethodNameFieldEditor() { return SwtFieldEditorFactory.INSTANCE.createTextEditor( - IParameter.SEAM_METHOD_NAME, "Method name:", ""); + IParameter.SEAM_METHOD_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_METHOD_NAME, ""); //$NON-NLS-1$ } @@ -66,7 +66,7 @@ */ public static IFieldEditor createSeamPageNameFieldEditor() { return SwtFieldEditorFactory.INSTANCE.createTextEditor( - IParameter.SEAM_PAGE_NAME, "Page name:", ""); + IParameter.SEAM_PAGE_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_PAGE_NAME, ""); //$NON-NLS-1$ } /** @@ -74,7 +74,7 @@ */ public static IFieldEditor createSeamMasterPageNameFieldEditor() { return SwtFieldEditorFactory.INSTANCE.createTextEditor( - IParameter.SEAM_MASTER_PAGE_NAME, "Master page name:", ""); + IParameter.SEAM_MASTER_PAGE_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_MASTER_PAGE_NAME, ""); //$NON-NLS-1$ } public static final IFieldEditor[] createBaseFormFieldEditors(String defaultSelection) { @@ -94,7 +94,7 @@ public static IFieldEditor createSeamComponentNameFieldEditor() { // TODO Auto-generated method stub return SwtFieldEditorFactory.INSTANCE.createTextEditor( - IParameter.SEAM_COMPONENT_NAME, "Seam component name:", ""); + IParameter.SEAM_COMPONENT_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME, ""); //$NON-NLS-1$ } /** @@ -102,7 +102,7 @@ */ public static IFieldEditor createSeamEntityClasNameFieldEditor() { return SwtFieldEditorFactory.INSTANCE.createTextEditor( - IParameter.SEAM_ENTITY_CLASS_NAME, "Seam entity class name:", ""); + IParameter.SEAM_ENTITY_CLASS_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_SEAM_ENTITY_CLASS_NAME, ""); //$NON-NLS-1$ } /** @@ -120,7 +120,7 @@ if(configurationNames.size()>0) { defaultSelection = configurationNames.get(0); } else { - defaultSelection = ""; + defaultSelection = ""; //$NON-NLS-1$ } } IFieldEditor editor = SwtFieldEditorFactory.INSTANCE.createComboEditor( Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -37,7 +37,7 @@ if(project!=null)return project.getName(); } } - return ""; + return ""; //$NON-NLS-1$ } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SelectSeamProjectAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SelectSeamProjectAction.java 2007-10-05 10:49:39 UTC (rev 4021) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SelectSeamProjectAction.java 2007-10-05 10:58:43 UTC (rev 4022) @@ -16,6 +16,7 @@ import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.ListDialog; +import org.jboss.tools.seam.ui.SeamUIMessages; import org.jboss.tools.seam.ui.widget.editor.ButtonFieldEditor; public class SelectSeamProjectAction extends ButtonFieldEditor.ButtonPressedAction { @@ -24,7 +25,7 @@ * @param label */ public SelectSeamProjectAction() { - super("Browse"); + super(SeamUIMessages.SELECT_SEAM_PROJECT_ACTION_BROWSE); // TODO Auto-generated constructor stub } @@ -32,7 +33,7 @@ public void run() { ListDialog dialog = new SeamProjectSelectionDialog( Display.getCurrent().getActiveShell()); - if(!"".equals(this.getFieldEditor().getValueAsString())) + if(!"".equals(this.getFieldEditor().getValueAsString())) //$NON-NLS-1$ dialog.setInitialSelections(new Object[] { ResourcesPlugin.getWorkspace().getRoot().getProject(this.getFieldEditor().getValueAsString())}); if (dialog.open() == Window.CANCEL) {