Issue #34 Added check so duplicates are not entered into Activity.node.

seidewitz · seidewitz · commit 5d59bfe7bf9c · 2020-01-22T23:16:21.000-05:00
- Also add ActivityGroup, to handle XMI in which group references are
serialized for structured activity nodes.
diff --git a/org.modeldriven.fuml/bin/log4j.properties b/org.modeldriven.fuml/bin/log4j.properties
@@ -8,7 +8,7 @@ log4j.rootLogger=INFO, console, fumllog
 
 # Set to DEBUG to see execution trace logging.
 # Set to INFO to see subset execution event logging.
-log4j.category.fUML.Debug=DEBUG
+log4j.category.fuml.Debug=DEBUG
 
 # Logging level for implementation infrastructure categories.
 log4j.category.org.modeldriven.fuml.environment=INFO
diff --git a/org.modeldriven.fuml/log4j.properties b/org.modeldriven.fuml/log4j.properties
@@ -3,11 +3,11 @@
 #Valid values are:  OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL
 log4j.threshold=ALL
 
-log4j.rootLogger=INFO, fumllog
+log4j.rootLogger=ERROR, console
 
 # Set to DEBUG to see full execution trace logging.
 # Set to INFO to see subset execution event logging.
-log4j.category.fUML.Debug=DEBUG
+log4j.category.fuml.Debug=DEBUG
 
 # Logging level for implementation infrastructure categories.
 log4j.category.org.modeldriven.fuml.model=ERROR
diff --git a/org.modeldriven.fuml/src/main/java/fuml/semantics/actions/ConditionalNodeActivation.java b/org.modeldriven.fuml/src/main/java/fuml/semantics/actions/ConditionalNodeActivation.java
@@ -21,11 +21,11 @@
 import fuml.syntax.actions.Clause;
 import fuml.syntax.actions.ClauseList;
 import fuml.syntax.actions.ConditionalNode;
-import fuml.syntax.actions.ExecutableNode;
-import fuml.syntax.actions.ExecutableNodeList;
 import fuml.syntax.actions.OutputPin;
 import fuml.syntax.actions.OutputPinList;
 import fuml.syntax.actions.Pin;
+import fuml.syntax.activities.ExecutableNode;
+import fuml.syntax.activities.ExecutableNodeList;
 
 public class ConditionalNodeActivation
 		extends
diff --git a/org.modeldriven.fuml/src/main/java/fuml/semantics/actions/LoopNodeActivation.java b/org.modeldriven.fuml/src/main/java/fuml/semantics/actions/LoopNodeActivation.java
@@ -17,14 +17,14 @@
 import fuml.semantics.activities.ActivityNodeActivationList;
 import fuml.semantics.simpleclassifiers.BooleanValue;
 import fuml.semantics.values.ValueList;
-import fuml.syntax.actions.ExecutableNode;
 import fuml.syntax.actions.InputPin;
 import fuml.syntax.actions.InputPinList;
 import fuml.syntax.actions.LoopNode;
 import fuml.syntax.actions.OutputPin;
 import fuml.syntax.actions.OutputPinList;
 import fuml.syntax.actions.Pin;
 import fuml.syntax.activities.ActivityNodeList;
+import fuml.syntax.activities.ExecutableNode;
 
 public class LoopNodeActivation
 		extends
diff --git a/org.modeldriven.fuml/src/main/java/fuml/semantics/actions/StructuredActivityNodeActivation.java b/org.modeldriven.fuml/src/main/java/fuml/semantics/actions/StructuredActivityNodeActivation.java
@@ -98,7 +98,7 @@ public fuml.semantics.activities.ActivityNodeActivation getNodeActivation(
 	} // getNodeActivation
 
 	public fuml.syntax.activities.ActivityNodeList makeActivityNodeList(
-			fuml.syntax.actions.ExecutableNodeList nodes) {
+			fuml.syntax.activities.ExecutableNodeList nodes) {
 		// Return an activity node list containing the given list of executable
 		// nodes
 		// and any pins that they own.
diff --git a/org.modeldriven.fuml/src/main/java/fuml/syntax/actions/Action.java b/org.modeldriven.fuml/src/main/java/fuml/syntax/actions/Action.java
@@ -13,7 +13,7 @@
 package fuml.syntax.actions;
 
 public abstract class Action extends
-		fuml.syntax.actions.ExecutableNode {
+		fuml.syntax.activities.ExecutableNode {
 
 	public fuml.syntax.actions.OutputPinList output = new fuml.syntax.actions.OutputPinList();
 	public fuml.syntax.classification.Classifier context = null;
diff --git a/org.modeldriven.fuml/src/main/java/fuml/syntax/actions/Clause.java b/org.modeldriven.fuml/src/main/java/fuml/syntax/actions/Clause.java
@@ -14,8 +14,8 @@
 
 public class Clause extends fuml.syntax.commonstructure.Element {
 
-	public fuml.syntax.actions.ExecutableNodeList test = new fuml.syntax.actions.ExecutableNodeList();
-	public fuml.syntax.actions.ExecutableNodeList body = new fuml.syntax.actions.ExecutableNodeList();
+	public fuml.syntax.activities.ExecutableNodeList test = new fuml.syntax.activities.ExecutableNodeList();
+	public fuml.syntax.activities.ExecutableNodeList body = new fuml.syntax.activities.ExecutableNodeList();
 	public fuml.syntax.actions.ClauseList predecessorClause = new fuml.syntax.actions.ClauseList();
 	public fuml.syntax.actions.ClauseList successorClause = new fuml.syntax.actions.ClauseList();
 	public fuml.syntax.actions.OutputPin decider = null;
@@ -28,12 +28,12 @@ public void addPredecessorClause(
 	} // addPredecessorClause
 
 	public void addTest(
-			fuml.syntax.actions.ExecutableNode test) {
+			fuml.syntax.activities.ExecutableNode test) {
 		this.test.addValue(test);
 	} // addTest
 
 	public void addBody(
-			fuml.syntax.actions.ExecutableNode body) {
+			fuml.syntax.activities.ExecutableNode body) {
 		this.body.addValue(body);
 	} // addBody
 
diff --git a/org.modeldriven.fuml/src/main/java/fuml/syntax/actions/LoopNode.java b/org.modeldriven.fuml/src/main/java/fuml/syntax/actions/LoopNode.java
@@ -18,25 +18,25 @@ public class LoopNode
 
 	public boolean isTestedFirst = false;
 	public fuml.syntax.actions.OutputPin decider = null;
-	public fuml.syntax.actions.ExecutableNodeList test = new fuml.syntax.actions.ExecutableNodeList();
+	public fuml.syntax.activities.ExecutableNodeList test = new fuml.syntax.activities.ExecutableNodeList();
 	public fuml.syntax.actions.OutputPinList bodyOutput = new fuml.syntax.actions.OutputPinList();
 	public fuml.syntax.actions.InputPinList loopVariableInput = new fuml.syntax.actions.InputPinList();
-	public fuml.syntax.actions.ExecutableNodeList bodyPart = new fuml.syntax.actions.ExecutableNodeList();
+	public fuml.syntax.activities.ExecutableNodeList bodyPart = new fuml.syntax.activities.ExecutableNodeList();
 	public fuml.syntax.actions.OutputPinList result = new fuml.syntax.actions.OutputPinList();
 	public fuml.syntax.actions.OutputPinList loopVariable = new fuml.syntax.actions.OutputPinList();
-	public fuml.syntax.actions.ExecutableNodeList setupPart = new fuml.syntax.actions.ExecutableNodeList();
+	public fuml.syntax.activities.ExecutableNodeList setupPart = new fuml.syntax.activities.ExecutableNodeList();
 
 	public void setIsTestedFirst(boolean isTestedFirst) {
 		this.isTestedFirst = isTestedFirst;
 	} // setIsTestedFirst
 
 	public void addTest(
-			fuml.syntax.actions.ExecutableNode test) {
+			fuml.syntax.activities.ExecutableNode test) {
 		this.test.addValue(test);
 	} // addTest
 
 	public void addBodyPart(
-			fuml.syntax.actions.ExecutableNode bodyPart) {
+			fuml.syntax.activities.ExecutableNode bodyPart) {
 		this.bodyPart.addValue(bodyPart);
 	} // addBodyPart
 
diff --git a/org.modeldriven.fuml/src/main/java/fuml/syntax/activities/Activity.java b/org.modeldriven.fuml/src/main/java/fuml/syntax/activities/Activity.java
@@ -21,23 +21,35 @@ public class Activity extends
 	public fuml.syntax.activities.ActivityNodeList node = new fuml.syntax.activities.ActivityNodeList();
 	public boolean isReadOnly = false;
 	public fuml.syntax.activities.ActivityEdgeList edge = new fuml.syntax.activities.ActivityEdgeList();
+	public fuml.syntax.activities.ActivityGroupList group = new fuml.syntax.activities.ActivityGroupList();
 
 	public void setIsReadOnly(boolean isReadOnly) {
 		this.isReadOnly = isReadOnly;
 	} // setIsReadOnly
 
 	public void addNode(
 			fuml.syntax.activities.ActivityNode node) {
-		super.addOwnedElement(node);
-
-		this.node.add(node);
-		node._setActivity(this);
-
-		if (node instanceof StructuredActivityNode) {
+		if (!this.node.contains(node)) {
+			super.addOwnedElement(node);
+	
+			this.node.add(node);
+			node._setActivity(this);
+		}
+		
+		if (node instanceof StructuredActivityNode &&
+				!this.structuredNode.contains(node)) {
 			this.structuredNode.add((StructuredActivityNode) node);
 		}
 
 	} // addNode
+	
+	public void addStructuredNode(fuml.syntax.actions.StructuredActivityNode node) {
+		this.addNode(node);
+	}
+	
+	public void addGroup(fuml.syntax.activities.ActivityGroup group) {
+		this.group.add(group);
+	}
 
 	public void addEdge(
 			fuml.syntax.activities.ActivityEdge edge) {
diff --git a/org.modeldriven.fuml/src/main/java/fuml/syntax/activities/ActivityGroup.java b/org.modeldriven.fuml/src/main/java/fuml/syntax/activities/ActivityGroup.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2020 Model Driven Solutions, Inc.
+ *
+ * Licensed under the Academic Free License version 3.0 
+ * (http://www.opensource.org/licenses/afl-3.0.php), except as stated 
+ * in the file entitled Licensing-Information. 
+ */
+package fuml.syntax.activities;
+
+public abstract class ActivityGroup extends ActivityNode {
+
+}
diff --git a/org.modeldriven.fuml/src/main/java/fuml/syntax/activities/ActivityGroupList.java b/org.modeldriven.fuml/src/main/java/fuml/syntax/activities/ActivityGroupList.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020 Model Driven Solutions, Inc.
+ *
+ * Licensed under the Academic Free License version 3.0 
+ * (http://www.opensource.org/licenses/afl-3.0.php), except as stated 
+ * in the file entitled Licensing-Information. 
+ */
+package fuml.syntax.activities;
+
+import java.util.ArrayList;
+
+public class ActivityGroupList extends ArrayList<ActivityGroup> {
+	public ActivityGroupList() {
+		super();
+	}
+
+	public ActivityGroup getValue(int i) {
+		return (ActivityGroup) get(i);
+	}
+
+	public void addValue(ActivityGroup v) {
+		add(v);
+	}
+
+	public void addValue(int i, ActivityGroup v) {
+		add(i, v);
+	}
+
+	public void setValue(int i, ActivityGroup v) {
+		set(i, v);
+	}
+
+	public void removeValue(int i) {
+		remove(i);
+	}
+}
diff --git a/org.modeldriven.fuml/src/main/java/fuml/syntax/activities/ExecutableNode.java b/org.modeldriven.fuml/src/main/java/fuml/syntax/activities/ExecutableNode.java
@@ -3,16 +3,17 @@
  * Initial version copyright 2008 Lockheed Martin Corporation, except  
  * as stated in the file entitled Licensing-Information. 
  * 
- * All modifications copyright 2009-2012 Data Access Technologies, Inc.
+ * Modifications:
+ * Copyright 2009-2012 Data Access Technologies, Inc.
+ * Copyright 2020 Model Driven Solutions, Inc.
  *
  * Licensed under the Academic Free License version 3.0 
  * (http://www.opensource.org/licenses/afl-3.0.php), except as stated 
  * in the file entitled Licensing-Information. 
  */
 
-package fuml.syntax.actions;
+package fuml.syntax.activities;
 
-public abstract class ExecutableNode extends
-		fuml.syntax.activities.ActivityNode {
+public abstract class ExecutableNode extends fuml.syntax.activities.ActivityGroup {
 
 } // ExecutableNode
diff --git a/org.modeldriven.fuml/src/main/java/fuml/syntax/activities/ExecutableNodeList.java b/org.modeldriven.fuml/src/main/java/fuml/syntax/activities/ExecutableNodeList.java
@@ -10,13 +10,13 @@
  * in the file entitled Licensing-Information. 
  */
 
-package fuml.syntax.actions;
+package fuml.syntax.activities;
 
 import java.util.ArrayList;
 
 public class ExecutableNodeList
 		extends
-		ArrayList<fuml.syntax.actions.ExecutableNode> {
+		ArrayList<fuml.syntax.activities.ExecutableNode> {
 	public ExecutableNodeList() {
 		super();
 	}
diff --git a/org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/model/EclipseExecutionTestCase.java b/org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/model/EclipseExecutionTestCase.java
diff --git a/org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/model/ExecutionTestCase.java b/org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/model/ExecutionTestCase.java
diff --git a/org.modeldriven.fuml/src/test/resources/uml/fUML-Tests.uml b/org.modeldriven.fuml/src/test/resources/uml/fUML-Tests.uml
