[jbosstools-commits] JBoss Tools SVN: r24767 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/console and 1 other directories.

Author: vyemialyanchyk Date: 2010-09-07 10:24:02 -0400 (Tue, 07 Sep 2010) New Revision: 24767 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.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java Log: https://jira.jboss.org/browse/JBIDE-6997 - fixed Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-09-07 14:23:44 UTC (rev 24766) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-09-07 14:24:02 UTC (rev 24767) @@ -87,6 +87,8 @@ updateAttr(root, prefs.getEntityResolverName(), ConfigurationXMLStrings.ENTITYRESOLVER); updateAttr(root, prefs.getNamingStrategy(), ConfigurationXMLStrings.NAMINGSTRATEGY); updateAttr(root, prefs.getPersistenceUnitName(), ConfigurationXMLStrings.PERSISTENCEUNIT); + // very specific property, for more information -> JBIDE-6997 + //updateAttr(root, additional, ConfigurationXMLStrings.PREFERBASICCOMPOSITEIDS); updateAttr(root, additional, ConfigurationXMLStrings.DETECTMANYTOMANY); updateAttr(root, additional, ConfigurationXMLStrings.DETECTONTTOONE); updateAttr(root, additional, ConfigurationXMLStrings.DETECTOPTIMISTICLOCK); 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 2010-09-07 14:23:44 UTC (rev 24766) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2010-09-07 14:24:02 UTC (rev 24767) @@ -386,6 +386,7 @@ public static String CodeGenerationSettingsTab_use_existing; public static String CodeGenerationSettingsTab_workspace; public static String CodeGenerationSettingsTab_use_generation_in_external_process; + public static String CodeGenerationSettingsTab_script_can_not_be_generated_correctly_without; public static String ConsoleConfigurationLaunchDelegate_direct_launch_not_supported; public static String ConsoleConfigurationMainTab_annotations; public static String ConsoleConfigurationMainTab_cfg_xml; 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 2010-09-07 14:23:44 UTC (rev 24766) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2010-09-07 14:24:02 UTC (rev 24767) @@ -389,6 +389,7 @@ CodeGenerationSettingsTab_use_existing=Use &existing... CodeGenerationSettingsTab_workspace=&Workspace... CodeGenerationSettingsTab_use_generation_in_external_process=Use generation in external process +CodeGenerationSettingsTab_script_can_not_be_generated_correctly_without=The script can not be generated correctly without "Generate basic typed composite ids" flag set. ConsoleConfigurationLaunchDelegate_direct_launch_not_supported=Direct launch not supported ConsoleConfigurationMainTab_annotations=Annotations (jdk 1.5+) ConsoleConfigurationMainTab_cfg_xml=cfg.xml Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2010-09-07 14:23:44 UTC (rev 24766) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2010-09-07 14:24:02 UTC (rev 24767) @@ -385,6 +385,11 @@ msg = PathHelper.checkDirectory(templatePath, HibernateConsoleMessages.CodeGenerationSettingsTab_template_dir, true); } } + if (msg == null) { + if (reverseEngineer && !preferBasicCompositeIds) { + msg = HibernateConsoleMessages.CodeGenerationSettingsTab_script_can_not_be_generated_correctly_without; + } + } return msg; } }