[jbosstools-commits] JBoss Tools SVN: r39236 - branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition.

[jbosstools-commits at lists.jboss.org]

Author: dgolovin
Date: 2012-03-01 19:34:07 -0500 (Thu, 01 Mar 2012)
New Revision: 39236

Modified:
   branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToManyMappingDefinition.java
   branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java
Log:
JBIDE-11079 JPA: Hibernate extension mixed up OneToOne and OneToMany mappings
applied patch to 3.3.0.Beta1 branch

Modified: branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToManyMappingDefinition.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToManyMappingDefinition.java	2012-03-01 21:45:42 UTC (rev 39235)
+++ branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToManyMappingDefinition.java	2012-03-02 00:34:07 UTC (rev 39236)
@@ -20,9 +20,9 @@
 import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.JoinColumnsAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnsAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.MapKeyAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.OrderByAnnotation;
 import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
 
 /**
@@ -49,11 +49,11 @@
 	}
 
 	public String getKey() {
-		return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
+		return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY;
 	}
 
 	public String getAnnotationName() {
-		return OneToOneAnnotation.ANNOTATION_NAME;
+		return OneToManyAnnotation.ANNOTATION_NAME;
 	}
 
 	public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
@@ -66,10 +66,10 @@
 
 	private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
 		JoinTableAnnotation.ANNOTATION_NAME,
+		MapKeyAnnotation.ANNOTATION_NAME,
+		OrderByAnnotation.ANNOTATION_NAME,
 		JoinColumnAnnotation.ANNOTATION_NAME,
-		JoinColumnsAnnotation.ANNOTATION_NAME,
-		PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME,
-		PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME
+		JoinColumnsAnnotation.ANNOTATION_NAME
 	};
 	private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY);
 
@@ -79,7 +79,7 @@
 	}
 	
 	public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
-		return factory.buildJavaOneToOneMapping(persistentAttribute);
+		return factory.buildJavaOneToManyMapping(persistentAttribute);
 	}
 
 	@Override

Modified: branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java	2012-03-01 21:45:42 UTC (rev 39235)
+++ branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java	2012-03-02 00:34:07 UTC (rev 39236)
@@ -20,9 +20,9 @@
 import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.JoinColumnsAnnotation;
 import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.MapKeyAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.OrderByAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnsAnnotation;
 import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
 
 /**
@@ -49,11 +49,11 @@
 	}
 
 	public String getKey() {
-		return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY;
+		return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
 	}
 
 	public String getAnnotationName() {
-		return OneToManyAnnotation.ANNOTATION_NAME;
+		return OneToOneAnnotation.ANNOTATION_NAME;
 	}
 
 	public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
@@ -66,10 +66,10 @@
 
 	private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
 		JoinTableAnnotation.ANNOTATION_NAME,
-		MapKeyAnnotation.ANNOTATION_NAME,
-		OrderByAnnotation.ANNOTATION_NAME,
 		JoinColumnAnnotation.ANNOTATION_NAME,
-		JoinColumnsAnnotation.ANNOTATION_NAME
+		JoinColumnsAnnotation.ANNOTATION_NAME,
+		PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME,
+		PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME
 	};
 	private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY);
 
@@ -79,7 +79,7 @@
 	}
 	
 	public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
-		return factory.buildJavaOneToManyMapping(persistentAttribute);
+		return factory.buildJavaOneToOneMapping(persistentAttribute);
 	}
 
 	@Override