Author: max.andersen(a)jboss.com Date: 2009-03-06 15:14:36 -0500 (Fri, 06 Mar 2009) New Revision: 14091 Modified: branches/jbosstools-3.0.x/ branches/jbosstools-3.0.x/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java Log: Merged revisions 14088 via svnmerge from https://svn.jboss.org/repos/jbosstools/trunk ........ r14088 | max.andersen(a)jboss.com | 2009-03-06 20:47:25 +0100 (Fri, 06 Mar 2009) | 1 line JBIDE-3960 calls to buildClassRef caused double creation of all annotations in jpa model which resulted in validation errors ........ Property changes on: branches/jbosstools-3.0.x ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-13898 /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005 /branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079 + /trunk:1-13898,14088 /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005 /branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079 Modified: branches/jbosstools-3.0.x/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java =================================================================== --- branches/jbosstools-3.0.x/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-03-06 20:03:58 UTC (rev 14090) +++ branches/jbosstools-3.0.x/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2009-03-06 20:14:36 UTC (rev 14091) @@ -178,8 +178,9 @@ protected void updateGenericGenerators(){ JpaProject project = getJpaProject(); - for (String annotClass : CollectionTools.iterable(project.annotatedClassNames())) { - ClassRef classRef = buildClassRef(annotClass); + + for (ClassRef classRef : CollectionTools.iterable(classRefs())) { + String annotClass = classRef.getClassName(); JavaPersistentType type = classRef.getJavaPersistentType(); JavaResourcePersistentMember jrpt = null; GenericGeneratorAnnotation annotation = null;