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

Removed DelegatedObject reference.

parent 44c15e06
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 88 deletions
tools.descartes.prisma.agent.generic.edit/src/tools/descartes/prisma/agent/generic/genericagent/provider/GenericAgentConfigurationItemProvider.java
+ 0
− 7
View file @ 0331fc6b
......@@ -107,7 +107,6 @@ public class GenericAgentConfigurationItemProvider
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__SCOPE);
childrenFeatures.add(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__DELEGATED_OBJECTS);
childrenFeatures.add(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__REQUIRED_OBJECTS);
childrenFeatures.add(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__SKELETON);
}
......@@ -169,7 +168,6 @@ public class GenericAgentConfigurationItemProvider
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
case GenericAgentPackage.GENERIC_AGENT_CONFIGURATION__SCOPE:
case GenericAgentPackage.GENERIC_AGENT_CONFIGURATION__DELEGATED_OBJECTS:
case GenericAgentPackage.GENERIC_AGENT_CONFIGURATION__REQUIRED_OBJECTS:
case GenericAgentPackage.GENERIC_AGENT_CONFIGURATION__SKELETON:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
......@@ -194,11 +192,6 @@ public class GenericAgentConfigurationItemProvider
(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__SCOPE,
ScopeFactory.eINSTANCE.createScopeReference()));
newChildDescriptors.add
(createChildParameter
(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__DELEGATED_OBJECTS,
ScopeFactory.eINSTANCE.createDelegatedObject()));
newChildDescriptors.add
(createChildParameter
(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__SKELETON,
......
tools.descartes.prisma.agent.generic/model/genericagent.ecore
+ 0
− 3
View file @ 0331fc6b
......@@ -6,9 +6,6 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="scope" lowerBound="1" eType="ecore:EClass ../../tools.descartes.prisma.model/model/scope.ecore#//ScopeReference"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="delegatedObjects" upperBound="-1"
eType="ecore:EClass ../../tools.descartes.prisma.model/model/scope.ecore#//DelegatedObject"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="requiredObjects" upperBound="-1"
eType="#//RequiredObject" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="skeleton" lowerBound="1"
......
tools.descartes.prisma.agent.generic/model/genericagent.genmodel
+ 1
− 4
View file @ 0331fc6b
......@@ -14,15 +14,12 @@
<genClasses ecoreClass="genericagent.ecore#//GenericAgentConfiguration">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute genericagent.ecore#//GenericAgentConfiguration/id"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference genericagent.ecore#//GenericAgentConfiguration/scope"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference genericagent.ecore#//GenericAgentConfiguration/delegatedObjects"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference genericagent.ecore#//GenericAgentConfiguration/requiredObjects"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference genericagent.ecore#//GenericAgentConfiguration/skeleton"/>
</genClasses>
<genClasses image="false" ecoreClass="genericagent.ecore#//RequiredObject">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference genericagent.ecore#//RequiredObject/object"/>
</genClasses>
<genClasses ecoreClass="genericagent.ecore#//RequiredContainer">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference genericagent.ecore#//RequiredContainer/container"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute genericagent.ecore#//RequiredObject/exchange"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
tools.descartes.prisma.agent.generic/src/tools/descartes/prisma/agent/generic/genericagent/GenericAgentConfiguration.java
+ 0
− 18
View file @ 0331fc6b
......@@ -5,7 +5,6 @@ package tools.descartes.prisma.agent.generic.genericagent;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.common.util.EList;
import tools.descartes.prisma.model.scope.DelegatedObject;
import tools.descartes.prisma.model.scope.ScopeReference;
import tools.descartes.prisma.model.skeleton.ModelSkeleton;
......@@ -20,7 +19,6 @@ import tools.descartes.prisma.model.skeleton.ModelSkeleton;
* <ul>
* <li>{@link tools.descartes.prisma.agent.generic.genericagent.GenericAgentConfiguration#getId <em>Id</em>}</li>
* <li>{@link tools.descartes.prisma.agent.generic.genericagent.GenericAgentConfiguration#getScope <em>Scope</em>}</li>
* <li>{@link tools.descartes.prisma.agent.generic.genericagent.GenericAgentConfiguration#getDelegatedObjects <em>Delegated Objects</em>}</li>
* <li>{@link tools.descartes.prisma.agent.generic.genericagent.GenericAgentConfiguration#getRequiredObjects <em>Required Objects</em>}</li>
* <li>{@link tools.descartes.prisma.agent.generic.genericagent.GenericAgentConfiguration#getSkeleton <em>Skeleton</em>}</li>
* </ul>
......@@ -83,22 +81,6 @@ public interface GenericAgentConfiguration extends CDOObject {
*/
void setScope(ScopeReference value);
/**
* Returns the value of the '<em><b>Delegated Objects</b></em>' containment reference list.
* The list contents are of type {@link tools.descartes.prisma.model.scope.DelegatedObject}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Delegated Objects</em>' reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Delegated Objects</em>' containment reference list.
* @see tools.descartes.prisma.agent.generic.genericagent.GenericAgentPackage#getGenericAgentConfiguration_DelegatedObjects()
* @model containment="true" resolveProxies="true"
* @generated
*/
EList<DelegatedObject> getDelegatedObjects();
/**
* Returns the value of the '<em><b>Required Objects</b></em>' containment reference list.
* The list contents are of type {@link tools.descartes.prisma.agent.generic.genericagent.RequiredObject}.
......
tools.descartes.prisma.agent.generic/src/tools/descartes/prisma/agent/generic/genericagent/GenericAgentPackage.java
+ 3
− 31
View file @ 0331fc6b
......@@ -84,15 +84,6 @@ public interface GenericAgentPackage extends EPackage {
*/
int GENERIC_AGENT_CONFIGURATION__SCOPE = 1;
/**
* The feature id for the '<em><b>Delegated Objects</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GENERIC_AGENT_CONFIGURATION__DELEGATED_OBJECTS = 2;
/**
* The feature id for the '<em><b>Required Objects</b></em>' containment reference list.
* <!-- begin-user-doc -->
......@@ -100,7 +91,7 @@ public interface GenericAgentPackage extends EPackage {
* @generated
* @ordered
*/
int GENERIC_AGENT_CONFIGURATION__REQUIRED_OBJECTS = 3;
int GENERIC_AGENT_CONFIGURATION__REQUIRED_OBJECTS = 2;
/**
* The feature id for the '<em><b>Skeleton</b></em>' containment reference.
......@@ -109,7 +100,7 @@ public interface GenericAgentPackage extends EPackage {
* @generated
* @ordered
*/
int GENERIC_AGENT_CONFIGURATION__SKELETON = 4;
int GENERIC_AGENT_CONFIGURATION__SKELETON = 3;
/**
* The number of structural features of the '<em>Configuration</em>' class.
......@@ -118,7 +109,7 @@ public interface GenericAgentPackage extends EPackage {
* @generated
* @ordered
*/
int GENERIC_AGENT_CONFIGURATION_FEATURE_COUNT = 5;
int GENERIC_AGENT_CONFIGURATION_FEATURE_COUNT = 4;
/**
* The number of operations of the '<em>Configuration</em>' class.
......@@ -208,17 +199,6 @@ public interface GenericAgentPackage extends EPackage {
*/
EReference getGenericAgentConfiguration_Scope();
/**
* Returns the meta object for the containment reference list '{@link tools.descartes.prisma.agent.generic.genericagent.GenericAgentConfiguration#getDelegatedObjects <em>Delegated Objects</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Delegated Objects</em>'.
* @see tools.descartes.prisma.agent.generic.genericagent.GenericAgentConfiguration#getDelegatedObjects()
* @see #getGenericAgentConfiguration()
* @generated
*/
EReference getGenericAgentConfiguration_DelegatedObjects();
/**
* Returns the meta object for the containment reference list '{@link tools.descartes.prisma.agent.generic.genericagent.GenericAgentConfiguration#getRequiredObjects <em>Required Objects</em>}'.
* <!-- begin-user-doc -->
......@@ -322,14 +302,6 @@ public interface GenericAgentPackage extends EPackage {
*/
EReference GENERIC_AGENT_CONFIGURATION__SCOPE = eINSTANCE.getGenericAgentConfiguration_Scope();
/**
* The meta object literal for the '<em><b>Delegated Objects</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
EReference GENERIC_AGENT_CONFIGURATION__DELEGATED_OBJECTS = eINSTANCE.getGenericAgentConfiguration_DelegatedObjects();
/**
* The meta object literal for the '<em><b>Required Objects</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
......
tools.descartes.prisma.agent.generic/src/tools/descartes/prisma/agent/generic/genericagent/impl/GenericAgentConfigurationImpl.java
+ 0
− 12
View file @ 0331fc6b
......@@ -11,7 +11,6 @@ import tools.descartes.prisma.agent.generic.genericagent.GenericAgentConfigurati
import tools.descartes.prisma.agent.generic.genericagent.GenericAgentPackage;
import tools.descartes.prisma.agent.generic.genericagent.RequiredObject;
import tools.descartes.prisma.model.scope.DelegatedObject;
import tools.descartes.prisma.model.scope.ScopeReference;
import tools.descartes.prisma.model.skeleton.ModelSkeleton;
......@@ -25,7 +24,6 @@ import tools.descartes.prisma.model.skeleton.ModelSkeleton;
* <ul>
* <li>{@link tools.descartes.prisma.agent.generic.genericagent.impl.GenericAgentConfigurationImpl#getId <em>Id</em>}</li>
* <li>{@link tools.descartes.prisma.agent.generic.genericagent.impl.GenericAgentConfigurationImpl#getScope <em>Scope</em>}</li>
* <li>{@link tools.descartes.prisma.agent.generic.genericagent.impl.GenericAgentConfigurationImpl#getDelegatedObjects <em>Delegated Objects</em>}</li>
* <li>{@link tools.descartes.prisma.agent.generic.genericagent.impl.GenericAgentConfigurationImpl#getRequiredObjects <em>Required Objects</em>}</li>
* <li>{@link tools.descartes.prisma.agent.generic.genericagent.impl.GenericAgentConfigurationImpl#getSkeleton <em>Skeleton</em>}</li>
* </ul>
......@@ -98,16 +96,6 @@ public class GenericAgentConfigurationImpl extends CDOObjectImpl implements Gene
eSet(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__SCOPE, newScope);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@SuppressWarnings("unchecked")
public EList<DelegatedObject> getDelegatedObjects() {
return (EList<DelegatedObject>)eGet(GenericAgentPackage.Literals.GENERIC_AGENT_CONFIGURATION__DELEGATED_OBJECTS, true);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
......
tools.descartes.prisma.agent.generic/src/tools/descartes/prisma/agent/generic/genericagent/impl/GenericAgentPackageImpl.java
+ 2
− 13
View file @ 0331fc6b
......@@ -130,22 +130,13 @@ public class GenericAgentPackageImpl extends EPackageImpl implements GenericAgen
return (EReference)genericAgentConfigurationEClass.getEStructuralFeatures().get(1);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EReference getGenericAgentConfiguration_DelegatedObjects() {
return (EReference)genericAgentConfigurationEClass.getEStructuralFeatures().get(2);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EReference getGenericAgentConfiguration_RequiredObjects() {
return (EReference)genericAgentConfigurationEClass.getEStructuralFeatures().get(3);
return (EReference)genericAgentConfigurationEClass.getEStructuralFeatures().get(2);
}
/**
......@@ -154,7 +145,7 @@ public class GenericAgentPackageImpl extends EPackageImpl implements GenericAgen
* @generated
*/
public EReference getGenericAgentConfiguration_Skeleton() {
return (EReference)genericAgentConfigurationEClass.getEStructuralFeatures().get(4);
return (EReference)genericAgentConfigurationEClass.getEStructuralFeatures().get(3);
}
/**
......@@ -215,7 +206,6 @@ public class GenericAgentPackageImpl extends EPackageImpl implements GenericAgen
genericAgentConfigurationEClass = createEClass(GENERIC_AGENT_CONFIGURATION);
createEAttribute(genericAgentConfigurationEClass, GENERIC_AGENT_CONFIGURATION__ID);
createEReference(genericAgentConfigurationEClass, GENERIC_AGENT_CONFIGURATION__SCOPE);
createEReference(genericAgentConfigurationEClass, GENERIC_AGENT_CONFIGURATION__DELEGATED_OBJECTS);
createEReference(genericAgentConfigurationEClass, GENERIC_AGENT_CONFIGURATION__REQUIRED_OBJECTS);
createEReference(genericAgentConfigurationEClass, GENERIC_AGENT_CONFIGURATION__SKELETON);
......@@ -261,7 +251,6 @@ public class GenericAgentPackageImpl extends EPackageImpl implements GenericAgen
initEClass(genericAgentConfigurationEClass, GenericAgentConfiguration.class, "GenericAgentConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getGenericAgentConfiguration_Id(), ecorePackage.getEString(), "id", null, 1, 1, GenericAgentConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getGenericAgentConfiguration_Scope(), theScopePackage.getScopeReference(), null, "scope", 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_DelegatedObjects(), theScopePackage.getDelegatedObject(), null, "delegatedObjects", null, 0, -1, GenericAgentConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getGenericAgentConfiguration_RequiredObjects(), this.getRequiredObject(), null, "requiredObjects", null, 0, -1, GenericAgentConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
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);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment