Minor accessors issue.
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/srcgen/org/metaabm/impl/SAttributeImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/srcgen/org/metaabm/impl/SAttributeImpl.java
index 2008855..927e3ed 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/srcgen/org/metaabm/impl/SAttributeImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/srcgen/org/metaabm/impl/SAttributeImpl.java
@@ -40,6 +40,7 @@
import org.metaabm.SAttributed;
import org.metaabm.SContext;
import org.metaabm.SProjection;
+import org.metaabm.SState;
import org.metaabm.act.AAccessor;
import org.metaabm.act.AAct;
import org.metaabm.act.ACreateAgents;
@@ -189,11 +190,16 @@
parent = ((SProjection) getOwner()).getOwner();
}
agentAccessors(parent, this, searchObjects);
+ if (this instanceof SState) {
+ for (IValue value : ((SState) this).getOptions()) {
+ agentAccessors(parent, value, searchObjects);
+ }
+ }
return new EcoreEList.UnmodifiableEList.FastCompare<EObject>(this,
MetaABMPackage.Literals.IVALUE__ACCESSORS, searchObjects.size(), searchObjects.toArray());
}
- public static void agentAccessors(SAgent parent, SAttribute attribute, Collection<EObject> searchObjects) {
+ public static void agentAccessors(SAgent parent, IValue attribute, Collection<EObject> searchObjects) {
if (parent != null && parent.getRootActivity() != null) {
for (AAct act : ((AGroup) parent.getRootActivity()).getMembers()) {
if (act instanceof ASink) {
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/srcgen/org/metaabm/impl/SStateImpl.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/srcgen/org/metaabm/impl/SStateImpl.java
index 32daf9a..16409f4 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/srcgen/org/metaabm/impl/SStateImpl.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/srcgen/org/metaabm/impl/SStateImpl.java
@@ -85,7 +85,7 @@
public EList<SStateValue> getOptions() {
if (options == null) {
options = new EObjectContainmentWithInverseEList<SStateValue>(SStateValue.class, this,
- MetaABMPackage.SSTATE__OPTIONS, MetaABMPackage.SSTATE_VALUE__SET);
+ MetaABMPackage.SSTATE__OPTIONS, MetaABMPackage.SSTATE_VALUE__SET);
}
return options;
}
@@ -99,9 +99,10 @@
InternalEObject oldDefaultOption = (InternalEObject) defaultOption;
defaultOption = (SStateValue) eResolveProxy(oldDefaultOption);
if (defaultOption != oldDefaultOption) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, MetaABMPackage.SSTATE__DEFAULT_OPTION,
- oldDefaultOption, defaultOption));
+ oldDefaultOption, defaultOption));
+ }
}
}
return defaultOption;
@@ -122,9 +123,10 @@
public void setDefaultOption(SStateValue newDefaultOption) {
SStateValue oldDefaultOption = defaultOption;
defaultOption = newDefaultOption;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, MetaABMPackage.SSTATE__DEFAULT_OPTION,
- oldDefaultOption, defaultOption));
+ oldDefaultOption, defaultOption));
+ }
}
/**
@@ -164,7 +166,9 @@
case MetaABMPackage.SSTATE__OPTIONS:
return getOptions();
case MetaABMPackage.SSTATE__DEFAULT_OPTION:
- if (resolve) return getDefaultOption();
+ if (resolve) {
+ return getDefaultOption();
+ }
return basicGetDefaultOption();
}
return super.eGet(featureID, resolve, coreType);
@@ -224,7 +228,7 @@
@Override
public boolean accepts(IValue value) {
return getOptions().contains(value) || value instanceof AEvaluate
- && ((AEvaluate) value).getFunction().getID().equals("randomState")
- && ((AEvaluate) value).getInputs().size() > 0 && ((AEvaluate) value).getInputs().get(0).getValue() == this;
+ && ((AEvaluate) value).getFunction().getID().equals("randomState")
+ && ((AEvaluate) value).getInputs().size() > 0 && ((AEvaluate) value).getInputs().get(0).getValue() == this;
}
} // SStateImpl