Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtaal2007-01-30 05:51:10 -0500
committermtaal2007-01-30 05:51:10 -0500
commit9ada19064027bbad719f89f686b78e76dbe7811e (patch)
treeb3984ba19ea52c90442c0ac736f47202f0b44be7
parent2fcf1fd9af749332c575ddc80d44fe6fa7c27184 (diff)
downloadorg.eclipse.emf.teneo-9ada19064027bbad719f89f686b78e76dbe7811e.tar.gz
org.eclipse.emf.teneo-9ada19064027bbad719f89f686b78e76dbe7811e.tar.xz
org.eclipse.emf.teneo-9ada19064027bbad719f89f686b78e76dbe7811e.zip
[170221]
Re-organized imports in various locations
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/DefaultAnnotator.java110
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/PersistenceMappingBuilder.java5
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedETypedElement.java3
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelFactoryImpl.java4
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelAdapterFactory.java4
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelSwitch.java4
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelValidator.java4
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationFactoryImpl.java4
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationAdapterFactory.java4
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationSwitch.java4
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationValidator.java4
11 files changed, 68 insertions, 82 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 111b8c64e..237d6e66c 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,11 +11,11 @@
* Martin Taal
* </copyright>
*
- * $Id: DefaultAnnotator.java,v 1.18 2006/11/28 06:14:07 mtaal Exp $
+ * $Id: DefaultAnnotator.java,v 1.19 2007/01/30 10:51:11 mtaal Exp $
*/
-
+
package org.eclipse.emf.teneo.annotations.mapper;
-
+
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
@@ -80,7 +80,7 @@ import org.eclipse.emf.teneo.util.StoreUtil;
* information. It sets the default annotations according to the ejb3 spec.
*
* @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
*/
public class DefaultAnnotator {
@@ -119,7 +119,7 @@ public class DefaultAnnotator {
/** Current Temporal */
private TemporalType optionDefaultTemporal = null;
-
+
/** Option maximum column length */
private int optionMaximumSqlLength = -1;
@@ -178,6 +178,10 @@ public class DefaultAnnotator {
optionDefaultInheritanceMapping = InheritanceType.SINGLE_TABLE_LITERAL;
log.debug("Option inheritance: single");
break;
+ case InheritanceType.TABLE_PER_CLASS:
+ optionDefaultInheritanceMapping = InheritanceType.TABLE_PER_CLASS_LITERAL;
+ log.debug("Option inheritance: table per class");
+ break;
default:
throw new IllegalArgumentException("Inheritance mapping option: " + po.getInheritanceMapping()
+ " is not supported");
@@ -205,17 +209,17 @@ public class DefaultAnnotator {
optionSQLCaseStrategy = po.getSQLCaseStrategy();
log.debug("SQLCaseStrategy " + optionSQLCaseStrategy.getClass().getName());
-
+
optionJoinTableNamingStrategy = po.getJoinTableNamingStrategy();
log.debug("JoinTableNamingStrategy " + optionJoinTableNamingStrategy);
-
+
optionDefaultTemporal = TemporalType.get(po.getDefaultTemporalValue());
if (optionDefaultTemporal == null) {
throw new IllegalArgumentException("Temporal value not found: " + po.getDefaultTemporalValue());
}
-
- if (optionJoinTableNamingStrategy == null || optionJoinTableNamingStrategy.compareToIgnoreCase("ejb3") != 0 &&
- optionJoinTableNamingStrategy.compareToIgnoreCase("unique") != 0) {
+
+ if (optionJoinTableNamingStrategy == null || optionJoinTableNamingStrategy.compareToIgnoreCase("ejb3") != 0
+ && optionJoinTableNamingStrategy.compareToIgnoreCase("unique") != 0) {
throw new IllegalArgumentException("JoinTable naming strategy option: " + optionJoinTableNamingStrategy
+ " is not supported");
}
@@ -224,12 +228,12 @@ public class DefaultAnnotator {
/** Maps one epackage */
protected void processPackage(PAnnotatedEPackage aPackage) {
log.debug(">>>> Adding default annotations for EPackage " + aPackage.getAnnotatedElement().getName());
-
+
log.debug("Processing EDataTypes");
for (Iterator it = aPackage.getPaEDataTypes().iterator(); it.hasNext();) {
processEDataType((PAnnotatedEDataType) it.next());
}
-
+
log.debug("Processing EClasses");
for (Iterator it = aPackage.getPaEClasses().iterator(); it.hasNext();) {
processClass((PAnnotatedEClass) it.next());
@@ -239,13 +243,14 @@ public class DefaultAnnotator {
/** Process an edatatype, does nothing in this impl. */
protected void processEDataType(PAnnotatedEDataType ped) {
}
-
+
/** Returns the annotated version of an EClass */
protected void processClass(PAnnotatedEClass aClass) {
if (aClass == null) {
- throw new StoreAnnotationsException("Mapping Exception, no Annotated Class for EClass, " +
- "a common cause is that you did not register all EPackages in the DataStore/Helper Class. " +
- "When there are references between EClasses in different EPackages then they need to be handled in one DataStore/Helper Class.");
+ throw new StoreAnnotationsException(
+ "Mapping Exception, no Annotated Class for EClass, "
+ + "a common cause is that you did not register all EPackages in the DataStore/Helper Class. "
+ + "When there are references between EClasses in different EPackages then they need to be handled in one DataStore/Helper Class.");
}
log.debug(" Adding default annotations for EClass: " + aClass.getAnnotatedElement().getName());
@@ -263,10 +268,12 @@ public class DefaultAnnotator {
final EClass eclass = (EClass) it.next();
final PAnnotatedEClass superAClass = aClass.getPaModel().getPAnnotated(eclass);
if (superAClass == null) {
- throw new StoreAnnotationsException("Mapping Exception, no Annotated Class for EClass: " + eclass.getName() +
- " a common cause is that you did not register all EPackages in the DataStore/Helper Class. " +
- "When there are references between EClasses in different EPackages then they need to be handled in one DataStore/Helper Class.");
- }
+ throw new StoreAnnotationsException(
+ "Mapping Exception, no Annotated Class for EClass: "
+ + eclass.getName()
+ + " a common cause is that you did not register all EPackages in the DataStore/Helper Class. "
+ + "When there are references between EClasses in different EPackages then they need to be handled in one DataStore/Helper Class.");
+ }
processClass(superAClass);
}
@@ -322,7 +329,8 @@ public class DefaultAnnotator {
}
// add PrimaryKeyJoinColumn
- if (!isInheritanceRoot && inheritanceType.getValue() == InheritanceType.JOINED) {
+ if (!isInheritanceRoot
+ && inheritanceType.equals(InheritanceType.JOINED_LITERAL)) {
ArrayList idFeatures = new ArrayList();
boolean firstDone = false;
EClass superClass = null;
@@ -349,8 +357,9 @@ public class DefaultAnnotator {
// add the table annotation or the name annotation of the table
// only do this if this is the root in case of singletable or when this is the joined table strategy
if (aClass.getTable() == null
- && ((isInheritanceRoot && inheritanceType.equals(InheritanceType.SINGLE_TABLE_LITERAL) || inheritanceType
- .equals(InheritanceType.JOINED_LITERAL)))) {
+ && ((isInheritanceRoot && inheritanceType.equals(InheritanceType.SINGLE_TABLE_LITERAL))
+ || inheritanceType.equals(InheritanceType.JOINED_LITERAL) || inheritanceType
+ .equals(InheritanceType.TABLE_PER_CLASS_LITERAL))) {
final Table table = aFactory.createTable();
table.setEModelElement(eclass);
table.setName(trunc(eclass.getName(), false));
@@ -420,9 +429,9 @@ public class DefaultAnnotator {
// - transietn is true and it's opposite is not a containment relation
final boolean isTransient = eStructuralFeature.isTransient()
&& (eStructuralFeature instanceof EAttribute
- || ((EReference) eStructuralFeature).getEOpposite() == null ||
- !((EReference) eStructuralFeature).getEOpposite().isContainment() ||
- ((EReference) eStructuralFeature).getEOpposite().isTransient());
+ || ((EReference) eStructuralFeature).getEOpposite() == null
+ || !((EReference) eStructuralFeature).getEOpposite().isContainment() || ((EReference) eStructuralFeature)
+ .getEOpposite().isTransient());
if (aStructuralFeature.getTransient() == null && (eStructuralFeature.isVolatile() || isTransient)) {
log.debug("Structural feature " + eStructuralFeature.getName()
@@ -465,8 +474,7 @@ public class DefaultAnnotator {
}
if (aAttribute.getColumn() != null && aAttribute.getColumn().getName() == null) {
- aAttribute.getColumn().setName(
- trunc(aAttribute.getAnnotatedEAttribute().getName(), true));
+ aAttribute.getColumn().setName(trunc(aAttribute.getAnnotatedEAttribute().getName(), true));
}
} else if (aStructuralFeature instanceof PAnnotatedEReference) {
@@ -783,7 +791,7 @@ public class DefaultAnnotator {
// only use a jointable if the relation is non unique
final boolean isEObject = EClassNameStrategy.EOBJECT_ECLASS_URI.compareTo(otm.getTargetEntity()) == 0;
- if (isEObject || // in case of eobject always a join table is required
+ if (isEObject || // in case of eobject always a join table is required
(optionJoinTableForNonContainedAssociations && !eReference.isContainment()) || !otm.isUnique()) {
JoinTable joinTable = aReference.getJoinTable();
if (joinTable == null) {
@@ -795,14 +803,15 @@ public class DefaultAnnotator {
// see remark in manytomany about naming of jointables
if (joinTable.getName() == null) {
if (!isEObject && optionJoinTableNamingStrategy.compareToIgnoreCase("ejb3") == 0) {
- final String jTableName = getEntityName(eReference.getEContainingClass())
- + "_" + getEntityName(eReference.getEReferenceType());
+ final String jTableName = getEntityName(eReference.getEContainingClass()) + "_"
+ + getEntityName(eReference.getEReferenceType());
joinTable.setName(trunc(jTableName, false));
} else {
- AssertUtil.assertTrue("option optionJoinTableNamingStrategy " + optionJoinTableNamingStrategy +
- " not supported", isEObject || optionJoinTableNamingStrategy.compareToIgnoreCase("unique") == 0);
+ AssertUtil.assertTrue("option optionJoinTableNamingStrategy " + optionJoinTableNamingStrategy
+ + " not supported", isEObject
+ || optionJoinTableNamingStrategy.compareToIgnoreCase("unique") == 0);
final String jTableName = getEntityName(eReference.getEContainingClass()) + "_"
- + eReference.getName();
+ + eReference.getName();
joinTable.setName(trunc(jTableName, false));
}
}
@@ -812,9 +821,9 @@ public class DefaultAnnotator {
// joincolum(s)
// the name of this eclass, the name of the property on the other side
if (aReference.getAnnotatedEReference().getEOpposite() != null) {
- // get opposite
+ // get opposite
EReference opposite = aReference.getAnnotatedEReference().getEOpposite();
-
+
addJoinColumns(aReference.getPaModel().getPAnnotated(opposite.getEContainingClass()), opposite,
aReference, aReference.getEmbedded() == null, true);
} else { // no prop on the other side just use this one
@@ -863,7 +872,7 @@ public class DefaultAnnotator {
// also check if the other side has a (manual) manytomany with mappedby set
// bugzilla: 164808
final PAnnotatedEReference otherPA = aReference.getPaModel().getPAnnotated(eOpposite);
- if (mtm.getMappedBy() == null && setMappedBy(eReference)
+ if (mtm.getMappedBy() == null && setMappedBy(eReference)
&& (otherPA.getManyToMany() == null || otherPA.getManyToMany().getMappedBy() == null)) {
mtm.setMappedBy(eOpposite.getName());
}
@@ -921,18 +930,15 @@ public class DefaultAnnotator {
}
}
} else {
- AssertUtil.assertTrue("option optionJoinTableNamingStrategy " + optionJoinTableNamingStrategy +
- " not supported", optionJoinTableNamingStrategy.compareToIgnoreCase("unique") == 0);
+ AssertUtil.assertTrue("option optionJoinTableNamingStrategy " + optionJoinTableNamingStrategy
+ + " not supported", optionJoinTableNamingStrategy.compareToIgnoreCase("unique") == 0);
if (mtm.isIndexed()) {
- jTableName = getEntityName(eReference.getEContainingClass()) + "_"
- + eReference.getName();
+ jTableName = getEntityName(eReference.getEContainingClass()) + "_" + eReference.getName();
} else {
if (compareNames(eReference, eOpposite)) {
- jTableName = getEntityName(eOpposite.getEContainingClass()) + "_"
- + eOpposite.getName();
+ jTableName = getEntityName(eOpposite.getEContainingClass()) + "_" + eOpposite.getName();
} else {
- jTableName = getEntityName(eReference.getEContainingClass()) + "_"
- + eReference.getName();
+ jTableName = getEntityName(eReference.getEContainingClass()) + "_" + eReference.getName();
}
}
}
@@ -993,14 +999,12 @@ public class DefaultAnnotator {
if (joinTable.getName() == null) {
if (optionJoinTableNamingStrategy.compareToIgnoreCase("ejb3") == 0) {
final String oppName = mtm.getTargetEntity();
- final String jTableName = getEntityName(eReference.getEContainingClass()) + "_"
- + oppName;
+ final String jTableName = getEntityName(eReference.getEContainingClass()) + "_" + oppName;
joinTable.setName(trunc(jTableName, false));
} else {
- AssertUtil.assertTrue("option optionJoinTableNamingStrategy " + optionJoinTableNamingStrategy +
- " not supported", optionJoinTableNamingStrategy.compareToIgnoreCase("unique") == 0);
- final String jTableName = getEntityName(eReference.getEContainingClass()) + "_"
- + eReference.getName();
+ AssertUtil.assertTrue("option optionJoinTableNamingStrategy " + optionJoinTableNamingStrategy
+ + " not supported", optionJoinTableNamingStrategy.compareToIgnoreCase("unique") == 0);
+ final String jTableName = getEntityName(eReference.getEContainingClass()) + "_" + eReference.getName();
joinTable.setName(trunc(jTableName, false));
}
}
@@ -1119,12 +1123,12 @@ public class DefaultAnnotator {
boolean doUseFeatureName, boolean isUpdateInsertable) {
final List result = new ArrayList();
final List names = getIDFeaturesNames(aClass);
-
+
boolean useFeatureName = doUseFeatureName;
if (esf.getEType() == aClass.getAnnotatedEClass()) {
useFeatureName = true;
}
-
+
for (Iterator it = names.iterator(); it.hasNext();) {
String name = (String) it.next();
JoinColumn jc = aFactory.createJoinColumn();
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/PersistenceMappingBuilder.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/PersistenceMappingBuilder.java
index 2fd94976f..9b6856cfc 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/PersistenceMappingBuilder.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/mapper/PersistenceMappingBuilder.java
@@ -11,7 +11,7 @@
* Martin Taal
* </copyright>
*
- * $Id: PersistenceMappingBuilder.java,v 1.6 2006/12/21 15:47:47 mtaal Exp $
+ * $Id: PersistenceMappingBuilder.java,v 1.7 2007/01/30 10:51:10 mtaal Exp $
*/
package org.eclipse.emf.teneo.annotations.mapper;
@@ -24,7 +24,6 @@ import java.util.Iterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
@@ -52,7 +51,7 @@ import org.eclipse.emf.teneo.annotations.xml.XmlPersistenceMapper;
* returned.
*
* @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class PersistenceMappingBuilder {
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedETypedElement.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedETypedElement.java
index f6e180d4a..7b916f957 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedETypedElement.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/PAnnotatedETypedElement.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PAnnotatedETypedElement.java,v 1.2 2007/01/24 23:29:42 mtaal Exp $
+ * $Id: PAnnotatedETypedElement.java,v 1.3 2007/01/30 10:51:11 mtaal Exp $
*/
package org.eclipse.emf.teneo.annotations.pamodel;
@@ -11,7 +11,6 @@ import org.eclipse.emf.teneo.annotations.pannotation.Column;
import org.eclipse.emf.teneo.annotations.pannotation.JoinTable;
import org.eclipse.emf.teneo.annotations.pannotation.OneToMany;
import org.eclipse.emf.teneo.annotations.pannotation.SequenceGenerator;
-import org.eclipse.emf.teneo.annotations.pannotation.TableGenerator;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelFactoryImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelFactoryImpl.java
index 67e2043ad..6ce9e3680 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelFactoryImpl.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/impl/PamodelFactoryImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PamodelFactoryImpl.java,v 1.15 2007/01/24 23:29:41 mtaal Exp $
+ * $Id: PamodelFactoryImpl.java,v 1.16 2007/01/30 10:51:11 mtaal Exp $
*/
package org.eclipse.emf.teneo.annotations.pamodel.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.annotations.pamodel.*;
-
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEDataType;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelAdapterFactory.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelAdapterFactory.java
index bd909fac1..2c6c67b56 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelAdapterFactory.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelAdapterFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PamodelAdapterFactory.java,v 1.12 2007/01/24 23:29:40 mtaal Exp $
+ * $Id: PamodelAdapterFactory.java,v 1.13 2007/01/30 10:51:10 mtaal Exp $
*/
package org.eclipse.emf.teneo.annotations.pamodel.util;
@@ -10,8 +10,6 @@ import org.eclipse.emf.common.notify.Adapter;
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.pamodel.*;
-
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEDataType;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelSwitch.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelSwitch.java
index a27a9c93e..bfd73e04a 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelSwitch.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelSwitch.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PamodelSwitch.java,v 1.12 2007/01/24 23:29:40 mtaal Exp $
+ * $Id: PamodelSwitch.java,v 1.13 2007/01/30 10:51:10 mtaal Exp $
*/
package org.eclipse.emf.teneo.annotations.pamodel.util;
@@ -10,8 +10,6 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.teneo.annotations.pamodel.*;
-
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEDataType;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelValidator.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelValidator.java
index 03c0a8254..63b2efc38 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelValidator.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pamodel/util/PamodelValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PamodelValidator.java,v 1.11 2007/01/24 23:29:40 mtaal Exp $
+ * $Id: PamodelValidator.java,v 1.12 2007/01/30 10:51:10 mtaal Exp $
*/
package org.eclipse.emf.teneo.annotations.pamodel.util;
@@ -20,8 +20,6 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.emf.teneo.annotations.pamodel.*;
-
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass;
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEDataType;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationFactoryImpl.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationFactoryImpl.java
index 227959d48..076e69fba 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationFactoryImpl.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/impl/PannotationFactoryImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PannotationFactoryImpl.java,v 1.17 2007/01/24 23:29:42 mtaal Exp $
+ * $Id: PannotationFactoryImpl.java,v 1.18 2007/01/30 10:51:10 mtaal Exp $
*/
package org.eclipse.emf.teneo.annotations.pannotation.impl;
@@ -12,8 +12,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.annotations.pannotation.*;
-
import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverride;
import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride;
import org.eclipse.emf.teneo.annotations.pannotation.Basic;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationAdapterFactory.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationAdapterFactory.java
index 0e9d57fd2..024e2445c 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationAdapterFactory.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationAdapterFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PannotationAdapterFactory.java,v 1.17 2007/01/24 23:29:40 mtaal Exp $
+ * $Id: PannotationAdapterFactory.java,v 1.18 2007/01/30 10:51:11 mtaal Exp $
*/
package org.eclipse.emf.teneo.annotations.pannotation.util;
@@ -10,8 +10,6 @@ import org.eclipse.emf.common.notify.Adapter;
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.*;
-
import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverride;
import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride;
import org.eclipse.emf.teneo.annotations.pannotation.Basic;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationSwitch.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationSwitch.java
index 9c77a2cd8..f521431cb 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationSwitch.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationSwitch.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PannotationSwitch.java,v 1.17 2007/01/24 23:29:40 mtaal Exp $
+ * $Id: PannotationSwitch.java,v 1.18 2007/01/30 10:51:11 mtaal Exp $
*/
package org.eclipse.emf.teneo.annotations.pannotation.util;
@@ -10,8 +10,6 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.teneo.annotations.pannotation.*;
-
import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverride;
import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride;
import org.eclipse.emf.teneo.annotations.pannotation.Basic;
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationValidator.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationValidator.java
index 206f82f2c..070ef8e6f 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationValidator.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/pannotation/util/PannotationValidator.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: PannotationValidator.java,v 1.18 2007/01/24 23:29:40 mtaal Exp $
+ * $Id: PannotationValidator.java,v 1.19 2007/01/30 10:51:11 mtaal Exp $
*/
package org.eclipse.emf.teneo.annotations.pannotation.util;
@@ -25,8 +25,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.emf.teneo.annotations.pannotation.*;
-
import org.eclipse.emf.teneo.annotations.pannotation.AssociationOverride;
import org.eclipse.emf.teneo.annotations.pannotation.AttributeOverride;
import org.eclipse.emf.teneo.annotations.pannotation.Basic;

Back to the top