[jbosstools-commits] JBoss Tools SVN: r31352 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core: src/org/jboss/tools/hibernate/jpt/core/internal and 3 other directories.

Author: dgeraskov Date: 2011-05-18 06:18:56 -0400 (Wed, 18 May 2011) New Revision: 31352 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java.tmp Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java Log: https://issues.jboss.org/browse/JBIDE-8947 Mode hibernate tools to Eclipse3.7M7 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2011-05-18 10:18:56 UTC (rev 31352) @@ -17,7 +17,7 @@ org.eclipse.jpt.common.utility, org.eclipse.jpt.common.core, org.eclipse.jpt.jpa.db, - org.eclipse.jpt.jpa.core, + org.eclipse.jpt.jpa.core;bundle-version="3.0.0", org.eclipse.text;bundle-version="3.5.100", org.eclipse.jst.j2ee;bundle-version="1.1.500" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007-2008 Red Hat, Inc. + * Copyright (c) 2007-2011 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, @@ -28,7 +28,6 @@ import org.eclipse.jpt.jpa.core.internal.JavaResourceModelProvider; import org.eclipse.jpt.jpa.core.internal.OrmResourceModelProvider; import org.eclipse.jpt.jpa.core.internal.PersistenceResourceModelProvider; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaBasicMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddableDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedIdMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedMappingDefinition; @@ -133,7 +132,7 @@ // order matches that used by the Reference Implementation (EclipseLink) protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] { JavaEmbeddedMappingDefinition.instance(), - JavaBasicMappingDefinition.instance() + HibernateJavaBasicMappingDefinition.instance() }; @Override Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -12,14 +12,23 @@ import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaBasicMappingDefinition; +import org.eclipse.jpt.jpa.core.JpaFactory; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.jpa.core.resource.java.BasicAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.EnumeratedAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.LobAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; /** * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ -public class HibernateJavaBasicMappingDefinition extends AbstractJavaBasicMappingDefinition +public class HibernateJavaBasicMappingDefinition implements DefaultJavaAttributeMappingDefinition { // singleton private static final HibernateJavaBasicMappingDefinition INSTANCE = new HibernateJavaBasicMappingDefinition(); @@ -31,22 +40,55 @@ return INSTANCE; } - /** * Enforce singleton usage */ private HibernateJavaBasicMappingDefinition() { super(); } + + public String getKey() { + return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; + } + public String getAnnotationName() { + return BasicAnnotation.ANNOTATION_NAME; + } + + public boolean isSpecified(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null; + } + protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] { Hibernate.GENERATED, Hibernate.INDEX, Hibernate.TYPE }; + + private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] { + ColumnAnnotation.ANNOTATION_NAME, + LobAnnotation.ANNOTATION_NAME, + TemporalAnnotation.ANNOTATION_NAME, + EnumeratedAnnotation.ANNOTATION_NAME + }; + private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY); + @Override public Iterable<String> getSupportingAnnotationNames() { - return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); + return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); } + + public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) { + return factory.buildJavaBasicMapping(persistentAttribute); + } + + public boolean isDefault(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.typeIsBasic(); + } + + @Override + public String toString() { + return this.getClass().getSimpleName(); + } } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -12,14 +12,24 @@ import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaIdMappingDefinition; +import org.eclipse.jpt.jpa.core.JpaFactory; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; +import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.SequenceGeneratorAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.TableGeneratorAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; /** * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ -public class HibernateJavaIdMappingDefinition extends AbstractJavaIdMappingDefinition +public class HibernateJavaIdMappingDefinition implements JavaAttributeMappingDefinition { // singleton private static final HibernateJavaIdMappingDefinition INSTANCE = new HibernateJavaIdMappingDefinition(); @@ -31,21 +41,52 @@ return INSTANCE; } - /** * Enforce singleton usage */ private HibernateJavaIdMappingDefinition() { super(); } + + public String getKey() { + return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; + } + public String getAnnotationName() { + return IdAnnotation.ANNOTATION_NAME; + } + + public boolean isSpecified(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null; + } + protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] { Hibernate.INDEX, Hibernate.TYPE }; + + private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] { + ColumnAnnotation.ANNOTATION_NAME, + GeneratedValueAnnotation.ANNOTATION_NAME, + TemporalAnnotation.ANNOTATION_NAME, + TableGeneratorAnnotation.ANNOTATION_NAME, + SequenceGeneratorAnnotation.ANNOTATION_NAME + }; + private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY); @Override public Iterable<String> getSupportingAnnotationNames() { - return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); + return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); } + + @Override + public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) { + return factory.buildJavaIdMapping(persistentAttribute); + } + + @Override + public String toString() { + return this.getClass().getSimpleName(); + } + } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -10,22 +10,32 @@ ******************************************************************************/ package org.jboss.tools.hibernate.jpt.core.internal.context.definition; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToManyMappingDefinition; +import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.jpa.core.JpaFactory; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; +import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; +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.ManyToOneAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; - /** * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ -public class HibernateJavaManyToManyMappingDefinition extends AbstractJavaManyToManyMappingDefinition { - +public class HibernateJavaManyToManyMappingDefinition implements JavaAttributeMappingDefinition +{ // singleton - private static final HibernateJavaManyToManyMappingDefinition INSTANCE = new HibernateJavaManyToManyMappingDefinition(); + private static final JavaAttributeMappingDefinition INSTANCE = new HibernateJavaManyToManyMappingDefinition(); /** * Return the singleton. */ - public static HibernateJavaManyToManyMappingDefinition instance() { + public static JavaAttributeMappingDefinition instance() { return INSTANCE; } @@ -37,4 +47,40 @@ super(); } -} + public String getKey() { + return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; + } + + public String getAnnotationName() { + return ManyToOneAnnotation.ANNOTATION_NAME; + } + + public boolean isSpecified(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null; + } + + @Override + public Iterable<String> getSupportingAnnotationNames() { + return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); + } + + protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] { + Hibernate.FOREIGN_KEY, + }; + + private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] { + JoinTableAnnotation.ANNOTATION_NAME, + JoinColumnAnnotation.ANNOTATION_NAME, + JoinColumnsAnnotation.ANNOTATION_NAME + }; + private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY); + + public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) { + return factory.buildJavaManyToOneMapping(persistentAttribute); + } + + @Override + public String toString() { + return this.getClass().getSimpleName(); + } +} \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -12,15 +12,22 @@ import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.jpa.core.JpaFactory; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToOneMappingDefinition; +import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; +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.ManyToOneAnnotation; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; /** * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ -public class HibernateJavaManyToOneMappingDefinition extends AbstractJavaManyToOneMappingDefinition +public class HibernateJavaManyToOneMappingDefinition implements JavaAttributeMappingDefinition { // singleton private static final HibernateJavaManyToOneMappingDefinition INSTANCE = new HibernateJavaManyToOneMappingDefinition(); @@ -32,20 +39,47 @@ return INSTANCE; } - /** * Enforce singleton usage */ private HibernateJavaManyToOneMappingDefinition() { super(); } + + public String getKey() { + return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; + } + public String getAnnotationName() { + return ManyToOneAnnotation.ANNOTATION_NAME; + } + + public boolean isSpecified(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null; + } + protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] { Hibernate.FOREIGN_KEY, }; + + private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] { + JoinTableAnnotation.ANNOTATION_NAME, + JoinColumnAnnotation.ANNOTATION_NAME, + JoinColumnsAnnotation.ANNOTATION_NAME + }; + private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY); @Override public Iterable<String> getSupportingAnnotationNames() { - return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); + return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); } + + public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) { + return factory.buildJavaManyToOneMapping(persistentAttribute); + } + + @Override + public String toString() { + return this.getClass().getSimpleName(); + } } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -12,14 +12,24 @@ import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaOneToOneMappingDefinition; +import org.eclipse.jpt.jpa.core.JpaFactory; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; +import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; +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.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; /** * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ -public class HibernateJavaOneToOneMappingDefinition extends AbstractJavaOneToOneMappingDefinition +public class HibernateJavaOneToOneMappingDefinition implements JavaAttributeMappingDefinition { // singleton private static final HibernateJavaOneToOneMappingDefinition INSTANCE = new HibernateJavaOneToOneMappingDefinition(); @@ -31,7 +41,6 @@ return INSTANCE; } - /** * Enforce singleton usage */ @@ -39,12 +48,44 @@ super(); } + public String getKey() { + return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; + } + + public String getAnnotationName() { + return OneToOneAnnotation.ANNOTATION_NAME; + } + + public boolean isSpecified(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null; + } + protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] { Hibernate.FOREIGN_KEY, }; + private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] { + JoinTableAnnotation.ANNOTATION_NAME, + JoinColumnAnnotation.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); + @Override public Iterable<String> getSupportingAnnotationNames() { - return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); + return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); } + + public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) { + return factory.buildJavaOneToOneMapping(persistentAttribute); + } + + @Override + public String toString() { + return this.getClass().getSimpleName(); + } + + } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -195,7 +195,6 @@ } } - // ********** hibernateNamed native queries ********** public ListIterator<HibernateJavaNamedNativeQuery> hibernateNamedNativeQueries() { @@ -305,71 +304,10 @@ } } - - // ********** validation ********** - @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateQueries(messages, astRoot); - } - - @Override - protected void validateQueries(List<IMessage> messages, CompilationUnit astRoot) { - for (Iterator<JavaQuery> localQueries = this.queries(); localQueries.hasNext(); ) { - JavaQuery localQuery = localQueries.next(); - String name = localQuery.getName(); - if (StringTools.stringIsEmpty(name)){ - messages.add( - DefaultJpaValidationMessages.buildMessage( - IMessage.HIGH_SEVERITY, - JpaValidationMessages.QUERY_NAME_UNDEFINED, - new String[] {}, - localQuery, - localQuery.getNameTextRange(astRoot) - ) - ); - } else { - List<String> reportedNames = new ArrayList<String>(); - for (Iterator<Query> globalQueries = this.getPersistenceUnit().queries(); globalQueries.hasNext(); ) { - if (localQuery.duplicates(globalQueries.next()) && !reportedNames.contains(name)) { - messages.add( - DefaultJpaValidationMessages.buildMessage( - IMessage.HIGH_SEVERITY, - JpaValidationMessages.QUERY_DUPLICATE_NAME, - new String[] {name}, - localQuery, - localQuery.getNameTextRange(astRoot) - ) - ); - reportedNames.add(name); - } - } - } - String query = localQuery.getQuery(); - if (StringTools.stringIsEmpty(query)){ - messages.add( - DefaultJpaValidationMessages.buildMessage( - IMessage.HIGH_SEVERITY, - JpaValidationMessages.QUERY_STATEMENT_UNDEFINED, - new String[] {name}, - localQuery, - localQuery.getNameTextRange(astRoot) - ) - ); - } - } - } - - - @Override @SuppressWarnings("unchecked") public Iterator<JavaQuery> queries() { - return new CompositeIterator<JavaQuery>(this.hibernateNamedNativeQueries(), this.hibernateNamedQueries()); + return new CompositeIterator<JavaQuery>(queries(), this.hibernateNamedNativeQueries(), this.hibernateNamedQueries()); } - @Override - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.owner.getResourceAnnotatedElement().getTextRange(astRoot); - } } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java.tmp =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java.tmp (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java.tmp 2011-05-18 10:18:56 UTC (rev 31352) @@ -0,0 +1,314 @@ +/******************************************************************************* + * Copyright (c) 2010-2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.core.internal.context.java; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Vector; + +import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.jpa.core.context.Query; +import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.jpa.core.context.java.JavaQuery; +import org.eclipse.jpt.jpa.core.internal.context.ContextContainerTools; +import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaQueryContainer; +import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.eclipse.wst.validation.internal.provisional.core.IReporter; +import org.jboss.tools.hibernate.jpt.core.internal.HibernateAbstractJpaFactory; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedNativeQuery; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQuery; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedNativeQueriesAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedNativeQueryAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedQueriesAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedQueryAnnotation; + +/** + * + * @author Dmitry Geraskov + * + */ +public class HibernateJavaQueryContainerImpl extends GenericJavaQueryContainer +implements HibernateJavaQueryContainer{ + + protected final Vector<HibernateJavaNamedQuery> hibernateNamedQueries = new Vector<HibernateJavaNamedQuery>(); + protected HibernateNamedQueryContainerAdapter hibernateNamedQueryContainerAdapter = new HibernateNamedQueryContainerAdapter(); + + protected final Vector<HibernateJavaNamedNativeQuery> hibernateNamedNativeQueries = new Vector<HibernateJavaNamedNativeQuery>(); + protected HibernateNamedNativeQueryContainerAdapter hibernateNamedNativeQueryContainerAdapter = new HibernateNamedNativeQueryContainerAdapter(); + + + public HibernateJavaQueryContainerImpl(JavaJpaContextNode parent, Owner owner) { + super(parent, owner); + this.initializeHibernateNamedQueries(); + this.initializeHibernateNamedNativeQueries(); + } + + @Override + protected HibernateAbstractJpaFactory getJpaFactory() { + return (HibernateAbstractJpaFactory) super.getJpaFactory(); + } + + + // ********** synchronize/update ********** + + @Override + public void synchronizeWithResourceModel() { + super.synchronizeWithResourceModel(); + this.syncHibernateNamedQueries(); + this.syncHibernateNamedNativeQueries(); + } + + @Override + public void update() { + super.update(); + this.updateNodes(this.getHibernateNamedQueries()); + this.updateNodes(this.getHibernateNamedNativeQueries()); + } + + + // ********** hibernateNamed queries ********** + + public ListIterator<HibernateJavaNamedQuery> hibernateNamedQueries() { + return this.getHibernateNamedQueries().iterator(); + } + + protected ListIterable<HibernateJavaNamedQuery> getHibernateNamedQueries() { + return new LiveCloneListIterable<HibernateJavaNamedQuery>(this.hibernateNamedQueries); + } + + public int hibernateNamedQueriesSize() { + return this.hibernateNamedQueries.size(); + } + + public HibernateNamedQuery addHibernateNamedQuery() { + return this.addHibernateNamedQuery(this.hibernateNamedQueries.size()); + } + + public HibernateJavaNamedQuery addHibernateNamedQuery(int index) { + HibernateNamedQueryAnnotation annotation = this.buildHibernateNamedQueryAnnotation(index); + return this.addHibernateNamedQuery_(index, annotation); + } + + protected HibernateNamedQueryAnnotation buildHibernateNamedQueryAnnotation(int index) { + return (HibernateNamedQueryAnnotation) this.owner.getResourceAnnotatedElement().addAnnotation(index, HibernateNamedQueryAnnotation.ANNOTATION_NAME, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); + } + + public void removeHibernateNamedQuery(HibernateNamedQuery hibernateNamedQuery) { + this.removeHibernateNamedQuery(this.hibernateNamedQueries.indexOf(hibernateNamedQuery)); + } + + public void removeHibernateNamedQuery(int index) { + this.owner.getResourceAnnotatedElement().removeAnnotation(index, HibernateNamedQueryAnnotation.ANNOTATION_NAME, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); + this.removeHibernateNamedQuery_(index); + } + + protected void removeHibernateNamedQuery_(int index) { + this.removeItemFromList(index, this.hibernateNamedQueries, NAMED_QUERIES_LIST); + } + + public void moveHibernateNamedQuery(int targetIndex, int sourceIndex) { + this.owner.getResourceAnnotatedElement().moveAnnotation(targetIndex, sourceIndex, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); + this.moveItemInList(targetIndex, sourceIndex, this.hibernateNamedQueries, NAMED_QUERIES_LIST); + } + + protected void initializeHibernateNamedQueries() { + for (HibernateNamedQueryAnnotation annotation : this.getHibernateNamedQueryAnnotations()) { + this.hibernateNamedQueries.add(this.buildHibernateNamedQuery(annotation)); + } + } + + protected HibernateJavaNamedQuery buildHibernateNamedQuery(HibernateNamedQueryAnnotation hibernateNamedQueryAnnotation) { + return this.getJpaFactory().buildHibernateJavaNamedQuery(this, hibernateNamedQueryAnnotation); + } + + protected void syncHibernateNamedQueries() { + ContextContainerTools.synchronizeWithResourceModel(this.hibernateNamedQueryContainerAdapter); + } + + protected Iterable<HibernateNamedQueryAnnotation> getHibernateNamedQueryAnnotations() { + return new SubIterableWrapper<NestableAnnotation, HibernateNamedQueryAnnotation>( + CollectionTools.iterable(this.hibernateNamedQueryAnnotations()) + ); + } + + protected Iterator<NestableAnnotation> hibernateNamedQueryAnnotations() { + return this.owner.getResourceAnnotatedElement().annotations(HibernateNamedQueryAnnotation.ANNOTATION_NAME, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); + } + + protected void moveHibernateNamedQuery_(int index, HibernateJavaNamedQuery hibernateNamedQuery) { + this.moveItemInList(index, hibernateNamedQuery, this.hibernateNamedQueries, NAMED_QUERIES_LIST); + } + + protected HibernateJavaNamedQuery addHibernateNamedQuery_(int index, HibernateNamedQueryAnnotation hibernateNamedQueryAnnotation) { + HibernateJavaNamedQuery query = this.buildHibernateNamedQuery(hibernateNamedQueryAnnotation); + this.addItemToList(index, query, this.hibernateNamedQueries, NAMED_QUERIES_LIST); + return query; + } + + protected void removeHibernateNamedQuery_(HibernateNamedQuery hibernateNamedQuery) { + this.removeHibernateNamedQuery_(this.hibernateNamedQueries.indexOf(hibernateNamedQuery)); + } + + /** + * hibernateNamed query container adapter + */ + protected class HibernateNamedQueryContainerAdapter + implements ContextContainerTools.Adapter<HibernateJavaNamedQuery, HibernateNamedQueryAnnotation> + { + public Iterable<HibernateJavaNamedQuery> getContextElements() { + return HibernateJavaQueryContainerImpl.this.getHibernateNamedQueries(); + } + public Iterable<HibernateNamedQueryAnnotation> getResourceElements() { + return HibernateJavaQueryContainerImpl.this.getHibernateNamedQueryAnnotations(); + } + public HibernateNamedQueryAnnotation getResourceElement(HibernateJavaNamedQuery contextElement) { + return contextElement.getQueryAnnotation(); + } + public void moveContextElement(int index, HibernateJavaNamedQuery element) { + HibernateJavaQueryContainerImpl.this.moveHibernateNamedQuery_(index, element); + } + public void addContextElement(int index, HibernateNamedQueryAnnotation resourceElement) { + HibernateJavaQueryContainerImpl.this.addHibernateNamedQuery_(index, resourceElement); + } + public void removeContextElement(HibernateJavaNamedQuery element) { + HibernateJavaQueryContainerImpl.this.removeHibernateNamedQuery_(element); + } + } + + + // ********** hibernateNamed native queries ********** + + public ListIterator<HibernateJavaNamedNativeQuery> hibernateNamedNativeQueries() { + return this.getHibernateNamedNativeQueries().iterator(); + } + + protected ListIterable<HibernateJavaNamedNativeQuery> getHibernateNamedNativeQueries() { + return new LiveCloneListIterable<HibernateJavaNamedNativeQuery>(this.hibernateNamedNativeQueries); + } + + public int hibernateNamedNativeQueriesSize() { + return this.hibernateNamedNativeQueries.size(); + } + + public HibernateNamedNativeQuery addHibernateNamedNativeQuery() { + return this.addHibernateNamedNativeQuery(this.hibernateNamedNativeQueries.size()); + } + + public HibernateJavaNamedNativeQuery addHibernateNamedNativeQuery(int index) { + HibernateNamedNativeQueryAnnotation annotation = this.buildHibernateNamedNativeQueryAnnotation(index); + return this.addHibernateNamedNativeQuery_(index, annotation); + } + + protected HibernateNamedNativeQueryAnnotation buildHibernateNamedNativeQueryAnnotation(int index) { + return (HibernateNamedNativeQueryAnnotation) this.owner.getResourceAnnotatedElement().addAnnotation(index, HibernateNamedNativeQueryAnnotation.ANNOTATION_NAME, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); + } + + public void removeHibernateNamedNativeQuery(HibernateNamedNativeQuery hibernateNamedNativeQuery) { + this.removeHibernateNamedNativeQuery(this.hibernateNamedNativeQueries.indexOf(hibernateNamedNativeQuery)); + } + + public void removeHibernateNamedNativeQuery(int index) { + this.owner.getResourceAnnotatedElement().removeAnnotation(index, HibernateNamedNativeQueryAnnotation.ANNOTATION_NAME, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); + this.removeHibernateNamedNativeQuery_(index); + } + + protected void removeHibernateNamedNativeQuery_(int index) { + this.removeItemFromList(index, this.hibernateNamedNativeQueries, NAMED_NATIVE_QUERIES_LIST); + } + + public void moveHibernateNamedNativeQuery(int targetIndex, int sourceIndex) { + this.owner.getResourceAnnotatedElement().moveAnnotation(targetIndex, sourceIndex, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); + this.moveItemInList(targetIndex, sourceIndex, this.hibernateNamedNativeQueries, NAMED_NATIVE_QUERIES_LIST); + } + + protected void initializeHibernateNamedNativeQueries() { + for (HibernateNamedNativeQueryAnnotation annotation : this.getHibernateNamedNativeQueryAnnotations()) { + this.hibernateNamedNativeQueries.add(this.buildHibernateNamedNativeQuery(annotation)); + } + } + + protected HibernateJavaNamedNativeQuery buildHibernateNamedNativeQuery(HibernateNamedNativeQueryAnnotation hibernateNamedNativeQueryAnnotation) { + return this.getJpaFactory().buildHibernateJavaNamedNativeQuery(this, hibernateNamedNativeQueryAnnotation); + } + + protected void syncHibernateNamedNativeQueries() { + ContextContainerTools.synchronizeWithResourceModel(this.hibernateNamedNativeQueryContainerAdapter); + } + + protected Iterable<HibernateNamedNativeQueryAnnotation> getHibernateNamedNativeQueryAnnotations() { + return new SubIterableWrapper<NestableAnnotation, HibernateNamedNativeQueryAnnotation>( + CollectionTools.iterable(this.hibernateNamedNativeQueryAnnotations()) + ); + } + + protected Iterator<NestableAnnotation> hibernateNamedNativeQueryAnnotations() { + return this.owner.getResourceAnnotatedElement().annotations(HibernateNamedNativeQueryAnnotation.ANNOTATION_NAME, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); + } + + protected void moveHibernateNamedNativeQuery_(int index, HibernateJavaNamedNativeQuery hibernateNamedNativeQuery) { + this.moveItemInList(index, hibernateNamedNativeQuery, this.hibernateNamedNativeQueries, NAMED_NATIVE_QUERIES_LIST); + } + + protected HibernateJavaNamedNativeQuery addHibernateNamedNativeQuery_(int index, HibernateNamedNativeQueryAnnotation hibernateNamedNativeQueryAnnotation) { + HibernateJavaNamedNativeQuery query = this.buildHibernateNamedNativeQuery(hibernateNamedNativeQueryAnnotation); + this.addItemToList(index, query, this.hibernateNamedNativeQueries, NAMED_NATIVE_QUERIES_LIST); + return query; + } + + protected void removeHibernateNamedNativeQuery_(HibernateNamedNativeQuery hibernateNamedNativeQuery) { + this.removeHibernateNamedNativeQuery_(this.hibernateNamedNativeQueries.indexOf(hibernateNamedNativeQuery)); + } + + /** + * hibernateNamed native query container adapter + */ + protected class HibernateNamedNativeQueryContainerAdapter + implements ContextContainerTools.Adapter<HibernateJavaNamedNativeQuery, HibernateNamedNativeQueryAnnotation> + { + public Iterable<HibernateJavaNamedNativeQuery> getContextElements() { + return HibernateJavaQueryContainerImpl.this.getHibernateNamedNativeQueries(); + } + public Iterable<HibernateNamedNativeQueryAnnotation> getResourceElements() { + return HibernateJavaQueryContainerImpl.this.getHibernateNamedNativeQueryAnnotations(); + } + public HibernateNamedNativeQueryAnnotation getResourceElement(HibernateJavaNamedNativeQuery contextElement) { + return contextElement.getQueryAnnotation(); + } + public void moveContextElement(int index, HibernateJavaNamedNativeQuery element) { + HibernateJavaQueryContainerImpl.this.moveHibernateNamedNativeQuery_(index, element); + } + public void addContextElement(int index, HibernateNamedNativeQueryAnnotation resourceElement) { + HibernateJavaQueryContainerImpl.this.addHibernateNamedNativeQuery_(index, resourceElement); + } + public void removeContextElement(HibernateJavaNamedNativeQuery element) { + HibernateJavaQueryContainerImpl.this.removeHibernateNamedNativeQuery_(element); + } + } + + @Override + @SuppressWarnings("unchecked") + public Iterator<JavaQuery> queries() { + return new CompositeIterator<JavaQuery>(queries(), this.hibernateNamedNativeQueries(), this.hibernateNamedQueries()); + } + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -38,7 +38,7 @@ import org.jboss.tools.hibernate.jpt.core.internal.resource.java.ParameterAnnotation; /** - * @author Dmitry Geraskov + * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ public class JavaGenericGeneratorImpl extends AbstractJavaGenerator<GenericGeneratorAnnotation> @@ -101,11 +101,6 @@ } @Override - public TextRange getSelectionTextRange(CompilationUnit astRoot) { - return this.generatorAnnotation.getTextRange(astRoot); - } - - @Override public TextRange getNameTextRange(CompilationUnit astRoot) { return this.generatorAnnotation.getNameTextRange(astRoot); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -28,24 +28,24 @@ import org.eclipse.jpt.jpa.core.internal.JavaResourceModelProvider; import org.eclipse.jpt.jpa.core.internal.OrmResourceModelProvider; import org.eclipse.jpt.jpa.core.internal.PersistenceResourceModelProvider; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaBasicMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddableDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedIdMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaEntityDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaMappedSuperclassDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaTransientMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaVersionMappingDefinition; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaElementCollectionMappingDefinition2_0; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaEmbeddedMappingDefinition2_0; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaIdMappingDefinition2_0; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaManyToManyMappingDefinition2_0; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaManyToOneMappingDefinition2_0; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaOneToManyMappingDefinition2_0; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaOneToOneMappingDefinition2_0; +import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaBasicMappingDefinition; +import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaEntityDefinition; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmXmlDefinition; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.jpa2.HibernateOrmXml2_0Definition; import org.jboss.tools.hibernate.jpt.core.internal.context.persistence.HibernatePersistenceXmlDefinition; import org.jboss.tools.hibernate.jpt.core.internal.context.persistence.jpa2.Hibernate2_0PersistenceXmlDefinition; +import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaIdMappingDefinition2_0; +import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaManyToManyMappingDefinition2_0; +import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaManyToOneMappingDefinition2_0; +import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaOneToOneMappingDefinition2_0; /** * @author Dmitry Geraskov @@ -67,7 +67,6 @@ return INSTANCE; } - /** * Enforce singleton usage */ @@ -119,7 +118,7 @@ // order matches that used by the Reference Implementation (EclipseLink) protected static final JavaTypeMappingDefinition[] JAVA_TYPE_MAPPING_DEFINITIONS = new JavaTypeMappingDefinition[] { - JavaEntityDefinition.instance(), + HibernateJavaEntityDefinition.instance(), JavaEmbeddableDefinition.instance(), JavaMappedSuperclassDefinition.instance() }; @@ -135,7 +134,7 @@ // order matches that used by the Reference Implementation (EclipseLink) protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] { JavaEmbeddedMappingDefinition2_0.instance(), - JavaBasicMappingDefinition.instance() + HibernateJavaBasicMappingDefinition.instance() }; @Override @@ -147,15 +146,15 @@ protected static final JavaAttributeMappingDefinition[] SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new JavaAttributeMappingDefinition[] { JavaTransientMappingDefinition.instance(), JavaElementCollectionMappingDefinition2_0.instance(), - JavaIdMappingDefinition2_0.instance(), + HibernateJavaIdMappingDefinition2_0.instance(), JavaVersionMappingDefinition.instance(), - JavaBasicMappingDefinition.instance(), + HibernateJavaBasicMappingDefinition.instance(), JavaEmbeddedMappingDefinition2_0.instance(), JavaEmbeddedIdMappingDefinition.instance(), - JavaManyToManyMappingDefinition2_0.instance(), - JavaManyToOneMappingDefinition2_0.instance(), + HibernateJavaManyToManyMappingDefinition2_0.instance(), + HibernateJavaManyToOneMappingDefinition2_0.instance(), JavaOneToManyMappingDefinition2_0.instance(), - JavaOneToOneMappingDefinition2_0.instance() + HibernateJavaOneToOneMappingDefinition2_0.instance() };