diff --git a/statemachine.solution/src/main/jastadd/AttributeGetters.jadd b/statemachine.solution/src/main/jastadd/AttributeGetters.jadd index e21a7d477845c83277587b2b3ef8b3cb8baa6187..ac85e67fe1ebc30a4ef51e97d112611e7057221c 100644 --- a/statemachine.solution/src/main/jastadd/AttributeGetters.jadd +++ b/statemachine.solution/src/main/jastadd/AttributeGetters.jadd @@ -9,11 +9,11 @@ aspect AttributeGetters { public Attribute RigidType.getNewestAttribute(String name) { Attribute match = null; - for (Fulfillment f : roles()) { + for (Fulfillment f : fulfillments()) { Attribute a = f.getFilled().getAttributeByName(name); if (a != null) match = a; } - if (roles().isEmpty() || match == null) return getAttributeByName(name); + if (fulfillments().isEmpty() || match == null) return getAttributeByName(name); return match; } diff --git a/statemachine.solution/src/main/jastadd/Plays.jadd b/statemachine.solution/src/main/jastadd/Plays.jadd index f10a5064c544995fa8c0fea7e3ff0dd93e029c25..4bc6c7a46fa56223405de5380b5b25801fedd2db 100644 --- a/statemachine.solution/src/main/jastadd/Plays.jadd +++ b/statemachine.solution/src/main/jastadd/Plays.jadd @@ -1,11 +1,11 @@ aspect Plays { - coll ArrayList<Fulfillment> RigidType.roles() + coll ArrayList<Fulfillment> RigidType.fulfillments() [new ArrayList<Fulfillment>()] with add; //PersonConsultantFulfillment contributes this Fulfillment contributes this - to RigidType.roles() + to RigidType.fulfillments() for getFiller(); @@ -25,7 +25,7 @@ aspect Plays { //} public void RigidType.unplays(RoleType rt) { - roles().removeIf(element -> (element.getFilled().equals(rt))); + fulfillments().removeIf(element -> (element.getFilled().equals(rt))); } /*------------------------------------------------------------------------------------------------------------------ diff --git a/statemachine.solution/src/main/jastadd/Printing.jrag b/statemachine.solution/src/main/jastadd/Printing.jrag index ac18338d0c76a8d79b413b941e66b316a5de49d3..0b7b970af886c82dfd8afa912376e813b11bf0e3 100644 --- a/statemachine.solution/src/main/jastadd/Printing.jrag +++ b/statemachine.solution/src/main/jastadd/Printing.jrag @@ -16,9 +16,9 @@ aspect Printing { eq NaturalType.prettyPrint() { StringBuilder sb = new StringBuilder(); sb.append("NT " + getName()); - if (!roles().isEmpty()) + if (!fulfillments().isEmpty()) sb.append("\n\tPlays "); - for (Fulfillment f : roles()) { + for (Fulfillment f : fulfillments()) { sb.append("\n\t\t" + f.getFilled().getName() + " "); } if (getAttributeList().getNumChild() != 0) @@ -43,6 +43,11 @@ aspect Printing { eq CompartmentType.prettyPrint() { StringBuilder sb = new StringBuilder(); sb.append("CT " + getName()); + if (!fulfillments().isEmpty()) + sb.append("\n\tPlays "); + for (Fulfillment f : fulfillments()) { + sb.append("\n\t\t" + f.getFilled().getName() + " "); + } if (getPartsList().getNumChild() != 0) sb.append("\n\tContains "); for (RoleType r : getPartsList()) {