Author: dgeraskov Date: 2009-08-20 05:31:30 -0400 (Thu, 20 Aug 2009) New Revision: 17181 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java Log: https://jira.jboss.org/jira/browse/JBIDE-4761 Prevent double id-property altering in NamingStrategy. Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2009-08-20 08:27:30 UTC (rev 17180) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2009-08-20 09:31:30 UTC (rev 17181) @@ -468,7 +468,7 @@ protected String getResourceDefaultName() { NamingStrategy namingStrategy = getJpaProject().getNamingStrategy(); if (namingStrategy != null){ - return namingStrategy.classToTableName(javaResourcePersistentType.getName()); + return namingStrategy.classToTableName(javaResourcePersistentType.getQualifiedName()); } return javaResourcePersistentType.getName(); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java 2009-08-20 08:27:30 UTC (rev 17180) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping.java 2009-08-20 09:31:30 UTC (rev 17181) @@ -193,12 +193,4 @@ return (HibernateJpaProject) super.getJpaProject(); } - @Override - public String getDefaultColumnName() { - NamingStrategy namingStrategy = getJpaProject().getNamingStrategy(); - if (namingStrategy != null && getPersistentAttribute().getName() != null){ - return namingStrategy.propertyToColumnName(getPersistentAttribute().getName()); - } - return super.getDefaultColumnName(); - } }