439644: [Moka] [Validation] Moka shall contribute some validation rules

https://bugs.eclipse.org/bugs/show_bug.cgi?id=439644

- Fix build path (Java 6)

4 files changed, 57 insertions, 54 deletions

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.classpath b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.classpath
index 098194ca4b7..c2c5a85e66d 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.classpath
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.settings/org.eclipse.jdt.core.prefs b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f287d53cf45
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.6

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
index 8aa79a91839..393d495be6e 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.validation;bundle-version="1.8.0",
  org.eclipse.uml2.uml;bundle-version="5.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ArgumentAndResultPinsOfCallActions_Constraint.java b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ArgumentAndResultPinsOfCallActions_Constraint.java
index 43cb1927364..29592f6e6e9 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ArgumentAndResultPinsOfCallActions_Constraint.java
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ArgumentAndResultPinsOfCallActions_Constraint.java
@@ -31,77 +31,73 @@ import org.eclipse.uml2.uml.Signal;
 /**
  * This class is introduced to check the following constraint:
  * Argument / result pins of call actions shall match parameters of invoked / sent Operation / Behavior / Signal
- * See 439648: [Moka] [Validation]  Argument / result pins of call actions shall match parameters of invoked / sent Operation / Behavior / Signal https://bugs.eclipse.org/bugs/show_bug.cgi?id=439648
- * 
+ * See 439648: [Moka] [Validation] Argument / result pins of call actions shall match parameters of invoked / sent Operation / Behavior / Signal
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=439648
+ *
  */
 public class ArgumentAndResultPinsOfCallActions_Constraint extends AbstractModelConstraint {
 
 	@Override
 	public IStatus validate(IValidationContext ctx) {
 		// fUML / PSCS support three kinds of call actions: CallOperationAction, CallBehaviorAction, SendSignalAction
-		// First gather relevant information to validate argument / result pins of the call, 
+		// First gather relevant information to validate argument / result pins of the call,
 		// which a an approach specific to each kind of action.
 		// From the standpoint of the fUML Execution Engine, only the number of pins are relevant
-		List<ConnectableElement> inputParameters = new ArrayList<ConnectableElement>() ;
-		List<ConnectableElement> outputParameters = new ArrayList<ConnectableElement>() ;
-		if (ctx.getTarget() instanceof CallOperationAction || ctx.getTarget() instanceof CallBehaviorAction) {
-			List<Parameter> allParameters = new ArrayList<>() ;
-			if (ctx.getTarget() instanceof CallOperationAction) {
-				Operation op = ((CallOperationAction)ctx.getTarget()).getOperation() ;
-				if (op != null) {
-					allParameters.addAll(op.getOwnedParameters()) ;
+		List<ConnectableElement> inputParameters = new ArrayList<ConnectableElement>();
+		List<ConnectableElement> outputParameters = new ArrayList<ConnectableElement>();
+		if(ctx.getTarget() instanceof CallOperationAction || ctx.getTarget() instanceof CallBehaviorAction) {
+			List<Parameter> allParameters = new ArrayList<Parameter>();
+			if(ctx.getTarget() instanceof CallOperationAction) {
+				Operation op = ((CallOperationAction)ctx.getTarget()).getOperation();
+				if(op != null) {
+					allParameters.addAll(op.getOwnedParameters());
 				}
-			}
-			else if (ctx.getTarget() instanceof CallBehaviorAction) {
-				Behavior behav = ((CallBehaviorAction)ctx.getTarget()).getBehavior() ;
-				if (behav != null) {
-					allParameters.addAll(behav.getOwnedParameters()) ;
+			} else if(ctx.getTarget() instanceof CallBehaviorAction) {
+				Behavior behav = ((CallBehaviorAction)ctx.getTarget()).getBehavior();
+				if(behav != null) {
+					allParameters.addAll(behav.getOwnedParameters());
 				}
 			}
-			for (Parameter p : allParameters) {
-				if (p.getDirection().equals(ParameterDirectionKind.IN_LITERAL) || p.getDirection().equals(ParameterDirectionKind.INOUT_LITERAL)) {
-					inputParameters.add(p) ;
+			for(Parameter p : allParameters) {
+				if(p.getDirection().equals(ParameterDirectionKind.IN_LITERAL) || p.getDirection().equals(ParameterDirectionKind.INOUT_LITERAL)) {
+					inputParameters.add(p);
 				}
-				if (p.getDirection().equals(ParameterDirectionKind.INOUT_LITERAL) || p.getDirection().equals(ParameterDirectionKind.OUT_LITERAL) 
-						|| p.getDirection().equals(ParameterDirectionKind.RETURN_LITERAL)) {
-					outputParameters.add(p) ;
+				if(p.getDirection().equals(ParameterDirectionKind.INOUT_LITERAL) || p.getDirection().equals(ParameterDirectionKind.OUT_LITERAL) || p.getDirection().equals(ParameterDirectionKind.RETURN_LITERAL)) {
+					outputParameters.add(p);
 				}
 			}
-		}
-		else if (ctx.getTarget() instanceof SendSignalAction) {
-			Signal s = ((SendSignalAction)ctx.getTarget()).getSignal() ;
-			if (s != null) {
-				inputParameters.addAll(s.getAllAttributes()) ;
+		} else if(ctx.getTarget() instanceof SendSignalAction) {
+			Signal s = ((SendSignalAction)ctx.getTarget()).getSignal();
+			if(s != null) {
+				inputParameters.addAll(s.getAllAttributes());
 			}
 		}
 
-		CallAction callAction = (CallAction)ctx.getTarget() ;
-		String argumentsErrorMessage = "" ;
-		if (callAction.getArguments().size() < inputParameters.size()) {
-			argumentsErrorMessage += "Not enough argument pins (found " + callAction.getArguments().size() + ", expected " + inputParameters.size() + ")" ;
-		}
-		else if (callAction.getArguments().size() > inputParameters.size()) {
-			argumentsErrorMessage += "Too many argument pins (found " + callAction.getArguments().size() + ", expected " + inputParameters.size() + ")" ;
-		}
-		String resultsErrorMessage = "" ;
-		if (callAction.getResults().size() < outputParameters.size()) {
-			resultsErrorMessage += "Not enough result pins (found " + callAction.getResults().size() + ", expected " + outputParameters.size() + ")" ;
+		CallAction callAction = (CallAction)ctx.getTarget();
+		String argumentsErrorMessage = "";
+		if(callAction.getArguments().size() < inputParameters.size()) {
+			argumentsErrorMessage += "Not enough argument pins (found " + callAction.getArguments().size() + ", expected " + inputParameters.size() + ")";
+		} else if(callAction.getArguments().size() > inputParameters.size()) {
+			argumentsErrorMessage += "Too many argument pins (found " + callAction.getArguments().size() + ", expected " + inputParameters.size() + ")";
 		}
-		else if (callAction.getResults().size() > outputParameters.size()) {
-			if (callAction.getResults().size() < outputParameters.size()) {
-				resultsErrorMessage += "Too many result pins (found " + callAction.getResults().size() + ", expected " + outputParameters.size() + ")" ;
+		String resultsErrorMessage = "";
+		if(callAction.getResults().size() < outputParameters.size()) {
+			resultsErrorMessage += "Not enough result pins (found " + callAction.getResults().size() + ", expected " + outputParameters.size() + ")";
+		} else if(callAction.getResults().size() > outputParameters.size()) {
+			if(callAction.getResults().size() < outputParameters.size()) {
+				resultsErrorMessage += "Too many result pins (found " + callAction.getResults().size() + ", expected " + outputParameters.size() + ")";
 			}
 		}
 
-		if (argumentsErrorMessage.equals("") && resultsErrorMessage.equals("")) {
-			return ctx.createSuccessStatus() ;
+		if(argumentsErrorMessage.equals("") && resultsErrorMessage.equals("")) {
+			return ctx.createSuccessStatus();
 		}
 
-		if (! argumentsErrorMessage.equals("")) {
-			resultsErrorMessage = " - " + resultsErrorMessage ;
+		if(!argumentsErrorMessage.equals("")) {
+			resultsErrorMessage = " - " + resultsErrorMessage;
 		}
 
-		return ctx.createFailureStatus(argumentsErrorMessage + resultsErrorMessage) ;
+		return ctx.createFailureStatus(argumentsErrorMessage + resultsErrorMessage);
 	}
 
 }