ST6RI-884 Moved EvaluationUtil into org.omg.sysml.util with other Utils.

Author: seidewitz

org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend

@@ -88,21 +88,21 @@ import org.omg.sysml.lang.sysml.VisibilityKind
 import org.omg.sysml.lang.sysml.Structure
 import org.omg.sysml.lang.sysml.CrossSubsetting
 import org.omg.sysml.lang.sysml.Annotation
+import org.omg.sysml.lang.sysml.InstantiationExpression
+import org.omg.sysml.lang.sysml.ConstructorExpression
 
 import org.omg.sysml.util.TypeUtil
 import org.omg.sysml.util.ElementUtil
+import org.omg.sysml.util.EvaluationUtil
 import org.omg.sysml.util.ExpressionUtil
 import org.omg.sysml.util.FeatureUtil
 import org.omg.sysml.util.NamespaceUtil
 import org.omg.sysml.util.ImplicitGeneralizationMap
 
-import org.omg.sysml.expressions.util.EvaluationUtil
 import java.util.Collections
 import java.util.HashMap
 import java.util.Set
 import java.util.Map
-import org.omg.sysml.lang.sysml.InstantiationExpression
-import org.omg.sysml.lang.sysml.ConstructorExpression
 
 /**
  * This class contains custom validation rules. 

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/ExpressionEvaluator.java

@@ -24,7 +24,6 @@
 import org.eclipse.emf.common.util.EList;
 import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
 import org.omg.sysml.expressions.functions.LibraryFunction;
-import org.omg.sysml.expressions.util.EvaluationUtil;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Expression;
 import org.omg.sysml.lang.sysml.Feature;
@@ -36,6 +35,7 @@
 import org.omg.sysml.lang.sysml.SysMLFactory;
 import org.omg.sysml.lang.sysml.Type;
 import org.omg.sysml.util.ElementUtil;
+import org.omg.sysml.util.EvaluationUtil;
 import org.omg.sysml.util.FeatureUtil;
 import org.omg.sysml.util.TypeUtil;
 

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/ExcludesFunction.java

@@ -22,9 +22,9 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
-import org.omg.sysml.expressions.util.EvaluationUtil;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.InvocationExpression;
+import org.omg.sysml.util.EvaluationUtil;
 
 public class ExcludesFunction extends SequenceFunction {
 

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/IncludesFunction.java

@@ -22,9 +22,9 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
-import org.omg.sysml.expressions.util.EvaluationUtil;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.InvocationExpression;
+import org.omg.sysml.util.EvaluationUtil;
 
 public class IncludesFunction extends SequenceFunction {
 

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/IsEmptyFunction.java

@@ -22,9 +22,9 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
-import org.omg.sysml.expressions.util.EvaluationUtil;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.InvocationExpression;
+import org.omg.sysml.util.EvaluationUtil;
 
 public class IsEmptyFunction extends SequenceFunction {
 

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/NotEmptyFunction.java

@@ -22,9 +22,9 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
-import org.omg.sysml.expressions.util.EvaluationUtil;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.InvocationExpression;
+import org.omg.sysml.util.EvaluationUtil;
 
 public class NotEmptyFunction extends SequenceFunction {
 

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/ProdFunction.java

@@ -23,11 +23,11 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
-import org.omg.sysml.expressions.util.EvaluationUtil;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.InvocationExpression;
 import org.omg.sysml.lang.sysml.LiteralInteger;
 import org.omg.sysml.lang.sysml.LiteralRational;
+import org.omg.sysml.util.EvaluationUtil;
 
 public class ProdFunction extends NumericalFunction {
 

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/SizeFunction.java

@@ -22,9 +22,9 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
-import org.omg.sysml.expressions.util.EvaluationUtil;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.InvocationExpression;
+import org.omg.sysml.util.EvaluationUtil;
 
 public class SizeFunction extends SequenceFunction {
 

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/StringLengthFunction.java

@@ -23,9 +23,9 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
-import org.omg.sysml.expressions.util.EvaluationUtil;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.InvocationExpression;
+import org.omg.sysml.util.EvaluationUtil;
 
 public class StringLengthFunction extends StringFunction {
 

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/StringSubstringFunction.java

@@ -23,9 +23,9 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
-import org.omg.sysml.expressions.util.EvaluationUtil;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.InvocationExpression;
+import org.omg.sysml.util.EvaluationUtil;
 
 public class StringSubstringFunction extends StringFunction {