Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-08-01 13:19:22 +0000
committerGerrit Code Review @ Eclipse.org2014-08-01 13:19:22 +0000
commit55cb10ea62a8059aa7e4294aeab770971cfb18f3 (patch)
treedd90f27c438c60e41db11d5da2be935f1a39f40c
parent47dc6688d9dad9db3546e5569b865459dbc37bf9 (diff)
parent8b71db22cc25e5a4c4ea85fb9c0c909b33fda2bd (diff)
downloadorg.eclipse.papyrus-55cb10ea62a8059aa7e4294aeab770971cfb18f3.tar.gz
org.eclipse.papyrus-55cb10ea62a8059aa7e4294aeab770971cfb18f3.tar.xz
org.eclipse.papyrus-55cb10ea62a8059aa7e4294aeab770971cfb18f3.zip
Merge "439644: [Moka] [Validation] Moka shall contribute some validation rules https://bugs.eclipse.org/bugs/show_bug.cgi?id=439644"
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.classpath7
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.project28
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF13
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/about.html28
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/build.properties8
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/plugin.xml91
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/pom.xml14
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/Activator.java62
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/ClientSelector.java28
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ActiveClassHasClassifierBehavior_Constraint.java39
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ArgumentAndResultPinsOfCallActions_Constraint.java107
-rw-r--r--extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NonAbstractOperationShallHaveMethod_Constraint.java46
-rwxr-xr-xreleng/top-pom-extras.xml1
13 files changed, 472 insertions, 0 deletions
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.classpath b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.classpath
new file mode 100644
index 00000000000..098194ca4b7
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.classpath
@@ -0,0 +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>
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.project b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.project
new file mode 100644
index 00000000000..7c54481bd2b
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.moka.fuml.validation</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
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
new file mode 100644
index 00000000000..8aa79a91839
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Moka Validation Rules for fUML/PSCS models (Incubation)
+Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.validation;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.moka.fuml.validation.Activator
+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-ActivationPolicy: lazy
+Bundle-Vendor: Eclipse Modeling Project
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/about.html b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/about.html
new file mode 100644
index 00000000000..dd3c089a94c
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>November 14, 2008</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html> \ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/build.properties b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/build.properties
new file mode 100644
index 00000000000..bc2f4677126
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ build.properties,\
+ about.html
+src.includes = about.html
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/plugin.xml b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/plugin.xml
new file mode 100644
index 00000000000..a8191a200f0
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/plugin.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.emf.validation.constraintProviders">
+ <category
+ id="org.eclipse.papyrus.moka.fuml.validation.category"
+ name="Moka fUML / PSCS">
+ </category>
+ <constraintProvider
+ cache="true"
+ mode="Batch">
+ <package
+ namespaceUri="http://www.eclipse.org/uml2/5.0.0/UML">
+ </package>
+ <constraints
+ categories="org.eclipse.papyrus.moka.fuml.validation.category">
+ <constraint
+ class="org.eclipse.papyrus.moka.fuml.validation.constraints.ActiveClassHasClassifierBehavior_Constraint"
+ id="org.eclipse.papyrus.moka.fuml.validation.constraint.active_class_shall_have_a_classifier_behavior"
+ lang="java"
+ mode="Batch"
+ name="active_class_shall_have_a_classifier_behavior"
+ severity="ERROR"
+ statusCode="1">
+ <message>
+ [Moka] {0}
+ </message>
+ <description>
+ An active class shall have a classifier behavior
+ </description>
+ <target
+ class="Class">
+ </target>
+ </constraint>
+ <constraint
+ class="org.eclipse.papyrus.moka.fuml.validation.constraints.NonAbstractOperationShallHaveMethod_Constraint"
+ id="org.eclipse.papyrus.moka.fuml.validation.non_abstract_operation_shall_have_method"
+ lang="java"
+ mode="Batch"
+ name="non_abstract_operation_shall_have_method"
+ severity="ERROR"
+ statusCode="1">
+ <message>
+ [Moka] {0}
+ </message>
+ <description>
+ A non-abstract Operation shall have a method
+ </description>
+ <target
+ class="Operation">
+ </target>
+ </constraint>
+ <constraint
+ class="org.eclipse.papyrus.moka.fuml.validation.constraints.ArgumentAndResultPinsOfCallActions_Constraint"
+ id="org.eclipse.papyrus.moka.fuml.validation.argument_and_result_pins_of_call_actions"
+ lang="java"
+ mode="Batch"
+ name="argument_and_result_pins_of_call_actions"
+ severity="ERROR"
+ statusCode="1">
+ <message>
+ [Moka] {0}
+ </message>
+ <description>
+ Argument / result pins of call actions shall match parameters of invoked Operation/Behavior, or sent Signal
+ </description>
+ <target
+ class="CallAction">
+ </target>
+ </constraint>
+ </constraints>
+ </constraintProvider>
+ </extension>
+ <extension
+ point="org.eclipse.emf.validation.constraintBindings">
+ <clientContext
+ id="org.eclipse.papyrus.moka.fuml.validation.context">
+ <selector
+ class="org.eclipse.papyrus.moka.fuml.validation.ClientSelector">
+ </selector>
+ </clientContext>
+ <binding
+ context="org.eclipse.papyrus.moka.fuml.validation.context">
+ <category
+ ref="org.eclipse.papyrus.moka.fuml.validation.category">
+ </category>
+ </binding>
+ </extension>
+
+</plugin>
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/pom.xml b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/pom.xml
new file mode 100644
index 00000000000..f73607d0737
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.papyrus</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../releng/top-pom-extras.xml</relativePath>
+ </parent>
+ <artifactId>org.eclipse.papyrus.moka.fuml.validation</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project> \ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/Activator.java b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/Activator.java
new file mode 100644
index 00000000000..c033902b904
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/Activator.java
@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.moka.fuml.validation;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.moka.fuml.validation"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/ClientSelector.java b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/ClientSelector.java
new file mode 100644
index 00000000000..112008a81b9
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/ClientSelector.java
@@ -0,0 +1,28 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.moka.fuml.validation;
+
+import org.eclipse.emf.validation.model.IClientSelector;
+import org.eclipse.uml2.uml.Element;
+
+/**
+ * THe client selector for constraints contributed by Moka
+ *
+ */
+public class ClientSelector implements IClientSelector {
+
+ @Override
+ public boolean selects(Object object) {
+ return (object instanceof Element);
+ }
+
+}
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ActiveClassHasClassifierBehavior_Constraint.java b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ActiveClassHasClassifierBehavior_Constraint.java
new file mode 100644
index 00000000000..a1c96c0b415
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ActiveClassHasClassifierBehavior_Constraint.java
@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.moka.fuml.validation.constraints;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.validation.AbstractModelConstraint;
+import org.eclipse.emf.validation.IValidationContext;
+import org.eclipse.uml2.uml.Class;
+
+
+/**
+ * This class is introduced to check the following constraint:
+ * An active class shall have a classifier behavior
+ * See 439645: [Moka] [Validation] An active class shall have a classifier behavior https://bugs.eclipse.org/bugs/show_bug.cgi?id=439645
+ *
+ */
+public class ActiveClassHasClassifierBehavior_Constraint extends AbstractModelConstraint {
+
+ @Override
+ public IStatus validate(IValidationContext ctx) {
+ Class clazz = (Class)ctx.getTarget();
+ if (clazz.isActive()) {
+ if (clazz.getClassifierBehavior() == null) {
+ return ctx.createFailureStatus("An active Class shall have a classifier behavior") ;
+ }
+ }
+ return ctx.createSuccessStatus();
+ }
+
+}
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
new file mode 100644
index 00000000000..43cb1927364
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ArgumentAndResultPinsOfCallActions_Constraint.java
@@ -0,0 +1,107 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.moka.fuml.validation.constraints;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.validation.AbstractModelConstraint;
+import org.eclipse.emf.validation.IValidationContext;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.CallAction;
+import org.eclipse.uml2.uml.CallBehaviorAction;
+import org.eclipse.uml2.uml.CallOperationAction;
+import org.eclipse.uml2.uml.ConnectableElement;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.uml2.uml.SendSignalAction;
+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
+ *
+ */
+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,
+ // 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()) ;
+ }
+ }
+ 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) ;
+ }
+ 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()) ;
+ }
+ }
+
+ 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() + ")" ;
+ }
+ 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 = " - " + resultsErrorMessage ;
+ }
+
+ return ctx.createFailureStatus(argumentsErrorMessage + resultsErrorMessage) ;
+ }
+
+}
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NonAbstractOperationShallHaveMethod_Constraint.java b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NonAbstractOperationShallHaveMethod_Constraint.java
new file mode 100644
index 00000000000..19690513e2c
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NonAbstractOperationShallHaveMethod_Constraint.java
@@ -0,0 +1,46 @@
+
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.moka.fuml.validation.constraints;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.validation.AbstractModelConstraint;
+import org.eclipse.emf.validation.IValidationContext;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Stereotype;
+
+/**
+ * This class is introduced to check the following constraints:
+ * A non-abstract operation shall have a method
+ * See 439646: [Moka] [Validation] A non-abstract operation shall have a method https://bugs.eclipse.org/bugs/show_bug.cgi?id=439646
+ *
+ */
+public class NonAbstractOperationShallHaveMethod_Constraint extends AbstractModelConstraint {
+
+ @Override
+ public IStatus validate(IValidationContext ctx) {
+ Operation operation = (Operation)ctx.getTarget();
+ if (operation.getMethods().isEmpty()) {
+ // if it is empty, need to check that the operation is not a constructor,
+ // because PSCS defines semantics for invocation of constructor operations without
+ // methods
+ for (Stereotype applied : operation.getAppliedStereotypes()) {
+ if (applied.getName().equals("Create")) {
+ return ctx.createSuccessStatus() ;
+ }
+ }
+ return ctx.createFailureStatus("A non-abstract Operation shall have a method") ;
+ }
+ return ctx.createSuccessStatus();
+ }
+
+}
diff --git a/releng/top-pom-extras.xml b/releng/top-pom-extras.xml
index ba83404d810..833987e7aa5 100755
--- a/releng/top-pom-extras.xml
+++ b/releng/top-pom-extras.xml
@@ -104,6 +104,7 @@
<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml</module>
<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary</module>
<module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary</module>
+ <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation</module>
<module>../extraplugins/moka/org.eclipse.papyrus.moka.ui</module>
<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core</module>
<module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc</module>

Back to the top