Issue FUML14-9 - Moved some classes into the correct packages.

Author: seidewitz

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/AcceptEventActionActivation.java

@@ -14,11 +14,11 @@
 
 import fuml.Debug;
 import fuml.semantics.activities.ActivityNodeActivationGroup;
-import fuml.semantics.classification.ValueList;
 import fuml.semantics.commonbehavior.ParameterValue;
 import fuml.semantics.commonbehavior.ParameterValueList;
 import fuml.semantics.commonbehavior.SignalEventOccurrence;
 import fuml.semantics.simpleclassifiers.SignalInstance;
+import fuml.semantics.values.ValueList;
 import fuml.syntax.actions.AcceptEventAction;
 import fuml.syntax.actions.OutputPin;
 import fuml.syntax.actions.OutputPinList;

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/ActionActivation.java

@@ -23,10 +23,10 @@
 import fuml.semantics.activities.ObjectToken;
 import fuml.semantics.activities.Token;
 import fuml.semantics.activities.TokenList;
-import fuml.semantics.classification.Value;
-import fuml.semantics.classification.ValueList;
 import fuml.semantics.simpleclassifiers.BooleanValue;
 import fuml.semantics.simpleclassifiers.FeatureValueList;
+import fuml.semantics.values.Value;
+import fuml.semantics.values.ValueList;
 import fuml.syntax.actions.Action;
 import fuml.syntax.actions.InputPin;
 import fuml.syntax.actions.InputPinList;
@@ -307,7 +307,7 @@ public fuml.semantics.actions.PinActivation getPinActivation(
 	} // getPinActivation
 
 	public void putToken(fuml.syntax.actions.OutputPin pin,
-			fuml.semantics.classification.Value value) {
+			fuml.semantics.values.Value value) {
 		// Precondition: The action execution has fired and the given pin is
 		// owned by the action of the action execution.
 		// Place a token for the given value on the pin activation corresponding
@@ -323,7 +323,7 @@ public void putToken(fuml.syntax.actions.OutputPin pin,
 	} // putToken
 
 	public void putTokens(fuml.syntax.actions.OutputPin pin,
-			fuml.semantics.classification.ValueList values) {
+			fuml.semantics.values.ValueList values) {
 		// Precondition: The action execution has fired and the given pin is
 		// owned by the action of the action execution.
 		// Place tokens for the given values on the pin activation corresponding
@@ -338,7 +338,7 @@ public void putTokens(fuml.syntax.actions.OutputPin pin,
 
 	} // putTokens
 
-	public fuml.semantics.classification.ValueList getTokens(
+	public fuml.semantics.values.ValueList getTokens(
 			fuml.syntax.actions.InputPin pin) {
 		// Precondition: The action execution has fired and the given pin is
 		// owned by the action of the action execution.
@@ -363,7 +363,7 @@ public fuml.semantics.classification.ValueList getTokens(
 		return values;
 	} // getTokens
 
-	public fuml.semantics.classification.ValueList takeTokens(
+	public fuml.semantics.values.ValueList takeTokens(
 			fuml.syntax.actions.InputPin pin) {
 		// Precondition: The action execution has fired and the given pin is
 		// owned by the action of the action execution.
@@ -402,7 +402,7 @@ public boolean isSourceFor(
 	} // isSourceFor
 
 	public boolean valueParticipatesInLink(
-			fuml.semantics.classification.Value value,
+			fuml.semantics.values.Value value,
 			fuml.semantics.structuredclassifiers.Link link) {
 		// Test if the given value participates in the given link.
 

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/AddStructuralFeatureValueActionActivation.java

@@ -12,15 +12,15 @@
 
 package fuml.semantics.actions;
 
-import fuml.semantics.classification.Value;
-import fuml.semantics.classification.ValueList;
 import fuml.semantics.loci.ChoiceStrategy;
 import fuml.semantics.simpleclassifiers.FeatureValue;
 import fuml.semantics.simpleclassifiers.StructuredValue;
 import fuml.semantics.simpleclassifiers.UnlimitedNaturalValue;
 import fuml.semantics.structuredclassifiers.Link;
 import fuml.semantics.structuredclassifiers.LinkList;
 import fuml.semantics.structuredclassifiers.Reference;
+import fuml.semantics.values.Value;
+import fuml.semantics.values.ValueList;
 import fuml.syntax.actions.AddStructuralFeatureValueAction;
 import fuml.syntax.classification.Property;
 import fuml.syntax.classification.StructuralFeature;

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/CallOperationActionActivation.java

@@ -12,9 +12,9 @@
 
 package fuml.semantics.actions;
 
-import fuml.semantics.classification.Value;
 import fuml.semantics.commonbehavior.Execution;
 import fuml.semantics.structuredclassifiers.Reference;
+import fuml.semantics.values.Value;
 import fuml.syntax.actions.CallOperationAction;
 
 public class CallOperationActionActivation extends

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/ClauseActivation.java

@@ -15,8 +15,8 @@
 import java.util.Iterator;
 
 import fuml.Debug;
-import fuml.semantics.classification.ValueList;
 import fuml.semantics.simpleclassifiers.BooleanValue;
+import fuml.semantics.values.ValueList;
 import fuml.syntax.actions.Clause;
 import fuml.syntax.actions.ClauseList;
 

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/ClearAssociationActionActivation.java

@@ -12,9 +12,9 @@
 
 package fuml.semantics.actions;
 
-import fuml.semantics.classification.Value;
 import fuml.semantics.structuredclassifiers.ExtensionalValueList;
 import fuml.semantics.structuredclassifiers.Link;
+import fuml.semantics.values.Value;
 import fuml.syntax.actions.ClearAssociationAction;
 
 public class ClearAssociationActionActivation extends

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/ClearStructuralFeatureActionActivation.java

@@ -12,12 +12,12 @@
 
 package fuml.semantics.actions;
 
-import fuml.semantics.classification.Value;
-import fuml.semantics.classification.ValueList;
 import fuml.semantics.simpleclassifiers.StructuredValue;
 import fuml.semantics.structuredclassifiers.Link;
 import fuml.semantics.structuredclassifiers.LinkList;
 import fuml.semantics.structuredclassifiers.Reference;
+import fuml.semantics.values.Value;
+import fuml.semantics.values.ValueList;
 import fuml.syntax.actions.ClearStructuralFeatureAction;
 import fuml.syntax.classification.StructuralFeature;
 import fuml.syntax.structuredclassifiers.Association;

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/DestroyObjectActionActivation.java

@@ -13,14 +13,14 @@
 package fuml.semantics.actions;
 
 import fuml.Debug;
-import fuml.semantics.classification.Value;
-import fuml.semantics.classification.ValueList;
 import fuml.semantics.simpleclassifiers.FeatureValue;
 import fuml.semantics.simpleclassifiers.FeatureValueList;
 import fuml.semantics.structuredclassifiers.ExtensionalValue;
 import fuml.semantics.structuredclassifiers.ExtensionalValueList;
 import fuml.semantics.structuredclassifiers.Link;
 import fuml.semantics.structuredclassifiers.Reference;
+import fuml.semantics.values.Value;
+import fuml.semantics.values.ValueList;
 import fuml.syntax.actions.DestroyObjectAction;
 import fuml.syntax.classification.AggregationKind;
 import fuml.syntax.classification.Property;
@@ -46,7 +46,7 @@ public void doAction() {
 
 	} // doAction
 
-	public void destroyObject(fuml.semantics.classification.Value value,
+	public void destroyObject(fuml.semantics.values.Value value,
 			boolean isDestroyLinks, boolean isDestroyOwnedObjects) {
 		// If the given value is a reference, then destroy the referenced
 		// object, per the given destroy action attribute values.

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/LinkActionActivation.java

@@ -12,9 +12,9 @@
 
 package fuml.semantics.actions;
 
-import fuml.semantics.classification.Value;
 import fuml.semantics.simpleclassifiers.FeatureValue;
 import fuml.semantics.simpleclassifiers.UnlimitedNaturalValue;
+import fuml.semantics.values.Value;
 import fuml.syntax.actions.LinkAction;
 import fuml.syntax.actions.LinkEndDestructionData;
 import fuml.syntax.classification.Property;

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/LoopNodeActivation.java

@@ -15,8 +15,8 @@
 import fuml.Debug;
 import fuml.semantics.activities.ActivityNodeActivation;
 import fuml.semantics.activities.ActivityNodeActivationList;
-import fuml.semantics.classification.ValueList;
 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;