You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fr...@apache.org on 2006/11/20 23:16:02 UTC
svn commit: r477364 [1/8] - in /incubator/tuscany/java/sdo:
impl/src/main/java/org/apache/tuscany/sdo/helper/
impl/src/main/java/org/apache/tuscany/sdo/impl/
impl/src/main/java/org/apache/tuscany/sdo/model/
impl/src/main/java/org/apache/tuscany/sdo/mod...
Author: frankb
Date: Mon Nov 20 14:16:00 2006
New Revision: 477364
URL: http://svn.apache.org/viewvc?view=rev&rev=477364
Log:
Regenerated SDO commonj model (for SDO 2.1) using noEMF option
Removed:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java
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/FactoryBase.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/BaseDataGraphType.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.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/TextType.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.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/ModelsTypeImpl.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/model/impl/TextTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
incubator/tuscany/java/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
incubator/tuscany/java/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet
incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- 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 Mon Nov 20 14:16:00 2006
@@ -25,13 +25,14 @@
import java.util.List;
import org.apache.tuscany.sdo.SDOExtendedMetaData;
-import org.apache.tuscany.sdo.model.ModelPackage;
+import org.apache.tuscany.sdo.model.ModelFactory;
import org.apache.tuscany.sdo.util.SDOUtil;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.util.ExtendedMetaData;
import org.eclipse.xsd.XSDComplexTypeDefinition;
@@ -39,7 +40,6 @@
import org.eclipse.xsd.XSDConcreteComponent;
import org.eclipse.xsd.XSDFeature;
import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
import org.eclipse.xsd.XSDSimpleTypeDefinition;
import org.eclipse.xsd.XSDTypeDefinition;
import org.eclipse.xsd.ecore.XSDEcoreBuilder;
@@ -58,7 +58,7 @@
public SDOXSDEcoreBuilder(ExtendedMetaData extendedMetaData)
{
super(extendedMetaData);
- populateTypeToTypeObjectMap(ModelPackage.eINSTANCE);
+ populateTypeToTypeObjectMap((EPackage)ModelFactory.INSTANCE);
}
/**
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- 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 Mon Nov 20 14:16:00 2006
@@ -24,10 +24,10 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.tuscany.sdo.model.impl.ModelPackageImpl;
-import org.apache.tuscany.sdo.model.java.impl.JavaPackageImpl;
+import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
+import org.apache.tuscany.sdo.model.java.impl.JavaFactoryImpl;
import org.apache.tuscany.sdo.util.SDOUtil;
-import org.apache.tuscany.sdo.util.metadata.impl.MetadataPackageImpl;
+import org.apache.tuscany.sdo.util.metadata.impl.MetadataFactoryImpl;
import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.ExtendedMetaData;
@@ -59,9 +59,9 @@
this.extendedMetaData = extendedMetaData;
// Register the standard (predefined) SDO types
- ModelPackageImpl.init();
- JavaPackageImpl.init();
- MetadataPackageImpl.init();
+ ModelFactoryImpl.init(); //FB
+ JavaFactoryImpl.init(); //FB
+ MetadataFactoryImpl.init(); //FB
}
public Type getType(String uri, String typeName)
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- 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 Mon Nov 20 14:16:00 2006
@@ -257,6 +257,19 @@
public void setContainment(boolean value) {
throw new UnsupportedOperationException();
}
+
+ public void setNullable(boolean value) {
+ throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+ }
+
+ public void unsetNullable() {
+ throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+ }
+
+ public boolean isSetNullable() {
+ return isReadOnly();
+ }
+
/////////////////////////////////////////////////////////////////////////////////////////////////////////
// DataObject method implementations
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?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- 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 Nov 20 14:16:00 2006
@@ -61,6 +61,23 @@
((SDOEFactoryImpl)getEFactoryInstance()).sdoFactory = this;
}
+ protected FactoryBase(String namespaceURI, String namespacePrefix, String interfacePackage)
+ {
+ super(new SDOEFactoryImpl());
+
+ int index = interfacePackage.lastIndexOf(".");
+ setName(index != -1 ? interfacePackage.substring(index + 1) : interfacePackage);
+ 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;
@@ -92,11 +109,16 @@
createEReference((EClass)containingType, propertyNumber);
}
- protected void initializeType(Type type, Class instanceClass, String name)
+ protected void initializeType(Type type, Class instanceClass, String name) //FB TODO regenerate models and then delete this method
{
initEClass((EClass)type, instanceClass, name, !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
}
+ protected void initializeType(Type type, Class instanceClass, String name, boolean isAbstract)
+ {
+ initEClass((EClass)type, instanceClass, name, isAbstract, !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);
@@ -112,7 +134,7 @@
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()
+ protected void initXSD()
{
createDocumentRoot();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- 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 Mon Nov 20 14:16:00 2006
@@ -224,6 +224,19 @@
return isContainment();
}
+ public void setNullable(boolean value) {
+ throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+ }
+
+ public void unsetNullable() {
+ throw new UnsupportedOperationException("Property is frozen and cannot be modified");
+ }
+
+ public boolean isSetNullable() {
+ return isReadOnly();
+ }
+
+
/////////////////////////////////////////////////////////////////////////////////////////////////////////
// DataObject method implementations
/////////////////////////////////////////////////////////////////////////////////////////////////////////
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?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- 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 Nov 20 14:16:00 2006
@@ -1,26 +1,15 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model;
import commonj.sdo.Sequence;
+import java.io.Serializable;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Base Data Graph Type</b></em>'.
@@ -31,14 +20,15 @@
* <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#getChangeSummary_ <em>Change Summary</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getAnyAttribute <em>Any Attribute</em>}</li>
* </ul>
* </p>
*
+ * @extends Serializable
* @generated
*/
-public interface BaseDataGraphType
+public interface BaseDataGraphType extends Serializable
{
/**
* Returns the value of the '<em><b>Models</b></em>' containment reference.
@@ -103,11 +93,11 @@
ChangeSummaryType getChangeSummary_();
/**
- * Sets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getChangeSummary <em>Change Summary</em>}' containment reference.
+ * 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()
+ * @see #getChangeSummary_()
* @generated
*/
void setChangeSummary(ChangeSummaryType value);
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?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- 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 Nov 20 14:16:00 2006
@@ -1,26 +1,15 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model;
import commonj.sdo.Sequence;
+import java.io.Serializable;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Change Summary Type</b></em>'.
@@ -36,9 +25,10 @@
* </ul>
* </p>
*
+ * @extends Serializable
* @generated
*/
-public interface ChangeSummaryType
+public interface ChangeSummaryType extends Serializable
{
/**
* Returns the value of the '<em><b>Any</b></em>' attribute list.
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?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- 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 Nov 20 14:16:00 2006
@@ -1,21 +1,8 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model;
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?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- 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 Nov 20 14:16:00 2006
@@ -1,24 +1,12 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model;
+import java.io.Serializable;
/**
* <!-- begin-user-doc -->
@@ -26,8 +14,9 @@
* <!-- end-user-doc -->
*
*
+ * @extends Serializable
* @generated
*/
-public interface DataObject
+public interface DataObject extends Serializable
{
} // DataObject
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?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- 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 Nov 20 14:16:00 2006
@@ -1,21 +1,8 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model;
@@ -29,13 +16,14 @@
*/
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;
+ ModelFactory INSTANCE = org.apache.tuscany.sdo.model.impl.ModelFactoryImpl.init();
/**
* Returns a new object of class '<em>Change Summary Type</em>'.
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java Mon Nov 20 14:16:00 2006
@@ -1,26 +1,15 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model;
import commonj.sdo.Sequence;
+import java.io.Serializable;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Models Type</b></em>'.
@@ -39,9 +28,10 @@
* </ul>
* </p>
*
+ * @extends Serializable
* @generated
*/
-public interface ModelsType
+public interface ModelsType extends Serializable
{
/**
* Returns the value of the '<em><b>Any</b></em>' attribute list.
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- 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 Mon Nov 20 14:16:00 2006
@@ -1,26 +1,15 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model;
import commonj.sdo.Sequence;
+import java.io.Serializable;
+
import java.util.List;
/**
@@ -33,25 +22,22 @@
* <ul>
* <li>{@link org.apache.tuscany.sdo.model.Property#getAliasName <em>Alias Name</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.Property#getAny <em>Any</em>}</li>
+ * <li>{@link org.apache.tuscany.sdo.model.Property#getName <em>Name</em>}</li>
+ * <li>{@link org.apache.tuscany.sdo.model.Property#isMany <em>Many</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.Property#isContainment <em>Containment</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.Property#getDefault <em>Default</em>}</li>
- * <li>{@link org.apache.tuscany.sdo.model.Property#isMany <em>Many</em>}</li>
- * <li>{@link org.apache.tuscany.sdo.model.Property#getName <em>Name</em>}</li>
- * <li>{@link org.apache.tuscany.sdo.model.Property#getOpposite <em>Opposite</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.Property#isReadOnly <em>Read Only</em>}</li>
- * <li>{@link org.apache.tuscany.sdo.model.Property#getType <em>Type</em>}</li>
+ * <li>{@link org.apache.tuscany.sdo.model.Property#getType_ <em>Type</em>}</li>
+ * <li>{@link org.apache.tuscany.sdo.model.Property#getOpposite <em>Opposite</em>}</li>
+ * <li>{@link org.apache.tuscany.sdo.model.Property#isNullable <em>Nullable</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.Property#getAnyAttribute <em>Any Attribute</em>}</li>
* </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
- *
+ * @extends Serializable
* @generated
*/
-public interface Property
+public interface Property extends Serializable
{
/**
* Returns the value of the '<em><b>Alias Name</b></em>' attribute list.
@@ -81,79 +67,28 @@
Sequence getAny();
/**
- * Returns the value of the '<em><b>Containment</b></em>' attribute.
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Containment</em>' attribute isn't clear,
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Containment</em>' attribute.
- * @see #isSetContainment()
- * @see #unsetContainment()
- * @see #setContainment(boolean)
- * @generated
- */
- boolean isContainment();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#isContainment <em>Containment</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Containment</em>' attribute.
- * @see #isSetContainment()
- * @see #unsetContainment()
- * @see #isContainment()
- * @generated
- */
- void setContainment(boolean value);
-
- /**
- * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Property#isContainment <em>Containment</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetContainment()
- * @see #isContainment()
- * @see #setContainment(boolean)
- * @generated
- */
- void unsetContainment();
-
- /**
- * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Property#isContainment <em>Containment</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Containment</em>' attribute is set.
- * @see #unsetContainment()
- * @see #isContainment()
- * @see #setContainment(boolean)
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
* @generated
*/
- boolean isSetContainment();
-
- /**
- * Returns the value of the '<em><b>Default</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Default</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Default</em>' attribute.
- * @see #setDefault(String)
- * @generated NOT
- */
- String getDefault_();
+ String getName();
/**
- * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getDefault <em>Default</em>}' attribute.
+ * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Default</em>' attribute.
- * @see #getDefault()
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
* @generated
*/
- void setDefault_(String value);
+ void setName(String value);
/**
* Returns the value of the '<em><b>Many</b></em>' attribute.
@@ -207,52 +142,79 @@
boolean isSetMany();
/**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * Returns the value of the '<em><b>Containment</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * If the meaning of the '<em>Containment</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
+ * @return the value of the '<em>Containment</em>' attribute.
+ * @see #isSetContainment()
+ * @see #unsetContainment()
+ * @see #setContainment(boolean)
* @generated
*/
- String getName();
+ boolean isContainment();
/**
- * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#isContainment <em>Containment</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
+ * @param value the new value of the '<em>Containment</em>' attribute.
+ * @see #isSetContainment()
+ * @see #unsetContainment()
+ * @see #isContainment()
* @generated
*/
- void setName(String value);
+ void setContainment(boolean value);
/**
- * Returns the value of the '<em><b>Opposite</b></em>' reference.
+ * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Property#isContainment <em>Containment</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isSetContainment()
+ * @see #isContainment()
+ * @see #setContainment(boolean)
+ * @generated
+ */
+ void unsetContainment();
+
+ /**
+ * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Property#isContainment <em>Containment</em>}' attribute is set.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return whether the value of the '<em>Containment</em>' attribute is set.
+ * @see #unsetContainment()
+ * @see #isContainment()
+ * @see #setContainment(boolean)
+ * @generated
+ */
+ boolean isSetContainment();
+
+ /**
+ * Returns the value of the '<em><b>Default</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Opposite</em>' reference isn't clear,
+ * If the meaning of the '<em>Default</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Opposite</em>' reference.
- * @see #setOpposite(Property)
+ * @return the value of the '<em>Default</em>' attribute.
+ * @see #setDefault_(String)
* @generated
*/
- Property getOpposite_();
+ String getDefault_();
/**
- * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getOpposite <em>Opposite</em>}' reference.
+ * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getDefault <em>Default</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Opposite</em>' reference.
- * @see #getOpposite()
+ * @param value the new value of the '<em>Default</em>' attribute.
+ * @see #getDefault_()
* @generated
*/
- void setOpposite_(Property value);
+ void setDefault_(String value);
/**
* Returns the value of the '<em><b>Read Only</b></em>' attribute.
@@ -320,14 +282,89 @@
Type getType_();
/**
- * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getType <em>Type</em>}' reference.
+ * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getType_ <em>Type</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Type</em>' reference.
- * @see #getType()
+ * @see #getType_()
* @generated
*/
void setType(Type value);
+
+ /**
+ * Returns the value of the '<em><b>Opposite</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Opposite</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Opposite</em>' reference.
+ * @see #setOpposite_(Property)
+ * @generated
+ */
+ Property getOpposite_();
+
+ /**
+ * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getOpposite <em>Opposite</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Opposite</em>' reference.
+ * @see #getOpposite_()
+ * @generated
+ */
+ void setOpposite_(Property value);
+
+ /**
+ * Returns the value of the '<em><b>Nullable</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Nullable</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Nullable</em>' attribute.
+ * @see #isSetNullable()
+ * @see #unsetNullable()
+ * @see #setNullable(boolean)
+ * @generated
+ */
+ boolean isNullable();
+
+ /**
+ * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#isNullable <em>Nullable</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Nullable</em>' attribute.
+ * @see #isSetNullable()
+ * @see #unsetNullable()
+ * @see #isNullable()
+ * @generated
+ */
+ void setNullable(boolean value);
+
+ /**
+ * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Property#isNullable <em>Nullable</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isSetNullable()
+ * @see #isNullable()
+ * @see #setNullable(boolean)
+ * @generated
+ */
+ void unsetNullable();
+
+ /**
+ * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Property#isNullable <em>Nullable</em>}' attribute is set.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return whether the value of the '<em>Nullable</em>' attribute is set.
+ * @see #unsetNullable()
+ * @see #isNullable()
+ * @see #setNullable(boolean)
+ * @generated
+ */
+ boolean isSetNullable();
/**
* Returns the value of the '<em><b>Any Attribute</b></em>' attribute list.
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java Mon Nov 20 14:16:00 2006
@@ -1,24 +1,13 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model;
+import java.io.Serializable;
+
import java.util.List;
/**
@@ -33,9 +22,10 @@
* </ul>
* </p>
*
+ * @extends Serializable
* @generated
*/
-public interface TextType
+public interface TextType extends Serializable
{
/**
* Returns the value of the '<em><b>Text</b></em>' attribute list.
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java Mon Nov 20 14:16:00 2006
@@ -1,26 +1,15 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model;
import commonj.sdo.Sequence;
+import java.io.Serializable;
+
import java.util.List;
/**
@@ -35,19 +24,20 @@
* <li>{@link org.apache.tuscany.sdo.model.Type#getProperty <em>Property</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.Type#getAliasName <em>Alias Name</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.Type#getAny <em>Any</em>}</li>
- * <li>{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}</li>
- * <li>{@link org.apache.tuscany.sdo.model.Type#isDataType <em>Data Type</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.Type#getName <em>Name</em>}</li>
+ * <li>{@link org.apache.tuscany.sdo.model.Type#getUri <em>Uri</em>}</li>
+ * <li>{@link org.apache.tuscany.sdo.model.Type#isDataType <em>Data Type</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.Type#isOpen <em>Open</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.Type#isSequenced <em>Sequenced</em>}</li>
- * <li>{@link org.apache.tuscany.sdo.model.Type#getUri <em>Uri</em>}</li>
+ * <li>{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.Type#getAnyAttribute <em>Any Attribute</em>}</li>
* </ul>
* </p>
*
+ * @extends Serializable
* @generated
*/
-public interface Type
+public interface Type extends Serializable
{
/**
* Returns the value of the '<em><b>Base Type</b></em>' reference list.
@@ -105,55 +95,52 @@
Sequence getAny();
/**
- * Returns the value of the '<em><b>Abstract</b></em>' attribute.
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Abstract</em>' attribute isn't clear,
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Abstract</em>' attribute.
- * @see #isSetAbstract()
- * @see #unsetAbstract()
- * @see #setAbstract(boolean)
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
* @generated
*/
- boolean isAbstract();
+ String getName();
/**
- * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}' attribute.
+ * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Abstract</em>' attribute.
- * @see #isSetAbstract()
- * @see #unsetAbstract()
- * @see #isAbstract()
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
* @generated
*/
- void setAbstract(boolean value);
+ void setName(String value);
/**
- * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}' attribute.
+ * Returns the value of the '<em><b>Uri</b></em>' attribute.
* <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Uri</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
* <!-- end-user-doc -->
- * @see #isSetAbstract()
- * @see #isAbstract()
- * @see #setAbstract(boolean)
+ * @return the value of the '<em>Uri</em>' attribute.
+ * @see #setUri(String)
* @generated
*/
- void unsetAbstract();
+ String getUri();
/**
- * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}' attribute is set.
+ * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#getUri <em>Uri</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return whether the value of the '<em>Abstract</em>' attribute is set.
- * @see #unsetAbstract()
- * @see #isAbstract()
- * @see #setAbstract(boolean)
+ * @param value the new value of the '<em>Uri</em>' attribute.
+ * @see #getUri()
* @generated
*/
- boolean isSetAbstract();
+ void setUri(String value);
/**
* Returns the value of the '<em><b>Data Type</b></em>' attribute.
@@ -207,30 +194,6 @@
boolean isSetDataType();
/**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
* Returns the value of the '<em><b>Open</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -333,28 +296,55 @@
boolean isSetSequenced();
/**
- * Returns the value of the '<em><b>Uri</b></em>' attribute.
+ * Returns the value of the '<em><b>Abstract</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Uri</em>' attribute isn't clear,
+ * If the meaning of the '<em>Abstract</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Uri</em>' attribute.
- * @see #setUri(String)
+ * @return the value of the '<em>Abstract</em>' attribute.
+ * @see #isSetAbstract()
+ * @see #unsetAbstract()
+ * @see #setAbstract(boolean)
* @generated
*/
- String getUri();
+ boolean isAbstract();
/**
- * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#getUri <em>Uri</em>}' attribute.
+ * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Uri</em>' attribute.
- * @see #getUri()
+ * @param value the new value of the '<em>Abstract</em>' attribute.
+ * @see #isSetAbstract()
+ * @see #unsetAbstract()
+ * @see #isAbstract()
* @generated
*/
- void setUri(String value);
+ void setAbstract(boolean value);
+
+ /**
+ * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isSetAbstract()
+ * @see #isAbstract()
+ * @see #setAbstract(boolean)
+ * @generated
+ */
+ void unsetAbstract();
+
+ /**
+ * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}' attribute is set.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return whether the value of the '<em>Abstract</em>' attribute is set.
+ * @see #unsetAbstract()
+ * @see #isAbstract()
+ * @see #setAbstract(boolean)
+ * @generated
+ */
+ boolean isSetAbstract();
/**
* Returns the value of the '<em><b>Any Attribute</b></em>' attribute list.
@@ -370,5 +360,5 @@
Sequence getAnyAttribute();
String getInstanceClassName();
-
+
} // Type
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java Mon Nov 20 14:16:00 2006
@@ -1,24 +1,13 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model;
+import java.io.Serializable;
+
import java.util.List;
/**
@@ -29,13 +18,14 @@
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.apache.tuscany.sdo.model.Types#getType <em>Type</em>}</li>
+ * <li>{@link org.apache.tuscany.sdo.model.Types#getType_ <em>Type</em>}</li>
* </ul>
* </p>
*
+ * @extends Serializable
* @generated
*/
-public interface Types
+public interface Types extends Serializable
{
/**
* Returns the value of the '<em><b>Type</b></em>' containment reference list.
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java Mon Nov 20 14:16:00 2006
@@ -1,26 +1,15 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model;
import commonj.sdo.Sequence;
+import java.io.Serializable;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>XSD Type</b></em>'.
@@ -39,9 +28,10 @@
* </ul>
* </p>
*
+ * @extends Serializable
* @generated
*/
-public interface XSDType
+public interface XSDType extends Serializable
{
/**
* Returns the value of the '<em><b>Any</b></em>' attribute list.
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java Mon Nov 20 14:16:00 2006
@@ -1,47 +1,22 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model.impl;
import commonj.sdo.Sequence;
+import commonj.sdo.Type;
+import org.apache.tuscany.sdo.impl.DataObjectBase;
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
import org.apache.tuscany.sdo.model.BaseDataGraphType;
import org.apache.tuscany.sdo.model.ChangeSummaryType;
+import org.apache.tuscany.sdo.model.ModelFactory;
import org.apache.tuscany.sdo.model.ModelsType;
import org.apache.tuscany.sdo.model.XSDType;
-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.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Base Data Graph Type</b></em>'.
@@ -51,16 +26,62 @@
* <ul>
* <li>{@link org.apache.tuscany.sdo.model.impl.BaseDataGraphTypeImpl#getModels <em>Models</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.impl.BaseDataGraphTypeImpl#getXsd <em>Xsd</em>}</li>
- * <li>{@link org.apache.tuscany.sdo.model.impl.BaseDataGraphTypeImpl#getChangeSummary <em>Change Summary</em>}</li>
+ * <li>{@link org.apache.tuscany.sdo.model.impl.BaseDataGraphTypeImpl#getChangeSummary_ <em>Change Summary</em>}</li>
* <li>{@link org.apache.tuscany.sdo.model.impl.BaseDataGraphTypeImpl#getAnyAttribute <em>Any Attribute</em>}</li>
* </ul>
* </p>
*
* @generated
*/
-public abstract class BaseDataGraphTypeImpl extends DataObjectImpl implements BaseDataGraphType
+public abstract class BaseDataGraphTypeImpl extends DataObjectBase implements BaseDataGraphType
{
/**
+ * The feature id for the '<em><b>Models</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public final static int MODELS = 0;
+
+ /**
+ * The feature id for the '<em><b>Xsd</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public final static int XSD = 1;
+
+ /**
+ * The feature id for the '<em><b>Change Summary</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public final static int CHANGE_SUMMARY = 2;
+
+ /**
+ * The feature id for the '<em><b>Any Attribute</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public final static int ANY_ATTRIBUTE = 3;
+
+ /**
+ * This represents the number of properties for this type.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+
+ public final static int SDO_PROPERTY_COUNT = 4;
+
+ /**
* The cached value of the '{@link #getModels() <em>Models</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -68,8 +89,9 @@
* @generated
* @ordered
*/
+
protected ModelsType models = null;
-
+
/**
* The cached value of the '{@link #getXsd() <em>Xsd</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -78,18 +100,20 @@
* @generated
* @ordered
*/
+
protected XSDType xsd = null;
-
+
/**
- * The cached value of the '{@link #getChangeSummary() <em>Change Summary</em>}' containment reference.
+ * The cached value of the '{@link #getChangeSummary_() <em>Change Summary</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getChangeSummary()
+ * @see #getChangeSummary_()
* @generated
* @ordered
*/
+
protected ChangeSummaryType changeSummary = null;
-
+
/**
* The cached value of the '{@link #getAnyAttribute() <em>Any Attribute</em>}' attribute list.
* <!-- begin-user-doc -->
@@ -98,8 +122,9 @@
* @generated
* @ordered
*/
- protected BasicSequence anyAttribute = null;
-
+
+ protected Sequence anyAttribute = null;
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -115,9 +140,9 @@
* <!-- end-user-doc -->
* @generated
*/
- protected EClass eStaticClass()
+ public Type getType()
{
- return ModelPackageImpl.Literals.BASE_DATA_GRAPH_TYPE;
+ return ((ModelFactoryImpl)ModelFactory.INSTANCE).getBaseDataGraphType();
}
/**
@@ -129,22 +154,20 @@
{
return models;
}
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetModels(ModelsType newModels, NotificationChain msgs)
+ public ChangeContext basicSetModels(ModelsType newModels, ChangeContext changeContext)
{
ModelsType oldModels = models;
models = newModels;
- if (eNotificationRequired())
+ if (isNotifying())
{
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ModelPackageImpl.BASE_DATA_GRAPH_TYPE__MODELS, oldModels, newModels);
- if (msgs == null) msgs = notification; else msgs.add(notification);
+ addNotification(this, ChangeKind.SET, MODELS, oldModels, newModels, changeContext);
}
- return msgs;
+ return changeContext;
}
/**
@@ -156,16 +179,16 @@
{
if (newModels != models)
{
- NotificationChain msgs = null;
+ ChangeContext changeContext = null;
if (models != null)
- msgs = ((InternalEObject)models).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackageImpl.BASE_DATA_GRAPH_TYPE__MODELS, null, msgs);
+ changeContext = inverseRemove(models, this, OPPOSITE_FEATURE_BASE - MODELS, null, changeContext);
if (newModels != null)
- msgs = ((InternalEObject)newModels).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackageImpl.BASE_DATA_GRAPH_TYPE__MODELS, null, msgs);
- msgs = basicSetModels(newModels, msgs);
- if (msgs != null) msgs.dispatch();
+ changeContext = inverseAdd(newModels, this, OPPOSITE_FEATURE_BASE - MODELS, null, changeContext);
+ changeContext = basicSetModels(newModels, changeContext);
+ if (changeContext != null) dispatch(changeContext);
}
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackageImpl.BASE_DATA_GRAPH_TYPE__MODELS, newModels, newModels));
+ else if (isNotifying())
+ notify(ChangeKind.SET, MODELS, newModels, newModels);
}
/**
@@ -177,22 +200,20 @@
{
return xsd;
}
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetXsd(XSDType newXsd, NotificationChain msgs)
+ public ChangeContext basicSetXsd(XSDType newXsd, ChangeContext changeContext)
{
XSDType oldXsd = xsd;
xsd = newXsd;
- if (eNotificationRequired())
+ if (isNotifying())
{
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ModelPackageImpl.BASE_DATA_GRAPH_TYPE__XSD, oldXsd, newXsd);
- if (msgs == null) msgs = notification; else msgs.add(notification);
+ addNotification(this, ChangeKind.SET, XSD, oldXsd, newXsd, changeContext);
}
- return msgs;
+ return changeContext;
}
/**
@@ -204,16 +225,16 @@
{
if (newXsd != xsd)
{
- NotificationChain msgs = null;
+ ChangeContext changeContext = null;
if (xsd != null)
- msgs = ((InternalEObject)xsd).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackageImpl.BASE_DATA_GRAPH_TYPE__XSD, null, msgs);
+ changeContext = inverseRemove(xsd, this, OPPOSITE_FEATURE_BASE - XSD, null, changeContext);
if (newXsd != null)
- msgs = ((InternalEObject)newXsd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackageImpl.BASE_DATA_GRAPH_TYPE__XSD, null, msgs);
- msgs = basicSetXsd(newXsd, msgs);
- if (msgs != null) msgs.dispatch();
+ changeContext = inverseAdd(newXsd, this, OPPOSITE_FEATURE_BASE - XSD, null, changeContext);
+ changeContext = basicSetXsd(newXsd, changeContext);
+ if (changeContext != null) dispatch(changeContext);
}
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackageImpl.BASE_DATA_GRAPH_TYPE__XSD, newXsd, newXsd));
+ else if (isNotifying())
+ notify(ChangeKind.SET, XSD, newXsd, newXsd);
}
/**
@@ -225,22 +246,20 @@
{
return changeSummary;
}
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetChangeSummary(ChangeSummaryType newChangeSummary, NotificationChain msgs)
+ public ChangeContext basicSetChangeSummary(ChangeSummaryType newChangeSummary, ChangeContext changeContext)
{
ChangeSummaryType oldChangeSummary = changeSummary;
changeSummary = newChangeSummary;
- if (eNotificationRequired())
+ if (isNotifying())
{
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ModelPackageImpl.BASE_DATA_GRAPH_TYPE__CHANGE_SUMMARY, oldChangeSummary, newChangeSummary);
- if (msgs == null) msgs = notification; else msgs.add(notification);
+ addNotification(this, ChangeKind.SET, CHANGE_SUMMARY, oldChangeSummary, newChangeSummary, changeContext);
}
- return msgs;
+ return changeContext;
}
/**
@@ -252,16 +271,16 @@
{
if (newChangeSummary != changeSummary)
{
- NotificationChain msgs = null;
+ ChangeContext changeContext = null;
if (changeSummary != null)
- msgs = ((InternalEObject)changeSummary).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackageImpl.BASE_DATA_GRAPH_TYPE__CHANGE_SUMMARY, null, msgs);
+ changeContext = inverseRemove(changeSummary, this, OPPOSITE_FEATURE_BASE - CHANGE_SUMMARY, null, changeContext);
if (newChangeSummary != null)
- msgs = ((InternalEObject)newChangeSummary).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackageImpl.BASE_DATA_GRAPH_TYPE__CHANGE_SUMMARY, null, msgs);
- msgs = basicSetChangeSummary(newChangeSummary, msgs);
- if (msgs != null) msgs.dispatch();
+ changeContext = inverseAdd(newChangeSummary, this, OPPOSITE_FEATURE_BASE - CHANGE_SUMMARY, null, changeContext);
+ changeContext = basicSetChangeSummary(newChangeSummary, changeContext);
+ if (changeContext != null) dispatch(changeContext);
}
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackageImpl.BASE_DATA_GRAPH_TYPE__CHANGE_SUMMARY, newChangeSummary, newChangeSummary));
+ else if (isNotifying())
+ notify(ChangeKind.SET, CHANGE_SUMMARY, newChangeSummary, newChangeSummary);
}
/**
@@ -273,30 +292,29 @@
{
if (anyAttribute == null)
{
- anyAttribute = new BasicSequence(new BasicFeatureMap(this, ModelPackageImpl.BASE_DATA_GRAPH_TYPE__ANY_ATTRIBUTE));
+ anyAttribute = createSequence(ANY_ATTRIBUTE);
}
return anyAttribute;
}
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
{
- switch (featureID)
+ switch (propertyIndex)
{
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__MODELS:
- return basicSetModels(null, msgs);
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__XSD:
- return basicSetXsd(null, msgs);
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__CHANGE_SUMMARY:
- return basicSetChangeSummary(null, msgs);
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__ANY_ATTRIBUTE:
- return ((InternalEList)((FeatureMap.Internal.Wrapper)getAnyAttribute()).featureMap()).basicRemove(otherEnd, msgs);
+ case MODELS:
+ return basicSetModels(null, changeContext);
+ case XSD:
+ return basicSetXsd(null, changeContext);
+ case CHANGE_SUMMARY:
+ return basicSetChangeSummary(null, changeContext);
+ case ANY_ATTRIBUTE:
+ return removeFromSequence(getAnyAttribute(), otherEnd, changeContext);
}
- return super.eInverseRemove(otherEnd, featureID, msgs);
+ return super.inverseRemove(otherEnd, propertyIndex, changeContext);
}
/**
@@ -304,21 +322,22 @@
* <!-- end-user-doc -->
* @generated
*/
- public Object eGet(int featureID, boolean resolve, boolean coreType)
+ public Object get(int propertyIndex, boolean resolve)
{
- switch (featureID)
+ switch (propertyIndex)
{
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__MODELS:
+ case MODELS:
return getModels();
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__XSD:
+ case XSD:
return getXsd();
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__CHANGE_SUMMARY:
- return getChangeSummary();
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__ANY_ATTRIBUTE:
- if (coreType) return ((FeatureMap.Internal.Wrapper)getAnyAttribute()).featureMap();
+ case CHANGE_SUMMARY:
+ return getChangeSummary_();
+ case ANY_ATTRIBUTE:
+ // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
+ //if (coreType)
return getAnyAttribute();
}
- return super.eGet(featureID, resolve, coreType);
+ return super.get(propertyIndex, resolve);
}
/**
@@ -326,24 +345,24 @@
* <!-- end-user-doc -->
* @generated
*/
- public void eSet(int featureID, Object newValue)
+ public void set(int propertyIndex, Object newValue)
{
- switch (featureID)
+ switch (propertyIndex)
{
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__MODELS:
+ case MODELS:
setModels((ModelsType)newValue);
return;
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__XSD:
+ case XSD:
setXsd((XSDType)newValue);
return;
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__CHANGE_SUMMARY:
+ case CHANGE_SUMMARY:
setChangeSummary((ChangeSummaryType)newValue);
return;
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__ANY_ATTRIBUTE:
- ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)getAnyAttribute()).featureMap()).set(newValue);
+ case ANY_ATTRIBUTE:
+ setSequence(getAnyAttribute(), newValue);
return;
}
- super.eSet(featureID, newValue);
+ super.set(propertyIndex, newValue);
}
/**
@@ -351,24 +370,24 @@
* <!-- end-user-doc -->
* @generated
*/
- public void eUnset(int featureID)
+ public void unset(int propertyIndex)
{
- switch (featureID)
+ switch (propertyIndex)
{
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__MODELS:
+ case MODELS:
setModels((ModelsType)null);
return;
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__XSD:
+ case XSD:
setXsd((XSDType)null);
return;
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__CHANGE_SUMMARY:
+ case CHANGE_SUMMARY:
setChangeSummary((ChangeSummaryType)null);
return;
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__ANY_ATTRIBUTE:
- ((FeatureMap.Internal.Wrapper)getAnyAttribute()).featureMap().clear();
+ case ANY_ATTRIBUTE:
+ unsetSequence(getAnyAttribute());
return;
}
- super.eUnset(featureID);
+ super.unset(propertyIndex);
}
/**
@@ -376,20 +395,20 @@
* <!-- end-user-doc -->
* @generated
*/
- public boolean eIsSet(int featureID)
+ public boolean isSet(int propertyIndex)
{
- switch (featureID)
+ switch (propertyIndex)
{
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__MODELS:
+ case MODELS:
return models != null;
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__XSD:
+ case XSD:
return xsd != null;
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__CHANGE_SUMMARY:
+ case CHANGE_SUMMARY:
return changeSummary != null;
- case ModelPackageImpl.BASE_DATA_GRAPH_TYPE__ANY_ATTRIBUTE:
- return anyAttribute != null && !anyAttribute.featureMap().isEmpty();
+ case ANY_ATTRIBUTE:
+ return anyAttribute != null && !isSequenceEmpty(getAnyAttribute());
}
- return super.eIsSet(featureID);
+ return super.isSet(propertyIndex);
}
/**
@@ -399,7 +418,7 @@
*/
public String toString()
{
- if (eIsProxy()) return super.toString();
+ if (isProxy(this)) return super.toString();
StringBuffer result = new StringBuffer(super.toString());
result.append(" (anyAttribute: ");
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java?view=diff&rev=477364&r1=477363&r2=477364
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java Mon Nov 20 14:16:00 2006
@@ -1,43 +1,18 @@
/**
+ * <copyright>
+ * </copyright>
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
+ * $Id$
*/
package org.apache.tuscany.sdo.model.impl;
import commonj.sdo.Sequence;
+import commonj.sdo.Type;
+import org.apache.tuscany.sdo.impl.DataObjectBase;
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
import org.apache.tuscany.sdo.model.ChangeSummaryType;
-
-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.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
+import org.apache.tuscany.sdo.model.ModelFactory;
/**
* <!-- begin-user-doc -->
@@ -55,9 +30,55 @@
*
* @generated
*/
-public class ChangeSummaryTypeImpl extends DataObjectImpl implements ChangeSummaryType
+public class ChangeSummaryTypeImpl extends DataObjectBase implements ChangeSummaryType
{
/**
+ * The feature id for the '<em><b>Any</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public final static int ANY = 0;
+
+ /**
+ * The feature id for the '<em><b>Create</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public final static int CREATE = 1;
+
+ /**
+ * The feature id for the '<em><b>Delete</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public final static int DELETE = 2;
+
+ /**
+ * The feature id for the '<em><b>Logging</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public final static int LOGGING = 3;
+
+ /**
+ * This represents the number of properties for this type.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+
+ public final static int SDO_PROPERTY_COUNT = 4;
+
+ /**
* The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -65,8 +86,9 @@
* @generated
* @ordered
*/
- protected BasicSequence any = null;
-
+
+ protected Sequence any = null;
+
/**
* The default value of the '{@link #getCreate() <em>Create</em>}' attribute.
* <!-- begin-user-doc -->
@@ -75,7 +97,7 @@
* @generated
* @ordered
*/
- protected static final String CREATE_EDEFAULT = null;
+ protected static final String CREATE_DEFAULT_ = null;
/**
* The cached value of the '{@link #getCreate() <em>Create</em>}' attribute.
@@ -85,7 +107,7 @@
* @generated
* @ordered
*/
- protected String create = CREATE_EDEFAULT;
+ protected String create = CREATE_DEFAULT_;
/**
* The default value of the '{@link #getDelete() <em>Delete</em>}' attribute.
@@ -95,7 +117,7 @@
* @generated
* @ordered
*/
- protected static final String DELETE_EDEFAULT = null;
+ protected static final String DELETE_DEFAULT_ = null;
/**
* The cached value of the '{@link #getDelete() <em>Delete</em>}' attribute.
@@ -105,7 +127,7 @@
* @generated
* @ordered
*/
- protected String delete = DELETE_EDEFAULT;
+ protected String delete = DELETE_DEFAULT_;
/**
* The default value of the '{@link #isLogging() <em>Logging</em>}' attribute.
@@ -115,7 +137,7 @@
* @generated
* @ordered
*/
- protected static final boolean LOGGING_EDEFAULT = false;
+ protected static final boolean LOGGING_DEFAULT_ = false;
/**
* The cached value of the '{@link #isLogging() <em>Logging</em>}' attribute.
@@ -125,7 +147,7 @@
* @generated
* @ordered
*/
- protected boolean logging = LOGGING_EDEFAULT;
+ protected boolean logging = LOGGING_DEFAULT_;
/**
* This is true if the Logging attribute has been set.
@@ -134,7 +156,7 @@
* @generated
* @ordered
*/
- protected boolean loggingESet = false;
+ protected boolean logging_set_ = false;
/**
* <!-- begin-user-doc -->
@@ -151,9 +173,9 @@
* <!-- end-user-doc -->
* @generated
*/
- protected EClass eStaticClass()
+ public Type getType()
{
- return ModelPackageImpl.Literals.CHANGE_SUMMARY_TYPE;
+ return ((ModelFactoryImpl)ModelFactory.INSTANCE).getChangeSummaryType();
}
/**
@@ -165,11 +187,10 @@
{
if (any == null)
{
- any = new BasicSequence(new BasicFeatureMap(this, ModelPackageImpl.CHANGE_SUMMARY_TYPE__ANY));
+ any = createSequence(ANY);
}
return any;
}
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -179,7 +200,6 @@
{
return create;
}
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -189,8 +209,8 @@
{
String oldCreate = create;
create = newCreate;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackageImpl.CHANGE_SUMMARY_TYPE__CREATE, oldCreate, create));
+ if (isNotifying())
+ notify(ChangeKind.SET, CREATE, oldCreate, create);
}
/**
@@ -202,7 +222,6 @@
{
return delete;
}
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -212,8 +231,8 @@
{
String oldDelete = delete;
delete = newDelete;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackageImpl.CHANGE_SUMMARY_TYPE__DELETE, oldDelete, delete));
+ if (isNotifying())
+ notify(ChangeKind.SET, DELETE, oldDelete, delete);
}
/**
@@ -225,7 +244,6 @@
{
return logging;
}
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -235,10 +253,10 @@
{
boolean oldLogging = logging;
logging = newLogging;
- boolean oldLoggingESet = loggingESet;
- loggingESet = true;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackageImpl.CHANGE_SUMMARY_TYPE__LOGGING, oldLogging, logging, !oldLoggingESet));
+ boolean oldLogging_set_ = logging_set_;
+ logging_set_ = true;
+ if (isNotifying())
+ notify(ChangeKind.SET, LOGGING, oldLogging, logging, !oldLogging_set_);
}
/**
@@ -249,11 +267,11 @@
public void unsetLogging()
{
boolean oldLogging = logging;
- boolean oldLoggingESet = loggingESet;
- logging = LOGGING_EDEFAULT;
- loggingESet = false;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, ModelPackageImpl.CHANGE_SUMMARY_TYPE__LOGGING, oldLogging, LOGGING_EDEFAULT, oldLoggingESet));
+ boolean oldLogging_set_ = logging_set_;
+ logging = LOGGING_DEFAULT_;
+ logging_set_ = false;
+ if (isNotifying())
+ notify(ChangeKind.UNSET, LOGGING, oldLogging, LOGGING_DEFAULT_, oldLogging_set_);
}
/**
@@ -263,7 +281,7 @@
*/
public boolean isSetLogging()
{
- return loggingESet;
+ return logging_set_;
}
/**
@@ -271,14 +289,14 @@
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
{
- switch (featureID)
+ switch (propertyIndex)
{
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__ANY:
- return ((InternalEList)((FeatureMap.Internal.Wrapper)getAny()).featureMap()).basicRemove(otherEnd, msgs);
+ case ANY:
+ return removeFromSequence(getAny(), otherEnd, changeContext);
}
- return super.eInverseRemove(otherEnd, featureID, msgs);
+ return super.inverseRemove(otherEnd, propertyIndex, changeContext);
}
/**
@@ -286,21 +304,22 @@
* <!-- end-user-doc -->
* @generated
*/
- public Object eGet(int featureID, boolean resolve, boolean coreType)
+ public Object get(int propertyIndex, boolean resolve)
{
- switch (featureID)
+ switch (propertyIndex)
{
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__ANY:
- if (coreType) return ((FeatureMap.Internal.Wrapper)getAny()).featureMap();
+ case ANY:
+ // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
+ //if (coreType)
return getAny();
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__CREATE:
+ case CREATE:
return getCreate();
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__DELETE:
+ case DELETE:
return getDelete();
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__LOGGING:
+ case LOGGING:
return isLogging() ? Boolean.TRUE : Boolean.FALSE;
}
- return super.eGet(featureID, resolve, coreType);
+ return super.get(propertyIndex, resolve);
}
/**
@@ -308,24 +327,24 @@
* <!-- end-user-doc -->
* @generated
*/
- public void eSet(int featureID, Object newValue)
+ public void set(int propertyIndex, Object newValue)
{
- switch (featureID)
+ switch (propertyIndex)
{
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__ANY:
- ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)getAny()).featureMap()).set(newValue);
+ case ANY:
+ setSequence(getAny(), newValue);
return;
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__CREATE:
+ case CREATE:
setCreate((String)newValue);
return;
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__DELETE:
+ case DELETE:
setDelete((String)newValue);
return;
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__LOGGING:
+ case LOGGING:
setLogging(((Boolean)newValue).booleanValue());
return;
}
- super.eSet(featureID, newValue);
+ super.set(propertyIndex, newValue);
}
/**
@@ -333,24 +352,24 @@
* <!-- end-user-doc -->
* @generated
*/
- public void eUnset(int featureID)
+ public void unset(int propertyIndex)
{
- switch (featureID)
+ switch (propertyIndex)
{
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__ANY:
- ((FeatureMap.Internal.Wrapper)getAny()).featureMap().clear();
+ case ANY:
+ unsetSequence(getAny());
return;
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__CREATE:
- setCreate(CREATE_EDEFAULT);
+ case CREATE:
+ setCreate(CREATE_DEFAULT_);
return;
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__DELETE:
- setDelete(DELETE_EDEFAULT);
+ case DELETE:
+ setDelete(DELETE_DEFAULT_);
return;
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__LOGGING:
+ case LOGGING:
unsetLogging();
return;
}
- super.eUnset(featureID);
+ super.unset(propertyIndex);
}
/**
@@ -358,20 +377,20 @@
* <!-- end-user-doc -->
* @generated
*/
- public boolean eIsSet(int featureID)
+ public boolean isSet(int propertyIndex)
{
- switch (featureID)
+ switch (propertyIndex)
{
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__ANY:
- return any != null && !any.featureMap().isEmpty();
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__CREATE:
- return CREATE_EDEFAULT == null ? create != null : !CREATE_EDEFAULT.equals(create);
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__DELETE:
- return DELETE_EDEFAULT == null ? delete != null : !DELETE_EDEFAULT.equals(delete);
- case ModelPackageImpl.CHANGE_SUMMARY_TYPE__LOGGING:
+ case ANY:
+ return any != null && !isSequenceEmpty(getAny());
+ case CREATE:
+ return CREATE_DEFAULT_ == null ? create != null : !CREATE_DEFAULT_.equals(create);
+ case DELETE:
+ return DELETE_DEFAULT_ == null ? delete != null : !DELETE_DEFAULT_.equals(delete);
+ case LOGGING:
return isSetLogging();
}
- return super.eIsSet(featureID);
+ return super.isSet(propertyIndex);
}
/**
@@ -381,7 +400,7 @@
*/
public String toString()
{
- if (eIsProxy()) return super.toString();
+ if (isProxy(this)) return super.toString();
StringBuffer result = new StringBuffer(super.toString());
result.append(" (any: ");
@@ -391,7 +410,7 @@
result.append(", delete: ");
result.append(delete);
result.append(", logging: ");
- if (loggingESet) result.append(logging); else result.append("<unset>");
+ if (logging_set_) result.append(logging); else result.append("<unset>");
result.append(')');
return result.toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org