Author: vyemialyanchyk Date: 2009-04-03 10:43:18 -0400 (Fri, 03 Apr 2009) New Revision: 14497 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterDefinition.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConsoleConfigurationPropertySource.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/figures/PersistentClassFigure.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/figures/TableFigure.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/DisplayStringProposalComparator.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCodeScanner.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/ConnectionProfileRenameChange.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/CFGXMLStructuredTextViewerConfiguration.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/HibernateJptUIPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernatePlatformUI.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/messages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/SimpleTestProject.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/hqleditor/preferences/HQLEditorPreferencePageTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/ELTransformerTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HQLQueryValidatorTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest2.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateJDTuiTestPlugin.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/QuestionDialog.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/DeployAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/ExplodeAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/GenerateEntitiesAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewActionAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewConversationAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewEntityAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewFormAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewProjectAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/RestartAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UndeployAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UnexplodeAction.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UpdateProjectAction.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl/EditorTestHelper.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PreferencePageTest.java Log: JBIDE-4044 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -196,7 +196,7 @@ if (dialect == null && getConnectionProfileName() != null && getConnectionProfileName() != null) { IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName()); if (profile == null) return null; - String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass"); + String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass"); //$NON-NLS-1$ dialect = new DriverClassHelpers().getDialect(driver); } return dialect; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -6,14 +6,6 @@ public static final String BUNDLE_NAME = "org.hibernate.eclipse.console.HibernateConsoleMessages"; //$NON-NLS-1$ // - public static String popup_copy_text; - public static String popup_paste_text; - public static String popup_select_all; - public static String find_replace_action_label; - public static String find_replace_action_tooltip; - public static String find_replace_action_image; - public static String find_replace_action_description; - // public static String AbstractQueryEditor_could_not_show_query_editor_input; public static String AbstractQueryEditor_do_you_want_open_session_factory; public static String AbstractQueryEditor_max_results; @@ -163,65 +155,17 @@ public static String QueryPagePropertySource_sec; public static String QueryPagePropertySource_unknown; // - public static String ConsoleConfigurationCreationWizard_configuring_hibernate_console; - public static String ConsoleConfigurationCreationWizard_enable_hibernate_features; - public static String ConsoleConfigurationCreationWizard_error_finishing; - public static String ConsoleConfigurationCreationWizard_missing_classes; - public static String ConsoleConfigurationCreationWizard_the_project; - public static String ConsoleConfigurationCreationWizard_the_project_named; - public static String ConsoleConfigurationCreationWizard_the_project_named_have; - public static String ConsoleConfigurationWizardPage_27; - public static String ConsoleConfigurationWizardPage_28; - public static String ConsoleConfigurationWizardPage_35; - public static String ConsoleConfigurationWizardPage_add_classpath_entry; - public static String ConsoleConfigurationWizardPage_add_directory_zip_jar; - public static String ConsoleConfigurationWizardPage_add_external_jars; - public static String ConsoleConfigurationWizardPage_add_hbmxml_file; - public static String ConsoleConfigurationWizardPage_add_hibernate_mapping_file; - public static String ConsoleConfigurationWizardPage_add_jar_dir; - public static String ConsoleConfigurationWizardPage_additional_classpath; - public static String ConsoleConfigurationWizardPage_additional_mapping_files; - public static String ConsoleConfigurationWizardPage_annotations; - public static String ConsoleConfigurationWizardPage_browse; - public static String ConsoleConfigurationWizardPage_choose_file_to_use; - public static String ConsoleConfigurationWizardPage_choose_file_to_use_hibcfgxml_file; - public static String ConsoleConfigurationWizardPage_classpath; - public static String ConsoleConfigurationWizardPage_config_file; public static String ConsoleConfigurationWizardPage_config_name_already_exist; public static String ConsoleConfigurationWizardPage_config_page; - public static String ConsoleConfigurationWizardPage_configuration_file; - public static String ConsoleConfigurationWizardPage_core; public static String ConsoleConfigurationWizardPage_create_hibernate_console_config; - public static String ConsoleConfigurationWizardPage_does_not_exist; - public static String ConsoleConfigurationWizardPage_entity_resolver; - public static String ConsoleConfigurationWizardPage_general; - public static String ConsoleConfigurationWizardPage_include_default_classpath; - public static String ConsoleConfigurationWizardPage_is_not_a_file; - public static String ConsoleConfigurationWizardPage_jpa; - public static String ConsoleConfigurationWizardPage_mappings; public static String ConsoleConfigurationWizardPage_name; public static String ConsoleConfigurationWizardPage_name_must_specified; public static String ConsoleConfigurationWizardPage_bad_name; public static String ConsoleConfigurationWizardPage_bad_char; - public static String ConsoleConfigurationWizardPage_naming_strategy; - public static String ConsoleConfigurationWizardPage_need_to_specify_classpath; - public static String ConsoleConfigurationWizardPage_both_hibernate_properties_and_hibernate_cfg_xml; - public static String ConsoleConfigurationWizardPage_need_to_specify_project; - public static String ConsoleConfigurationWizardPage_persistence_unit; public static String ConsoleConfigurationWizardPage_problem_while_initializing_cc; - public static String ConsoleConfigurationWizardPage_problem_while_locating_jdbc_drivers; - public static String ConsoleConfigurationWizardPage_project; - public static String ConsoleConfigurationWizardPage_property_file_1; - public static String ConsoleConfigurationWizardPage_property_file_2; - public static String ConsoleConfigurationWizardPage_select_entity_resolver_class; - public static String ConsoleConfigurationWizardPage_select_hibcfgxml_file; - public static String ConsoleConfigurationWizardPage_select_java_project; - public static String ConsoleConfigurationWizardPage_select_java_project_to_classpath; - public static String ConsoleConfigurationWizardPage_select_naming_strategy_class; - public static String ConsoleConfigurationWizardPage_select_property_file; - public static String ConsoleConfigurationWizardPage_the_java_project_does_not_exist; public static String ConsoleConfigurationWizardPage_this_wizard_allows; - public static String ConsoleConfigurationWizardPage_type; + public static String ConsoleConfigurationWizardPage_warnings; + public static String ConsoleConfigurationWizardPage_errors; public static String NewConfigurationWizard_create_hibernate_cfg_file; public static String NewConfigurationWizard_create_new_hibernate_cfg_xml; public static String NewConfigurationWizard_creating; @@ -535,6 +479,7 @@ public static String ConnectionProfileCtrl_Edit; public static String ConnectionProfileCtrl_HibernateConfiguredConnection; + public static String ConnectionProfileCtrl_JPAConfiguredConnection; public static String ConnectionProfileCtrl_New; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-04-03 14:43:18 UTC (rev 14497) @@ -1,10 +1,3 @@ -popup_copy_text=Copy -popup_paste_text=Paste -popup_select_all=Select All -find_replace_action_label=Find/Replace -find_replace_action_tooltip=Find/Replace -find_replace_action_image= -find_replace_action_description=Find & Replace AbstractQueryEditor_could_not_show_query_editor_input=Could not show query editor input AbstractQueryEditor_do_you_want_open_session_factory=Do you want to open the session factory for {0} ? AbstractQueryEditor_max_results=Max results: @@ -154,65 +147,17 @@ QueryPagePropertySource_sec=\ sec QueryPagePropertySource_unknown=(unknown) -ConsoleConfigurationCreationWizard_configuring_hibernate_console=Configuring Hibernate Console -ConsoleConfigurationCreationWizard_enable_hibernate_features=Enable Hibernate features for project -ConsoleConfigurationCreationWizard_error_finishing=Error while finishing Wizard -ConsoleConfigurationCreationWizard_missing_classes=Probably missing classes or errors with classloading -ConsoleConfigurationCreationWizard_the_project=The project named ''{0}'' does not have Hibernate features enabled. Should it be updated to use {1} ? -ConsoleConfigurationCreationWizard_the_project_named=The project named ''{0}'' does not have a default Hibernate configuration specified. Should it be updated to use {1} ? -ConsoleConfigurationCreationWizard_the_project_named_have=The project named ''{0}'' have the ''{1}'' specified. Should it be updated to use {2} ? -ConsoleConfigurationWizardPage_27=.jar -ConsoleConfigurationWizardPage_28=.zip -ConsoleConfigurationWizardPage_35=hbm.xml -ConsoleConfigurationWizardPage_add_classpath_entry=Add classpath entry -ConsoleConfigurationWizardPage_add_directory_zip_jar=Add a directory, .zip or .jar file -ConsoleConfigurationWizardPage_add_external_jars=Add External JARS... -ConsoleConfigurationWizardPage_add_hbmxml_file=Add hbm.xml file -ConsoleConfigurationWizardPage_add_hibernate_mapping_file=Add a Hibernate Mapping file -ConsoleConfigurationWizardPage_add_jar_dir=Add JAR/Dir... -ConsoleConfigurationWizardPage_additional_classpath=Additional classpath (Hibernate jars not necessary\!) -ConsoleConfigurationWizardPage_additional_mapping_files=Additional mapping files (not listed in cfg.xml) -ConsoleConfigurationWizardPage_annotations=Annotations (jdk 1.5+) -ConsoleConfigurationWizardPage_browse=Browse... -ConsoleConfigurationWizardPage_choose_file_to_use=Choose file to use as hibernate.properties -ConsoleConfigurationWizardPage_choose_file_to_use_hibcfgxml_file=Choose file to use as hibernate.cfg.xml -ConsoleConfigurationWizardPage_classpath=Classpath -ConsoleConfigurationWizardPage_config_file=&Configuration file: ConsoleConfigurationWizardPage_config_name_already_exist=A configuration with this name already exists\! ConsoleConfigurationWizardPage_config_page=configurationPage -ConsoleConfigurationWizardPage_configuration_file=Configuration file -ConsoleConfigurationWizardPage_core=Core ConsoleConfigurationWizardPage_create_hibernate_console_config=Create Hibernate Console Configuration -ConsoleConfigurationWizardPage_does_not_exist=\ does not exist -ConsoleConfigurationWizardPage_entity_resolver=&Entity resolver: -ConsoleConfigurationWizardPage_general=General -ConsoleConfigurationWizardPage_include_default_classpath=Include default classpath from project -ConsoleConfigurationWizardPage_is_not_a_file=\ is not a file -ConsoleConfigurationWizardPage_jpa=JPA (jdk 1.5+) -ConsoleConfigurationWizardPage_mappings=Mappings ConsoleConfigurationWizardPage_name=&Name: ConsoleConfigurationWizardPage_name_must_specified=A configuration name must be specified ConsoleConfigurationWizardPage_bad_name={0} is an invalid configuration name. ConsoleConfigurationWizardPage_bad_char=''{0}'' is an invalid character in a configuration name. -ConsoleConfigurationWizardPage_naming_strategy=&Naming strategy: -ConsoleConfigurationWizardPage_need_to_specify_classpath=Need to specify a classpath when not using a project classpath -ConsoleConfigurationWizardPage_both_hibernate_properties_and_hibernate_cfg_xml=If you have both 'Property file' and 'Configuration file', the settings of 'Configuration file' will override the settings used in 'Property file'. -ConsoleConfigurationWizardPage_need_to_specify_project=Need to specify a project or setup a classpath -ConsoleConfigurationWizardPage_persistence_unit=&Persistence unit: ConsoleConfigurationWizardPage_problem_while_initializing_cc=Problem while initializing ConsoleConfigurationWizardPage -ConsoleConfigurationWizardPage_problem_while_locating_jdbc_drivers=Problem while locating jdbc drivers -ConsoleConfigurationWizardPage_project=Pro&ject: -ConsoleConfigurationWizardPage_property_file_1=Property file -ConsoleConfigurationWizardPage_property_file_2=&Property file: -ConsoleConfigurationWizardPage_select_entity_resolver_class=Select entity resolver class -ConsoleConfigurationWizardPage_select_hibcfgxml_file=Select hibernate.cfg.xml file -ConsoleConfigurationWizardPage_select_java_project=Select java project -ConsoleConfigurationWizardPage_select_java_project_to_classpath=The (optional) java project is used to determine the default classpath -ConsoleConfigurationWizardPage_select_naming_strategy_class=Select naming strategy class -ConsoleConfigurationWizardPage_select_property_file=Select property file -ConsoleConfigurationWizardPage_the_java_project_does_not_exist=The Java project {0} does not exist. ConsoleConfigurationWizardPage_this_wizard_allows=This wizard allows you to create a configuration for Hibernate Console. -ConsoleConfigurationWizardPage_type=Type: +ConsoleConfigurationWizardPage_warnings={0} warns: {1} +ConsoleConfigurationWizardPage_errors={0} errors: {1} NewConfigurationWizard_create_hibernate_cfg_file=Create Hibernate Configuration file (cfg.xml) NewConfigurationWizard_create_new_hibernate_cfg_xml=Create a new hibernate.cfg.xml. NewConfigurationWizard_creating=Creating @@ -527,6 +472,7 @@ ConnectionProfileCtrl_Edit=Edit... ConnectionProfileCtrl_HibernateConfiguredConnection=[Hibernate configured connection] +ConnectionProfileCtrl_JPAConfiguredConnection=[JPA Project Configured Connection] ConnectionProfileCtrl_New=New... ConnectionProfileRenameChange_update_connection_profile_name=Update connection profile name in launch configuration ConnectionProfileRenameParticipant_launch_configurations_updates=Launch Configurations updates \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -540,7 +540,7 @@ if (exception instanceof CoreException) { status = ((CoreException)exception).getStatus(); } else if (exception != null) { - status = new MultiStatus(ID, IStatus.ERROR, new IStatus[] { throwableToStatus(exception.getCause())}, exception.toString(), exception); //$NON-NLS-1$ + status = new MultiStatus(ID, IStatus.ERROR, new IStatus[] { throwableToStatus(exception.getCause())}, exception.toString(), exception); } // Check for multi-status with only one child Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -406,8 +406,8 @@ } } else{ String toolTag = tool.getTag(property); - if ("component".equals(toolTag) && "embedded".equals(property.getPropertyAccessorName())){ - toolTag = "properties"; + if ("component".equals(toolTag) && "embedded".equals(property.getPropertyAccessorName())){ //$NON-NLS-1$//$NON-NLS-2$ + toolTag = "properties"; //$NON-NLS-1$ } pattern.append(toolTag); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterDefinition.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterDefinition.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -111,7 +111,7 @@ propertyElements[i].getAttribute("description"), //$NON-NLS-1$ propertyElements[i].getAttribute("value"), //$NON-NLS-1$ Boolean.valueOf(propertyElements[i].getAttribute("required")).booleanValue()); //$NON-NLS-1$ - String type = propertyElements[i].getAttribute("type"); + String type = propertyElements[i].getAttribute("type"); //$NON-NLS-1$ if (type != null){ property.setType(type); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -205,7 +205,7 @@ List templatePathList = new ArrayList(); if(props.containsKey("template_path")) { //$NON-NLS-1$ String resolveTemplatePath = resolve(props.getProperty("template_path")); //$NON-NLS-1$ - StringTokenizer st = new StringTokenizer(resolveTemplatePath, ";"); + StringTokenizer st = new StringTokenizer(resolveTemplatePath, ";"); //$NON-NLS-1$ String out = new String(); while (st.hasMoreTokens()) { String locationAsStringPath = PathHelper.getLocationAsStringPath(st.nextToken()); @@ -216,7 +216,7 @@ templatePathList.add(locationAsStringPath); } } - if (out.length() > 0 ){//$NON-NLS-1$ + if (out.length() > 0 ){ out = out.substring(0, out.length() - 1); throw new HibernateConsoleRuntimeException(out); } @@ -224,8 +224,8 @@ } if (StringHelper.isNotEmpty(customTemplatePath)){ String resolvedCustomTemplatePath = resolve(customTemplatePath); - StringTokenizer st = new StringTokenizer(resolvedCustomTemplatePath, ";"); - String out = ""; + StringTokenizer st = new StringTokenizer(resolvedCustomTemplatePath, ";"); //$NON-NLS-1$ + String out = ""; //$NON-NLS-1$ while (st.hasMoreTokens()) { String locationAsStringPath = PathHelper.getLocationAsStringPath(st.nextToken()); if(locationAsStringPath != null) { @@ -235,7 +235,7 @@ resolvedCustomTemplatePath, getExporterDefinition().getDescription()); } } - if (out != ""){ + if (!("".equals(out))){ //$NON-NLS-1$ out = out.substring(0, out.length() - 1); throw new HibernateConsoleRuntimeException(out); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -129,7 +129,7 @@ IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport(); try { IWebBrowser browser = support.getExternalBrowser(); - browser.openURL(new URL(urlEncode(href.toCharArray()))); //$NON-NLS-1$ + browser.openURL(new URL(urlEncode(href.toCharArray()))); } catch (MalformedURLException e) { openWebBrowserError(href, e); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConsoleConfigurationPropertySource.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConsoleConfigurationPropertySource.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConsoleConfigurationPropertySource.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -76,7 +76,7 @@ return preferences.getPropertyFile(); } if("mapping.files".equals(id)) { //$NON-NLS-1$ - return new Integer(preferences.getMappingFiles().length); + return Integer.valueOf(preferences.getMappingFiles().length); } return null; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -146,7 +146,7 @@ container.setLayoutData(gd); nameLabel = new Label(container, SWT.HORIZONTAL | SWT.LEFT); - nameLabel.setText("Name"); + nameLabel.setText(HibernateConsoleMessages.ConsoleConfigurationWizardPage_name); nameLabel.setLayoutData(new GridData( GridData.HORIZONTAL_ALIGN_BEGINNING)); @@ -279,14 +279,14 @@ if (messageWarning == null) { messageWarning = tabs[i].getMessage(); if(messageWarning!=null) { - System.out.println(tabs[i].getName() + " warns: " + messageWarning); + System.out.println(NLS.bind(HibernateConsoleMessages.ConsoleConfigurationWizardPage_warnings, tabs[i].getName(), messageWarning)); } } } else { if (messageError == null) { messageError = tabs[i].getErrorMessage(); if(messageError!=null) { - System.out.println(tabs[i].getName() + " errors: " + messageError); + System.out.println(NLS.bind(HibernateConsoleMessages.ConsoleConfigurationWizardPage_errors, tabs[i].getName(), messageError)); } } } @@ -485,7 +485,7 @@ currentLaunchConfig.setAttribute(attr, nonEmptyTrimOrNull(str)); } else { - currentLaunchConfig.setAttribute(attr, str); + currentLaunchConfig.setAttribute(attr, (String)null); } } // END @@ -580,7 +580,7 @@ launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, (List<String>)null); } } else if (obj instanceof EclipseConsoleConfiguration) { - throw new IllegalStateException("This should never happen!"); + throw new IllegalStateException("This should never happen!"); //$NON-NLS-1$ } } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/figures/PersistentClassFigure.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/figures/PersistentClassFigure.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/figures/PersistentClassFigure.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -35,7 +35,7 @@ //public static Color classColor = new Color(null, 188, 174, 121); // hibernate brown //public static Color classColor = new Color(null, 179, 202, 227); // opera tab blue - public static Color classColor = new Color(null, 212, 229, 254); // skype says + public static final Color classColor = new Color(null, 212, 229, 254); // skype says static Font classHeaderFont = new Font(null, "Arial", 12, SWT.BOLD); //$NON-NLS-1$ Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/figures/TableFigure.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/figures/TableFigure.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/figures/TableFigure.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -32,7 +32,7 @@ public class TableFigure extends Figure { - public static Color tableColor = new Color(null, 0xff, 0xff, 0xaa); + public static final Color tableColor = new Color(null, 0xff, 0xff, 0xaa); static Font tableHeaderFont = new Font(null, "Arial", 12, SWT.BOLD); //$NON-NLS-1$ private Label label; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/DisplayStringProposalComparator.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/DisplayStringProposalComparator.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/DisplayStringProposalComparator.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -31,7 +31,7 @@ */ public class DisplayStringProposalComparator implements Comparator { - static public Comparator INSTANCE = new DisplayStringProposalComparator(); + static final public Comparator INSTANCE = new DisplayStringProposalComparator(); public int compare( Object o1, Object o2 ) { ICompletionProposal c1 = (ICompletionProposal) o1; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCodeScanner.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCodeScanner.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCodeScanner.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -238,7 +238,7 @@ List rules = new ArrayList(); rules.add( new EndOfLineRule( "--", commentToken )); //$NON-NLS-1$ - rules.add( new SingleLineRule( "'", "'", stringToken, '\\' )); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + rules.add( new SingleLineRule( "'", "'", stringToken, '\\' )); //$NON-NLS-1$ //$NON-NLS-2$ rules.add( new WhitespaceRule( new HQLWhiteSpaceDetector() )); //rules.add( new HQLLexerRule( hqlToken )); // TODO: need to categorize tokens into types. Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -49,7 +49,7 @@ /** * * - * @author Vitali + * @author Vitali Yemialyanchyk */ public class ConnectionProfileCtrl { @@ -57,8 +57,8 @@ protected Button buttonNew; protected Button buttonEdit; - static final String NO_CONNECTIN_NAME = "[Hibernate configured connection]"; - static final String JPA_CONNECTIN_NAME = "[JPA Project Configured Connection]"; + static final String NO_CONNECTIN_NAME = HibernateConsoleMessages.ConnectionProfileCtrl_HibernateConfiguredConnection; + static final String JPA_CONNECTIN_NAME = HibernateConsoleMessages.ConnectionProfileCtrl_JPAConfiguredConnection; static final protected ConnectionWrapper NO_CONNECTION_PLACEHOLDER = new ConnectionWrapper(NO_CONNECTIN_NAME, null); static final protected ConnectionWrapper JPA_CONNECTION_PLACEHOLDER = new ConnectionWrapper(JPA_CONNECTIN_NAME, null); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -199,7 +199,7 @@ if (Boolean.parseBoolean(configuration.getAttribute(IConsoleConfigurationLaunchConstants.USE_JPA_PROJECT_PROFILE, Boolean.toString(false)))){ connectionProfileCtrl.selectValue(ConnectionProfileCtrl.JPA_CONNECTIN_NAME); } else - connectionProfileCtrl.selectValue(configuration.getAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, ConnectionProfileCtrl.NO_CONNECTIN_NAME)); //$NON-NLS-1$ + connectionProfileCtrl.selectValue(configuration.getAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, ConnectionProfileCtrl.NO_CONNECTIN_NAME)); } catch (CoreException e) { HibernateConsolePlugin.getDefault().log( e ); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/ConnectionProfileRenameChange.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/ConnectionProfileRenameChange.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/ConnectionProfileRenameChange.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -90,7 +90,7 @@ } final ILaunchConfigurationWorkingCopy wc = fLaunchConfiguration.getWorkingCopy(); - String oldName = wc.getAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, ""); + String oldName = wc.getAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, ""); //$NON-NLS-1$ wc.setAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, fRenameArguments.getNewName()); ILaunchConfiguration newConfig = wc.isDirty() ? wc.doSave() : fLaunchConfiguration; RenameArguments args = new RenameArguments(oldName, true); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -357,7 +357,7 @@ List<ILaunchConfiguration> list = new ArrayList<ILaunchConfiguration>(); for(int i = 0; i < configs.length && configs[i].exists(); i++) {//refactor only hibernate launch configurations if (!ICodeGenerationLaunchConstants.CONSOLE_CONFIGURATION_LAUNCH_TYPE_ID.equals(configs[i].getType().getIdentifier())) continue; - if (profile.getName().equals(configs[i].getAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, ""))) + if (profile.getName().equals(configs[i].getAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, ""))) //$NON-NLS-1$ list.add(configs[i]); } configs = list.toArray(new ILaunchConfiguration[list.size()]); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -17,7 +17,6 @@ public static String HQLQuickAssistProcessor_copy_to_hql_editor; public static String JPAMapToolActionPulldownDelegate_menu; public static String SaveQueryEditorListener_replacequestion; - public static String SaveQueryEditorListener_replacetitle; public static String SaveQueryEditorListener_hql_editor; public static String SaveQueryEditorListener_cri_editor; public static String SaveQueryEditorListener_change_name; @@ -25,7 +24,6 @@ public static String SaveQueryEditorListener_refactoringtitle; public static String SaveQueryEditorListener_replacetitle_info; public static String SaveQueryEditorListener_replacequestion_confirm; - public static String SaveQueryEditorListener_errormessage; public static String JPAMapToolActor_message_title; public static String JPAMapToolActor_message; public static String ResolveAmbiguous_column_Class; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2009-04-03 14:43:18 UTC (rev 14497) @@ -21,7 +21,6 @@ HQLQuickAssistProcessor_copy_to_hql_editor=Copy to HQL Editor JPAMapToolActionPulldownDelegate_menu=JPA annotations SaveQueryEditorListener_replacequestion= Do you want to save this {0} query into ''{1}''? -SaveQueryEditorListener_replacetitle= Query replace SaveQueryEditorListener_hql_editor=HQL SaveQueryEditorListener_cri_editor=Criteria SaveQueryEditorListener_change_name=Update {0} query in ''{1}'' @@ -29,7 +28,6 @@ SaveQueryEditorListener_refactoringtitle= Update {0} query in file SaveQueryEditorListener_replacetitle_info= Query replace SaveQueryEditorListener_replacequestion_confirm= ''{0}'' was changed. It is not possible to update the query. -SaveQueryEditorListener_errormessage=Error while query refactoring JPAMapToolActor_message_title=Hibernate/JPA JPAMapToolActor_message=Cannot generate annotations for an interface or enumeration ResolveAmbiguous_column_Class=Class Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -12,7 +12,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.ui.refactoring.RefactoringSaveHelper; import org.eclipse.jdt.internal.ui.refactoring.actions.RefactoringStarter; import org.eclipse.jface.dialogs.MessageDialog; @@ -193,7 +192,7 @@ wizard.setDefaultPageTitle(wizard_title); IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if ( new RefactoringStarter().activate(wizard, win.getShell(), wizard_title, RefactoringSaveHelper.SAVE_ALL)){ //$NON-NLS-1$ + if ( new RefactoringStarter().activate(wizard, win.getShell(), wizard_title, RefactoringSaveHelper.SAVE_ALL)){ query = newQuery; position.y = query.length(); fromEditorPart.doSave(null); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -185,10 +185,11 @@ public static String getFieldNameByGetter(MethodDeclaration node){ if (node.parameters().size() != 0) return null; String methodName = node.getName().getIdentifier(); - if (methodName.startsWith("get") && methodName.length() > 3){ + if (methodName.startsWith("get") && methodName.length() > 3){ //$NON-NLS-1$ methodName = methodName.substring(3); return Character.toLowerCase(methodName.charAt(0)) + methodName.substring(1); - } else if (methodName.startsWith("is") && methodName.length() > 2){ + } + else if (methodName.startsWith("is") && methodName.length() > 2){ //$NON-NLS-1$ methodName = methodName.substring(2); return Character.toLowerCase(methodName.charAt(0)) + methodName.substring(1); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/CFGXMLStructuredTextViewerConfiguration.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/CFGXMLStructuredTextViewerConfiguration.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/CFGXMLStructuredTextViewerConfiguration.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -75,7 +75,7 @@ } } catch (Exception ex) { - MapperPlugin.getDefault().logException(ex); //$NON-NLS-1$ + MapperPlugin.getDefault().logException(ex); } return javaProject; } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -515,7 +515,7 @@ alreadyFound.add(fullName); } if (beginsWith(fullName,matchString) || beginsWith(shortName,matchString) ) { - CustomCompletionProposal proposal = new CustomCompletionProposal(fullName, //$NON-NLS-2$//$NON-NLS-1$ + CustomCompletionProposal proposal = new CustomCompletionProposal(fullName, offset, matchString.length(), fullName.length() + 1, null/*XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE)*/, fullName, null, null, XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE); proposals.add(proposal); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/JPAPostInstallFasetListener.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -62,13 +62,13 @@ for (int i = 0; i < lm.getLaunchConfigurations(lct).length; i++){ ILaunchConfiguration lc = lm.getLaunchConfigurations(lct)[i]; if (project.getName().equals( - lc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""))){//lc uses this project + lc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""))){//lc uses this project //$NON-NLS-1$ if (project.getName().equals(lc.getName())) return lc; configs.add(lc); } } //select best launch configuration "projectName (1)" - Pattern p = Pattern.compile(project.getName() + " \\(\\d+\\)"); + Pattern p = Pattern.compile(project.getName() + " \\(\\d+\\)"); //$NON-NLS-1$ for (int i = 0; i < configs.size(); i++) { ILaunchConfiguration lc = configs.get(i); if (p.matcher(lc.getName()).matches()) return lc; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -83,9 +83,9 @@ } public void addToMessages(List<IMessage> messages) { - invokeMethod(this, "addMappingFileMessages", "validateMappingFiles", + invokeMethod(this, "addMappingFileMessages", "validateMappingFiles", //$NON-NLS-1$ //$NON-NLS-2$ new Class[]{List.class}, messages); - invokeMethod(this, "addClassMessages", "validateClassRefs", new Class[]{List.class}, messages); + invokeMethod(this, "addClassMessages", "validateClassRefs", new Class[]{List.class}, messages); //$NON-NLS-1$//$NON-NLS-2$ addFileNotExistsMessages(messages); } @@ -183,19 +183,19 @@ JavaPersistentType type = classRef.getJavaPersistentType(); JavaResourcePersistentMember jrpt = null; GenericGeneratorAnnotation annotation = null; - jrpt = (JavaResourcePersistentMember) invokeMethod(project, "getJavaPersistentTypeResource", - "getJavaResourcePersistentType", new Class[]{String.class}, annotClass); + jrpt = (JavaResourcePersistentMember) invokeMethod(project, "getJavaPersistentTypeResource", //$NON-NLS-1$ + "getJavaResourcePersistentType", new Class[]{String.class}, annotClass); //$NON-NLS-1$ if (jrpt != null){ - annotation = (GenericGeneratorAnnotation)invokeMethod(jrpt, "getAnnotation", - "getSupportingAnnotation", new Class[]{String.class}, GENERIC_GENERATOR); + annotation = (GenericGeneratorAnnotation)invokeMethod(jrpt, "getAnnotation", //$NON-NLS-1$ + "getSupportingAnnotation", new Class[]{String.class}, GENERIC_GENERATOR); //$NON-NLS-1$ if (annotation != null) { addGenerator(annotation.buildJavaGenericGenerator(type)); } ListIterator<JavaPersistentAttribute> typeAttrs = type.attributes(); for (JavaPersistentAttribute persAttr : CollectionTools.iterable(typeAttrs)) { JavaResourcePersistentAttribute jrpa = persAttr.getResourcePersistentAttribute(); - annotation = (GenericGeneratorAnnotation)invokeMethod(jrpa, "getAnnotation", - "getSupportingAnnotation", new Class[]{String.class}, GENERIC_GENERATOR); + annotation = (GenericGeneratorAnnotation)invokeMethod(jrpa, "getAnnotation", //$NON-NLS-1$ + "getSupportingAnnotation", new Class[]{String.class}, GENERIC_GENERATOR); //$NON-NLS-1$ if (annotation != null) { addGenerator(annotation.buildJavaGenericGenerator(persAttr.getSpecifiedMapping())); @@ -230,11 +230,11 @@ } else { StringBuilder params = new StringBuilder(); for (int i = 0; i < argsTypes.length; i++) { - params.append(argsTypes[i].getName() + ", "); + params.append(argsTypes[i].getName() + ", "); //$NON-NLS-1$ } if (params.length() > 0) params.deleteCharAt(params.length() - 2); - HibernateJptPlugin.logError("Nor \"" + dali20Name + "\" nor \"" + dali21Name - + "\" methods were found with parameter types: (" + params + ")"); + HibernateJptPlugin.logError("Nor \"" + dali20Name + "\" nor \"" + dali21Name //$NON-NLS-1$//$NON-NLS-2$ + + "\" methods were found with parameter types: (" + params + ")"); //$NON-NLS-1$//$NON-NLS-2$ } return null; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitProperties.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -91,7 +91,7 @@ */ public boolean itemIsProperty(Property item) { if (item == null) { - throw new IllegalArgumentException("Property is null"); + throw new IllegalArgumentException("Property is null"); //$NON-NLS-1$ } return this.propertyNames().keySet().contains(item.getName()); } @@ -103,7 +103,7 @@ public String propertyIdFor(Property property) { String propertyId = this.propertyNames().get(property.getName()); if (propertyId == null) { - throw new IllegalArgumentException("Illegal property: " + property.toString()); + throw new IllegalArgumentException("Illegal property: " + property.toString()); //$NON-NLS-1$ } return propertyId; } @@ -114,7 +114,7 @@ return hibernateKey; } } - throw new IllegalArgumentException("Illegal property: " + propertyId); + throw new IllegalArgumentException("Illegal property: " + propertyId); //$NON-NLS-1$ } // ****** get/set String convenience methods ******* Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -84,15 +84,15 @@ } public void itemsMoved(ListChangeEvent e) { - throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName()); + throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName()); //$NON-NLS-1$//$NON-NLS-2$ } public void listCleared(ListChangeEvent e) { - throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName()); + throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName()); //$NON-NLS-1$//$NON-NLS-2$ } public void listChanged(ListChangeEvent e) { - throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName()); + throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName()); //$NON-NLS-1$//$NON-NLS-2$ } // ********** internal methods ********** Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/HibernateJptUIPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/HibernateJptUIPlugin.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/HibernateJptUIPlugin.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -22,7 +22,7 @@ public class HibernateJptUIPlugin extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.hibernate.jpt.ui"; + public static final String PLUGIN_ID = "org.jboss.tools.hibernate.jpt.ui"; //$NON-NLS-1$ // The shared instance private static HibernateJptUIPlugin plugin; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -34,6 +34,7 @@ import org.hibernate.eclipse.console.utils.DriverClassHelpers; import org.hibernate.eclipse.launch.PathHelper; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties; +import org.jboss.tools.hibernate.jpt.ui.wizard.Messages; import org.jboss.tools.hibernate.jpt.ui.xpl.AbstractPane; /** @@ -59,7 +60,7 @@ protected void initializeLayout(Composite container) { - Composite section = buildSection(container, "Basic properties"); + Composite section = buildSection(container, Messages.HibernatePropertiesComposite_basic_properties); helper = new DriverClassHelpers(); @@ -322,6 +323,6 @@ } public String getPageText() { - return "Hibernate"; + return Messages.HibernatePropertiesComposite_hibernate; } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernatePlatformUI.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernatePlatformUI.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernatePlatformUI.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -34,10 +34,10 @@ */ public class HibernatePlatformUI extends GenericPlatformUi { - public static final String LaunchConfigurationType_ID = "org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"; + public static final String LaunchConfigurationType_ID = "org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"; //$NON-NLS-1$ - public static String exporter_id = "hbmexporter"; - public static String full_exporter_id = HibernateLaunchConstants.ATTR_EXPORTERS + '.' + "hbmexporter"; + public static final String exporter_id = "hbmexporter"; //$NON-NLS-1$ + public static final String full_exporter_id = HibernateLaunchConstants.ATTR_EXPORTERS + '.' + "hbmexporter"; //$NON-NLS-1$ @Override public void generateEntities(JpaProject project, IStructuredSelection selection) { @@ -63,14 +63,14 @@ public static ILaunchConfigurationWorkingCopy createDefaultLaunchConfig(String projectName) { ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType launchConfigurationType = launchManager - .getLaunchConfigurationType(LaunchConfigurationType_ID); //$NON-NLS-1$ + .getLaunchConfigurationType(LaunchConfigurationType_ID); ILaunchConfigurationWorkingCopy wc = null; try { - wc = launchConfigurationType.newInstance(null, projectName + "-hibernate-generate"); + wc = launchConfigurationType.newInstance(null, projectName + "-hibernate-generate"); //$NON-NLS-1$ // Create exporters List<String> exporters = new ArrayList<String>(); - exporters.add(exporter_id); //$NON-NLS-1$ + exporters.add(exporter_id); wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS, exporters); wc.setAttribute(full_exporter_id, true); } catch (CoreException e) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -56,14 +56,14 @@ if (wc != null) { String concoleConfigurationName = initPage.getConfigurationName(); wc.setAttribute(HibernateLaunchConstants.ATTR_CONSOLE_CONFIGURATION_NAME, concoleConfigurationName); - wc.setAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR, initPage.getOutputDir()); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR, initPage.getOutputDir()); Map<String, String> prop = new HashMap<String, String>(); - prop.put("outputFileName", initPage.getFilename()); - prop.put("format", "true"); - prop.put("scriptToConsole", "false"); + prop.put("outputFileName", initPage.getFilename()); //$NON-NLS-1$ + prop.put("format", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + prop.put("scriptToConsole", "false"); //$NON-NLS-1$ //$NON-NLS-2$ - wc.setAttribute(HibernatePlatformUI.full_exporter_id + ".properties", prop); + wc.setAttribute(HibernatePlatformUI.full_exporter_id + ".properties", prop); //$NON-NLS-1$ wc.setAttribute(HibernatePlatformUI.full_exporter_id + ".extension_id", HibernateLaunchConstants.ATTR_PREFIX + "hbm2ddl"); //$NON-NLS-1$ //$NON-NLS-2$ try { wc.launch(ILaunchManager.RUN_MODE, null); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -77,8 +77,8 @@ ( (GridData)controls[1].getLayoutData() ).grabExcessHorizontalSpace = true; filename = new StringDialogField(); - filename.setLabelText("File name"); - filename.setText("schema.ddl"); + filename.setLabelText(Messages.GenerateDdlWizardPage_file_name); + filename.setText("schema.ddl"); //$NON-NLS-1$ filename.setDialogFieldListener(fieldlistener); filename.doFillIntoGrid(container, numColumns); @@ -97,7 +97,7 @@ } if (StringHelper.isEmpty(getFilename())) { - setErrorMessage( "Please, input file name" ); + setErrorMessage(Messages.GenerateDdlWizardPage_err_msg_input_file_name); setPageComplete( false ); return; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -59,7 +59,7 @@ String concoleConfigurationName = initPage.getConfigurationName(); wc.setAttribute(HibernateLaunchConstants.ATTR_CONSOLE_CONFIGURATION_NAME, concoleConfigurationName); - wc.setAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR, initPage.getOutputDir()); //$NON-NLS-1$ + wc.setAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR, initPage.getOutputDir()); wc.setAttribute(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER, true); wc.setAttribute(HibernateLaunchConstants.ATTR_PACKAGE_NAME, initPage.getPackageName()); @@ -69,11 +69,11 @@ wc.setAttribute(HibernateLaunchConstants.ATTR_ENABLE_JDK5, true); wc.setAttribute(HibernateLaunchConstants.ATTR_ENABLE_EJB3_ANNOTATIONS, true); - wc.setAttribute("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect"); - wc.setAttribute("hibernate.temp.use_jdbc_metadata_defaults", true); + wc.setAttribute("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute("hibernate.temp.use_jdbc_metadata_defaults", true); //$NON-NLS-1$ - wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + '.' + HibernatePlatformUI.exporter_id + ".extension_id", - HibernateLaunchConstants.ATTR_PREFIX + "hbm2java"); //$NON-NLS-1$ //$NON-NLS-2$ + wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + '.' + HibernatePlatformUI.exporter_id + ".extension_id", //$NON-NLS-1$ + HibernateLaunchConstants.ATTR_PREFIX + "hbm2java"); //$NON-NLS-1$ try { wc.launch(ILaunchManager.RUN_MODE, null); } catch (CoreException e) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -10,14 +10,9 @@ ******************************************************************************/ package org.jboss.tools.hibernate.jpt.ui.wizard; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Properties; import org.eclipse.core.runtime.IPath; import org.eclipse.datatools.connectivity.IConnectionProfile; @@ -63,7 +58,7 @@ */ public abstract class GenerateInitWizardPage extends WizardPage { - private static final String AUTODETECT = "[Autodetect]"; //$NON-NLS-1$ + private static final String AUTODETECT = Messages.GenerateInitWizardPage_autodetect; private DriverClassHelpers helper = new DriverClassHelpers(); @@ -88,7 +83,7 @@ }; public GenerateInitWizardPage(JpaProject jpaProject){ - super("", Messages.title, null); + super("", Messages.GenerateInitWizardPage_title, null); //$NON-NLS-1$ this.jpaProject = jpaProject; } @@ -108,7 +103,7 @@ createChildControls(container); selectMethod = new Button(container, SWT.CHECK); - selectMethod.setText("Use Console Configuration"); + selectMethod.setText(Messages.GenerateInitWizardPage_use_console_configuration); selectMethod.setSelection(true); //selectMethod.setEnabled(false); selectMethod.addSelectionListener(new SelectionListener(){ @@ -166,11 +161,11 @@ GridData gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = numColumns; dbGroup.setLayoutData(gd); - dbGroup.setText(Messages.databaseSettings); + dbGroup.setText(Messages.GenerateInitWizardPage_databaseSettings); //****************************connection profile***************** connectionProfileName = new ComboDialogField(SWT.READ_ONLY); - connectionProfileName.setLabelText(Messages.databaseSettings_connection); + connectionProfileName.setLabelText(Messages.GenerateInitWizardPage_databaseSettings_connection); connectionProfileName.setItems(dtpConnectionProfileNames()); @@ -195,8 +190,8 @@ // TODO Auto-generated method stub }}); - schemaName.setLabelText(Messages.databaseShema); - schemaName.setButtonLabel("Refresh"); + schemaName.setLabelText(Messages.GenerateInitWizardPage_databaseShema); + schemaName.setButtonLabel(Messages.GenerateInitWizardPage_refresh); Control[] controls = schemaName.doFillIntoGrid(dbGroup, numColumns); // Hack to tell the text field to stretch! ( (GridData)controls[1].getLayoutData() ).grabExcessHorizontalSpace = true; @@ -208,17 +203,17 @@ if (selectMethod.getSelection() && (StringHelper.isEmpty(getConfigurationName()))){ setPageComplete(false); - setErrorMessage("Please, select console configuration"); + setErrorMessage(Messages.GenerateInitWizardPage_err_msg_select_console_configuration); return; } if (!selectMethod.getSelection() && (StringHelper.isEmpty(getConnectionProfileName()))){ setPageComplete(false); - setErrorMessage("Please, select connection profile"); + setErrorMessage(Messages.GenerateInitWizardPage_err_msg_select_connection_profile); return; } if (selectMethod.getSelection()){ // TODO: can't check that dialect set - setWarningMessage("Impossible to check that hibernate dialect is set."); + setWarningMessage(Messages.GenerateInitWizardPage_wrn_msg_check_hibernate_dialect); } setPageComplete(true); @@ -279,9 +274,9 @@ protected String getDefaultOutput(){ try{ - if (getJpaProject() == null) return ""; - if (getJpaProject().getJavaProject() == null) return ""; - if (!getJpaProject().getJavaProject().exists()) return ""; + if (getJpaProject() == null) return ""; //$NON-NLS-1$ + if (getJpaProject().getJavaProject() == null) return ""; //$NON-NLS-1$ + if (!getJpaProject().getJavaProject().exists()) return ""; //$NON-NLS-1$ IPackageFragmentRoot[] roots = getJpaProject().getJavaProject().getPackageFragmentRoots(); for (int i = 0; i < roots.length; i++) { IPackageFragmentRoot root = roots[i]; @@ -292,7 +287,7 @@ return getJpaProject().getJavaProject().getResource().getFullPath().toOSString(); } catch(JavaModelException e){ HibernateJptUIPlugin.logException(e); - return ""; + return ""; //$NON-NLS-1$ } } @@ -310,7 +305,7 @@ } if (!selectMethod.getSelection()){ IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName()); - String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass"); + String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass"); //$NON-NLS-1$ return helper.getDialect(driver); } return null; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/Messages.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/Messages.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -19,14 +19,20 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.jpt.ui.wizard.messages"; //$NON-NLS-1$ - public static String ccName; - public static String connectionProfileError; - public static String title; - public static String selectName; - public static String wizardMessage; - public static String databaseSettings; - public static String databaseSettings_connection; - public static String databaseShema; + public static String GenerateInitWizardPage_title; + public static String GenerateInitWizardPage_autodetect; + public static String GenerateInitWizardPage_use_console_configuration; + public static String GenerateInitWizardPage_refresh; + public static String GenerateInitWizardPage_databaseSettings; + public static String GenerateInitWizardPage_databaseSettings_connection; + public static String GenerateInitWizardPage_databaseShema; + public static String GenerateInitWizardPage_err_msg_select_console_configuration; + public static String GenerateInitWizardPage_err_msg_select_connection_profile; + public static String GenerateInitWizardPage_wrn_msg_check_hibernate_dialect; + public static String GenerateDdlWizardPage_file_name; + public static String GenerateDdlWizardPage_err_msg_input_file_name; + public static String HibernatePropertiesComposite_basic_properties; + public static String HibernatePropertiesComposite_hibernate; static { // initialize resource bundle Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/messages.properties 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/messages.properties 2009-04-03 14:43:18 UTC (rev 14497) @@ -1,8 +1,15 @@ -ccName=Console Configuration name -connectionProfileError=Connection profile should be selected. -selectName=Create default Console Configuration -title=Use existing console configuration or connection profile for database connection -wizardMessage=Enter console configuration name if you want to create new one for selected project. -databaseSettings=Database Settings -databaseSettings_connection=Database Connection -databaseShema=Schema \ No newline at end of file +GenerateInitWizardPage_title=Use existing console configuration or connection profile for database connection +GenerateInitWizardPage_autodetect=[Autodetect] +GenerateInitWizardPage_use_console_configuration=Use Console Configuration +GenerateInitWizardPage_refresh=Refresh +GenerateInitWizardPage_autodetect=[Autodetect] +GenerateInitWizardPage_databaseSettings=Database Settings +GenerateInitWizardPage_databaseSettings_connection=Database Connection +GenerateInitWizardPage_databaseShema=Schema +GenerateInitWizardPage_err_msg_select_console_configuration=Please, select console configuration +GenerateInitWizardPage_err_msg_select_connection_profile=Please, select connection profile +GenerateInitWizardPage_wrn_msg_check_hibernate_dialect=Impossible to check that hibernate dialect is set. +GenerateDdlWizardPage_file_name=File name +GenerateDdlWizardPage_err_msg_input_file_name=Please, input file name +HibernatePropertiesComposite_basic_properties=Basic properties +HibernatePropertiesComposite_hibernate=Hibernate \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -29,7 +29,7 @@ * */ public class OpenMappingAction extends SelectionAction { - public static String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.mapping"; //$NON-NLS-1$ + public static final String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.mapping"; //$NON-NLS-1$ public OpenMappingAction(IWorkbenchPart part) { super(part); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -24,7 +24,7 @@ * */ public class OpenSourceAction extends SelectionAction { - public static String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.source"; //$NON-NLS-1$ + public static final String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.source"; //$NON-NLS-1$ public OpenSourceAction(IWorkbenchPart part) { super(part); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -16,7 +16,7 @@ org.eclipse.gef.editparts.AbstractTreeEditPart implements PropertyChangeListener { - static protected OrmLabelProvider ormLabelProvider = new OrmLabelProvider( + static final protected OrmLabelProvider ormLabelProvider = new OrmLabelProvider( new OrmModelImageVisitor(), new OrmModelNameVisitor()); /** Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -57,7 +57,7 @@ public class ShapeEditPart extends OrmEditPart implements PropertyChangeListener, NodeEditPart { - static protected OrmLabelProvider ormLabelProvider = + static final protected OrmLabelProvider ormLabelProvider = new OrmLabelProvider(new OrmModelImageVisitor(), new OrmModelNameVisitor()); protected void createEditPolicies() { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -17,7 +17,7 @@ org.eclipse.gef.editparts.AbstractTreeEditPart implements PropertyChangeListener { - static protected OrmLabelProvider ormLabelProvider = new OrmLabelProvider( + static final protected OrmLabelProvider ormLabelProvider = new OrmLabelProvider( new OrmModelImageVisitor(), new OrmModelNameVisitor()); /** Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -18,8 +18,6 @@ import java.util.Properties; import java.util.ResourceBundle; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; @@ -27,9 +25,7 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.ide.IDE; import org.osgi.framework.BundleContext; /** Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/SimpleTestProject.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/SimpleTestProject.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/SimpleTestProject.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -26,9 +26,9 @@ final private String projectName; - public static String PACKAGE_NAME = "test"; //$NON-NLS-1$ - public static String TYPE_NAME = "TestClass"; //$NON-NLS-1$ - public static String FILE_NAME = "TestClass.java"; //$NON-NLS-1$ + public static final String PACKAGE_NAME = "test"; //$NON-NLS-1$ + public static final String TYPE_NAME = "TestClass"; //$NON-NLS-1$ + public static final String FILE_NAME = "TestClass.java"; //$NON-NLS-1$ public SimpleTestProject(String projectName) { Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -201,7 +201,7 @@ long period = System.currentTimeMillis() - st_pack_time; String time = period / 1000 + "." + (period % 1000) / 100; //$NON-NLS-1$ System.out.println( time +ConsoleTestMessages.HibernateAllMappingTests_seconds + - " {" + javaElement.getElementName() + "}"); + " {" + javaElement.getElementName() + "}"); //$NON-NLS-1$//$NON-NLS-2$ } waitForJobs(); delay(Customization.EACTH_PACK_TEST_DELAY); Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -39,8 +39,8 @@ private static MappingTestProject singleton= null; - public static String PROJECT_NAME = "MappingTestProject"; //$NON-NLS-1$ - public static String RESOURCE_PATH = "res/project/"; //$NON-NLS-1$ + public static final String PROJECT_NAME = "MappingTestProject"; //$NON-NLS-1$ + public static final String RESOURCE_PATH = "res/project/"; //$NON-NLS-1$ private IProject project; private IJavaProject javaProject; Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -27,7 +27,6 @@ import org.eclipse.jface.text.TextSelection; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchWindow; @@ -129,7 +128,7 @@ ILaunchConfigurationTab[] tabs = page.getTabs(); ConsoleConfigurationMainTab main = (ConsoleConfigurationMainTab) tabs[0]; Class clazz = main.getClass(); - Field projectName = clazz.getDeclaredField("projectNameText"); + Field projectName = clazz.getDeclaredField("projectNameText"); //$NON-NLS-1$ projectName.setAccessible(true); Text text = (Text) projectName.get(main); text.setText(MappingTestProject.PROJECT_NAME); Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/hqleditor/preferences/HQLEditorPreferencePageTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/hqleditor/preferences/HQLEditorPreferencePageTest.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/hqleditor/preferences/HQLEditorPreferencePageTest.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -22,7 +22,7 @@ prefDialog.open(); Object selectedPage = prefDialog.getSelectedPage(); - assertTrue("Selected page is not an instance of HQLEditorPreferencePage", selectedPage instanceof HQLEditorPreferencePage); + assertTrue("Selected page is not an instance of HQLEditorPreferencePage", selectedPage instanceof HQLEditorPreferencePage); //$NON-NLS-1$ } finally { prefDialog.close(); } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/ELTransformerTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/ELTransformerTest.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/ELTransformerTest.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -8,11 +8,11 @@ public void testTransformer() { - assertEquals("from Test", ELTransformer.removeEL("from Test")); - assertEquals("from Test where t.x = :_customer_id_", ELTransformer.removeEL("from Test where t.x = #{customer.id}")); - assertEquals("from Test where t.x = #{customer.id", ELTransformer.removeEL("from Test where t.x = #{customer.id")); - assertEquals("from Test where t.x = :_customer_id_ and x = :_id_ ", ELTransformer.removeEL("from Test where t.x = #{customer.id} and x = #{id} ")); - assertEquals("from Test where t.x = :_customer_id_and_x_____id_ ", ELTransformer.removeEL("from Test where t.x = #{customer.id and x = #{id} ")); - assertEquals("from Test where t.x = :_id_______", ELTransformer.removeEL("from Test where t.x = #{id+-&*()}")); + assertEquals("from Test", ELTransformer.removeEL("from Test")); //$NON-NLS-1$//$NON-NLS-2$ + assertEquals("from Test where t.x = :_customer_id_", ELTransformer.removeEL("from Test where t.x = #{customer.id}")); //$NON-NLS-1$//$NON-NLS-2$ + assertEquals("from Test where t.x = #{customer.id", ELTransformer.removeEL("from Test where t.x = #{customer.id")); //$NON-NLS-1$//$NON-NLS-2$ + assertEquals("from Test where t.x = :_customer_id_ and x = :_id_ ", ELTransformer.removeEL("from Test where t.x = #{customer.id} and x = #{id} ")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("from Test where t.x = :_customer_id_and_x_____id_ ", ELTransformer.removeEL("from Test where t.x = #{customer.id and x = #{id} ")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("from Test where t.x = :_id_______", ELTransformer.removeEL("from Test where t.x = #{id+-&*()}")); //$NON-NLS-1$//$NON-NLS-2$ } } \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HQLQueryValidatorTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HQLQueryValidatorTest.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HQLQueryValidatorTest.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -46,7 +46,8 @@ @Override protected SimpleTestProject createTestProject() { - return new SimpleTestProject("hqlquerytest-" + System.currentTimeMillis()) { // the currentTime Millis can be removed once the classloader stop hanging on to the jars. see JBIDE-1012 + // the currentTime Millis can be removed once the classloader stop hanging on to the jars. see JBIDE-1012 + return new SimpleTestProject("hqlquerytest-" + System.currentTimeMillis()) { //$NON-NLS-1$ @Override protected void buildSimpleTestProject() throws JavaModelException, @@ -65,24 +66,24 @@ assertEquals(3,getIJavaProject().getRawClasspath().length); - getIProject().getFolder("src/META-INF").create(true, true, new NullProgressMonitor()); - getIProject().getFile("src/META-INF/persistence.xml").create( - new ByteArrayInputStream(("<persistence>\n" + - " <persistence-unit name=\"manager1\" transaction-type=\"RESOURCE_LOCAL\">\n" + - " <class>test.TestClass</class>\n" + - " <properties>\n" + - " <property name=\"hibernate.dialect\" value=\"org.hibernate.dialect.HSQLDialect\"/>\n" + - " <property name=\"hibernate.connection.driver_class\" value=\"org.hsqldb.jdbcDriver\"/>\n" + - " <property name=\"hibernate.connection.username\" value=\"sa\"/>\n" + - " <property name=\"hibernate.connection.password\" value=\"\"/>\n" + - " <property name=\"hibernate.connection.url\" value=\"jdbc:hsqldb:.\"/>\n" + - " <property name=\"hibernate.query.startup_check\" value=\"false\"/>\n" + - " </properties>\n" + - " </persistence-unit>\n" + - "</persistence>").getBytes()), + getIProject().getFolder("src/META-INF").create(true, true, new NullProgressMonitor()); //$NON-NLS-1$ + getIProject().getFile("src/META-INF/persistence.xml").create( //$NON-NLS-1$ + new ByteArrayInputStream(("<persistence>\n" + //$NON-NLS-1$ + " <persistence-unit name=\"manager1\" transaction-type=\"RESOURCE_LOCAL\">\n" + //$NON-NLS-1$ + " <class>test.TestClass</class>\n" + //$NON-NLS-1$ + " <properties>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.dialect\" value=\"org.hibernate.dialect.HSQLDialect\"/>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.connection.driver_class\" value=\"org.hsqldb.jdbcDriver\"/>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.connection.username\" value=\"sa\"/>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.connection.password\" value=\"\"/>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.connection.url\" value=\"jdbc:hsqldb:.\"/>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.query.startup_check\" value=\"false\"/>\n" + //$NON-NLS-1$ + " </properties>\n" + //$NON-NLS-1$ + " </persistence-unit>\n" + //$NON-NLS-1$ + "</persistence>").getBytes()), //$NON-NLS-1$ false /* force */, new NullProgressMonitor()); - getIProject().findMember("src/META-INF/persistence.xml"); + getIProject().findMember("src/META-INF/persistence.xml"); //$NON-NLS-1$ getIProject().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); } @@ -90,17 +91,17 @@ protected IType buildType(IPackageFragment pack, String cuName) throws JavaModelException { ICompilationUnit cu = pack.createCompilationUnit(cuName, - "", false, null); + "", false, null); //$NON-NLS-1$ cu.createPackageDeclaration(pack.getElementName(),null); IType type = cu.createType( - &quot;(a)javax.persistence.NamedQuery(name=\&quot;fromUnknown\&quot;, query=\"from Unknown\")\n" + - &quot;(a)javax.persistence.Entity\n&quot; + - "public class " + TYPE_NAME + " {}",null,false,null); - type.createField(&quot;(a)javax.persistence.Id private int id;",null,false,null); - type.createField("private String testField;",null,false,null); - type.createMethod("public String getTestField() {return this.testField;}",null,false,null); - type.createMethod("public void setTestField(String testField) {this.testField = testField;}",null,false,null); + &quot;(a)javax.persistence.NamedQuery(name=\&quot;fromUnknown\&quot;, query=\"from Unknown\")\n" + //$NON-NLS-1$ + &quot;(a)javax.persistence.Entity\n&quot; + //$NON-NLS-1$ + "public class " + TYPE_NAME + " {}",null,false,null); //$NON-NLS-1$ //$NON-NLS-2$ + type.createField(&quot;(a)javax.persistence.Id private int id;",null,false,null); //$NON-NLS-1$ + type.createField("private String testField;",null,false,null); //$NON-NLS-1$ + type.createMethod("public String getTestField() {return this.testField;}",null,false,null); //$NON-NLS-1$ + type.createMethod("public void setTestField(String testField) {this.testField = testField;}",null,false,null); //$NON-NLS-1$ return type; } }; @@ -158,25 +159,25 @@ assertEquals(1, hqlDetector.getProblems().size()); HQLProblem hqlProblem = (HQLProblem) hqlDetector.getProblems().get(0); - assertTrue(hqlProblem.getMessage().contains("from Unknown")); + assertTrue(hqlProblem.getMessage().contains("from Unknown")); //$NON-NLS-1$ } public void testCheckQueryEL() { - HQLDetector.checkQuery(ccfg, "from java.lang.Object", false); - HQLDetector.checkQuery(ccfg, "from TestClass", false); + HQLDetector.checkQuery(ccfg, "from java.lang.Object", false); //$NON-NLS-1$ + HQLDetector.checkQuery(ccfg, "from TestClass", false); //$NON-NLS-1$ try { - HQLDetector.checkQuery(ccfg, "from TestClass where id = #{some.id.field}", false); - fail("should have failed with EL expressions!"); + HQLDetector.checkQuery(ccfg, "from TestClass where id = #{some.id.field}", false); //$NON-NLS-1$ + fail("should have failed with EL expressions!"); //$NON-NLS-1$ } catch (HibernateException he) { // ok } - HQLDetector.checkQuery(ccfg, "from TestClass where id = #{some.id.field}", true); - HQLDetector.checkQuery(ccfg, "from TestClass where id = #{some.id.field=}", true); - HQLDetector.checkQuery(ccfg, "from TestClass where id = #{some.id and field=}", true); + HQLDetector.checkQuery(ccfg, "from TestClass where id = #{some.id.field}", true); //$NON-NLS-1$ + HQLDetector.checkQuery(ccfg, "from TestClass where id = #{some.id.field=}", true); //$NON-NLS-1$ + HQLDetector.checkQuery(ccfg, "from TestClass where id = #{some.id and field=}", true); //$NON-NLS-1$ } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -32,7 +32,7 @@ @Override protected SimpleTestProject createTestProject() { - return new SimpleTestProject("hqlquerytest-" + return new SimpleTestProject("hqlquerytest-" //$NON-NLS-1$ + System.currentTimeMillis()) { // the currentTime Millis can be // removed once the classloader // stop hanging on to the jars. @@ -61,28 +61,28 @@ assertEquals(3, getIJavaProject().getRawClasspath().length); - getIProject().getFolder("src/META-INF").create(true, true, + getIProject().getFolder("src/META-INF").create(true, true, //$NON-NLS-1$ new NullProgressMonitor()); getIProject() - .getFile("src/META-INF/persistence.xml") + .getFile("src/META-INF/persistence.xml") //$NON-NLS-1$ .create( new ByteArrayInputStream( - ("<persistence>\n" - + " <persistence-unit name=\"manager1\" transaction-type=\"RESOURCE_LOCAL\">\n" - + " <class>test.TestClass</class>\n" - + " <properties>\n" - + " <property name=\"hibernate.dialect\" value=\"org.hibernate.dialect.HSQLDialect\"/>\n" - + " <property name=\"hibernate.connection.driver_class\" value=\"org.hsqldb.jdbcDriver\"/>\n" - + " <property name=\"hibernate.connection.username\" value=\"sa\"/>\n" - + " <property name=\"hibernate.connection.password\" value=\"\"/>\n" - + " <property name=\"hibernate.connection.url\" value=\"jdbc:hsqldb:.\"/>\n" - + " <property name=\"hibernate.query.startup_check\" value=\"false\"/>\n" - + " </properties>\n" - + " </persistence-unit>\n" - + "</persistence>").getBytes()), + ("<persistence>\n" //$NON-NLS-1$ + + " <persistence-unit name=\"manager1\" transaction-type=\"RESOURCE_LOCAL\">\n" //$NON-NLS-1$ + + " <class>test.TestClass</class>\n" //$NON-NLS-1$ + + " <properties>\n" //$NON-NLS-1$ + + " <property name=\"hibernate.dialect\" value=\"org.hibernate.dialect.HSQLDialect\"/>\n" //$NON-NLS-1$ + + " <property name=\"hibernate.connection.driver_class\" value=\"org.hsqldb.jdbcDriver\"/>\n" //$NON-NLS-1$ + + " <property name=\"hibernate.connection.username\" value=\"sa\"/>\n" //$NON-NLS-1$ + + " <property name=\"hibernate.connection.password\" value=\"\"/>\n" //$NON-NLS-1$ + + " <property name=\"hibernate.connection.url\" value=\"jdbc:hsqldb:.\"/>\n" //$NON-NLS-1$ + + " <property name=\"hibernate.query.startup_check\" value=\"false\"/>\n" //$NON-NLS-1$ + + " </properties>\n" //$NON-NLS-1$ + + " </persistence-unit>\n" //$NON-NLS-1$ + + "</persistence>").getBytes()), //$NON-NLS-1$ false /* force */, new NullProgressMonitor()); - getIProject().findMember("src/META-INF/persistence.xml"); + getIProject().findMember("src/META-INF/persistence.xml"); //$NON-NLS-1$ getIProject().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); } @@ -90,27 +90,27 @@ @Override protected IType buildType(IPackageFragment pack, String cuName) throws JavaModelException { - ICompilationUnit cu = pack.createCompilationUnit(cuName, "", + ICompilationUnit cu = pack.createCompilationUnit(cuName, "", //$NON-NLS-1$ false, null); cu.createPackageDeclaration(pack.getElementName(), null); IType type = cu.createType( - &quot;(a)javax.persistence.NamedQuery(name=\&quot;fromUnknown\&quot;, query=\"from Unknown\")\n" - + &quot;(a)javax.persistence.Entity\n&quot; - + "public class " + TYPE_NAME + " {}", null, + &quot;(a)javax.persistence.NamedQuery(name=\&quot;fromUnknown\&quot;, query=\"from Unknown\")\n" //$NON-NLS-1$ + + &quot;(a)javax.persistence.Entity\n&quot; //$NON-NLS-1$ + + "public class " + TYPE_NAME + " {}", null, //$NON-NLS-1$ //$NON-NLS-2$ false, null); - type.createField(&quot;(a)javax.persistence.Id private int id;", null, + type.createField(&quot;(a)javax.persistence.Id private int id;", null, //$NON-NLS-1$ false, null); type - .createField("private String testField;", null, false, + .createField("private String testField;", null, false, //$NON-NLS-1$ null); type .createMethod( - "public String getTestField() {return this.testField;}", + "public String getTestField() {return this.testField;}", //$NON-NLS-1$ null, false, null); type .createMethod( - "public void setTestField(String testField) {this.testField = testField;}", + "public void setTestField(String testField) {this.testField = testField;}", //$NON-NLS-1$ null, false, null); return type; } @@ -139,7 +139,7 @@ .setPerspective( PlatformUI.getWorkbench().getPerspectiveRegistry() .findPerspectiveWithId( - "org.eclipse.ui.resourcePerspective")); + "org.eclipse.ui.resourcePerspective")); //$NON-NLS-1$ waitForJobs(); // getProject().deleteIProject(); @@ -173,9 +173,9 @@ private void deleteFile(File file) { try { if (!file.delete()) - throw new RuntimeException("Cannot remove the " + file.getAbsolutePath() + " file."); + throw new RuntimeException("Cannot remove the " + file.getAbsolutePath() + " file."); //$NON-NLS-1$//$NON-NLS-2$ } catch (Throwable e) { - throw new RuntimeException("Cannot remove the " + file.getAbsolutePath() + " file.",e); + throw new RuntimeException("Cannot remove the " + file.getAbsolutePath() + " file.",e); //$NON-NLS-1$ //$NON-NLS-2$ } } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest2.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest2.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest2.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -1,6 +1,5 @@ package org.hibernate.eclipse.jdt.ui.test; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -13,23 +12,15 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.dom.AST; -import org.eclipse.jdt.core.dom.ASTNode; -import org.eclipse.jdt.core.dom.ASTParser; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.launching.JavaRuntime; -import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PlatformUI; -import org.hibernate.HibernateException; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode; @@ -39,8 +30,6 @@ import org.hibernate.eclipse.console.test.SimpleTestProject; import org.hibernate.eclipse.console.test.xpl.JavaProjectHelper; import org.hibernate.eclipse.console.utils.ProjectUtils; -import org.hibernate.eclipse.jdt.ui.internal.HQLDetector; -import org.hibernate.eclipse.jdt.ui.internal.HQLProblem; public class HibernateErrorsTest2 extends HibernateConsoleTest { @@ -56,7 +45,8 @@ @Override protected SimpleTestProject createTestProject() { - return new SimpleTestProject("hqlquerytest-" + System.currentTimeMillis()) { // the currentTime Millis can be removed once the classloader stop hanging on to the jars. see JBIDE-1012 + // the currentTime Millis can be removed once the classloader stop hanging on to the jars. see JBIDE-1012 + return new SimpleTestProject("hqlquerytest-" + System.currentTimeMillis()) { //$NON-NLS-1$ @Override protected void buildSimpleTestProject() throws JavaModelException, @@ -75,24 +65,24 @@ assertEquals(3,getIJavaProject().getRawClasspath().length); - getIProject().getFolder("src/META-INF").create(true, true, new NullProgressMonitor()); - getIProject().getFile("src/META-INF/persistence.xml").create( - new ByteArrayInputStream(("<persistence>\n" + - " <persistence-unit name=\"manager1\" transaction-type=\"RESOURCE_LOCAL\">\n" + - " <class>test.TestClass</class>\n" + - " <properties>\n" + - " <property name=\"hibernate.dialect\" value=\"org.hibernate.dialect.HSQLDialect\"/>\n" + - " <property name=\"hibernate.connection.driver_class\" value=\"org.hsqldb.jdbcDriver\"/>\n" + - " <property name=\"hibernate.connection.username\" value=\"sa\"/>\n" + - " <property name=\"hibernate.connection.password\" value=\"\"/>\n" + - " <property name=\"hibernate.connection.url\" value=\"jdbc:hsqldb:.\"/>\n" + - " <property name=\"hibernate.query.startup_check\" value=\"false\"/>\n" + - " </properties>\n" + - " </persistence-unit>\n" + - "</persistence>").getBytes()), + getIProject().getFolder("src/META-INF").create(true, true, new NullProgressMonitor()); //$NON-NLS-1$ + getIProject().getFile("src/META-INF/persistence.xml").create( //$NON-NLS-1$ + new ByteArrayInputStream(("<persistence>\n" + //$NON-NLS-1$ + " <persistence-unit name=\"manager1\" transaction-type=\"RESOURCE_LOCAL\">\n" + //$NON-NLS-1$ + " <class>test.TestClass</class>\n" + //$NON-NLS-1$ + " <properties>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.dialect\" value=\"org.hibernate.dialect.HSQLDialect\"/>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.connection.driver_class\" value=\"org.hsqldb.jdbcDriver\"/>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.connection.username\" value=\"sa\"/>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.connection.password\" value=\"\"/>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.connection.url\" value=\"jdbc:hsqldb:.\"/>\n" + //$NON-NLS-1$ + " <property name=\"hibernate.query.startup_check\" value=\"false\"/>\n" + //$NON-NLS-1$ + " </properties>\n" + //$NON-NLS-1$ + " </persistence-unit>\n" + //$NON-NLS-1$ + "</persistence>").getBytes()), //$NON-NLS-1$ false /* force */, new NullProgressMonitor()); - getIProject().findMember("src/META-INF/persistence.xml"); + getIProject().findMember("src/META-INF/persistence.xml"); //$NON-NLS-1$ getIProject().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); } @@ -100,17 +90,17 @@ protected IType buildType(IPackageFragment pack, String cuName) throws JavaModelException { ICompilationUnit cu = pack.createCompilationUnit(cuName, - "", false, null); + "", false, null); //$NON-NLS-1$ cu.createPackageDeclaration(pack.getElementName(),null); IType type = cu.createType( - &quot;(a)javax.persistence.NamedQuery(name=\&quot;fromUnknown\&quot;, query=\"from Unknown\")\n" + - &quot;(a)javax.persistence.Entity\n&quot; + - "public class " + TYPE_NAME + " {}",null,false,null); - type.createField(&quot;(a)javax.persistence.Id private int id;",null,false,null); - type.createField("private String testField;",null,false,null); - type.createMethod("public String getTestField() {return this.testField;}",null,false,null); - type.createMethod("public void setTestField(String testField) {this.testField = testField;}",null,false,null); + &quot;(a)javax.persistence.NamedQuery(name=\&quot;fromUnknown\&quot;, query=\"from Unknown\")\n" + //$NON-NLS-1$ + &quot;(a)javax.persistence.Entity\n&quot; + //$NON-NLS-1$ + "public class " + TYPE_NAME + " {}",null,false,null); //$NON-NLS-1$//$NON-NLS-2$ + type.createField(&quot;(a)javax.persistence.Id private int id;",null,false,null); //$NON-NLS-1$ + type.createField("private String testField;",null,false,null); //$NON-NLS-1$ + type.createMethod("public String getTestField() {return this.testField;}",null,false,null); //$NON-NLS-1$ + type.createMethod("public void setTestField(String testField) {this.testField = testField;}",null,false,null); //$NON-NLS-1$ return type; } }; @@ -150,7 +140,7 @@ .setPerspective( PlatformUI.getWorkbench().getPerspectiveRegistry() .findPerspectiveWithId( - "org.eclipse.ui.resourcePerspective")); + "org.eclipse.ui.resourcePerspective")); //$NON-NLS-1$ waitForJobs(); // getProject().deleteIProject(); @@ -209,14 +199,14 @@ private String getMessage(File file) { StringBuffer buffer = new StringBuffer(); - buffer.append("Cannot remove the "); + buffer.append("Cannot remove the "); //$NON-NLS-1$ buffer.append(file.getAbsolutePath()); - buffer.append(" file. "); + buffer.append(" file. "); //$NON-NLS-1$ if (file.exists() && file.isDirectory()) { String[] files = file.list(); - buffer.append("List="); + buffer.append("List="); //$NON-NLS-1$ buffer.append(files); - buffer.append("-"); + buffer.append("-"); //$NON-NLS-1$ for (int i = 0; i < files.length; i++) buffer.append(files[i]); } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateJDTuiTestPlugin.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateJDTuiTestPlugin.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateJDTuiTestPlugin.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -18,7 +18,7 @@ public class HibernateJDTuiTestPlugin extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.hibernate.eclipse.jdt.ui.test"; + public static final String PLUGIN_ID = "org.hibernate.eclipse.jdt.ui.test"; //$NON-NLS-1$ // The shared instance private static HibernateJDTuiTestPlugin plugin; @@ -58,7 +58,7 @@ public File getFileInPlugin(IPath path) throws CoreException { try { - URL installURL= new URL(getBundle().getEntry("/"), path.toString()); + URL installURL= new URL(getBundle().getEntry("/"), path.toString()); //$NON-NLS-1$ URL localURL= FileLocator.toFileURL(installURL); return new File(localURL.getFile()); } catch (IOException e) { Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/QuestionDialog.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/QuestionDialog.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/QuestionDialog.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -109,7 +109,7 @@ ILaunchConfiguration configuration; try { - configuration = SeamGenAction.findLaunchConfig( "seamgen" ); + configuration = SeamGenAction.findLaunchConfig( "seamgen" ); //$NON-NLS-1$ if(configuration!=null) { existing = SeamGenAction.getSeamGenProperties( configuration ); } @@ -134,7 +134,7 @@ composite = defaultComposite; } Label label = new Label(composite, SWT.NONE); - label.setText( sgp.getDescription() + ":" ); + label.setText( sgp.getDescription() + ":" ); //$NON-NLS-1$ Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/DeployAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/DeployAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/DeployAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -3,7 +3,7 @@ public class DeployAction extends SeamGenAction { protected String getTarget() { - return "deploy"; + return "deploy"; //$NON-NLS-1$ } } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/ExplodeAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/ExplodeAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/ExplodeAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -3,7 +3,7 @@ public class ExplodeAction extends SeamGenAction { protected String getTarget() { - return "explode"; + return "explode"; //$NON-NLS-1$ } } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/GenerateEntitiesAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/GenerateEntitiesAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/GenerateEntitiesAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -3,7 +3,7 @@ public class GenerateEntitiesAction extends SeamGenAction { protected String getTarget() { - return "generate-entities"; + return "generate-entities"; //$NON-NLS-1$ } } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewActionAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewActionAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewActionAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -9,7 +9,7 @@ public class NewActionAction extends SeamGenAction { protected String getTarget() { - return "new-action"; + return "new-action"; //$NON-NLS-1$ } public String getTitle() { @@ -22,29 +22,29 @@ protected Map getQuestions() { Map properties = new LinkedHashMap(); - properties.put( "component.name", new SeamGenProperty("Seam component name") ); - properties.put( "interface.name", new SeamGenProperty("Local interface name") { + properties.put( "component.name", new SeamGenProperty("Seam component name") ); //$NON-NLS-1$ + properties.put( "interface.name", new SeamGenProperty("Local interface name") { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "component.name", "" ); + String property = others.getProperty( "component.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return upper(property); } }); - properties.put( "bean.name", new SeamGenProperty("Bean name") { + properties.put( "bean.name", new SeamGenProperty("Bean name") { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "component.name", "" ); + String property = others.getProperty( "component.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return upper(property + "Bean"); } }); - properties.put( "method.name", new SeamGenProperty("Method name") { + properties.put( "method.name", new SeamGenProperty("Method name") { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "component.name", "" ); + String property = others.getProperty( "component.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return lower(property); } }); - properties.put( "page.name", new SeamGenProperty("Page name") { + properties.put( "page.name", new SeamGenProperty("Page name") { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "component.name", "" ); + String property = others.getProperty( "component.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return lower(property); } }); Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewConversationAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewConversationAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewConversationAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -3,7 +3,7 @@ public class NewConversationAction extends NewActionAction { protected String getTarget() { - return "new-conversation"; + return "new-conversation"; //$NON-NLS-1$ } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewEntityAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewEntityAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewEntityAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -9,7 +9,7 @@ public class NewEntityAction extends SeamGenAction { protected String getTarget() { - return "new-entity"; + return "new-entity"; //$NON-NLS-1$ } public String getTitle() { @@ -22,17 +22,17 @@ protected Map getQuestions() { Map properties = new LinkedHashMap(); - properties.put( "entity.name", new SeamGenProperty("Entity class name") ); - properties.put( "masterPage.name", new SeamGenProperty("Master page name") { + properties.put( "entity.name", new SeamGenProperty("Entity class name") ); //$NON-NLS-1$ + properties.put( "masterPage.name", new SeamGenProperty("Master page name") { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "entity.name", "" ); + String property = others.getProperty( "entity.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return lower(property) + "List"; } }); - properties.put( "page.name", new SeamGenProperty("Page name") { + properties.put( "page.name", new SeamGenProperty("Page name") { //$NON-NLS-1$ public String getDefaultValue(Properties others) { - String property = others.getProperty( "entity.name", "" ); + String property = others.getProperty( "entity.name", "" ); //$NON-NLS-1$ //$NON-NLS-2$ return lower(property); } }); Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewFormAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewFormAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewFormAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -8,7 +8,7 @@ } protected String getTarget() { - return "new-form"; + return "new-form"; //$NON-NLS-1$ } public String getTitle() { Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewProjectAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewProjectAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/NewProjectAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -3,7 +3,7 @@ public class NewProjectAction extends SeamGenAction { protected String getTarget() { - return "new-project"; + return "new-project"; //$NON-NLS-1$ } } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/RestartAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/RestartAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/RestartAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -3,7 +3,7 @@ public class RestartAction extends SeamGenAction { protected String getTarget() { - return "restart"; + return "restart"; //$NON-NLS-1$ } } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -3,7 +3,7 @@ public class SetupAction extends SeamGenAction { protected String getTarget() { - return "setup"; + return "setup"; //$NON-NLS-1$ } } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -19,7 +19,7 @@ protected static final String CODEGEN = "Code generation"; protected String getTarget() { - return "setup"; + return "setup"; //$NON-NLS-1$ } public Set getGroups() { Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UndeployAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UndeployAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UndeployAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -3,7 +3,7 @@ public class UndeployAction extends SeamGenAction { protected String getTarget() { - return "undeploy"; + return "undeploy"; //$NON-NLS-1$ } } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UnexplodeAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UnexplodeAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UnexplodeAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -3,7 +3,7 @@ public class UnexplodeAction extends SeamGenAction { protected String getTarget() { - return "unexplode"; + return "unexplode"; //$NON-NLS-1$ } } Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UpdateProjectAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UpdateProjectAction.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/UpdateProjectAction.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -3,7 +3,7 @@ public class UpdateProjectAction extends SeamGenAction { protected String getTarget() { - return "update-project"; + return "update-project"; //$NON-NLS-1$ } } Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -63,7 +63,7 @@ public static IProject loadProject(String projectName) throws CoreException { IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember(projectName); - assertNotNull("Can't load " + projectName, project); + assertNotNull("Can't load " + projectName, project); //$NON-NLS-1$ IProject result = project.getProject(); try { result.build(IncrementalProjectBuilder.FULL_BUILD, null); Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/WorkbenchUtils.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -40,13 +40,13 @@ static public IWizard findWizardByDefId(String definitionId) { IWizardDescriptor aWizardDescr = getWorkbench().getNewWizardRegistry() .findWizard(definitionId); - TestCase.assertNotNull("Cannot find wizard " + definitionId - + " definition in wizard registry", aWizardDescr); + TestCase.assertNotNull("Cannot find wizard " + definitionId //$NON-NLS-1$ + + " definition in wizard registry", aWizardDescr); //$NON-NLS-1$ IWorkbenchWizard aWizard = null; try { aWizard = aWizardDescr.createWizard(); } catch (CoreException e) { - JUnitUtils.fail("Cannot create IWorkbenchWizard instance", e); + JUnitUtils.fail("Cannot create IWorkbenchWizard instance", e); //$NON-NLS-1$ } return aWizard; } Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl/EditorTestHelper.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl/EditorTestHelper.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl/EditorTestHelper.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -206,7 +206,7 @@ Job[] jobs= jobManager.find(null); for (int i= 0; i < jobs.length; i++) { Job job= jobs[i]; - if ("Usage Data Event consumer".equals(job.getName()) || "Flush Cache Job".equals(job.getName())) continue; + if ("Usage Data Event consumer".equals(job.getName()) || "Flush Cache Job".equals(job.getName())) continue; //$NON-NLS-1$ //$NON-NLS-2$ int state= job.getState(); if (state == Job.RUNNING || state == Job.WAITING) { Logger.global.finest(job.getName()); Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -54,7 +54,7 @@ List<IMarker> result = new ArrayList<IMarker>(); IMarker[] markers = resource.findMarkers(type, true, IResource.DEPTH_INFINITE); for (int i = 0; i < markers.length; i++) { - String message = markers[i].getAttribute(IMarker.MESSAGE, ""); + String message = markers[i].getAttribute(IMarker.MESSAGE, ""); //$NON-NLS-1$ if (message.matches(pattern)) { result.add(markers[i]); } @@ -73,29 +73,29 @@ int line = findMarkerLine( resource, type, pattern); - assertTrue("Marker matches the '" + pattern + "' pattern wasn't found", + assertTrue("Marker matches the '" + pattern + "' pattern wasn't found", //$NON-NLS-1$ //$NON-NLS-2$ line != -1); - assertEquals("Marker matches the '" + pattern + "' pattern was found at wrong line", + assertEquals("Marker matches the '" + pattern + "' pattern was found at wrong line", //$NON-NLS-1$//$NON-NLS-2$ expectedLine,line); } protected void assertMarkerIsNotCreated(IResource resource, String type, String pattern) throws CoreException { IMarker[] markers = findMarkers(resource, type, pattern); - assertFalse("Marker matches the '" + pattern + "' pattern was found", markers.length>0); + assertFalse("Marker matches the '" + pattern + "' pattern was found", markers.length>0); //$NON-NLS-1$ //$NON-NLS-2$ } protected void assertMarkerIsNotCreated(IResource resource, String type, String pattern, int expectedLine) throws CoreException { int line = findMarkerLine(resource, type, pattern); - assertFalse("Marker matches the '" + pattern + "' pattern was found", line != -1); + assertFalse("Marker matches the '" + pattern + "' pattern was found", line != -1); //$NON-NLS-1$ //$NON-NLS-2$ } protected void assertMarkerIsCreated(IResource resource, String type, String pattern) throws CoreException { IMarker[] markers = findMarkers(resource, type, pattern); - assertTrue("Marker matches the '" + pattern + "' pattern wasn't found", + assertTrue("Marker matches the '" + pattern + "' pattern wasn't found", //$NON-NLS-1$ //$NON-NLS-2$ markers.length>0); } @@ -109,11 +109,11 @@ try{ IMarker[] markers = resource.findMarkers(null, true, IResource.DEPTH_INFINITE); for(int i=0;i<markers.length;i++){ - System.out.println("Marker - "+markers[i].getAttribute(IMarker.MESSAGE, "")); + System.out.println("Marker - "+markers[i].getAttribute(IMarker.MESSAGE, "")); //$NON-NLS-1$//$NON-NLS-2$ } return markers.length; }catch(CoreException ex){ - JUnitUtils.fail("Can'r get problem markers", ex); + JUnitUtils.fail("Can't get problem markers", ex); //$NON-NLS-1$ } return -1; } @@ -125,11 +125,11 @@ messages = new String[markers.length]; for(int i=0;i<markers.length;i++){ - System.out.println("Marker - "+markers[i].getAttribute(IMarker.MESSAGE, "")); - messages[i] = markers[i].getAttribute(IMarker.MESSAGE, ""); + System.out.println("Marker - "+markers[i].getAttribute(IMarker.MESSAGE, "")); //$NON-NLS-1$//$NON-NLS-2$ + messages[i] = markers[i].getAttribute(IMarker.MESSAGE, ""); //$NON-NLS-1$ } }catch(CoreException ex){ - JUnitUtils.fail("Can't get problem markers", ex); + JUnitUtils.fail("Can't get problem markers", ex); //$NON-NLS-1$ } return messages; } @@ -141,11 +141,11 @@ numbers = new int[markers.length]; for(int i=0;i<markers.length;i++){ - System.out.println("Marker line number - "+markers[i].getAttribute(IMarker.LINE_NUMBER, 0)); + System.out.println("Marker line number - "+markers[i].getAttribute(IMarker.LINE_NUMBER, 0)); //$NON-NLS-1$ numbers[i] = markers[i].getAttribute(IMarker.LINE_NUMBER, 0); } }catch(CoreException ex){ - JUnitUtils.fail("Can't get problem markers.", ex); + JUnitUtils.fail("Can't get problem markers.", ex); //$NON-NLS-1$ } return numbers; } Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PlugInLoadTest.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -25,21 +25,21 @@ */ public class PlugInLoadTest extends TestCase { - public static final String rhdsNS = "org.jboss.tools."; - private static String jbideNS = "org.jboss.ide.eclipse."; - private static String hibNS = "org.hibernate.eclipse."; - private static String jbpmNS = "org.jbpm.gd.jpdl"; - private static String jbwsNS = "com.eviware.soapui."; + public static final String rhdsNS = "org.jboss.tools."; //$NON-NLS-1$ + private static String jbideNS = "org.jboss.ide.eclipse."; //$NON-NLS-1$ + private static String hibNS = "org.hibernate.eclipse."; //$NON-NLS-1$ + private static String jbpmNS = "org.jbpm.gd.jpdl"; //$NON-NLS-1$ + private static String jbwsNS = "com.eviware.soapui."; //$NON-NLS-1$ private boolean isPluginResolved(String pluginId) { Bundle bundle = Platform.getBundle(pluginId); - assertNotNull(pluginId + " failed to load.", bundle); + assertNotNull(pluginId + " failed to load.", bundle); //$NON-NLS-1$ try { // In 3.3 when test case is running plug-in.getState always returns // STARTING state // to move plug-in in ACTIVE state at one class should be loaded // from plug-in - bundle.loadClass("fake class"); + bundle.loadClass("fake class"); //$NON-NLS-1$ } catch (Exception e) { // It happens always because loaded class doesn't not exist } @@ -49,88 +49,88 @@ private void assertPluginsResolved(String[] pluginIds) { for (int i = 0; i < pluginIds.length; i++) { - assertTrue("plugin '" + pluginIds[i] + "' is not resolved", + assertTrue("plugin '" + pluginIds[i] + "' is not resolved", //$NON-NLS-1$ //$NON-NLS-2$ isPluginResolved(pluginIds[i])); } } public void testCommonPluginsResolved() { assertPluginsResolved(new String[] { - rhdsNS + "common", - rhdsNS + "common.gef", - rhdsNS + "common.kb", - rhdsNS + "common.model", - rhdsNS + "common.model.ui", - rhdsNS + "common.projecttemplates", - rhdsNS + "common.text.ext", - rhdsNS + "common.text.xml", - rhdsNS + "common.verification", - rhdsNS + "common.verification.ui", }); + rhdsNS + "common", //$NON-NLS-1$ + rhdsNS + "common.gef", //$NON-NLS-1$ + rhdsNS + "common.kb", //$NON-NLS-1$ + rhdsNS + "common.model", //$NON-NLS-1$ + rhdsNS + "common.model.ui", //$NON-NLS-1$ + rhdsNS + "common.projecttemplates", //$NON-NLS-1$ + rhdsNS + "common.text.ext", //$NON-NLS-1$ + rhdsNS + "common.text.xml", //$NON-NLS-1$ + rhdsNS + "common.verification", //$NON-NLS-1$ + rhdsNS + "common.verification.ui", }); //$NON-NLS-1$ } public void testJsfPluginsResolved() { assertPluginsResolved(new String[] { - rhdsNS + "jsf", - rhdsNS + "jsf.text.ext", - rhdsNS + "jsf.text.ext.facelets", - rhdsNS + "jsf.ui", - rhdsNS + "jsf.verification", - rhdsNS + "jsf.vpe.ajax4jsf", - rhdsNS + "jsf.vpe.facelets", - rhdsNS + "jsf.vpe.richfaces", - rhdsNS + "jsf.vpe.seam" }); + rhdsNS + "jsf", //$NON-NLS-1$ + rhdsNS + "jsf.text.ext", //$NON-NLS-1$ + rhdsNS + "jsf.text.ext.facelets", //$NON-NLS-1$ + rhdsNS + "jsf.ui", //$NON-NLS-1$ + rhdsNS + "jsf.verification", //$NON-NLS-1$ + rhdsNS + "jsf.vpe.ajax4jsf", //$NON-NLS-1$ + rhdsNS + "jsf.vpe.facelets", //$NON-NLS-1$ + rhdsNS + "jsf.vpe.richfaces", //$NON-NLS-1$ + rhdsNS + "jsf.vpe.seam" }); //$NON-NLS-1$ } public void testJstPluginsResolved() { assertPluginsResolved(new String[] { - rhdsNS + "jst.jsp", - rhdsNS + "jst.web", - rhdsNS + "jst.web.debug", - rhdsNS + "jst.web.debug.ui", - rhdsNS + "jst.web.tiles", - rhdsNS + "jst.web.tiles.ui", - rhdsNS + "jst.web.ui", - rhdsNS + "jst.web.verification" }); + rhdsNS + "jst.jsp", //$NON-NLS-1$ + rhdsNS + "jst.web", //$NON-NLS-1$ + rhdsNS + "jst.web.debug", //$NON-NLS-1$ + rhdsNS + "jst.web.debug.ui", //$NON-NLS-1$ + rhdsNS + "jst.web.tiles", //$NON-NLS-1$ + rhdsNS + "jst.web.tiles.ui", //$NON-NLS-1$ + rhdsNS + "jst.web.ui", //$NON-NLS-1$ + rhdsNS + "jst.web.verification" }); //$NON-NLS-1$ } public void testVpePluginsResolved() { assertPluginsResolved(new String[] { - rhdsNS + "vpe", - rhdsNS + "vpe.ui.palette", - rhdsNS + "vpe.xulrunner" }); + rhdsNS + "vpe", //$NON-NLS-1$ + rhdsNS + "vpe.ui.palette", //$NON-NLS-1$ + rhdsNS + "vpe.xulrunner" }); //$NON-NLS-1$ } public void testStrutsPluginsResolved() { assertPluginsResolved(new String[] { - rhdsNS + "struts", - rhdsNS + "struts.debug", - rhdsNS + "struts.text.ext", - rhdsNS + "struts.ui", - rhdsNS + "struts.validator.ui", - rhdsNS + "struts.verification" }); + rhdsNS + "struts", //$NON-NLS-1$ + rhdsNS + "struts.debug", //$NON-NLS-1$ + rhdsNS + "struts.text.ext", //$NON-NLS-1$ + rhdsNS + "struts.ui", //$NON-NLS-1$ + rhdsNS + "struts.validator.ui", //$NON-NLS-1$ + rhdsNS + "struts.verification" }); //$NON-NLS-1$ } public void testCorePluginsResolved() { assertPluginsResolved(new String[] { - jbideNS + "archives.core", - jbideNS + "archives.ui"}); + jbideNS + "archives.core", //$NON-NLS-1$ + jbideNS + "archives.ui"}); //$NON-NLS-1$ } public void testASPluginsResolved() { assertPluginsResolved(new String[] { - jbideNS + "as.core", - jbideNS + "as.ui", - jbideNS + "as.ui.mbeans" }); + jbideNS + "as.core", //$NON-NLS-1$ + jbideNS + "as.ui", //$NON-NLS-1$ + jbideNS + "as.ui.mbeans" }); //$NON-NLS-1$ } public void testHibernatePluginsResolved() { assertPluginsResolved(new String[] { - "org.hibernate.eclipse", - hibNS + "console", - hibNS + "help", - hibNS + "mapper", - hibNS + "jdt.ui", - hibNS + "jdt.apt.ui" }); + "org.hibernate.eclipse", //$NON-NLS-1$ + hibNS + "console", //$NON-NLS-1$ + hibNS + "help", //$NON-NLS-1$ + hibNS + "mapper", //$NON-NLS-1$ + hibNS + "jdt.ui", //$NON-NLS-1$ + hibNS + "jdt.apt.ui" }); //$NON-NLS-1$ } @@ -142,7 +142,7 @@ public void testFreemarkerPluginsResolved() { assertPluginsResolved(new String[] { - jbideNS + "freemarker" }); + jbideNS + "freemarker" }); //$NON-NLS-1$ } public void testDroolsPluginsResolved() { Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PreferencePageTest.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PreferencePageTest.java 2009-04-03 14:18:35 UTC (rev 14496) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PreferencePageTest.java 2009-04-03 14:43:18 UTC (rev 14497) @@ -48,7 +48,7 @@ prefDialog.open(); Object selectedPage = prefDialog.getSelectedPage(); - assertTrue("Selected page is not an instance of SeamPreferencePage", instanceOf.isInstance(selectedPage)); + assertTrue("Selected page is not an instance of SeamPreferencePage", instanceOf.isInstance(selectedPage)); //$NON-NLS-1$ } finally { prefDialog.close(); }