tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fra...@apache.org
Subject svn commit: r399365 - in /incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo: helper/ impl/ model/ model/impl/ util/
Date Wed, 03 May 2006 17:55:16 GMT
Author: frankb
Date: Wed May  3 10:55:12 2006
New Revision: 399365

URL: http://svn.apache.org/viewcvs?rev=399365&view=rev
Log:
TypeHelper.define improved by making defined meta classes implement the modeled meta class interfaces

Modified:
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java?rev=399365&r1=399364&r2=399365&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java Wed May  3 10:55:12 2006
@@ -108,10 +108,8 @@
   }
 
   protected EEnum computeEEnum(XSDSimpleTypeDefinition xsdSimpleTypeDefinition) {
-    EEnum eenum = super.computeEEnum(xsdSimpleTypeDefinition);
-    return eenum;
+    return null;
   }
-
     
   protected EStructuralFeature createFeature(EClass eClass, String name, EClassifier type, XSDComponent xsdComponent, int minOccurs, int maxOccurs) {
     EStructuralFeature feature = 

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java?rev=399365&r1=399364&r2=399365&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java Wed May  3 10:55:12 2006
@@ -110,13 +110,13 @@
     
     if (!isDataType)
     {
-      SDOUtil.setOpen(definedType, modeledType.isOpen());
       SDOUtil.setSequenced(definedType, modeledType.isSequenced());
+      SDOUtil.setOpen(definedType, modeledType.isOpen());
       SDOUtil.setAbstract(definedType, modeledType.isAbstract());
       
       for (Iterator iter = modeledType.getBaseType().iterator(); iter.hasNext(); )
       {
-        Type baseType = getDefinedType((DataObject)iter.next());
+        Type baseType = getDefinedType((org.apache.tuscany.sdo.model.Type)iter.next());
         SDOUtil.addBaseType(definedType, baseType);
       }
       
@@ -130,11 +130,11 @@
       {
         org.apache.tuscany.sdo.model.Property modeledProperty = (org.apache.tuscany.sdo.model.Property)iter.next();
         
-        Type propertyType = getDefinedType((DataObject)modeledProperty.getType_());
+        Type propertyType = getDefinedType(modeledProperty.getType_());
         Property definedProperty = SDOUtil.createProperty(definedType, modeledProperty.getName(), propertyType);
         
         SDOUtil.setMany(definedProperty, modeledProperty.isMany());
-        SDOUtil.setDefault(definedProperty, modeledProperty.getDefault());
+        SDOUtil.setDefault(definedProperty, modeledProperty.getDefault_());
         SDOUtil.setReadOnly(definedProperty, modeledProperty.isReadOnly());
         
         for (Iterator iter2 = modeledProperty.getAliasName().iterator(); iter2.hasNext(); )
@@ -146,9 +146,9 @@
         if (!propertyType.isDataType())
         {
           SDOUtil.setContainment(definedProperty, modeledProperty.isContainment());
-          if (modeledProperty.getOpposite() != null)
+          if (modeledProperty.getOpposite_() != null)
           {
-            SDOUtil.setOpposite(definedProperty, getDefinedProperty((DataObject)modeledProperty.getOpposite()));
+            SDOUtil.setOpposite(definedProperty, getDefinedProperty(modeledProperty.getOpposite_()));
           }
         }
       }
@@ -168,7 +168,7 @@
     return definedTypes;
   }
   
-  protected Type getDefinedType(DataObject modeledType)
+  protected Type getDefinedType(org.apache.tuscany.sdo.model.Type modeledType)
   {
     if (modeledType instanceof Type)
     {
@@ -176,25 +176,33 @@
     }
     else
     {
-      org.apache.tuscany.sdo.model.Type type = (org.apache.tuscany.sdo.model.Type)modeledType;
-      EClassifier eClassifier = extendedMetaData.getType(type.getUri(), type.getName());
+      EClassifier eClassifier = extendedMetaData.getType(modeledType.getUri(), modeledType.getName());
       if (eClassifier != null)
       {
         return (Type)eClassifier;
       }
       else
       {
-        return define(modeledType);
+        return define((DataObject)modeledType);
       }
     }
   }
   
-  protected Property getDefinedProperty(DataObject modeledProperty)
+  protected Property getDefinedProperty(org.apache.tuscany.sdo.model.Property modeledProperty)
   {
-    Type definedType = getDefinedType(modeledProperty.getContainer());
-    String propertyName = ((org.apache.tuscany.sdo.model.Property)modeledProperty).getName();
+    if (modeledProperty instanceof Property)
+    {
+      return (Property)modeledProperty;
+    }
+    else
+    {
+      DataObject modeledContainingType = ((DataObject)modeledProperty).getContainer();
+      
+      Type definedContainingType = getDefinedType((org.apache.tuscany.sdo.model.Type)modeledContainingType);
+      String propertyName = modeledProperty.getName();
     
-    return definedType.getProperty(propertyName);
+      return definedContainingType.getProperty(propertyName);
+    }
   }
 
 }

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java?rev=399365&r1=399364&r2=399365&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java Wed May  3 10:55:12 2006
@@ -18,8 +18,6 @@
 
 import java.util.List;
 
-//import org.apache.tuscany.sdo.SDOPackage;
-
 import org.apache.tuscany.sdo.util.BasicSequence;
 import org.apache.tuscany.sdo.util.DataObjectUtil;
 import org.eclipse.emf.ecore.EClass;
@@ -30,6 +28,7 @@
 import org.eclipse.emf.ecore.util.FeatureMap;
 
 import commonj.sdo.Property;
+import commonj.sdo.Sequence;
 import commonj.sdo.Type;
 
 /**
@@ -41,7 +40,7 @@
  *
  * @generated
  */
-public class AttributeImpl extends EAttributeImpl implements Property
+public class AttributeImpl extends EAttributeImpl implements Property, org.apache.tuscany.sdo.model.Property/*, DataObject*/
 {
   /**
    * <!-- begin-user-doc -->
@@ -160,4 +159,574 @@
     }
   }
 
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  // org.apache.tuscany.sdo.model.Property methods
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  
+  public List getAliasName() {
+    return this.getAliasNames();
+  }
+
+  public Sequence getAny() {
+    throw new UnsupportedOperationException();
+  }
+
+  public void unsetContainment() {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSetContainment() {
+    return false;
+  }
+  
+  public void setMany(boolean value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public void unsetMany() {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSetMany() {
+    return isMany();
+  }
+
+  public void setReadOnly(boolean value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public void unsetReadOnly() {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSetReadOnly() {
+    return isReadOnly();
+  }
+
+  public org.apache.tuscany.sdo.model.Type getType_() {
+    return (org.apache.tuscany.sdo.model.Type)getType();
+  }
+
+  public void setType(org.apache.tuscany.sdo.model.Type value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public Sequence getAnyAttribute() {
+    throw new UnsupportedOperationException();
+  }
+
+  public String getDefault_() {
+    return (String) this.getDefault();
+  }
+
+  public void setDefault_(String value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public org.apache.tuscany.sdo.model.Property getOpposite_() {
+    return (org.apache.tuscany.sdo.model.Property) getOpposite();
+  }
+
+  public void setOpposite_(org.apache.tuscany.sdo.model.Property value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public void setContainment(boolean value) {
+    throw new UnsupportedOperationException();
+  }
+
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  // DataObject method implementations
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  /*
+  public Object get(int propertyIndex) {
+    return DataObjectUtil.get(this, propertyIndex);
+  }
+  
+  public void set(int propertyIndex, Object value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSet(int propertyIndex) {
+    return DataObjectUtil.isSet(this, propertyIndex);
+  }
+
+  public void unset(int propertyIndex) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+  
+  public Object get(Property property) {
+    return DataObjectUtil.get(this, ((EStructuralFeature)property).getFeatureID());
+  }
+  
+  public void set(Property property, Object value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSet(Property property) {
+    return DataObjectUtil.isSet(this, ((EStructuralFeature)property).getFeatureID());
+  }
+
+  public void unset(Property property) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+  
+  public DataObject getContainer() {
+    return (DataObject)eContainer();
+  }
+
+  public Property getContainmentProperty() {
+    return (Property)eContainmentFeature();
+  }  
+
+  // Remaining DataObject methods are (will be) implemented as straight delegation to DataObjectUtil
+
+  public Object get(String path) {
+    return DataObjectUtil.get(this, path);
+  }
+  
+  public void set(String path, Object value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSet(String path) {
+    return DataObjectUtil.isSet(this, path);
+  }
+
+  public void unset(String path) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean getBoolean(String path) {
+    return DataObjectUtil.getBoolean(get(path));
+  }
+
+  public byte getByte(String path) {
+    return DataObjectUtil.getByte(get(path));
+  }
+
+  public char getChar(String path) {
+    return DataObjectUtil.getChar(get(path));
+  }
+
+  public double getDouble(String path) {
+    return DataObjectUtil.getDouble(get(path));
+  }
+
+  public float getFloat(String path) {
+    return DataObjectUtil.getFloat(get(path));
+  }
+
+  public int getInt(String path) {
+    return DataObjectUtil.getInt(get(path));
+  }
+
+  public long getLong(String path) {
+    return DataObjectUtil.getLong(get(path));
+  }
+
+  public short getShort(String path) {
+    return DataObjectUtil.getShort(get(path));
+  }
+
+  public byte[] getBytes(String path) {
+    return DataObjectUtil.getBytes(get(path));
+  }
+
+  public BigDecimal getBigDecimal(String path) {
+    return DataObjectUtil.getBigDecimal(get(path));
+  }
+
+  public BigInteger getBigInteger(String path) {
+    return DataObjectUtil.getBigInteger(get(path));
+  }
+
+  public DataObject getDataObject(String path) {
+    return (DataObject)get(path);
+  }
+
+  public Date getDate(String path) {
+    return DataObjectUtil.getDate(get(path));
+  }
+
+  public String getString(String path) {
+    return DataObjectUtil.getString(get(path));
+  }
+
+  public List getList(String path) {
+    return (List)get(path);
+  }
+
+  public Sequence getSequence(String path) {
+    return (Sequence)get(path);
+  }
+
+  public void setBoolean(String path, boolean value) {
+    set(path, new Boolean(value));
+  }
+
+  public void setByte(String path, byte value) {
+    set(path, new Byte(value));
+  }
+
+  public void setChar(String path, char value) {
+    set(path, new Character(value));
+  }
+
+  public void setDouble(String path, double value) {
+    set(path, new Double(value));
+  }
+
+  public void setFloat(String path, float value) {
+    set(path, new Float(value));
+  }
+
+  public void setInt(String path, int value) {
+    set(path, new Integer(value));
+  }
+
+  public void setLong(String path, long value) {
+    set(path, new Long(value));
+  }
+
+  public void setShort(String path, short value) {
+    set(path, new Short(value));
+  }
+
+  public void setBytes(String path, byte[] value) {
+    set(path, value);
+  }
+
+  public void setBigDecimal(String path, BigDecimal value) {
+    set(path, value);
+  }
+
+  public void setBigInteger(String path, BigInteger value) {
+    set(path, value);
+  }
+
+  public void setDataObject(String path, DataObject value) {
+    set(path, value);
+  }
+
+  public void setDate(String path, Date value) {
+    set(path, value);
+  }
+
+  public void setString(String path, String value) {
+    set(path, value);
+  }
+
+  public void setList(String path, List value) {
+    set(path, value);
+  }
+
+  public boolean getBoolean(int propertyIndex) {
+    return DataObjectUtil.getBoolean(this, propertyIndex);
+  }
+
+  public byte getByte(int propertyIndex) {
+    return DataObjectUtil.getByte(this, propertyIndex);
+  }
+
+  public char getChar(int propertyIndex) {
+    return DataObjectUtil.getChar(this, propertyIndex);
+  }
+
+  public double getDouble(int propertyIndex) {
+    return DataObjectUtil.getDouble(this, propertyIndex);
+  }
+
+  public float getFloat(int propertyIndex) {
+    return DataObjectUtil.getFloat(this, propertyIndex);
+  }
+
+  public int getInt(int propertyIndex) {
+    return DataObjectUtil.getInt(this, propertyIndex);
+  }
+
+  public long getLong(int propertyIndex) {
+    return DataObjectUtil.getLong(this, propertyIndex);
+  }
+
+  public short getShort(int propertyIndex) {
+    return DataObjectUtil.getShort(this, propertyIndex);
+  }
+
+  public byte[] getBytes(int propertyIndex) {
+    return DataObjectUtil.getBytes(this, propertyIndex);
+  }
+
+  public BigDecimal getBigDecimal(int propertyIndex) {
+    return DataObjectUtil.getBigDecimal(this, propertyIndex);
+  }
+
+  public BigInteger getBigInteger(int propertyIndex) {
+    return DataObjectUtil.getBigInteger(this, propertyIndex);
+  }
+
+  public DataObject getDataObject(int propertyIndex) {
+    return DataObjectUtil.getDataObject(this, propertyIndex);
+  }
+
+  public Date getDate(int propertyIndex) {
+    return DataObjectUtil.getDate(this, propertyIndex);
+  }
+
+  public String getString(int propertyIndex) {
+    return DataObjectUtil.getString(this, propertyIndex);
+  }
+
+  public List getList(int propertyIndex) {
+    return DataObjectUtil.getList(this, propertyIndex);
+  }
+
+  public Sequence getSequence(int propertyIndex) {
+    return DataObjectUtil.getSequence(this, propertyIndex);
+  }
+
+  public void setBoolean(int propertyIndex, boolean value) {
+    set(propertyIndex, new Boolean(value));
+  }
+
+  public void setByte(int propertyIndex, byte value) {
+    set(propertyIndex, new Byte(value));
+  }
+
+  public void setChar(int propertyIndex, char value) {
+    set(propertyIndex, new Character(value));
+  }
+
+  public void setDouble(int propertyIndex, double value) {
+    set(propertyIndex, new Double(value));
+  }
+
+  public void setFloat(int propertyIndex, float value) {
+    set(propertyIndex, new Float(value));
+  }
+
+  public void setInt(int propertyIndex, int value) {
+    set(propertyIndex, new Integer(value));
+  }
+
+  public void setLong(int propertyIndex, long value) {
+    set(propertyIndex, new Long(value));
+  }
+
+  public void setShort(int propertyIndex, short value) {
+    set(propertyIndex, new Short(value));
+  }
+
+  public void setBytes(int propertyIndex, byte[] value) {
+    set(propertyIndex, value);
+  }
+
+  public void setBigDecimal(int propertyIndex, BigDecimal value) {
+    set(propertyIndex, value);
+  }
+
+  public void setBigInteger(int propertyIndex, BigInteger value) {
+    set(propertyIndex, value);
+  }
+
+  public void setDataObject(int propertyIndex, DataObject value) {
+    set(propertyIndex, value);
+  }
+
+  public void setDate(int propertyIndex, Date value) {
+    set(propertyIndex, value);
+  }
+
+  public void setString(int propertyIndex, String value) {
+    set(propertyIndex, value);
+  }
+
+  public void setList(int propertyIndex, List value) {
+    set(propertyIndex, value);
+  }
+
+  public boolean getBoolean(Property property) {
+    return DataObjectUtil.getBoolean(this, property);
+  }
+
+  public byte getByte(Property property) {
+    return DataObjectUtil.getByte(this, property);
+  }
+
+  public char getChar(Property property) {
+    return DataObjectUtil.getChar(this, property);
+  }
+
+  public double getDouble(Property property) {
+    return DataObjectUtil.getDouble(this, property);
+  }
+
+  public float getFloat(Property property) {
+    return DataObjectUtil.getFloat(this, property);
+  }
+
+  public int getInt(Property property) {
+    return DataObjectUtil.getInt(this, property);
+  }
+
+  public long getLong(Property property) {
+    return DataObjectUtil.getLong(this, property);
+  }
+
+  public short getShort(Property property) {
+    return DataObjectUtil.getShort(this, property);
+  }
+
+  public byte[] getBytes(Property property) {
+    return DataObjectUtil.getBytes(this, property);
+  }
+
+  public BigDecimal getBigDecimal(Property property) {
+    return DataObjectUtil.getBigDecimal(this, property);
+  }
+
+  public BigInteger getBigInteger(Property property) {
+    return DataObjectUtil.getBigInteger(this, property);
+  }
+
+  public DataObject getDataObject(Property property) {
+    return DataObjectUtil.getDataObject(this, property);
+  }
+
+  public Date getDate(Property property) {
+    return DataObjectUtil.getDate(this, property);
+  }
+
+  public String getString(Property property) {
+    return DataObjectUtil.getString(this, property);
+  }
+
+  public List getList(Property property) {
+    return DataObjectUtil.getList(this, property);
+  }
+
+  public Sequence getSequence(Property property) {
+    return DataObjectUtil.getSequence(this, property);
+  }
+
+  public void setBoolean(Property property, boolean value) {
+    set(property, new Boolean(value));
+  }
+
+  public void setByte(Property property, byte value) {
+    set(property, new Byte(value));
+  }
+
+  public void setChar(Property property, char value) {
+    set(property, new Character(value));
+  }
+
+  public void setDouble(Property property, double value) {
+    set(property, new Double(value));
+  }
+
+  public void setFloat(Property property, float value) {
+    set(property, new Float(value));
+  }
+
+  public void setInt(Property property, int value) {
+    set(property, new Integer(value));
+  }
+
+  public void setLong(Property property, long value) {
+    set(property, new Long(value));
+  }
+
+  public void setShort(Property property, short value) {
+    set(property, new Short(value));
+  }
+
+  public void setBytes(Property property, byte[] value) {
+    set(property, value);
+  }
+
+  public void setBigDecimal(Property property, BigDecimal value) {
+    set(property, value);
+  }
+
+  public void setBigInteger(Property property, BigInteger value) {
+    set(property, value);
+  }
+
+  public void setDataObject(Property property, DataObject value) {
+    set(property, value);
+  }
+
+  public void setDate(Property property, Date value) {
+    set(property, value);
+  }
+
+  public void setString(Property property, String value) {
+    set(property, value);
+  }
+
+  public void setList(Property property, List value) {
+    set(property, value);
+  }
+
+  public DataObject createDataObject(String propertyName) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataObject createDataObject(int propertyIndex) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataObject createDataObject(Property property) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataObject createDataObject(String propertyName, String namespaceURI, String typeName) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataObject createDataObject(int propertyIndex, String namespaceURI, String typeName) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataObject createDataObject(Property property, Type type) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public void delete() {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataGraph getDataGraph() {
+    return DataObjectUtil.getDataGraph(this);
+  }
+
+  public Sequence getSequence() {
+    EAttribute mixedFeature = BasicExtendedMetaData.INSTANCE.getMixedFeature(eClass());
+    return mixedFeature != null ? (Sequence)eGet(mixedFeature, true, false) : null;
+  }
+
+  public List getInstanceProperties() {
+    return DataObjectUtil.getInstanceProperties(this);
+  }
+
+  public DataObject getRootObject() {
+    return DataObjectUtil.getRootObject(this);
+  }
+
+  public ChangeSummary getChangeSummary() {
+    // TODO: implement this method
+    throw new UnsupportedOperationException();
+  }
+
+  public void detach() {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+    //DataObjectUtil.detach(this);
+  }
+
+  public Property getProperty(String propertyName) {
+    return DataObjectUtil.getProperty(this, propertyName);
+  }
+  */
+  
 } //AttributeImpl

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java?rev=399365&r1=399364&r2=399365&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java Wed May  3 10:55:12 2006
@@ -16,27 +16,18 @@
  */
 package org.apache.tuscany.sdo.impl;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.tuscany.sdo.model.impl.ModelPackageImpl;
 import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
 import org.eclipse.emf.ecore.util.ExtendedMetaData;
 
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
 import commonj.sdo.Property;
 import commonj.sdo.Sequence;
 import commonj.sdo.Type;
@@ -50,7 +41,7 @@
  *
  * @generated
  */
-public class ClassImpl extends EClassImpl implements Type, DataObject, org.apache.tuscany.sdo.model.Type
+public class ClassImpl extends EClassImpl implements Type, org.apache.tuscany.sdo.model.Type/*, DataObject*/
 {
   /**
    * <!-- begin-user-doc -->
@@ -208,11 +199,86 @@
   
   protected Map propertyNameToPropertyMap;
 
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  // org.apache.tuscany.sdo.model.Type method implementations
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  
+  public List getBaseType() {
+    return this.getBaseTypes();
+  }
+
+  public List getProperty() {
+    return this.getProperties();
+  }
+
+  public List getAliasName() {
+    return this.getAliasNames();
+  }
+
+  public void unsetAbstract() {
+    eUnset(EcorePackage.eINSTANCE.getEClass_Abstract());
+  }
+
+  public boolean isSetAbstract() {
+    return eIsSet(EcorePackage.eINSTANCE.getEClass_Abstract());
+  }
   
+  public Sequence getAny() {
+    throw new UnsupportedOperationException();
+  }
+
+  public Sequence getAnyAttribute() {
+    throw new UnsupportedOperationException();
+  }
+  
+  public void setDataType(boolean value) {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public void unsetDataType() {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public boolean isSetDataType() {
+    return false;
+  }
+
+  public void setOpen(boolean value) {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public void unsetOpen() {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public boolean isSetOpen() {
+    return isOpen();
+  }
+
+  public void setSequenced(boolean value) {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public void unsetSequenced() {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public boolean isSetSequenced() {
+    return isSequenced();
+  }
+
+  public void setUri(String value) {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+  
+  public String getUri() {
+    return getURI();
+  }
+
   /////////////////////////////////////////////////////////////////////////////////////////////////////////
   // DataObject method implementations
   /////////////////////////////////////////////////////////////////////////////////////////////////////////
-
+  /*
   public Object get(int propertyIndex) {
     return DataObjectUtil.get(this, propertyIndex);
   }
@@ -257,7 +323,6 @@
     return (Type)ModelPackageImpl.eINSTANCE.getType();
   }
   
-
   // Remaining DataObject methods are (will be) implemented as straight delegation to DataObjectUtil
 
   public Object get(String path) {
@@ -702,82 +767,6 @@
     throw new UnsupportedOperationException("Type is frozen and cannot be modified");
     //DataObjectUtil.detach(this);
   }
-
-
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // org.apache.tuscany.sdo.model.Type method implementations
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  
-  public List getBaseType() {
-    return this.getBaseTypes();
-  }
-
-  public List getProperty() {
-    return this.getProperties();
-  }
-
-  public List getAliasName() {
-    return this.getAliasNames();
-  }
-
-  public void unsetAbstract() {
-    eUnset(EcorePackage.eINSTANCE.getEClass_Abstract());
-  }
-
-  public boolean isSetAbstract() {
-    return eIsSet(EcorePackage.eINSTANCE.getEClass_Abstract());
-  }
-  
-  public Sequence getAny() {
-    throw new UnsupportedOperationException();
-  }
-
-  public Sequence getAnyAttribute() {
-    throw new UnsupportedOperationException();
-  }
-  
-  public void setDataType(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetDataType() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetDataType() {
-    return true;
-  }
-
-  public void setOpen(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetOpen() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetOpen() {
-    return true;
-  }
-
-  public void setSequenced(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetSequenced() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetSequenced() {
-    return true;
-  }
-
-  public void setUri(String value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-  
-  public String getUri() {
-    return getURI();
-  }
+  */
 
 } //ClassTypeImpl

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java?rev=399365&r1=399364&r2=399365&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java Wed May  3 10:55:12 2006
@@ -16,26 +16,16 @@
  */
 package org.apache.tuscany.sdo.impl;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 
-import org.apache.tuscany.sdo.model.impl.ModelPackageImpl;
 import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EDataTypeImpl;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
 import org.eclipse.emf.ecore.util.ExtendedMetaData;
 
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
 import commonj.sdo.Property;
 import commonj.sdo.Sequence;
 import commonj.sdo.Type;
@@ -49,7 +39,7 @@
  *
  * @generated
  */
-public class DataTypeImpl extends EDataTypeImpl implements Type, DataObject, org.apache.tuscany.sdo.model.Type
+public class DataTypeImpl extends EDataTypeImpl implements Type, org.apache.tuscany.sdo.model.Type/*, DataObject*/
 {
   /**
    * <!-- begin-user-doc -->
@@ -175,11 +165,95 @@
     return null;
   }
 
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  // org.apache.tuscany.sdo.model.Type method implementations
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  
+  public List getBaseType() {
+    return this.getBaseTypes();
+  }
+
+  public List getProperty() {
+    return this.getProperties();
+  }
+
+  public List getAliasName() {
+    return this.getAliasNames();
+  }
+
+  public Sequence getAny() {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Sequence getAnyAttribute() {
+    throw new UnsupportedOperationException();
+  }
+  
+  public boolean isAbstract()
+  {
+    return false;
+  }
+
+  public void setAbstract(boolean value) {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public boolean isSetAbstract() {
+    return false;
+  }
+
+  public void unsetAbstract() {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public void setDataType(boolean value) {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public void unsetDataType() {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public boolean isSetDataType() {
+    return true;
+  }
+
+  public void setOpen(boolean value) {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public void unsetOpen() {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public boolean isSetOpen() {
+    return false;
+  }
+
+  public void setSequenced(boolean value) {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public void unsetSequenced() {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+
+  public boolean isSetSequenced() {
+    return false;
+  }
+
+  public void setUri(String value) {
+    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
+  }
+  
+  public String getUri() {
+    return getURI();
+  }
 
   /////////////////////////////////////////////////////////////////////////////////////////////////////////
   // DataObject method implementations
   /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  
+  /*
   public Object get(int propertyIndex) {
     Object ret = DataObjectUtil.get(this, propertyIndex);
     return (ret != null) ? 
@@ -228,7 +302,6 @@
     return (Type)ModelPackageImpl.eINSTANCE.getType();
   }
   
-
   // Remaining DataObject methods are (will be) implemented as straight delegation to DataObjectUtil
 
   public Object get(String path) {
@@ -672,91 +745,6 @@
   public void detach() {
     throw new UnsupportedOperationException("Type is frozen and cannot be modified");
   }
-
-  
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // org.apache.tuscany.sdo.model.Type method implementations
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  
-  public List getBaseType() {
-    return this.getBaseTypes();
-  }
-
-  public List getProperty() {
-    return this.getProperties();
-  }
-
-  public List getAliasName() {
-    return this.getAliasNames();
-  }
-
-  public Sequence getAny() {
-    throw new UnsupportedOperationException();
-  }
-  
-  public Sequence getAnyAttribute() {
-    throw new UnsupportedOperationException();
-  }
-  
-  public boolean isAbstract()
-  {
-    return false;
-  }
-
-  public void setAbstract(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetAbstract() {
-    return false;
-  }
-
-  public void unsetAbstract() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void setDataType(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetDataType() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetDataType() {
-    return true;
-  }
-
-  public void setOpen(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetOpen() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetOpen() {
-    return false;
-  }
-
-  public void setSequenced(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetSequenced() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetSequenced() {
-    return false;
-  }
-
-  public void setUri(String value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
+  */
   
-  public String getUri() {
-    return getURI();
-  }
-
 } //DataTypeImpl

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java?rev=399365&r1=399364&r2=399365&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java Wed May  3 10:55:12 2006
@@ -37,6 +37,7 @@
  * </p>
  *
  * @generated
+ * @deprecated SDO doesn't support Enum types
  */
 public class EnumImpl extends EEnumImpl implements Type
 {

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java?rev=399365&r1=399364&r2=399365&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java Wed May  3 10:55:12 2006
@@ -18,14 +18,13 @@
 
 import java.util.List;
 
-//import org.apache.tuscany.sdo.SDOPackage;
-
 import org.apache.tuscany.sdo.util.DataObjectUtil;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EReferenceImpl;
 
 import commonj.sdo.Property;
+import commonj.sdo.Sequence;
 import commonj.sdo.Type;
 
 /**
@@ -37,7 +36,7 @@
  *
  * @generated
  */
-public class ReferenceImpl extends EReferenceImpl implements Property
+public class ReferenceImpl extends EReferenceImpl implements Property,/* DataObject,*/ org.apache.tuscany.sdo.model.Property
 {
   /**
    * <!-- begin-user-doc -->
@@ -103,6 +102,10 @@
    */
   public Type getType()
   {
+    // Note that Property.getType() conflicts with DataObject.getType(), so we can only implement
+    // it one way or the other here. We're implementing it to return the property type so it will
+    // return the wrong type when the caller is using the DataObject interface.  Not much we can 
+    // do about it tho. -- James Snell
     return (Type)getEType();
   }
 
@@ -126,4 +129,570 @@
     return (Property)getEOpposite();
   }
 
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  // org.apache.tuscany.sdo.model.Property methods
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  
+  public List getAliasName() {
+    return this.getAliasNames();
+  }
+
+  public Sequence getAny() {
+    throw new UnsupportedOperationException();
+  }
+
+  public void setMany(boolean value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public void unsetMany() {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSetMany() {
+    return isMany();
+  }
+
+  public void setReadOnly(boolean value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public void unsetReadOnly() {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSetReadOnly() {
+    return isReadOnly();
+  }
+
+  public org.apache.tuscany.sdo.model.Type getType_() {
+    return (org.apache.tuscany.sdo.model.Type)getType();
+  }
+
+  public void setType(org.apache.tuscany.sdo.model.Type value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public Sequence getAnyAttribute() {
+    throw new UnsupportedOperationException();
+  }
+
+  public String getDefault_() {
+    return (String) this.getDefault();
+  }
+
+  public void setDefault_(String value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public org.apache.tuscany.sdo.model.Property getOpposite_() {
+    return (org.apache.tuscany.sdo.model.Property) getOpposite();
+  }
+
+  public void setOpposite_(org.apache.tuscany.sdo.model.Property value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public void unsetContainment() {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSetContainment() {
+    return isContainment();
+  }
+
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  // DataObject method implementations
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////
+  /*
+  public Object get(int propertyIndex) {
+    return DataObjectUtil.get(this, propertyIndex);
+  }
+  
+  public void set(int propertyIndex, Object value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSet(int propertyIndex) {
+    return DataObjectUtil.isSet(this, propertyIndex);
+  }
+
+  public void unset(int propertyIndex) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+  
+  public Object get(Property property) {
+    return DataObjectUtil.get(this, ((EStructuralFeature)property).getFeatureID());
+  }
+  
+  public void set(Property property, Object value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSet(Property property) {
+    return DataObjectUtil.isSet(this, ((EStructuralFeature)property).getFeatureID());
+  }
+
+  public void unset(Property property) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+  
+  public DataObject getContainer() {
+    return (DataObject)eContainer();
+  }
+
+  public Property getContainmentProperty() {
+    return (Property)eContainmentFeature();
+  }  
+
+  // Remaining DataObject methods are (will be) implemented as straight delegation to DataObjectUtil
+
+  public Object get(String path) {
+    return DataObjectUtil.get(this, path);
+  }
+  
+  public void set(String path, Object value) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean isSet(String path) {
+    return DataObjectUtil.isSet(this, path);
+  }
+
+  public void unset(String path) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public boolean getBoolean(String path) {
+    return DataObjectUtil.getBoolean(get(path));
+  }
+
+  public byte getByte(String path) {
+    return DataObjectUtil.getByte(get(path));
+  }
+
+  public char getChar(String path) {
+    return DataObjectUtil.getChar(get(path));
+  }
+
+  public double getDouble(String path) {
+    return DataObjectUtil.getDouble(get(path));
+  }
+
+  public float getFloat(String path) {
+    return DataObjectUtil.getFloat(get(path));
+  }
+
+  public int getInt(String path) {
+    return DataObjectUtil.getInt(get(path));
+  }
+
+  public long getLong(String path) {
+    return DataObjectUtil.getLong(get(path));
+  }
+
+  public short getShort(String path) {
+    return DataObjectUtil.getShort(get(path));
+  }
+
+  public byte[] getBytes(String path) {
+    return DataObjectUtil.getBytes(get(path));
+  }
+
+  public BigDecimal getBigDecimal(String path) {
+    return DataObjectUtil.getBigDecimal(get(path));
+  }
+
+  public BigInteger getBigInteger(String path) {
+    return DataObjectUtil.getBigInteger(get(path));
+  }
+
+  public DataObject getDataObject(String path) {
+    return (DataObject)get(path);
+  }
+
+  public Date getDate(String path) {
+    return DataObjectUtil.getDate(get(path));
+  }
+
+  public String getString(String path) {
+    return DataObjectUtil.getString(get(path));
+  }
+
+  public List getList(String path) {
+    return (List)get(path);
+  }
+
+  public Sequence getSequence(String path) {
+    return (Sequence)get(path);
+  }
+
+  public void setBoolean(String path, boolean value) {
+    set(path, new Boolean(value));
+  }
+
+  public void setByte(String path, byte value) {
+    set(path, new Byte(value));
+  }
+
+  public void setChar(String path, char value) {
+    set(path, new Character(value));
+  }
+
+  public void setDouble(String path, double value) {
+    set(path, new Double(value));
+  }
+
+  public void setFloat(String path, float value) {
+    set(path, new Float(value));
+  }
+
+  public void setInt(String path, int value) {
+    set(path, new Integer(value));
+  }
+
+  public void setLong(String path, long value) {
+    set(path, new Long(value));
+  }
+
+  public void setShort(String path, short value) {
+    set(path, new Short(value));
+  }
+
+  public void setBytes(String path, byte[] value) {
+    set(path, value);
+  }
+
+  public void setBigDecimal(String path, BigDecimal value) {
+    set(path, value);
+  }
+
+  public void setBigInteger(String path, BigInteger value) {
+    set(path, value);
+  }
+
+  public void setDataObject(String path, DataObject value) {
+    set(path, value);
+  }
+
+  public void setDate(String path, Date value) {
+    set(path, value);
+  }
+
+  public void setString(String path, String value) {
+    set(path, value);
+  }
+
+  public void setList(String path, List value) {
+    set(path, value);
+  }
+
+  public boolean getBoolean(int propertyIndex) {
+    return DataObjectUtil.getBoolean(this, propertyIndex);
+  }
+
+  public byte getByte(int propertyIndex) {
+    return DataObjectUtil.getByte(this, propertyIndex);
+  }
+
+  public char getChar(int propertyIndex) {
+    return DataObjectUtil.getChar(this, propertyIndex);
+  }
+
+  public double getDouble(int propertyIndex) {
+    return DataObjectUtil.getDouble(this, propertyIndex);
+  }
+
+  public float getFloat(int propertyIndex) {
+    return DataObjectUtil.getFloat(this, propertyIndex);
+  }
+
+  public int getInt(int propertyIndex) {
+    return DataObjectUtil.getInt(this, propertyIndex);
+  }
+
+  public long getLong(int propertyIndex) {
+    return DataObjectUtil.getLong(this, propertyIndex);
+  }
+
+  public short getShort(int propertyIndex) {
+    return DataObjectUtil.getShort(this, propertyIndex);
+  }
+
+  public byte[] getBytes(int propertyIndex) {
+    return DataObjectUtil.getBytes(this, propertyIndex);
+  }
+
+  public BigDecimal getBigDecimal(int propertyIndex) {
+    return DataObjectUtil.getBigDecimal(this, propertyIndex);
+  }
+
+  public BigInteger getBigInteger(int propertyIndex) {
+    return DataObjectUtil.getBigInteger(this, propertyIndex);
+  }
+
+  public DataObject getDataObject(int propertyIndex) {
+    return DataObjectUtil.getDataObject(this, propertyIndex);
+  }
+
+  public Date getDate(int propertyIndex) {
+    return DataObjectUtil.getDate(this, propertyIndex);
+  }
+
+  public String getString(int propertyIndex) {
+    return DataObjectUtil.getString(this, propertyIndex);
+  }
+
+  public List getList(int propertyIndex) {
+    return DataObjectUtil.getList(this, propertyIndex);
+  }
+
+  public Sequence getSequence(int propertyIndex) {
+    return DataObjectUtil.getSequence(this, propertyIndex);
+  }
+
+  public void setBoolean(int propertyIndex, boolean value) {
+    set(propertyIndex, new Boolean(value));
+  }
+
+  public void setByte(int propertyIndex, byte value) {
+    set(propertyIndex, new Byte(value));
+  }
+
+  public void setChar(int propertyIndex, char value) {
+    set(propertyIndex, new Character(value));
+  }
+
+  public void setDouble(int propertyIndex, double value) {
+    set(propertyIndex, new Double(value));
+  }
+
+  public void setFloat(int propertyIndex, float value) {
+    set(propertyIndex, new Float(value));
+  }
+
+  public void setInt(int propertyIndex, int value) {
+    set(propertyIndex, new Integer(value));
+  }
+
+  public void setLong(int propertyIndex, long value) {
+    set(propertyIndex, new Long(value));
+  }
+
+  public void setShort(int propertyIndex, short value) {
+    set(propertyIndex, new Short(value));
+  }
+
+  public void setBytes(int propertyIndex, byte[] value) {
+    set(propertyIndex, value);
+  }
+
+  public void setBigDecimal(int propertyIndex, BigDecimal value) {
+    set(propertyIndex, value);
+  }
+
+  public void setBigInteger(int propertyIndex, BigInteger value) {
+    set(propertyIndex, value);
+  }
+
+  public void setDataObject(int propertyIndex, DataObject value) {
+    set(propertyIndex, value);
+  }
+
+  public void setDate(int propertyIndex, Date value) {
+    set(propertyIndex, value);
+  }
+
+  public void setString(int propertyIndex, String value) {
+    set(propertyIndex, value);
+  }
+
+  public void setList(int propertyIndex, List value) {
+    set(propertyIndex, value);
+  }
+
+  public boolean getBoolean(Property property) {
+    return DataObjectUtil.getBoolean(this, property);
+  }
+
+  public byte getByte(Property property) {
+    return DataObjectUtil.getByte(this, property);
+  }
+
+  public char getChar(Property property) {
+    return DataObjectUtil.getChar(this, property);
+  }
+
+  public double getDouble(Property property) {
+    return DataObjectUtil.getDouble(this, property);
+  }
+
+  public float getFloat(Property property) {
+    return DataObjectUtil.getFloat(this, property);
+  }
+
+  public int getInt(Property property) {
+    return DataObjectUtil.getInt(this, property);
+  }
+
+  public long getLong(Property property) {
+    return DataObjectUtil.getLong(this, property);
+  }
+
+  public short getShort(Property property) {
+    return DataObjectUtil.getShort(this, property);
+  }
+
+  public byte[] getBytes(Property property) {
+    return DataObjectUtil.getBytes(this, property);
+  }
+
+  public BigDecimal getBigDecimal(Property property) {
+    return DataObjectUtil.getBigDecimal(this, property);
+  }
+
+  public BigInteger getBigInteger(Property property) {
+    return DataObjectUtil.getBigInteger(this, property);
+  }
+
+  public DataObject getDataObject(Property property) {
+    return DataObjectUtil.getDataObject(this, property);
+  }
+
+  public Date getDate(Property property) {
+    return DataObjectUtil.getDate(this, property);
+  }
+
+  public String getString(Property property) {
+    return DataObjectUtil.getString(this, property);
+  }
+
+  public List getList(Property property) {
+    return DataObjectUtil.getList(this, property);
+  }
+
+  public Sequence getSequence(Property property) {
+    return DataObjectUtil.getSequence(this, property);
+  }
+
+  public void setBoolean(Property property, boolean value) {
+    set(property, new Boolean(value));
+  }
+
+  public void setByte(Property property, byte value) {
+    set(property, new Byte(value));
+  }
+
+  public void setChar(Property property, char value) {
+    set(property, new Character(value));
+  }
+
+  public void setDouble(Property property, double value) {
+    set(property, new Double(value));
+  }
+
+  public void setFloat(Property property, float value) {
+    set(property, new Float(value));
+  }
+
+  public void setInt(Property property, int value) {
+    set(property, new Integer(value));
+  }
+
+  public void setLong(Property property, long value) {
+    set(property, new Long(value));
+  }
+
+  public void setShort(Property property, short value) {
+    set(property, new Short(value));
+  }
+
+  public void setBytes(Property property, byte[] value) {
+    set(property, value);
+  }
+
+  public void setBigDecimal(Property property, BigDecimal value) {
+    set(property, value);
+  }
+
+  public void setBigInteger(Property property, BigInteger value) {
+    set(property, value);
+  }
+
+  public void setDataObject(Property property, DataObject value) {
+    set(property, value);
+  }
+
+  public void setDate(Property property, Date value) {
+    set(property, value);
+  }
+
+  public void setString(Property property, String value) {
+    set(property, value);
+  }
+
+  public void setList(Property property, List value) {
+    set(property, value);
+  }
+
+  public DataObject createDataObject(String propertyName) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataObject createDataObject(int propertyIndex) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataObject createDataObject(Property property) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataObject createDataObject(String propertyName, String namespaceURI, String typeName) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataObject createDataObject(int propertyIndex, String namespaceURI, String typeName) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataObject createDataObject(Property property, Type type) {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public void delete() {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+  }
+
+  public DataGraph getDataGraph() {
+    return DataObjectUtil.getDataGraph(this);
+  }
+
+  public Sequence getSequence() {
+    EAttribute mixedFeature = BasicExtendedMetaData.INSTANCE.getMixedFeature(eClass());
+    return mixedFeature != null ? (Sequence)eGet(mixedFeature, true, false) : null;
+  }
+
+  public List getInstanceProperties() {
+    return DataObjectUtil.getInstanceProperties(this);
+  }
+
+  public DataObject getRootObject() {
+    return DataObjectUtil.getRootObject(this);
+  }
+
+  public ChangeSummary getChangeSummary() {
+    // TODO: implement this method
+    throw new UnsupportedOperationException();
+  }
+
+  public void detach() {
+    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+    //DataObjectUtil.detach(this);
+  }
+  
+  public Property getProperty(String propertyName) {
+    return DataObjectUtil.getProperty(this, propertyName);
+  }
+  */
+  
 } //ReferenceImpl

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java?rev=399365&r1=399364&r2=399365&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java Wed May  3 10:55:12 2006
@@ -31,6 +31,11 @@
  * </ul>
  * </p>
  *
+ * Note: The getDefault and getOpposite methods had to be renamed to avoid
+ *       conflict with the commonj.sdo.Property getDefault and getOpposite
+ *       methods in classes that implement both.  Eventually, the two interfaces
+ *       should be brought in-line with one another -- James Snell 
+ *
  * @generated
  */
 public interface Property
@@ -123,9 +128,9 @@
    * <!-- end-user-doc -->
    * @return the value of the '<em>Default</em>' attribute.
    * @see #setDefault(String)
-   * @generated
+   * @generated NOT
    */
-  String getDefault();
+  String getDefault_();
 
   /**
    * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getDefault <em>Default</em>}' attribute.
@@ -135,7 +140,7 @@
    * @see #getDefault()
    * @generated
    */
-  void setDefault(String value);
+  void setDefault_(String value);
 
   /**
    * Returns the value of the '<em><b>Many</b></em>' attribute.
@@ -224,7 +229,7 @@
    * @see #setOpposite(Property)
    * @generated
    */
-  Property getOpposite();
+  Property getOpposite_();
 
   /**
    * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getOpposite <em>Opposite</em>}' reference.
@@ -234,7 +239,7 @@
    * @see #getOpposite()
    * @generated
    */
-  void setOpposite(Property value);
+  void setOpposite_(Property value);
 
   /**
    * Returns the value of the '<em><b>Read Only</b></em>' attribute.

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java?rev=399365&r1=399364&r2=399365&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java Wed May  3 10:55:12 2006
@@ -456,8 +456,8 @@
    */
   public Character createCharacterFromString(EDataType eDataType, String initialValue)
   {
-    return (initialValue != null && initialValue.length() > 0) ? 
-           new Character(initialValue.charAt(0)) : null;
+    return (initialValue == null && initialValue.length() > 0) 
+    ? null : (new Character(collapseWhiteSpace(initialValue).charAt(0)));
   }
 
   /**

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java?rev=399365&r1=399364&r2=399365&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java Wed May  3 10:55:12 2006
@@ -54,6 +54,11 @@
  * </ul>
  * </p>
  *
+ * Note: The getDefault and getOpposite methods had to be renamed to avoid
+ *       conflict with the commonj.sdo.Property getDefault and getOpposite
+ *       methods in classes that implement both.  Eventually, the two interfaces
+ *       should be brought in-line with one another -- James Snell
+ *
  * @generated
  */
 public class PropertyImpl extends DataObjectImpl implements Property
@@ -336,9 +341,9 @@
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
+   * @generated NOT
    */
-  public String getDefault()
+  public String getDefault_()
   {
     return default_;
   }
@@ -348,7 +353,7 @@
    * <!-- end-user-doc -->
    * @generated
    */
-  public void setDefault(String newDefault)
+  public void setDefault_(String newDefault)
   {
     String oldDefault = default_;
     default_ = newDefault;
@@ -432,9 +437,9 @@
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
+   * @generated NOT
    */
-  public Property getOpposite()
+  public Property getOpposite_()
   {
     if (opposite != null && ((EObject)opposite).eIsProxy())
     {
@@ -462,9 +467,9 @@
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
+   * @generated NOT
    */
-  public void setOpposite(Property newOpposite)
+  public void setOpposite_(Property newOpposite)
   {
     Property oldOpposite = opposite;
     opposite = newOpposite;
@@ -613,13 +618,13 @@
       case ModelPackageImpl.PROPERTY__CONTAINMENT:
         return isContainment() ? Boolean.TRUE : Boolean.FALSE;
       case ModelPackageImpl.PROPERTY__DEFAULT:
-        return getDefault();
+        return getDefault_();
       case ModelPackageImpl.PROPERTY__MANY:
         return isMany() ? Boolean.TRUE : Boolean.FALSE;
       case ModelPackageImpl.PROPERTY__NAME:
         return getName();
       case ModelPackageImpl.PROPERTY__OPPOSITE:
-        if (resolve) return getOpposite();
+        if (resolve) return getOpposite_();
         return basicGetOpposite();
       case ModelPackageImpl.PROPERTY__READ_ONLY:
         return isReadOnly() ? Boolean.TRUE : Boolean.FALSE;
@@ -653,7 +658,7 @@
         setContainment(((Boolean)newValue).booleanValue());
         return;
       case ModelPackageImpl.PROPERTY__DEFAULT:
-        setDefault((String)newValue);
+        setDefault_((String)newValue);
         return;
       case ModelPackageImpl.PROPERTY__MANY:
         setMany(((Boolean)newValue).booleanValue());
@@ -662,7 +667,7 @@
         setName((String)newValue);
         return;
       case ModelPackageImpl.PROPERTY__OPPOSITE:
-        setOpposite((Property)newValue);
+        setOpposite_((Property)newValue);
         return;
       case ModelPackageImpl.PROPERTY__READ_ONLY:
         setReadOnly(((Boolean)newValue).booleanValue());
@@ -696,7 +701,7 @@
         unsetContainment();
         return;
       case ModelPackageImpl.PROPERTY__DEFAULT:
-        setDefault(DEFAULT_EDEFAULT);
+        setDefault_(DEFAULT_EDEFAULT);
         return;
       case ModelPackageImpl.PROPERTY__MANY:
         unsetMany();
@@ -705,7 +710,7 @@
         setName(NAME_EDEFAULT);
         return;
       case ModelPackageImpl.PROPERTY__OPPOSITE:
-        setOpposite((Property)null);
+        setOpposite_((Property)null);
         return;
       case ModelPackageImpl.PROPERTY__READ_ONLY:
         unsetReadOnly();

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java?rev=399365&r1=399364&r2=399365&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java Wed May  3 10:55:12 2006
@@ -32,7 +32,6 @@
 import org.apache.tuscany.sdo.SDOExtendedMetaData;
 import org.apache.tuscany.sdo.impl.DataGraphImpl;
 import org.apache.tuscany.sdo.impl.SDOFactoryImpl;
-import org.apache.tuscany.sdo.model.impl.ModelPackageImpl;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.common.util.UniqueEList;
@@ -71,65 +70,6 @@
 
 public final class DataObjectUtil
 {
-  public static Object get(org.apache.tuscany.sdo.model.Type type, int propertyIndex) {
-    switch (propertyIndex)
-    {
-      case ModelPackageImpl.TYPE__BASE_TYPE:
-        return type.getBaseType();
-      case ModelPackageImpl.TYPE__PROPERTY:
-        return type.getProperty();
-      case ModelPackageImpl.TYPE__ALIAS_NAME:
-        return type.getAliasName();
-      case ModelPackageImpl.TYPE__ANY:
-        return type.getAny();
-      case ModelPackageImpl.TYPE__ABSTRACT:
-        return type.isAbstract() ? Boolean.TRUE : Boolean.FALSE;
-      case ModelPackageImpl.TYPE__DATA_TYPE:
-        return type.isDataType() ? Boolean.TRUE : Boolean.FALSE;
-      case ModelPackageImpl.TYPE__NAME:
-        return type.getName();
-      case ModelPackageImpl.TYPE__OPEN:
-        return type.isOpen() ? Boolean.TRUE : Boolean.FALSE;
-      case ModelPackageImpl.TYPE__SEQUENCED:
-        return type.isSequenced() ? Boolean.TRUE : Boolean.FALSE;
-      case ModelPackageImpl.TYPE__URI:
-        return type.getUri();
-      case ModelPackageImpl.TYPE__ANY_ATTRIBUTE:
-        return type.getAnyAttribute();
-    }
-    return null;
-  }
-  
-  public static boolean isSet(org.apache.tuscany.sdo.model.Type type, int propertyIndex) {
-    //FB Note that this implementation has the undesirable effect of invoking lazy creation of feature lists
-    switch (propertyIndex)
-    {
-      case ModelPackageImpl.TYPE__BASE_TYPE:
-        return !type.getBaseType().isEmpty();
-      case ModelPackageImpl.TYPE__PROPERTY:
-        return !type.getProperty().isEmpty();
-      case ModelPackageImpl.TYPE__ALIAS_NAME:
-        return !type.getAliasName().isEmpty();
-      case ModelPackageImpl.TYPE__ANY:
-        return false;
-      case ModelPackageImpl.TYPE__ABSTRACT:
-        return type.isSetAbstract();
-      case ModelPackageImpl.TYPE__DATA_TYPE:
-        return type.isSetDataType();
-      case ModelPackageImpl.TYPE__NAME:
-        return type.getName() != null;
-      case ModelPackageImpl.TYPE__OPEN:
-        return type.isSetOpen();
-      case ModelPackageImpl.TYPE__SEQUENCED:
-        return type.isSetSequenced();
-      case ModelPackageImpl.TYPE__URI:
-        return type.getUri() != null;
-      case ModelPackageImpl.TYPE__ANY_ATTRIBUTE:
-        return false;
-    }
-    return false;
-  }
-  
   public static Object writeReplace(DataObject dataObject) throws ObjectStreamException
   {
     DataGraph dataGraph = dataObject.getDataGraph();
@@ -2505,5 +2445,120 @@
   {
     // NOOP since init is done during static initialization of this class. See above.
   }
+  
+  /*
+  public static Object get(org.apache.tuscany.sdo.model.Property property, int propertyIndex) {
+    switch(propertyIndex)
+    {
+      case ModelPackageImpl.PROPERTY__ALIAS_NAME:
+        return property.getAliasName();
+      case ModelPackageImpl.PROPERTY__ANY:
+        return property.getAny();
+      case ModelPackageImpl.PROPERTY__ANY_ATTRIBUTE:
+        return property.getAnyAttribute();
+      case ModelPackageImpl.PROPERTY__CONTAINMENT:
+        return Boolean.valueOf(property.isContainment());
+      case ModelPackageImpl.PROPERTY__DEFAULT:
+        return property.getDefault_();
+      case ModelPackageImpl.PROPERTY__MANY:
+        return Boolean.valueOf(property.isMany());
+      case ModelPackageImpl.PROPERTY__NAME:
+        return property.getName();
+      case ModelPackageImpl.PROPERTY__OPPOSITE:
+        return property.getOpposite_();
+      case ModelPackageImpl.PROPERTY__READ_ONLY:
+        return Boolean.valueOf(property.isReadOnly());
+      case ModelPackageImpl.PROPERTY__TYPE:
+        return property.getType_();
+    }
+    return null;
+  }
+  
+  public static boolean isSet(org.apache.tuscany.sdo.model.Property property, int propertyIndex) {
+    switch(propertyIndex)
+    {
+      case ModelPackageImpl.PROPERTY__ALIAS_NAME:
+        return !property.getAliasName().isEmpty();
+      case ModelPackageImpl.PROPERTY__ANY:
+        return false;
+      case ModelPackageImpl.PROPERTY__ANY_ATTRIBUTE:
+        return false;
+      case ModelPackageImpl.PROPERTY__CONTAINMENT:
+        return property.isSetContainment();
+      case ModelPackageImpl.PROPERTY__DEFAULT:
+        return property.getDefault_() != null;
+      case ModelPackageImpl.PROPERTY__MANY:
+        return property.isSetMany();
+      case ModelPackageImpl.PROPERTY__NAME:
+        return property.getName() != null;
+      case ModelPackageImpl.PROPERTY__OPPOSITE:
+        return property.getOpposite_() != null;
+      case ModelPackageImpl.PROPERTY__READ_ONLY:
+        return property.isSetReadOnly();
+      case ModelPackageImpl.PROPERTY__TYPE:
+        return property.getType_() != null;
+    }
+    return false;
+  }
+  
+  public static Object get(org.apache.tuscany.sdo.model.Type type, int propertyIndex) {
+    switch (propertyIndex)
+    {
+      case ModelPackageImpl.TYPE__BASE_TYPE:
+        return type.getBaseType();
+      case ModelPackageImpl.TYPE__PROPERTY:
+        return type.getProperty();
+      case ModelPackageImpl.TYPE__ALIAS_NAME:
+        return type.getAliasName();
+      case ModelPackageImpl.TYPE__ANY:
+        return type.getAny();
+      case ModelPackageImpl.TYPE__ABSTRACT:
+        return Boolean.valueOf(type.isAbstract());
+      case ModelPackageImpl.TYPE__DATA_TYPE:
+        return Boolean.valueOf(type.isDataType());
+      case ModelPackageImpl.TYPE__NAME:
+        return type.getName();
+      case ModelPackageImpl.TYPE__OPEN:
+        return Boolean.valueOf(type.isOpen());
+      case ModelPackageImpl.TYPE__SEQUENCED:
+        return Boolean.valueOf(type.isSequenced());
+      case ModelPackageImpl.TYPE__URI:
+        return type.getUri();
+      case ModelPackageImpl.TYPE__ANY_ATTRIBUTE:
+        return type.getAnyAttribute();
+    }
+    return null;
+  }
+  
+  public static boolean isSet(org.apache.tuscany.sdo.model.Type type, int propertyIndex) {
+    //FB Note that this implementation has the undesirable effect of invoking lazy creation of feature lists
+    switch (propertyIndex)
+    {
+      case ModelPackageImpl.TYPE__BASE_TYPE:
+        return !type.getBaseType().isEmpty();
+      case ModelPackageImpl.TYPE__PROPERTY:
+        return !type.getProperty().isEmpty();
+      case ModelPackageImpl.TYPE__ALIAS_NAME:
+        return !type.getAliasName().isEmpty();
+      case ModelPackageImpl.TYPE__ANY:
+        return false;
+      case ModelPackageImpl.TYPE__ABSTRACT:
+        return type.isSetAbstract();
+      case ModelPackageImpl.TYPE__DATA_TYPE:
+        return type.isSetDataType();
+      case ModelPackageImpl.TYPE__NAME:
+        return type.getName() != null;
+      case ModelPackageImpl.TYPE__OPEN:
+        return type.isSetOpen();
+      case ModelPackageImpl.TYPE__SEQUENCED:
+        return type.isSetSequenced();
+      case ModelPackageImpl.TYPE__URI:
+        return type.getUri() != null;
+      case ModelPackageImpl.TYPE__ANY_ATTRIBUTE:
+        return false;
+    }
+    return false;
+  }
+  */
   
 }



Mime
View raw message