Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtaal2007-01-30 05:51:47 -0500
committermtaal2007-01-30 05:51:47 -0500
commita70014ec327c62798631a145a36505cd90080fc9 (patch)
treea1e69e332b099fbeeb75afc90441d754c1615f02
parent3bba9db4700dc320dbbdc0a1c0ab5a69aafebfc1 (diff)
downloadorg.eclipse.emf.teneo-a70014ec327c62798631a145a36505cd90080fc9.tar.gz
org.eclipse.emf.teneo-a70014ec327c62798631a145a36505cd90080fc9.tar.xz
org.eclipse.emf.teneo-a70014ec327c62798631a145a36505cd90080fc9.zip
[170221]
Re-organized imports in various locations
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Fetch.java3
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CacheImpl.java5
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FetchImpl.java11
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationFactoryImpl.java9
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeDefImpl.java7
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationAdapterFactory.java7
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationSwitch.java7
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationValidator.java9
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java7
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java3
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelFactoryImpl.java4
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelPackageImpl.java3
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelAdapterFactory.java4
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelSwitch.java4
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java3
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EmbeddedMapper.java10
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java9
-rw-r--r--plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HibernateMappingGenerator.java3
18 files changed, 47 insertions, 61 deletions
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Fetch.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Fetch.java
index e8845316a..cb37b4088 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Fetch.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Fetch.java
@@ -2,11 +2,10 @@
* <copyright>
* </copyright>
*
- * $Id: Fetch.java,v 1.1 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: Fetch.java,v 1.2 2007/01/30 10:51:48 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbannotation;
-import org.eclipse.emf.common.util.EList;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CacheImpl.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CacheImpl.java
index 55ce206e4..bad9bb56e 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CacheImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CacheImpl.java
@@ -2,19 +2,16 @@
* <copyright>
* </copyright>
*
- * $Id: CacheImpl.java,v 1.1 2006/11/01 16:18:44 mtaal Exp $
+ * $Id: CacheImpl.java,v 1.2 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.teneo.hibernate.hbannotation.Cache;
import org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FetchImpl.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FetchImpl.java
index 6a7dd6294..7b4fb9a3d 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FetchImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FetchImpl.java
@@ -2,25 +2,16 @@
* <copyright>
* </copyright>
*
- * $Id: FetchImpl.java,v 1.1 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: FetchImpl.java,v 1.2 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
-import java.util.Collection;
-
import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationFactoryImpl.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationFactoryImpl.java
index 9b704033b..07107aaf6 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationFactoryImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationFactoryImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: HbAnnotationFactoryImpl.java,v 1.3 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: HbAnnotationFactoryImpl.java,v 1.4 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
@@ -12,17 +12,20 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.teneo.hibernate.hbannotation.*;
-
+import org.eclipse.emf.teneo.hibernate.hbannotation.Cache;
+import org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
+import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
import org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationFactory;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
+import org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType;
import org.eclipse.emf.teneo.hibernate.hbannotation.IdBag;
import org.eclipse.emf.teneo.hibernate.hbannotation.MapKey;
import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
+import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
/**
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeDefImpl.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeDefImpl.java
index eaae71690..648289211 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeDefImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeDefImpl.java
@@ -2,25 +2,20 @@
* <copyright>
* </copyright>
*
- * $Id: TypeDefImpl.java,v 1.1 2006/11/13 14:53:01 mtaal Exp $
+ * $Id: TypeDefImpl.java,v 1.2 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbannotation.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationAdapterFactory.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationAdapterFactory.java
index 2c2eecb18..dac95336f 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationAdapterFactory.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationAdapterFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: HbAnnotationAdapterFactory.java,v 1.3 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: HbAnnotationAdapterFactory.java,v 1.4 2007/01/30 10:51:48 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbannotation.util;
@@ -11,10 +11,10 @@ import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
-import org.eclipse.emf.teneo.hibernate.hbannotation.*;
-
+import org.eclipse.emf.teneo.hibernate.hbannotation.Cache;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
+import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
import org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
@@ -22,6 +22,7 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.IdBag;
import org.eclipse.emf.teneo.hibernate.hbannotation.MapKey;
import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
+import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
/**
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationSwitch.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationSwitch.java
index 652b30184..cdfda5a8e 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationSwitch.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationSwitch.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: HbAnnotationSwitch.java,v 1.3 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: HbAnnotationSwitch.java,v 1.4 2007/01/30 10:51:48 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbannotation.util;
@@ -11,10 +11,10 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
-import org.eclipse.emf.teneo.hibernate.hbannotation.*;
-
+import org.eclipse.emf.teneo.hibernate.hbannotation.Cache;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
+import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
import org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
@@ -22,6 +22,7 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.IdBag;
import org.eclipse.emf.teneo.hibernate.hbannotation.MapKey;
import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
+import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
/**
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationValidator.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationValidator.java
index c6c8b9cde..868789f4b 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationValidator.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbAnnotationValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: HbAnnotationValidator.java,v 1.3 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: HbAnnotationValidator.java,v 1.4 2007/01/30 10:51:48 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbannotation.util;
@@ -15,17 +15,20 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
import org.eclipse.emf.ecore.util.EObjectValidator;
import org.eclipse.emf.teneo.annotations.pannotation.util.PannotationValidator;
-import org.eclipse.emf.teneo.hibernate.hbannotation.*;
-
+import org.eclipse.emf.teneo.hibernate.hbannotation.Cache;
+import org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
+import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
import org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation;
import org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage;
+import org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType;
import org.eclipse.emf.teneo.hibernate.hbannotation.IdBag;
import org.eclipse.emf.teneo.hibernate.hbannotation.MapKey;
import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
+import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
/**
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
index 9555a6ae6..d0a567a3b 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
@@ -2,17 +2,12 @@
* <copyright>
* </copyright>
*
- * $Id: HbAnnotatedEReference.java,v 1.3 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: HbAnnotatedEReference.java,v 1.4 2007/01/30 10:51:48 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbmodel;
-import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cache;
-
-import org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType;
-
import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
/**
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
index 46f255b47..727c5e7f0 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: HbAnnotatedEReferenceImpl.java,v 1.3 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: HbAnnotatedEReferenceImpl.java,v 1.4 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbmodel.impl;
@@ -21,7 +21,6 @@ import org.eclipse.emf.teneo.annotations.pannotation.Column;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cache;
import org.eclipse.emf.teneo.hibernate.hbannotation.Cascade;
import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
-import org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType;
import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
import org.eclipse.emf.teneo.hibernate.hbannotation.IdBag;
import org.eclipse.emf.teneo.hibernate.hbannotation.MapKey;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelFactoryImpl.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelFactoryImpl.java
index 6c769b0e2..cb59e8b81 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelFactoryImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelFactoryImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: HbModelFactoryImpl.java,v 1.3 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: HbModelFactoryImpl.java,v 1.4 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbmodel.impl;
@@ -11,8 +11,6 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.teneo.hibernate.hbmodel.*;
-
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelPackageImpl.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelPackageImpl.java
index ddf449bb0..b9c9831e1 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelPackageImpl.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbModelPackageImpl.java
@@ -2,11 +2,10 @@
* <copyright>
* </copyright>
*
- * $Id: HbModelPackageImpl.java,v 1.3 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: HbModelPackageImpl.java,v 1.4 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbmodel.impl;
-import org.eclipse.emf.ecore.EAttribute;
import java.util.Iterator;
import org.eclipse.emf.ecore.EClass;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelAdapterFactory.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelAdapterFactory.java
index 690646bfb..969860c31 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelAdapterFactory.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelAdapterFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: HbModelAdapterFactory.java,v 1.3 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: HbModelAdapterFactory.java,v 1.4 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbmodel.util;
@@ -18,8 +18,6 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedETypedElement;
-import org.eclipse.emf.teneo.hibernate.hbmodel.*;
-
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelSwitch.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelSwitch.java
index 107840aaf..606d56a93 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelSwitch.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbModelSwitch.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: HbModelSwitch.java,v 1.3 2006/11/20 08:18:08 mtaal Exp $
+ * $Id: HbModelSwitch.java,v 1.4 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.hbmodel.util;
@@ -18,8 +18,6 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedETypedElement;
-import org.eclipse.emf.teneo.hibernate.hbmodel.*;
-
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType;
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java
index 6f9c1f4dd..4bf697cba 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java
@@ -12,7 +12,7 @@
* Davide Marchignoli
* </copyright>
*
- * $Id: AbstractMapper.java,v 1.7 2006/11/28 06:14:01 mtaal Exp $
+ * $Id: AbstractMapper.java,v 1.8 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.mapper;
@@ -34,7 +34,6 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType;
import org.eclipse.emf.teneo.simpledom.Element;
import org.eclipse.emf.teneo.util.EcoreDataTypes;
-import org.eclipse.emf.teneo.util.StoreUtil;
/**
* Base class for all mapping classes. Provides access to the hbmcontext.
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EmbeddedMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EmbeddedMapper.java
index feb0f6dc3..08e2eaf3e 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EmbeddedMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EmbeddedMapper.java
@@ -12,7 +12,7 @@
* Davide Marchignoli
* </copyright>
*
- * $Id: EmbeddedMapper.java,v 1.4 2006/11/23 06:12:22 mtaal Exp $
+ * $Id: EmbeddedMapper.java,v 1.5 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.mapper;
@@ -34,8 +34,10 @@ import org.eclipse.emf.teneo.simpledom.Element;
*/
class EmbeddedMapper extends AbstractMapper {
+ // the logger
private static final Log log = LogFactory.getLog(EmbeddedMapper.class);
+ /** Constructor */
public EmbeddedMapper(MappingContext mappingContext) {
super(mappingContext);
}
@@ -44,6 +46,8 @@ class EmbeddedMapper extends AbstractMapper {
* Process Embedded object
*/
public void process(PAnnotatedEReference paReference) {
+ log.debug("Processing embedded: " + paReference.toString());
+
// push the current overrides
getHbmContext().pushOverrideOnStack();
// and add our own
@@ -80,6 +84,8 @@ class EmbeddedMapper extends AbstractMapper {
/** Process a many-to-one component */
private void processSingleEmbedded(PAnnotatedEReference paReference, String targetName, EClass target) {
+ log.debug("Processing single embedded: " + paReference.toString());
+
final EClass refType = (EClass) paReference.getAnnotatedEReference().getEType();
if (targetName == null || getHbmContext().isEasyEMFGenerated(refType)) {
@@ -101,6 +107,8 @@ class EmbeddedMapper extends AbstractMapper {
/** Process a list of components */
private void processMultiEmbedded(PAnnotatedEReference paReference) {
+ log.debug("Processing multi embedded: " + paReference.toString());
+
// let the featureprocessor handle this, the one to many is handled by the OneToManyMapper
getHbmContext().getFeatureMapper().getOneToManyMapper().process(paReference);
}
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
index 3f2411fc2..1e4a700cd 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
@@ -12,7 +12,7 @@
* Davide Marchignoli
* </copyright>
*
- * $Id: EntityMapper.java,v 1.5 2006/11/23 06:12:22 mtaal Exp $
+ * $Id: EntityMapper.java,v 1.6 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.mapper;
@@ -235,9 +235,12 @@ class EntityMapper extends AbstractMapper {
if (entity.getPrimaryKeyJoinColumns() != null && entity.getPrimaryKeyJoinColumns().size() > 0) {
addPrimaryKeyJoinColumn(entity.getPrimaryKeyJoinColumns());
} else if (entity.getPaSuperEntity() != null
- && !InheritanceType.SINGLE_TABLE_LITERAL.equals(entity.getInheritanceStrategy())) {
+ && InheritanceType.JOINED_LITERAL.equals(entity.getInheritanceStrategy())) {
final ArrayList list = new ArrayList();
- list.add(PannotationFactory.eINSTANCE.createPrimaryKeyJoinColumn());
+ final PrimaryKeyJoinColumn pkjc = PannotationFactory.eINSTANCE.createPrimaryKeyJoinColumn();
+ final String entityName = getHbmContext().getEntityName(entity.getAnnotatedEClass());
+ getHbmContext().trunc(entityName + "id"); // TODO improve name creation here
+ list.add(pkjc);
addPrimaryKeyJoinColumn(list);
}
diff --git a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HibernateMappingGenerator.java b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HibernateMappingGenerator.java
index 79177ec19..eaeec71c2 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HibernateMappingGenerator.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HibernateMappingGenerator.java
@@ -13,7 +13,7 @@
* Michael Kanaley, TIBCO Software Inc., custom type handling
* </copyright>
*
- * $Id: HibernateMappingGenerator.java,v 1.6 2006/11/28 06:14:01 mtaal Exp $
+ * $Id: HibernateMappingGenerator.java,v 1.7 2007/01/30 10:51:47 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.mapper;
@@ -39,7 +39,6 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage;
import org.eclipse.emf.teneo.simpledom.Document;
import org.eclipse.emf.teneo.simpledom.DocumentHelper;
import org.eclipse.emf.teneo.simpledom.Element;
-import org.eclipse.emf.teneo.util.StoreUtil;
/**
* The main starting point for generating a hibernate mapping from a PAnnotated model.

Back to the top