Skip to content
Snippets Groups Projects
Commit 9ac798c9 authored by Simon Spinner's avatar Simon Spinner
Browse files

Remove abstract flag from RequiredObject.

parent 1738d7cf
No related branches found
No related tags found
No related merge requests found
Showing
with 76 additions and 8 deletions
......@@ -195,6 +195,11 @@ public class GenericAgentConfigurationItemProvider
(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__SCOPE,
ScopeFactory.eINSTANCE.createScopeReference()));
newChildDescriptors.add
(createChildParameter
(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__REQUIRED_OBJECTS,
GenericAgentFactory.eINSTANCE.createRequiredObject()));
newChildDescriptors.add
(createChildParameter
(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__SKELETON,
......
......@@ -94,6 +94,29 @@ public class GenericAgentItemProviderAdapterFactory extends GenericAgentAdapterF
return genericAgentConfigurationItemProvider;
}
/**
* This keeps track of the one adapter used for all {@link tools.descartes.prisma.agent.generic.genericagent.RequiredObject} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected RequiredObjectItemProvider requiredObjectItemProvider;
/**
* This creates an adapter for a {@link tools.descartes.prisma.agent.generic.genericagent.RequiredObject}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Adapter createRequiredObjectAdapter() {
if (requiredObjectItemProvider == null) {
requiredObjectItemProvider = new RequiredObjectItemProvider(this);
}
return requiredObjectItemProvider;
}
/**
* This keeps track of the one adapter used for all {@link tools.descartes.prisma.agent.generic.genericagent.DelegationBinding} instances.
* <!-- begin-user-doc -->
......@@ -217,6 +240,7 @@ public class GenericAgentItemProviderAdapterFactory extends GenericAgentAdapterF
*/
public void dispose() {
if (genericAgentConfigurationItemProvider != null) genericAgentConfigurationItemProvider.dispose();
if (requiredObjectItemProvider != null) requiredObjectItemProvider.dispose();
if (delegationBindingItemProvider != null) delegationBindingItemProvider.dispose();
}
......
......@@ -14,10 +14,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="delegations" upperBound="-1"
eType="#//DelegationBinding" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="RequiredObject" abstract="true">
<eClassifiers xsi:type="ecore:EClass" name="RequiredObject">
<eStructuralFeatures xsi:type="ecore:EReference" name="object" lowerBound="1"
eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject" changeable="false"
transient="true" derived="true"/>
eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject" derived="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="port" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DelegationBinding">
......
......@@ -30,6 +30,15 @@ public interface GenericAgentFactory extends EFactory {
*/
GenericAgentConfiguration createGenericAgentConfiguration();
/**
* Returns a new object of class '<em>Required Object</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return a new object of class '<em>Required Object</em>'.
* @generated
*/
RequiredObject createRequiredObject();
/**
* Returns a new object of class '<em>Delegation Binding</em>'.
* <!-- begin-user-doc -->
......
......@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
*
* @see tools.descartes.prisma.agent.generic.genericagent.GenericAgentPackage#getRequiredObject()
* @model abstract="true"
* @model
* @extends CDOObject
* @generated
*/
......@@ -34,12 +34,23 @@ public interface RequiredObject extends CDOObject {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Object</em>' reference.
* @see #setObject(EObject)
* @see tools.descartes.prisma.agent.generic.genericagent.GenericAgentPackage#getRequiredObject_Object()
* @model required="true" transient="true" changeable="false" derived="true"
* @model required="true" derived="true"
* @generated
*/
EObject getObject();
/**
* Sets the value of the '{@link tools.descartes.prisma.agent.generic.genericagent.RequiredObject#getObject <em>Object</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Object</em>' reference.
* @see #getObject()
* @generated
*/
void setObject(EObject value);
/**
* Returns the value of the '<em><b>Port</b></em>' attribute.
* <!-- begin-user-doc -->
......
......@@ -57,6 +57,7 @@ public class GenericAgentFactoryImpl extends EFactoryImpl implements GenericAgen
public EObject create(EClass eClass) {
switch (eClass.getClassifierID()) {
case GenericAgentPackage.GENERIC_AGENT_CONFIGURATION: return (EObject)createGenericAgentConfiguration();
case GenericAgentPackage.REQUIRED_OBJECT: return (EObject)createRequiredObject();
case GenericAgentPackage.DELEGATION_BINDING: return (EObject)createDelegationBinding();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
......@@ -73,6 +74,16 @@ public class GenericAgentFactoryImpl extends EFactoryImpl implements GenericAgen
return genericAgentConfiguration;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public RequiredObject createRequiredObject() {
RequiredObjectImpl requiredObject = new RequiredObjectImpl();
return requiredObject;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......
......@@ -324,8 +324,8 @@ public class GenericAgentPackageImpl extends EPackageImpl implements GenericAgen
initEReference(getGenericAgentConfiguration_Skeleton(), theSkeletonPackage.getModelSkeleton(), null, "skeleton", null, 1, 1, GenericAgentConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getGenericAgentConfiguration_Delegations(), this.getDelegationBinding(), null, "delegations", null, 0, -1, GenericAgentConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(requiredObjectEClass, RequiredObject.class, "RequiredObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getRequiredObject_Object(), ecorePackage.getEObject(), null, "object", null, 1, 1, RequiredObject.class, IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEClass(requiredObjectEClass, RequiredObject.class, "RequiredObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getRequiredObject_Object(), ecorePackage.getEObject(), null, "object", null, 1, 1, RequiredObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEAttribute(getRequiredObject_Port(), ecorePackage.getEString(), "port", null, 1, 1, RequiredObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(delegationBindingEClass, DelegationBinding.class, "DelegationBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
......
......@@ -24,7 +24,7 @@ import tools.descartes.prisma.agent.generic.genericagent.RequiredObject;
*
* @generated
*/
public abstract class RequiredObjectImpl extends CDOObjectImpl implements RequiredObject {
public class RequiredObjectImpl extends CDOObjectImpl implements RequiredObject {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......@@ -63,6 +63,15 @@ public abstract class RequiredObjectImpl extends CDOObjectImpl implements Requir
return (EObject)eGet(GenericAgentPackage.Literals.REQUIRED_OBJECT__OBJECT, true);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public void setObject(EObject newObject) {
eSet(GenericAgentPackage.Literals.REQUIRED_OBJECT__OBJECT, newObject);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment