[jbosstools-commits] JBoss Tools SVN: r31296 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core: src/org/jboss/tools/hibernate/jpt/core/internal and 3 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri May 13 11:04:11 EDT 2011
Author: dgeraskov
Date: 2011-05-13 11:04:10 -0400 (Fri, 13 May 2011)
New Revision: 31296
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java
Removed:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java
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/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
Revert changes for M7
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml 2011-05-13 15:04:10 UTC (rev 31296)
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.tools.hibernatetools</groupId>
- <artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.hibernatetools.plugins</groupId>
<artifactId>org.jboss.tools.hibernate.jpt.core</artifactId>
<version>3.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -85,7 +85,13 @@
@Override
protected void addPackageAnnotationDefinitionsTo(
ArrayList<AnnotationDefinition> definitions) {
- // TODO Auto-generated method stub
-
+ definitions.add(GenericGeneratorAnnotationDefinition.instance());
+ definitions.add(GenericGeneratorsAnnotationDefinition.instance());
+ definitions.add(HibernateNamedQueryAnnotationDefinition.instance());
+ definitions.add(HibernateNamedQueriesAnnotationDefinition.instance());
+ definitions.add(HibernateNamedNativeQueryAnnotationDefinition.instance());
+ definitions.add(HibernateNamedNativeQueriesAnnotationDefinition.instance());
+ definitions.add(TypeDefAnnotationDefinition.instance());
+ definitions.add(TypeDefsAnnotationDefinition.instance());
}
}
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-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -28,10 +28,10 @@
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;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaManyToManyMappingDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaMappedSuperclassDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaOneToManyMappingDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaTransientMappingDefinition;
@@ -39,6 +39,7 @@
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.definition.HibernateJavaIdMappingDefinition;
+import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaManyToManyMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaManyToOneMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaOneToOneMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmXmlDefinition;
@@ -132,7 +133,7 @@
// order matches that used by the Reference Implementation (EclipseLink)
protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] {
JavaEmbeddedMappingDefinition.instance(),
- HibernateJavaBasicMappingDefinition.instance()
+ JavaBasicMappingDefinition.instance()
};
@Override
@@ -148,7 +149,7 @@
HibernateJavaBasicMappingDefinition.instance(),
JavaEmbeddedMappingDefinition.instance(),
JavaEmbeddedIdMappingDefinition.instance(),
- JavaManyToManyMappingDefinition.instance(),
+ HibernateJavaManyToManyMappingDefinition.instance(),
HibernateJavaManyToOneMappingDefinition.instance(),
JavaOneToManyMappingDefinition.instance(),
HibernateJavaOneToOneMappingDefinition.instance(),
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-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -12,23 +12,14 @@
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.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.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaBasicMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
/**
* @author Dmitry Geraskov (geraskov at gmail.com)
*
*/
-public class HibernateJavaBasicMappingDefinition implements DefaultJavaAttributeMappingDefinition
+public class HibernateJavaBasicMappingDefinition extends AbstractJavaBasicMappingDefinition
{
// singleton
private static final HibernateJavaBasicMappingDefinition INSTANCE = new HibernateJavaBasicMappingDefinition();
@@ -47,49 +38,15 @@
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>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
+ return new CompositeIterable<String>(super.getSupportingAnnotationNames(), 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-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -12,24 +12,14 @@
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.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.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaIdMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
/**
* @author Dmitry Geraskov (geraskov at gmail.com)
*
*/
-public class HibernateJavaIdMappingDefinition implements JavaAttributeMappingDefinition
+public class HibernateJavaIdMappingDefinition extends AbstractJavaIdMappingDefinition
{
// singleton
private static final HibernateJavaIdMappingDefinition INSTANCE = new HibernateJavaIdMappingDefinition();
@@ -48,46 +38,14 @@
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>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
+ return new CompositeIterable<String>(super.getSupportingAnnotationNames(), 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();
- }
-
}
Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java (from rev 31291, 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 (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 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.definition;
+
+import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToManyMappingDefinition;
+
+
+/**
+ * @author Dmitry Geraskov (geraskov at gmail.com)
+ *
+ */
+public class HibernateJavaManyToManyMappingDefinition extends AbstractJavaManyToManyMappingDefinition {
+
+ // singleton
+ private static final HibernateJavaManyToManyMappingDefinition INSTANCE = new HibernateJavaManyToManyMappingDefinition();
+
+ /**
+ * Return the singleton.
+ */
+ public static HibernateJavaManyToManyMappingDefinition instance() {
+ return INSTANCE;
+ }
+
+
+ /**
+ * Enforce singleton usage
+ */
+ private HibernateJavaManyToManyMappingDefinition() {
+ super();
+ }
+
+}
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-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -12,22 +12,15 @@
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.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToOneMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
/**
* @author Dmitry Geraskov (geraskov at gmail.com)
*
*/
-public class HibernateJavaManyToOneMappingDefinition implements JavaAttributeMappingDefinition
+public class HibernateJavaManyToOneMappingDefinition extends AbstractJavaManyToOneMappingDefinition
{
// singleton
private static final HibernateJavaManyToOneMappingDefinition INSTANCE = new HibernateJavaManyToOneMappingDefinition();
@@ -46,41 +39,13 @@
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>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
+ return new CompositeIterable<String>(super.getSupportingAnnotationNames(), 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-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -12,24 +12,14 @@
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.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.internal.context.java.AbstractJavaOneToOneMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
/**
* @author Dmitry Geraskov (geraskov at gmail.com)
*
*/
-public class HibernateJavaOneToOneMappingDefinition implements JavaAttributeMappingDefinition
+public class HibernateJavaOneToOneMappingDefinition extends AbstractJavaOneToOneMappingDefinition
{
// singleton
private static final HibernateJavaOneToOneMappingDefinition INSTANCE = new HibernateJavaOneToOneMappingDefinition();
@@ -49,44 +39,12 @@
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>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
+ return new CompositeIterable<String>(super.getSupportingAnnotationNames(), 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-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -305,10 +305,71 @@
}
}
+
+ // ********** 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>(queries(), this.hibernateNamedNativeQueries(), this.hibernateNamedQueries());
+ return new CompositeIterator<JavaQuery>(this.hibernateNamedNativeQueries(), this.hibernateNamedQueries());
}
+ @Override
+ public TextRange getValidationTextRange(CompilationUnit astRoot) {
+ return this.owner.getResourceAnnotatedElement().getTextRange(astRoot);
+ }
}
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-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -101,6 +101,11 @@
}
@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-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -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.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaBasicMappingDefinition;
-import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaEntityDefinition;
+import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaOneToOneMappingDefinition2_0;
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.HibernateJavaManyToOneMappingDefinition2_0;
-import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaOneToOneMappingDefinition2_0;
/**
* @author Dmitry Geraskov
@@ -67,6 +67,7 @@
return INSTANCE;
}
+
/**
* Enforce singleton usage
*/
@@ -118,7 +119,7 @@
// order matches that used by the Reference Implementation (EclipseLink)
protected static final JavaTypeMappingDefinition[] JAVA_TYPE_MAPPING_DEFINITIONS = new JavaTypeMappingDefinition[] {
- HibernateJavaEntityDefinition.instance(),
+ JavaEntityDefinition.instance(),
JavaEmbeddableDefinition.instance(),
JavaMappedSuperclassDefinition.instance()
};
@@ -134,7 +135,7 @@
// order matches that used by the Reference Implementation (EclipseLink)
protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] {
JavaEmbeddedMappingDefinition2_0.instance(),
- HibernateJavaBasicMappingDefinition.instance()
+ JavaBasicMappingDefinition.instance()
};
@Override
@@ -146,15 +147,15 @@
protected static final JavaAttributeMappingDefinition[] SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new JavaAttributeMappingDefinition[] {
JavaTransientMappingDefinition.instance(),
JavaElementCollectionMappingDefinition2_0.instance(),
- HibernateJavaIdMappingDefinition2_0.instance(),
+ JavaIdMappingDefinition2_0.instance(),
JavaVersionMappingDefinition.instance(),
- HibernateJavaBasicMappingDefinition.instance(),
+ JavaBasicMappingDefinition.instance(),
JavaEmbeddedMappingDefinition2_0.instance(),
JavaEmbeddedIdMappingDefinition.instance(),
JavaManyToManyMappingDefinition2_0.instance(),
- HibernateJavaManyToOneMappingDefinition2_0.instance(),
+ JavaManyToOneMappingDefinition2_0.instance(),
JavaOneToManyMappingDefinition2_0.instance(),
- HibernateJavaOneToOneMappingDefinition2_0.instance()
+ JavaOneToOneMappingDefinition2_0.instance()
};
More information about the jbosstools-commits
mailing list