svn commit: r437778 [15/42] - in /incubator/tuscany/java: ./ buildtools/ buildtools/src/main/resources/ das/ das/rdb/ das/rdb/src/main/java/org/apache/tuscany/das/rdb/ das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/ das/rdb/src/main/ja...

[dk...@apache.org]

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java?rev=437778&r1=437777&r2=437778&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java Mon Aug 28 11:53:49 2006
@@ -1,310 +1,310 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-
-import java.util.List;
-
-import org.apache.tuscany.sdo.util.BasicSequence;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-
-/**
- * Base implementation of the SDO DataObject interface. Used as base class for prototype of EMF-less generated subclasses
- */
-public abstract class DataObjectBase extends DataObjectImpl
-{
-  
-  protected int OPPOSITE_FEATURE_BASE = EOPPOSITE_FEATURE_BASE; 
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // Following methods should be proposed SPI for generated subclasses to use
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-  protected boolean isNotifying()
-  {
-    return changeRecorder != null;
-  }
-  
-  protected interface ChangeKind
-  {
-    int SET = Notification.SET;
-    int UNSET = Notification.UNSET;
-    int RESOLVE = Notification.RESOLVE;
-  }
-
-  protected void notify(int changeKind, int property, Object oldValue, Object newValue)
-  {
-    eNotify(new ENotificationImpl(this, Notification.SET, property, oldValue, newValue));
-  }
-
-  protected void notify(int changeKind, int property, Object oldValue, Object newValue, boolean isSetChange)
-  {
-    eNotify(new ENotificationImpl(this, Notification.SET, property, oldValue, newValue, isSetChange));
-  }
-  
-  protected void notify(int changeKind, int property, double oldDoubleValue, double newDoubleValue, boolean isSetChange)
-  {
-    eNotify(new ENotificationImpl(this, Notification.SET, property, oldDoubleValue, newDoubleValue, isSetChange));
-  }
-  
-  protected void notify(int changeKind, int property, boolean oldBooleanValue, boolean newBooleanValue, boolean isSetChange)
-  {
-    eNotify(new ENotificationImpl(this, Notification.SET, property, oldBooleanValue, newBooleanValue, isSetChange));
-  }
-  
-  protected interface ListKind
-  {
-    int CONTAINMENT = 0;
-  }
-  
-  protected List createPropertyList(int listKind, Class dataClass, int property)
-  {
-    switch (listKind)
-    {
-      case ListKind.CONTAINMENT:
-        return new EObjectContainmentEList(dataClass, this, property);
-    }
-    return null;
-  }
-  
-  protected BasicSequence createSequence(int property) {
-    return new BasicSequence(new BasicFeatureMap(this, property));
-  }
-  
-  protected Sequence createSequence(Sequence sequence, Type type, int propertyIndex) {
-    return new BasicSequence((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)sequence).featureMap().list(((EClass)type).getEStructuralFeature(propertyIndex)));
-  }
-  
- /*
-  * get the value of the type's property at propertyIndex via the sequence  
-  * @param seq
-  * @param type
-  * @param propertyIndex
-  * @return
-  */
-  protected Object get(Sequence seq, Type type, int propertyIndex) {
-    return ((FeatureMap.Internal.Wrapper)seq).featureMap().get(((EClass)type).getEStructuralFeature(propertyIndex), true);
-  }
-  
-  protected List getList(Sequence seq, Type type, int propertyIndex) {
-    return ((FeatureMap.Internal.Wrapper)seq).featureMap().list(((EClass)type).getEStructuralFeature(propertyIndex));
-  }
-  
-  protected void set(Sequence seq, Type type, int propertyIndex, Object newValue) {
-    ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).set(((EClass)type).getEStructuralFeature(propertyIndex), newValue);
-  }
-  
-  protected void unset(Sequence seq, Type type, int propertyIndex) {
-    ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).clear(((EClass)type).getEStructuralFeature(propertyIndex));
-     
-  }
-  protected boolean isSet(Sequence seq, Type type, int propertyIndex) {
-    return !((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).isEmpty(((EClass)type).getEStructuralFeature(propertyIndex));     
-  }
-  
-  protected boolean isSequenceEmpty(Sequence sequence) {
-    return ((FeatureMap.Internal.Wrapper)sequence).featureMap().isEmpty();  
-  }
-  
-  protected void setSequence(Sequence seq, Object newValue) {
-    ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).set(newValue);
-  }
-  
-  protected void unsetSequence(Sequence seq) {
-    ((FeatureMap.Internal.Wrapper)seq).featureMap().clear();
-  }
-
-  protected ChangeContext basicAdd(Sequence seq, Type type, int propertyIndex, Object newValue, ChangeContext changeContext) {
-    ChangeContextImpl changeContextImpl = (ChangeContextImpl)changeContext;
-    changeContextImpl.notificationChain = ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).basicAdd(((EClass)type).getEStructuralFeature(propertyIndex), newValue, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-  
-  protected Object get(int featureID, boolean resolve)
-  {
-    return null;
-  }
-  
-  private ChangeContextImpl initializeChangeContext(ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl;
-    if (changeContext == null) 
-    {
-      changeContextImpl = new ChangeContextImpl(null);
-    } else 
-    {
-      changeContextImpl = (ChangeContextImpl)changeContext;
-    }
-    return changeContextImpl;
-  }
-  
-  protected interface ChangeContext {}
-  
-  protected ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl.notificationChain = super.eInverseRemove((InternalEObject)otherEnd, propertyIndex, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-  
-  protected ChangeContext inverseAdd(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl = (ChangeContextImpl)changeContext;
-    changeContextImpl.notificationChain = super.eInverseAdd((InternalEObject)otherEnd, propertyIndex, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-
-  protected ChangeContext inverseRemove(Object thisEnd, Object otherEnd, int propertyIndex, Class baseClass, ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl = (ChangeContextImpl)changeContext;
-    changeContextImpl.notificationChain = ((InternalEObject)thisEnd).eInverseRemove((InternalEObject)otherEnd, propertyIndex, baseClass, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-
-  protected ChangeContext inverseAdd(Object thisEnd, Object otherEnd, int propertyIndex, Class baseClass, ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl.notificationChain = ((InternalEObject)thisEnd).eInverseAdd((InternalEObject)otherEnd, propertyIndex, baseClass, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-  
-  protected ChangeContext addNotification(Object notifier, int eventType, int featureID, Object oldValue, Object newValue, ChangeContext changeContext) 
-  {
-    ENotificationImpl notification = new ENotificationImpl((InternalEObject)notifier, eventType, featureID, oldValue, newValue);
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    if (changeContextImpl.notificationChain == null) changeContextImpl.notificationChain = notification; else changeContextImpl.notificationChain.add(notification);
-    return changeContextImpl;
-  }
-  
-  protected ChangeContext removeFromList(List propertyList, Object objectToRemove, ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl.notificationChain = ((InternalEList)propertyList).basicRemove(objectToRemove, changeContextImpl.notificationChain); 
-    return changeContextImpl;
-  }
-  
-  protected ChangeContext removeFromSequence(Sequence sequence, Object otherEnd, ChangeContext changeContext) 
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl.notificationChain = ((InternalEList)((FeatureMap.Internal.Wrapper)sequence).featureMap()).basicRemove(otherEnd, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-  
-  protected void dispatch(ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    if (changeContextImpl.notificationChain != null)
-    {
-      changeContextImpl.notificationChain.dispatch();
-    }
-  }
-
-  protected boolean isProxy()
-  {
-    return eIsProxy();
-  }
-  
-  protected Object resolveProxy(Object proxy)
-  {
-    return EcoreUtil.resolve((EObject)proxy, this);
-  }
-  
-
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // Following methods override EMF methods to work with pure SDO generated subclasses
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  
-  public EClass eStaticClass()
-  {
-    return (EClass)getType();
-  }
-  
-  public Type getType() // must be overridem in subclasses
-  {
-    throw new UnsupportedOperationException();
-  }
-  
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    Object result = get(featureID, resolve);
-    if (coreType)
-    {
-      if (result instanceof FeatureMap.Internal.Wrapper) result = ((FeatureMap.Internal.Wrapper)result).featureMap();
-    }
-    return result;
-  }
-
-  public void eSet(int featureID, Object newValue)
-  {
-    set(featureID, newValue);
-  } 
-
-  public void eUnset(int featureID)
-  {
-    unset(featureID);
-  }
-  
-  public boolean eIsSet(int featureID)
-  {
-    return isSet(featureID);
-  }
-  
-  private class ChangeContextImpl implements ChangeContext
-  {
-    protected NotificationChain notificationChain;
-    public ChangeContextImpl(NotificationChain notificationChain) {
-      this.notificationChain = notificationChain;
-    }
-  }
-  
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int propertyIndex, NotificationChain msgs)
-  {
-    return ((ChangeContextImpl)inverseRemove(otherEnd, propertyIndex, new ChangeContextImpl(msgs))).notificationChain;
-  }
-  
-  public String toString()
-  {
-    StringBuffer result = new StringBuffer(getClass().getName());
-    result.append('@');
-    result.append(Integer.toHexString(hashCode()));
-    if (eIsProxy())
-    {
-      result.append(" (proxyURI: ");
-      result.append(eProxyURI());
-      result.append(')');
-    }
-    return result.toString();
-  }
-  
-} //DataObjectBase
-
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.sdo.impl;
+
+
+import java.util.List;
+
+import org.apache.tuscany.sdo.util.BasicSequence;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.BasicFeatureMap;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+
+import commonj.sdo.Sequence;
+import commonj.sdo.Type;
+
+
+/**
+ * Base implementation of the SDO DataObject interface. Used as base class for prototype of EMF-less generated subclasses
+ */
+public abstract class DataObjectBase extends DataObjectImpl
+{
+  
+  protected int OPPOSITE_FEATURE_BASE = EOPPOSITE_FEATURE_BASE; 
+  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  // Following methods should be proposed SPI for generated subclasses to use
+  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+  protected boolean isNotifying()
+  {
+    return changeRecorder != null;
+  }
+  
+  protected interface ChangeKind
+  {
+    int SET = Notification.SET;
+    int UNSET = Notification.UNSET;
+    int RESOLVE = Notification.RESOLVE;
+  }
+
+  protected void notify(int changeKind, int property, Object oldValue, Object newValue)
+  {
+    eNotify(new ENotificationImpl(this, Notification.SET, property, oldValue, newValue));
+  }
+
+  protected void notify(int changeKind, int property, Object oldValue, Object newValue, boolean isSetChange)
+  {
+    eNotify(new ENotificationImpl(this, Notification.SET, property, oldValue, newValue, isSetChange));
+  }
+  
+  protected void notify(int changeKind, int property, double oldDoubleValue, double newDoubleValue, boolean isSetChange)
+  {
+    eNotify(new ENotificationImpl(this, Notification.SET, property, oldDoubleValue, newDoubleValue, isSetChange));
+  }
+  
+  protected void notify(int changeKind, int property, boolean oldBooleanValue, boolean newBooleanValue, boolean isSetChange)
+  {
+    eNotify(new ENotificationImpl(this, Notification.SET, property, oldBooleanValue, newBooleanValue, isSetChange));
+  }
+  
+  protected interface ListKind
+  {
+    int CONTAINMENT = 0;
+  }
+  
+  protected List createPropertyList(int listKind, Class dataClass, int property)
+  {
+    switch (listKind)
+    {
+      case ListKind.CONTAINMENT:
+        return new EObjectContainmentEList(dataClass, this, property);
+    }
+    return null;
+  }
+  
+  protected BasicSequence createSequence(int property) {
+    return new BasicSequence(new BasicFeatureMap(this, property));
+  }
+  
+  protected Sequence createSequence(Sequence sequence, Type type, int propertyIndex) {
+    return new BasicSequence((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)sequence).featureMap().list(((EClass)type).getEStructuralFeature(propertyIndex)));
+  }
+  
+ /*
+  * get the value of the type's property at propertyIndex via the sequence  
+  * @param seq
+  * @param type
+  * @param propertyIndex
+  * @return
+  */
+  protected Object get(Sequence seq, Type type, int propertyIndex) {
+    return ((FeatureMap.Internal.Wrapper)seq).featureMap().get(((EClass)type).getEStructuralFeature(propertyIndex), true);
+  }
+  
+  protected List getList(Sequence seq, Type type, int propertyIndex) {
+    return ((FeatureMap.Internal.Wrapper)seq).featureMap().list(((EClass)type).getEStructuralFeature(propertyIndex));
+  }
+  
+  protected void set(Sequence seq, Type type, int propertyIndex, Object newValue) {
+    ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).set(((EClass)type).getEStructuralFeature(propertyIndex), newValue);
+  }
+  
+  protected void unset(Sequence seq, Type type, int propertyIndex) {
+    ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).clear(((EClass)type).getEStructuralFeature(propertyIndex));
+     
+  }
+  protected boolean isSet(Sequence seq, Type type, int propertyIndex) {
+    return !((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).isEmpty(((EClass)type).getEStructuralFeature(propertyIndex));     
+  }
+  
+  protected boolean isSequenceEmpty(Sequence sequence) {
+    return ((FeatureMap.Internal.Wrapper)sequence).featureMap().isEmpty();  
+  }
+  
+  protected void setSequence(Sequence seq, Object newValue) {
+    ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).set(newValue);
+  }
+  
+  protected void unsetSequence(Sequence seq) {
+    ((FeatureMap.Internal.Wrapper)seq).featureMap().clear();
+  }
+
+  protected ChangeContext basicAdd(Sequence seq, Type type, int propertyIndex, Object newValue, ChangeContext changeContext) {
+    ChangeContextImpl changeContextImpl = (ChangeContextImpl)changeContext;
+    changeContextImpl.notificationChain = ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).basicAdd(((EClass)type).getEStructuralFeature(propertyIndex), newValue, changeContextImpl.notificationChain);
+    return changeContextImpl;
+  }
+  
+  protected Object get(int featureID, boolean resolve)
+  {
+    return null;
+  }
+  
+  private ChangeContextImpl initializeChangeContext(ChangeContext changeContext)
+  {
+    ChangeContextImpl changeContextImpl;
+    if (changeContext == null) 
+    {
+      changeContextImpl = new ChangeContextImpl(null);
+    } else 
+    {
+      changeContextImpl = (ChangeContextImpl)changeContext;
+    }
+    return changeContextImpl;
+  }
+  
+  protected interface ChangeContext {}
+  
+  protected ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
+  {
+    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
+    changeContextImpl.notificationChain = super.eInverseRemove((InternalEObject)otherEnd, propertyIndex, changeContextImpl.notificationChain);
+    return changeContextImpl;
+  }
+  
+  protected ChangeContext inverseAdd(Object otherEnd, int propertyIndex, ChangeContext changeContext)
+  {
+    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
+    changeContextImpl = (ChangeContextImpl)changeContext;
+    changeContextImpl.notificationChain = super.eInverseAdd((InternalEObject)otherEnd, propertyIndex, changeContextImpl.notificationChain);
+    return changeContextImpl;
+  }
+
+  protected ChangeContext inverseRemove(Object thisEnd, Object otherEnd, int propertyIndex, Class baseClass, ChangeContext changeContext)
+  {
+    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
+    changeContextImpl = (ChangeContextImpl)changeContext;
+    changeContextImpl.notificationChain = ((InternalEObject)thisEnd).eInverseRemove((InternalEObject)otherEnd, propertyIndex, baseClass, changeContextImpl.notificationChain);
+    return changeContextImpl;
+  }
+
+  protected ChangeContext inverseAdd(Object thisEnd, Object otherEnd, int propertyIndex, Class baseClass, ChangeContext changeContext)
+  {
+    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
+    changeContextImpl.notificationChain = ((InternalEObject)thisEnd).eInverseAdd((InternalEObject)otherEnd, propertyIndex, baseClass, changeContextImpl.notificationChain);
+    return changeContextImpl;
+  }
+  
+  protected ChangeContext addNotification(Object notifier, int eventType, int featureID, Object oldValue, Object newValue, ChangeContext changeContext) 
+  {
+    ENotificationImpl notification = new ENotificationImpl((InternalEObject)notifier, eventType, featureID, oldValue, newValue);
+    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
+    if (changeContextImpl.notificationChain == null) changeContextImpl.notificationChain = notification; else changeContextImpl.notificationChain.add(notification);
+    return changeContextImpl;
+  }
+  
+  protected ChangeContext removeFromList(List propertyList, Object objectToRemove, ChangeContext changeContext)
+  {
+    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
+    changeContextImpl.notificationChain = ((InternalEList)propertyList).basicRemove(objectToRemove, changeContextImpl.notificationChain); 
+    return changeContextImpl;
+  }
+  
+  protected ChangeContext removeFromSequence(Sequence sequence, Object otherEnd, ChangeContext changeContext) 
+  {
+    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
+    changeContextImpl.notificationChain = ((InternalEList)((FeatureMap.Internal.Wrapper)sequence).featureMap()).basicRemove(otherEnd, changeContextImpl.notificationChain);
+    return changeContextImpl;
+  }
+  
+  protected void dispatch(ChangeContext changeContext)
+  {
+    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
+    if (changeContextImpl.notificationChain != null)
+    {
+      changeContextImpl.notificationChain.dispatch();
+    }
+  }
+
+  protected boolean isProxy()
+  {
+    return eIsProxy();
+  }
+  
+  protected Object resolveProxy(Object proxy)
+  {
+    return EcoreUtil.resolve((EObject)proxy, this);
+  }
+  
+
+  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  // Following methods override EMF methods to work with pure SDO generated subclasses
+  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  
+  public EClass eStaticClass()
+  {
+    return (EClass)getType();
+  }
+  
+  public Type getType() // must be overridem in subclasses
+  {
+    throw new UnsupportedOperationException();
+  }
+  
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    Object result = get(featureID, resolve);
+    if (coreType)
+    {
+      if (result instanceof FeatureMap.Internal.Wrapper) result = ((FeatureMap.Internal.Wrapper)result).featureMap();
+    }
+    return result;
+  }
+
+  public void eSet(int featureID, Object newValue)
+  {
+    set(featureID, newValue);
+  } 
+
+  public void eUnset(int featureID)
+  {
+    unset(featureID);
+  }
+  
+  public boolean eIsSet(int featureID)
+  {
+    return isSet(featureID);
+  }
+  
+  private class ChangeContextImpl implements ChangeContext
+  {
+    protected NotificationChain notificationChain;
+    public ChangeContextImpl(NotificationChain notificationChain) {
+      this.notificationChain = notificationChain;
+    }
+  }
+  
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int propertyIndex, NotificationChain msgs)
+  {
+    return ((ChangeContextImpl)inverseRemove(otherEnd, propertyIndex, new ChangeContextImpl(msgs))).notificationChain;
+  }
+  
+  public String toString()
+  {
+    StringBuffer result = new StringBuffer(getClass().getName());
+    result.append('@');
+    result.append(Integer.toHexString(hashCode()));
+    if (eIsProxy())
+    {
+      result.append(" (proxyURI: ");
+      result.append(eProxyURI());
+      result.append(')');
+    }
+    return result.toString();
+  }
+  
+} //DataObjectBase
+

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java?rev=437778&r1=437777&r2=437778&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java Mon Aug 28 11:53:49 2006
@@ -1,296 +1,296 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-import org.apache.tuscany.sdo.model.impl.ModelPackageImpl;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-/**
- */
-public class FactoryBase extends EPackageImpl
-{
-  
-  public static final boolean IS_ATTRIBUTE = true;
-  
-  protected FactoryBase(String namespaceURI, String namespacePrefix)
-  {
-    super(new SDOEFactoryImpl());
-    
-    int index = namespacePrefix.lastIndexOf(".");
-    setName(index != -1 ? namespacePrefix.substring(index + 1) : namespacePrefix);
-    setNsPrefix(namespacePrefix);
-
-    createResource(namespaceURI);
-    setNsURI(namespaceURI);
-    //FIXME ... figure out proper (scoped) way to register static packages
-    EPackage.Registry.INSTANCE.put(namespaceURI, this);
-    
-    ((SDOEFactoryImpl)getEFactoryInstance()).sdoFactory = this;
-  }
-  
-  public DataObject create(int typeNumber)
-  {
-    return null;
-  }
-  
-  protected Type createType(boolean isDataType, int typeNumber)
-  {
-    if (isDataType)
-      return (Type)createEDataType(typeNumber);
-    else
-      return (Type)createEClass(typeNumber);
-  }
-  
-  protected void createProperty(boolean isDataType, Type containingType, int propertyNumber)
-  {
-    if (isDataType)
-      createEAttribute((EClass)containingType, propertyNumber);
-    else
-      createEReference((EClass)containingType, propertyNumber);
-  }
-  
-  protected void initializeType(Type type, Class instanceClass, String name)
-  {
-    initEClass((EClass)type, instanceClass, name, !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);   
-  }
-
-  protected void initializeType(Type type, Class instanceClass, String name, boolean isSerializable, boolean isGenerated)
-  {
-    initEDataType((EDataType)type, instanceClass, name, isSerializable, isGenerated);   
-  }
-  
-  protected void initializeProperty(Property property, Type type, String name, String defaultValue, int lower, int upper, Class containerClass, boolean isReadonly, boolean isUnsettable, boolean isDerived)
-  {
-    initEAttribute((EAttribute)property, (EClassifier)type, name, defaultValue, lower, upper, containerClass, isDerived, isDerived, !isReadonly, isUnsettable, !IS_ID, !IS_UNIQUE, isDerived, IS_ORDERED);
-  }
-  
-  protected void initializeProperty(Property property, Type type, String name, String defaultValue, int lower, int upper, Class containerClass, boolean isReadonly, boolean isUnsettable, boolean isDerived, boolean isComposite, Property oppositeProperty)
-  {
-    initEReference((EReference)property, (EClassifier)type, (EReference)oppositeProperty, name, defaultValue, lower, upper, containerClass, isDerived, isDerived, !isReadonly, isComposite, !isComposite /*resolve*/, isUnsettable, IS_UNIQUE, isDerived, IS_ORDERED);
-  }
-
-  protected void createXSDMetaData()
-  {
-    createDocumentRoot();
-  }
-
-  protected void addXSDMapping(String[] xsdMappings, String annotationSource)
-  {
-    addAnnotation((ENamedElement)this, annotationSource, xsdMappings);
-  }
-
-  protected void addXSDMapping(Type type, String[] xsdMappings)
-  {
-    addAnnotation((ENamedElement)type, ANNOTATION_SOURCE, xsdMappings);
-  }
-  
-  protected void addXSDMapping(Property property, String[] xsdMappings)
-  {
-    addAnnotation((ENamedElement)property, ANNOTATION_SOURCE, xsdMappings);
-  }
-  
-  protected void setInstanceProperty(Type type, String namespaceURI, String propertyName, String propertyValue)
-  {
-    setInstanceProperty((ENamedElement)type, namespaceURI, propertyName, propertyValue);
-  }
-
-  protected void setInstanceProperty(Property property, String namespaceURI, String propertyName, String propertyValue)
-  {
-    setInstanceProperty((ENamedElement)property, namespaceURI, propertyName, propertyValue); 
-  }
-  
-  private void setInstanceProperty(ENamedElement eNamedElement, String namespaceURI, String propertyName, String propertyValue)
-  {
-    EAnnotation annotation = eNamedElement.getEAnnotation(namespaceURI);
-    if (annotation == null)
-    {
-      addAnnotation(eNamedElement, namespaceURI, new String[]{propertyName, propertyValue});
-	  } else 
-    {
-      annotation.getDetails().put(propertyName, propertyValue);
-    }
-  }
-
-  protected Property createGlobalProperty(String name, Type type, String[] xsdMappings)
-  {
-    return createGlobalProperty(name, type, xsdMappings, false);
-  }
-  
-  protected Property createGlobalProperty(String name, Type type, String[] xsdMappings, boolean asAttribute)
-  {
-    return createGlobalProperty(name, type, xsdMappings, asAttribute, ANNOTATION_SOURCE);
-  }
-
-  protected Property createGlobalProperty(String name, Type type, String[] xsdMappings, boolean asAttribute, String annotationSource)
-  {
-    int propertyNumber = documentRootEClass.getEStructuralFeatures().size();
-
-    EStructuralFeature globalProperty;
-    if(asAttribute) {
-      createEAttribute(documentRootEClass, propertyNumber);
-      EAttribute gatt = (EAttribute)documentRootEClass.getEStructuralFeatures().get(propertyNumber);
-      initEAttribute(gatt, (EDataType)type, name, null, 0, -2, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-      globalProperty = gatt;
-    } else {
-      createEReference(documentRootEClass, propertyNumber);
-      EReference gref = (EReference)documentRootEClass.getEStructuralFeatures().get(propertyNumber);
-      initEReference(gref, (EClass)type, null, name, null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-      globalProperty = gref;
-    } 
-    addAnnotation((ENamedElement)globalProperty, annotationSource, xsdMappings);
-    return (Property) globalProperty;
-  }
-
-  protected Type getSequence() 
-  {
-    return (Type)ecorePackage.getEFeatureMapEntry();
-  }
-  
-  //public static FactoryBase getStaticFactory(String namespaceURI)
-  // temporarily return Object - until everything is gen'd with new codegen pattern
-  public static Object getStaticFactory(String namespaceURI)
-  {
-    EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(namespaceURI);
-    //return (FactoryBase)ePackage;
-    return ePackage instanceof FactoryBase ? (Object)ePackage : (Object)ePackage.getEFactoryInstance(); 
-  }
-  
-  // default implementation of createFromString
-  public Object createFromString(Type type, String stringValue, int propertyValue)
-  {
-	return (String)ModelFactoryImpl.eINSTANCE.createFromString(ModelPackageImpl.Literals.STRING, stringValue);
-  }
-  
-  // default implementation of convertToString
-  public String convertToString(Type type, Object objectValue, int propertyValue)
-  {
-	return ModelFactoryImpl.eINSTANCE.convertToString(ModelPackageImpl.Literals.STRING, objectValue);
-  }
-  
-  // private EMF-specific methods
-
-  private static class SDOEFactoryImpl extends EFactoryImpl
-  {
-    protected FactoryBase sdoFactory;
-    
-    public SDOEFactoryImpl()
-    {
-      super();
-    }
-    
-    public EObject create(EClass eClass)
-    {
-      DataObject result = sdoFactory.create(eClass.getClassifierID());
-      if (result == null) {
-        return super.create(eClass);
-      }
-      return (EObject)result;
-    }
-    
-    public Object createFromString(EDataType eDataType, String stringValue)
-    {
-      return sdoFactory.createFromString((Type)eDataType, stringValue, eDataType.getClassifierID());
-    }
-    
-    public String convertToString(EDataType eDataType, Object objectValue)
-    {
-      return sdoFactory.convertToString((Type)eDataType, objectValue, eDataType.getClassifierID());
-    }
-  }
-  
-  private static final int DOCUMENT_ROOT = 0;
-  private static final int DOCUMENT_ROOT__MIXED = 0;
-  private static final int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
-  private static final int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
-  private static final String ANNOTATION_SOURCE = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
-  private EClass documentRootEClass = null;
-  
-  private void createDocumentRoot()
-  {
-    documentRootEClass = ecoreFactory.createEClass();
-    ((EClassImpl)documentRootEClass).setClassifierID(DOCUMENT_ROOT);
-    getEClassifiers().add(DOCUMENT_ROOT, documentRootEClass);
-
-    createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
-    createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-    createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-    
-    initEClass(documentRootEClass, null, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute((EAttribute)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__MIXED), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XMLNS_PREFIX_MAP), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XSI_SCHEMA_LOCATION), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    addAnnotation
-      (documentRootEClass, 
-       ANNOTATION_SOURCE, 
-       new String[] 
-       {
-       "name", "",
-       "kind", "mixed"
-       });      
-    addAnnotation
-      ((EAttribute)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__MIXED), 
-       ANNOTATION_SOURCE, 
-       new String[] 
-       {
-       "kind", "elementWildcard",
-       "name", ":mixed"
-       });      
-    addAnnotation
-      ((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XMLNS_PREFIX_MAP), 
-       ANNOTATION_SOURCE, 
-       new String[] 
-       {
-       "kind", "attribute",
-       "name", "xmlns:prefix"
-       });      
-    addAnnotation
-      ((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XSI_SCHEMA_LOCATION), 
-       ANNOTATION_SOURCE, 
-       new String[] 
-       {
-       "kind", "attribute",
-       "name", "xsi:schemaLocation"
-       });      
-  }
-  
-  /**
-   * Initialize SDO runtime.
-   */
-  static
-  {
-    DataObjectUtil.initRuntime();
-  }
-}
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.sdo.impl;
+
+import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
+import org.apache.tuscany.sdo.model.impl.ModelPackageImpl;
+import org.apache.tuscany.sdo.util.DataObjectUtil;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.ENamedElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.impl.EClassImpl;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+import commonj.sdo.Type;
+
+/**
+ */
+public class FactoryBase extends EPackageImpl
+{
+  
+  public static final boolean IS_ATTRIBUTE = true;
+  
+  protected FactoryBase(String namespaceURI, String namespacePrefix)
+  {
+    super(new SDOEFactoryImpl());
+    
+    int index = namespacePrefix.lastIndexOf(".");
+    setName(index != -1 ? namespacePrefix.substring(index + 1) : namespacePrefix);
+    setNsPrefix(namespacePrefix);
+
+    createResource(namespaceURI);
+    setNsURI(namespaceURI);
+    //FIXME ... figure out proper (scoped) way to register static packages
+    EPackage.Registry.INSTANCE.put(namespaceURI, this);
+    
+    ((SDOEFactoryImpl)getEFactoryInstance()).sdoFactory = this;
+  }
+  
+  public DataObject create(int typeNumber)
+  {
+    return null;
+  }
+  
+  protected Type createType(boolean isDataType, int typeNumber)
+  {
+    if (isDataType)
+      return (Type)createEDataType(typeNumber);
+    else
+      return (Type)createEClass(typeNumber);
+  }
+  
+  protected void createProperty(boolean isDataType, Type containingType, int propertyNumber)
+  {
+    if (isDataType)
+      createEAttribute((EClass)containingType, propertyNumber);
+    else
+      createEReference((EClass)containingType, propertyNumber);
+  }
+  
+  protected void initializeType(Type type, Class instanceClass, String name)
+  {
+    initEClass((EClass)type, instanceClass, name, !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);   
+  }
+
+  protected void initializeType(Type type, Class instanceClass, String name, boolean isSerializable, boolean isGenerated)
+  {
+    initEDataType((EDataType)type, instanceClass, name, isSerializable, isGenerated);   
+  }
+  
+  protected void initializeProperty(Property property, Type type, String name, String defaultValue, int lower, int upper, Class containerClass, boolean isReadonly, boolean isUnsettable, boolean isDerived)
+  {
+    initEAttribute((EAttribute)property, (EClassifier)type, name, defaultValue, lower, upper, containerClass, isDerived, isDerived, !isReadonly, isUnsettable, !IS_ID, !IS_UNIQUE, isDerived, IS_ORDERED);
+  }
+  
+  protected void initializeProperty(Property property, Type type, String name, String defaultValue, int lower, int upper, Class containerClass, boolean isReadonly, boolean isUnsettable, boolean isDerived, boolean isComposite, Property oppositeProperty)
+  {
+    initEReference((EReference)property, (EClassifier)type, (EReference)oppositeProperty, name, defaultValue, lower, upper, containerClass, isDerived, isDerived, !isReadonly, isComposite, !isComposite /*resolve*/, isUnsettable, IS_UNIQUE, isDerived, IS_ORDERED);
+  }
+
+  protected void createXSDMetaData()
+  {
+    createDocumentRoot();
+  }
+
+  protected void addXSDMapping(String[] xsdMappings, String annotationSource)
+  {
+    addAnnotation((ENamedElement)this, annotationSource, xsdMappings);
+  }
+
+  protected void addXSDMapping(Type type, String[] xsdMappings)
+  {
+    addAnnotation((ENamedElement)type, ANNOTATION_SOURCE, xsdMappings);
+  }
+  
+  protected void addXSDMapping(Property property, String[] xsdMappings)
+  {
+    addAnnotation((ENamedElement)property, ANNOTATION_SOURCE, xsdMappings);
+  }
+  
+  protected void setInstanceProperty(Type type, String namespaceURI, String propertyName, String propertyValue)
+  {
+    setInstanceProperty((ENamedElement)type, namespaceURI, propertyName, propertyValue);
+  }
+
+  protected void setInstanceProperty(Property property, String namespaceURI, String propertyName, String propertyValue)
+  {
+    setInstanceProperty((ENamedElement)property, namespaceURI, propertyName, propertyValue); 
+  }
+  
+  private void setInstanceProperty(ENamedElement eNamedElement, String namespaceURI, String propertyName, String propertyValue)
+  {
+    EAnnotation annotation = eNamedElement.getEAnnotation(namespaceURI);
+    if (annotation == null)
+    {
+      addAnnotation(eNamedElement, namespaceURI, new String[]{propertyName, propertyValue});
+	  } else 
+    {
+      annotation.getDetails().put(propertyName, propertyValue);
+    }
+  }
+
+  protected Property createGlobalProperty(String name, Type type, String[] xsdMappings)
+  {
+    return createGlobalProperty(name, type, xsdMappings, false);
+  }
+  
+  protected Property createGlobalProperty(String name, Type type, String[] xsdMappings, boolean asAttribute)
+  {
+    return createGlobalProperty(name, type, xsdMappings, asAttribute, ANNOTATION_SOURCE);
+  }
+
+  protected Property createGlobalProperty(String name, Type type, String[] xsdMappings, boolean asAttribute, String annotationSource)
+  {
+    int propertyNumber = documentRootEClass.getEStructuralFeatures().size();
+
+    EStructuralFeature globalProperty;
+    if(asAttribute) {
+      createEAttribute(documentRootEClass, propertyNumber);
+      EAttribute gatt = (EAttribute)documentRootEClass.getEStructuralFeatures().get(propertyNumber);
+      initEAttribute(gatt, (EDataType)type, name, null, 0, -2, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+      globalProperty = gatt;
+    } else {
+      createEReference(documentRootEClass, propertyNumber);
+      EReference gref = (EReference)documentRootEClass.getEStructuralFeatures().get(propertyNumber);
+      initEReference(gref, (EClass)type, null, name, null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+      globalProperty = gref;
+    } 
+    addAnnotation((ENamedElement)globalProperty, annotationSource, xsdMappings);
+    return (Property) globalProperty;
+  }
+
+  protected Type getSequence() 
+  {
+    return (Type)ecorePackage.getEFeatureMapEntry();
+  }
+  
+  //public static FactoryBase getStaticFactory(String namespaceURI)
+  // temporarily return Object - until everything is gen'd with new codegen pattern
+  public static Object getStaticFactory(String namespaceURI)
+  {
+    EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(namespaceURI);
+    //return (FactoryBase)ePackage;
+    return ePackage instanceof FactoryBase ? (Object)ePackage : (Object)ePackage.getEFactoryInstance(); 
+  }
+  
+  // default implementation of createFromString
+  public Object createFromString(Type type, String stringValue, int propertyValue)
+  {
+	return (String)ModelFactoryImpl.eINSTANCE.createFromString(ModelPackageImpl.Literals.STRING, stringValue);
+  }
+  
+  // default implementation of convertToString
+  public String convertToString(Type type, Object objectValue, int propertyValue)
+  {
+	return ModelFactoryImpl.eINSTANCE.convertToString(ModelPackageImpl.Literals.STRING, objectValue);
+  }
+  
+  // private EMF-specific methods
+
+  private static class SDOEFactoryImpl extends EFactoryImpl
+  {
+    protected FactoryBase sdoFactory;
+    
+    public SDOEFactoryImpl()
+    {
+      super();
+    }
+    
+    public EObject create(EClass eClass)
+    {
+      DataObject result = sdoFactory.create(eClass.getClassifierID());
+      if (result == null) {
+        return super.create(eClass);
+      }
+      return (EObject)result;
+    }
+    
+    public Object createFromString(EDataType eDataType, String stringValue)
+    {
+      return sdoFactory.createFromString((Type)eDataType, stringValue, eDataType.getClassifierID());
+    }
+    
+    public String convertToString(EDataType eDataType, Object objectValue)
+    {
+      return sdoFactory.convertToString((Type)eDataType, objectValue, eDataType.getClassifierID());
+    }
+  }
+  
+  private static final int DOCUMENT_ROOT = 0;
+  private static final int DOCUMENT_ROOT__MIXED = 0;
+  private static final int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
+  private static final int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
+  private static final String ANNOTATION_SOURCE = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
+  private EClass documentRootEClass = null;
+  
+  private void createDocumentRoot()
+  {
+    documentRootEClass = ecoreFactory.createEClass();
+    ((EClassImpl)documentRootEClass).setClassifierID(DOCUMENT_ROOT);
+    getEClassifiers().add(DOCUMENT_ROOT, documentRootEClass);
+
+    createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
+    createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
+    createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
+    
+    initEClass(documentRootEClass, null, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute((EAttribute)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__MIXED), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XMLNS_PREFIX_MAP), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XSI_SCHEMA_LOCATION), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    addAnnotation
+      (documentRootEClass, 
+       ANNOTATION_SOURCE, 
+       new String[] 
+       {
+       "name", "",
+       "kind", "mixed"
+       });      
+    addAnnotation
+      ((EAttribute)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__MIXED), 
+       ANNOTATION_SOURCE, 
+       new String[] 
+       {
+       "kind", "elementWildcard",
+       "name", ":mixed"
+       });      
+    addAnnotation
+      ((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XMLNS_PREFIX_MAP), 
+       ANNOTATION_SOURCE, 
+       new String[] 
+       {
+       "kind", "attribute",
+       "name", "xmlns:prefix"
+       });      
+    addAnnotation
+      ((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XSI_SCHEMA_LOCATION), 
+       ANNOTATION_SOURCE, 
+       new String[] 
+       {
+       "kind", "attribute",
+       "name", "xsi:schemaLocation"
+       });      
+  }
+  
+  /**
+   * Initialize SDO runtime.
+   */
+  static
+  {
+    DataObjectUtil.initRuntime();
+  }
+}

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java?rev=437778&r1=437777&r2=437778&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java Mon Aug 28 11:53:49 2006
@@ -1,125 +1,125 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import commonj.sdo.Sequence;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Base Data Graph Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getModels <em>Models</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getXsd <em>Xsd</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getChangeSummary <em>Change Summary</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getAnyAttribute <em>Any Attribute</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public interface BaseDataGraphType
-{
-  /**
-   * Returns the value of the '<em><b>Models</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Models</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Models</em>' containment reference.
-   * @see #setModels(ModelsType)
-   * @generated
-   */
-  ModelsType getModels();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getModels <em>Models</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Models</em>' containment reference.
-   * @see #getModels()
-   * @generated
-   */
-  void setModels(ModelsType value);
-
-  /**
-   * Returns the value of the '<em><b>Xsd</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Xsd</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Xsd</em>' containment reference.
-   * @see #setXsd(XSDType)
-   * @generated
-   */
-  XSDType getXsd();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getXsd <em>Xsd</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Xsd</em>' containment reference.
-   * @see #getXsd()
-   * @generated
-   */
-  void setXsd(XSDType value);
-
-  /**
-   * Returns the value of the '<em><b>Change Summary</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Change Summary</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Change Summary</em>' containment reference.
-   * @see #setChangeSummary(ChangeSummaryType)
-   * @generated
-   */
-  ChangeSummaryType getChangeSummary_();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getChangeSummary <em>Change Summary</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Change Summary</em>' containment reference.
-   * @see #getChangeSummary()
-   * @generated
-   */
-  void setChangeSummary(ChangeSummaryType value);
-
-  /**
-   * Returns the value of the '<em><b>Any Attribute</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Any Attribute</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Any Attribute</em>' attribute list.
-   * @generated
-   */
-  Sequence getAnyAttribute();
-
-} // BaseDataGraphType
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.sdo.model;
+
+import commonj.sdo.Sequence;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Base Data Graph Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getModels <em>Models</em>}</li>
+ *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getXsd <em>Xsd</em>}</li>
+ *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getChangeSummary <em>Change Summary</em>}</li>
+ *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getAnyAttribute <em>Any Attribute</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public interface BaseDataGraphType
+{
+  /**
+   * Returns the value of the '<em><b>Models</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Models</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Models</em>' containment reference.
+   * @see #setModels(ModelsType)
+   * @generated
+   */
+  ModelsType getModels();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getModels <em>Models</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Models</em>' containment reference.
+   * @see #getModels()
+   * @generated
+   */
+  void setModels(ModelsType value);
+
+  /**
+   * Returns the value of the '<em><b>Xsd</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Xsd</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Xsd</em>' containment reference.
+   * @see #setXsd(XSDType)
+   * @generated
+   */
+  XSDType getXsd();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getXsd <em>Xsd</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Xsd</em>' containment reference.
+   * @see #getXsd()
+   * @generated
+   */
+  void setXsd(XSDType value);
+
+  /**
+   * Returns the value of the '<em><b>Change Summary</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Change Summary</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Change Summary</em>' containment reference.
+   * @see #setChangeSummary(ChangeSummaryType)
+   * @generated
+   */
+  ChangeSummaryType getChangeSummary_();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getChangeSummary <em>Change Summary</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Change Summary</em>' containment reference.
+   * @see #getChangeSummary()
+   * @generated
+   */
+  void setChangeSummary(ChangeSummaryType value);
+
+  /**
+   * Returns the value of the '<em><b>Any Attribute</b></em>' attribute list.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Any Attribute</em>' attribute list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Any Attribute</em>' attribute list.
+   * @generated
+   */
+  Sequence getAnyAttribute();
+
+} // BaseDataGraphType

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java?rev=437778&r1=437777&r2=437778&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java Mon Aug 28 11:53:49 2006
@@ -1,152 +1,152 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import commonj.sdo.Sequence;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Change Summary Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.ChangeSummaryType#getAny <em>Any</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.ChangeSummaryType#getCreate <em>Create</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.ChangeSummaryType#getDelete <em>Delete</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.ChangeSummaryType#isLogging <em>Logging</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public interface ChangeSummaryType
-{
-  /**
-   * Returns the value of the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Any</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Any</em>' attribute list.
-   * @generated
-   */
-  Sequence getAny();
-
-  /**
-   * Returns the value of the '<em><b>Create</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Create</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Create</em>' attribute.
-   * @see #setCreate(String)
-   * @generated
-   */
-  String getCreate();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.ChangeSummaryType#getCreate <em>Create</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Create</em>' attribute.
-   * @see #getCreate()
-   * @generated
-   */
-  void setCreate(String value);
-
-  /**
-   * Returns the value of the '<em><b>Delete</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Delete</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Delete</em>' attribute.
-   * @see #setDelete(String)
-   * @generated
-   */
-  String getDelete();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.ChangeSummaryType#getDelete <em>Delete</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Delete</em>' attribute.
-   * @see #getDelete()
-   * @generated
-   */
-  void setDelete(String value);
-
-  /**
-   * Returns the value of the '<em><b>Logging</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Logging</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Logging</em>' attribute.
-   * @see #isSetLogging()
-   * @see #unsetLogging()
-   * @see #setLogging(boolean)
-   * @generated
-   */
-  boolean isLogging();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.ChangeSummaryType#isLogging <em>Logging</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Logging</em>' attribute.
-   * @see #isSetLogging()
-   * @see #unsetLogging()
-   * @see #isLogging()
-   * @generated
-   */
-  void setLogging(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.ChangeSummaryType#isLogging <em>Logging</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetLogging()
-   * @see #isLogging()
-   * @see #setLogging(boolean)
-   * @generated
-   */
-  void unsetLogging();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.ChangeSummaryType#isLogging <em>Logging</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Logging</em>' attribute is set.
-   * @see #unsetLogging()
-   * @see #isLogging()
-   * @see #setLogging(boolean)
-   * @generated
-   */
-  boolean isSetLogging();
-
-} // ChangeSummaryType
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.sdo.model;
+
+import commonj.sdo.Sequence;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Change Summary Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.apache.tuscany.sdo.model.ChangeSummaryType#getAny <em>Any</em>}</li>
+ *   <li>{@link org.apache.tuscany.sdo.model.ChangeSummaryType#getCreate <em>Create</em>}</li>
+ *   <li>{@link org.apache.tuscany.sdo.model.ChangeSummaryType#getDelete <em>Delete</em>}</li>
+ *   <li>{@link org.apache.tuscany.sdo.model.ChangeSummaryType#isLogging <em>Logging</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public interface ChangeSummaryType
+{
+  /**
+   * Returns the value of the '<em><b>Any</b></em>' attribute list.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Any</em>' attribute list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Any</em>' attribute list.
+   * @generated
+   */
+  Sequence getAny();
+
+  /**
+   * Returns the value of the '<em><b>Create</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Create</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Create</em>' attribute.
+   * @see #setCreate(String)
+   * @generated
+   */
+  String getCreate();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.sdo.model.ChangeSummaryType#getCreate <em>Create</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Create</em>' attribute.
+   * @see #getCreate()
+   * @generated
+   */
+  void setCreate(String value);
+
+  /**
+   * Returns the value of the '<em><b>Delete</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Delete</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Delete</em>' attribute.
+   * @see #setDelete(String)
+   * @generated
+   */
+  String getDelete();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.sdo.model.ChangeSummaryType#getDelete <em>Delete</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Delete</em>' attribute.
+   * @see #getDelete()
+   * @generated
+   */
+  void setDelete(String value);
+
+  /**
+   * Returns the value of the '<em><b>Logging</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Logging</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Logging</em>' attribute.
+   * @see #isSetLogging()
+   * @see #unsetLogging()
+   * @see #setLogging(boolean)
+   * @generated
+   */
+  boolean isLogging();
+
+  /**
+   * Sets the value of the '{@link org.apache.tuscany.sdo.model.ChangeSummaryType#isLogging <em>Logging</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Logging</em>' attribute.
+   * @see #isSetLogging()
+   * @see #unsetLogging()
+   * @see #isLogging()
+   * @generated
+   */
+  void setLogging(boolean value);
+
+  /**
+   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.ChangeSummaryType#isLogging <em>Logging</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isSetLogging()
+   * @see #isLogging()
+   * @see #setLogging(boolean)
+   * @generated
+   */
+  void unsetLogging();
+
+  /**
+   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.ChangeSummaryType#isLogging <em>Logging</em>}' attribute is set.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return whether the value of the '<em>Logging</em>' attribute is set.
+   * @see #unsetLogging()
+   * @see #isLogging()
+   * @see #setLogging(boolean)
+   * @generated
+   */
+  boolean isSetLogging();
+
+} // ChangeSummaryType

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java?rev=437778&r1=437777&r2=437778&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java Mon Aug 28 11:53:49 2006
@@ -1,50 +1,50 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import commonj.sdo.Sequence;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Data Graph Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.DataGraphType#getAny <em>Any</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public interface DataGraphType extends BaseDataGraphType
-{
-  /**
-   * Returns the value of the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Any</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Any</em>' attribute list.
-   * @generated
-   */
-  Sequence getAny();
-
-} // DataGraphType
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.sdo.model;
+
+import commonj.sdo.Sequence;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Data Graph Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.apache.tuscany.sdo.model.DataGraphType#getAny <em>Any</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public interface DataGraphType extends BaseDataGraphType
+{
+  /**
+   * Returns the value of the '<em><b>Any</b></em>' attribute list.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Any</em>' attribute list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Any</em>' attribute list.
+   * @generated
+   */
+  Sequence getAny();
+
+} // DataGraphType

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java?rev=437778&r1=437777&r2=437778&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java Mon Aug 28 11:53:49 2006
@@ -1,30 +1,30 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Data Object</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @generated
- */
-public interface DataObject
-{
-} // DataObject
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.sdo.model;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Data Object</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @generated
+ */
+public interface DataObject
+{
+} // DataObject

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java?rev=437778&r1=437777&r2=437778&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java Mon Aug 28 11:53:49 2006
@@ -1,100 +1,100 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public interface ModelFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  ModelFactory INSTANCE = org.apache.tuscany.sdo.model.impl.ModelFactoryImpl.eINSTANCE;
-
-  /**
-   * Returns a new object of class '<em>Change Summary Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Change Summary Type</em>'.
-   * @generated
-   */
-  ChangeSummaryType createChangeSummaryType();
-
-  /**
-   * Returns a new object of class '<em>Data Graph Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Data Graph Type</em>'.
-   * @generated
-   */
-  DataGraphType createDataGraphType();
-
-  /**
-   * Returns a new object of class '<em>Models Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Models Type</em>'.
-   * @generated
-   */
-  ModelsType createModelsType();
-
-  /**
-   * Returns a new object of class '<em>Property</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Property</em>'.
-   * @generated
-   */
-  Property createProperty();
-
-  /**
-   * Returns a new object of class '<em>Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Type</em>'.
-   * @generated
-   */
-  Type createType();
-
-  /**
-   * Returns a new object of class '<em>Types</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Types</em>'.
-   * @generated
-   */
-  Types createTypes();
-
-  /**
-   * Returns a new object of class '<em>XSD Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>XSD Type</em>'.
-   * @generated
-   */
-  XSDType createXSDType();
-
-} //ModelFactory
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tuscany.sdo.model;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public interface ModelFactory
+{
+  /**
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  ModelFactory INSTANCE = org.apache.tuscany.sdo.model.impl.ModelFactoryImpl.eINSTANCE;
+
+  /**
+   * Returns a new object of class '<em>Change Summary Type</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Change Summary Type</em>'.
+   * @generated
+   */
+  ChangeSummaryType createChangeSummaryType();
+
+  /**
+   * Returns a new object of class '<em>Data Graph Type</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Data Graph Type</em>'.
+   * @generated
+   */
+  DataGraphType createDataGraphType();
+
+  /**
+   * Returns a new object of class '<em>Models Type</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Models Type</em>'.
+   * @generated
+   */
+  ModelsType createModelsType();
+
+  /**
+   * Returns a new object of class '<em>Property</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Property</em>'.
+   * @generated
+   */
+  Property createProperty();
+
+  /**
+   * Returns a new object of class '<em>Type</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Type</em>'.
+   * @generated
+   */
+  Type createType();
+
+  /**
+   * Returns a new object of class '<em>Types</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Types</em>'.
+   * @generated
+   */
+  Types createTypes();
+
+  /**
+   * Returns a new object of class '<em>XSD Type</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>XSD Type</em>'.
+   * @generated
+   */
+  XSDType createXSDType();
+
+} //ModelFactory

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org