Solved issue in that eobject was not handled

2 files changed, 7 insertions, 5 deletions

diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java
index 4a0186070..6ec34ac48 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  * 
- * $Id: DefaultAnnotator.java,v 1.30 2007/03/06 17:12:14 mtaal Exp $
+ * $Id: DefaultAnnotator.java,v 1.31 2007/03/07 23:33:50 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.annotations.mapper;
@@ -83,7 +83,7 @@ import org.eclipse.emf.teneo.util.StoreUtil;
  * annotations according to the ejb3 spec.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.30 $
+ * @version $Revision: 1.31 $
  */
 public class DefaultAnnotator {
 
@@ -999,7 +999,7 @@ public class DefaultAnnotator {
 		}
 
 		// only use a jointable if the relation is non unique
-		final boolean isEObject = EClassNameStrategy.EOBJECT_ECLASS_URI
+		final boolean isEObject = EClassNameStrategy.EOBJECT_ECLASS_NAME
 				.compareTo(otm.getTargetEntity()) == 0;
 		if (isEObject || // in case of eobject always a join table is
 				// required
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedModelImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedModelImpl.java
index 11dbbd5cf..50347a638 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedModelImpl.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PAnnotatedModelImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PAnnotatedModelImpl.java,v 1.12 2007/02/08 23:12:35 mtaal Exp $
+ * $Id: PAnnotatedModelImpl.java,v 1.13 2007/03/07 23:33:50 mtaal Exp $
  */
 package org.eclipse.emf.teneo.annotations.pamodel.impl;
 
@@ -261,8 +261,10 @@ public class PAnnotatedModelImpl extends EObjectImpl implements PAnnotatedModel
 	 *         feature) to the given <code>EClass</code>.
 	 */
 	public PAnnotatedEClass getPAnnotated(EClass e) {
+		// in this case do not throw an error
+		// this needs to be cleaned up
 		if (e.getEPackage() instanceof EcorePackage) {
-			return null; // ignore the eobjects
+			return (PAnnotatedEClass) eElement_to_pElement.get(e);
 		}
 		checkAnnotatedPresent(e, eElement_to_pElement);
 		return (PAnnotatedEClass) eElement_to_pElement.get(e);