fix merge with logicalSpecification branch

easier-logicalSpecification/LogicalSpecification/.classpath

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

easier-logicalSpecification/LogicalSpecification/.gitignore

@@ -0,0 +1,2 @@
+/bin/
+/target/

easier-logicalSpecification/LogicalSpecification/build.properties

@@ -0,0 +1,10 @@
+#
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin/

easier-logicalSpecification/LogicalSpecification/plugin.properties

@@ -0,0 +1,4 @@
+#
+
+pluginName = LogicalSpecification Model
+providerName = www.example.org

easier-logicalSpecification/LogicalSpecification/plugin.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated logicalSpecification -->
+      <package
+            uri="http://it.univaq.disim.seagroup/logicalSpecification"
+            class="logicalSpecification.LogicalSpecificationPackage"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated logicalSpecification -->
+      <package
+            uri="http://it.univaq.disim.seagroup/logicalSpecification/actions/uml"
+            class="logicalSpecification.actions.UML.UMLPackage"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated logicalSpecification -->
+      <package
+            uri="http://it.univaq.disim.seagroup/logicalSpecification/actions/aemilia"
+            class="logicalSpecification.actions.AEmilia.AEmiliaPackage"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated logicalSpecification -->
+      <package
+            uri="http://it.univaq.disim.seagroup/logicalSpecification/antipatterns/performance"
+            class="logicalSpecification.antipatterns.performance.PerformancePackage"/>
+   </extension>
+
+</plugin>

easier-logicalSpecification/LogicalSpecification/pom.xml

@@ -0,0 +1,56 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>it.univaq.disim.sealab</groupId>
+		<artifactId>easier</artifactId>
+		<version>0.6.3</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+	<artifactId>logicalSpecification</artifactId>
+	<version>0.6</version>
+
+	<properties>
+		<src.dir>src</src.dir>
+	</properties>
+
+	<build>
+		<sourceDirectory>${src.dir}</sourceDirectory>
+	</build>
+	<repositories>
+		<repository>
+			<id>Eclipse Repository</id>
+			<name>eclipse repo</name>
+			<url>https://repo.eclipse.org/content/groups/releases/</url>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<!-- https://mvnrepository.com/artifact/org.eclipse.uml2/org.eclipse.uml2.uml -->
+		<dependency>
+			<groupId>org.eclipse.uml2</groupId>
+			<artifactId>org.eclipse.uml2.uml</artifactId>
+			<version>5.0.1.v20140910-1354</version>
+		</dependency>
+
+		<dependency>
+			<groupId>it.univaq.disim.sealab</groupId>
+			<artifactId>aemiliaMetamodel</artifactId>
+			<version>${easier.aemiliaMetamodel.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.6</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.eclipse.ocl/org.eclipse.ocl -->
+		<dependency>
+			<groupId>org.eclipse.ocl</groupId>
+			<artifactId>org.eclipse.ocl</artifactId>
+			<version>3.4.2.v20140725-2242</version>
+		</dependency>
+	</dependencies>
+</project>

easier-logicalSpecification/LogicalSpecification/src/logicalSpecification/Action.java

@@ -0,0 +1,252 @@
+/**
+ */
+package logicalSpecification;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Action</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link logicalSpecification.Action#getNumOfChanges <em>Num Of Changes</em>}</li>
+ *   <li>{@link logicalSpecification.Action#getCost <em>Cost</em>}</li>
+ *   <li>{@link logicalSpecification.Action#getRefactoring <em>Refactoring</em>}</li>
+ *   <li>{@link logicalSpecification.Action#getParameters <em>Parameters</em>}</li>
+ *   <li>{@link logicalSpecification.Action#getPre <em>Pre</em>}</li>
+ *   <li>{@link logicalSpecification.Action#getPost <em>Post</em>}</li>
+ *   <li>{@link logicalSpecification.Action#getModel <em>Model</em>}</li>
+ * </ul>
+ *
+ * @see logicalSpecification.LogicalSpecificationPackage#getAction()
+ * @model
+ * @generated
+ */
+public interface Action extends NamedElement {
+	/**
+	 * Returns the value of the '<em><b>Num Of Changes</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Num Of Changes</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Num Of Changes</em>' attribute.
+	 * @see #setNumOfChanges(double)
+	 * @see logicalSpecification.LogicalSpecificationPackage#getAction_NumOfChanges()
+	 * @model default="0.0" required="true"
+	 * @generated
+	 */
+	double getNumOfChanges();
+
+	/**
+	 * Sets the value of the '{@link logicalSpecification.Action#getNumOfChanges <em>Num Of Changes</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Num Of Changes</em>' attribute.
+	 * @see #getNumOfChanges()
+	 * @generated
+	 */
+	void setNumOfChanges(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Cost</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Cost</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Cost</em>' attribute.
+	 * @see #setCost(double)
+	 * @see logicalSpecification.LogicalSpecificationPackage#getAction_Cost()
+	 * @model default="0.0" required="true"
+	 * @generated
+	 */
+	double getCost();
+
+	/**
+	 * Sets the value of the '{@link logicalSpecification.Action#getCost <em>Cost</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Cost</em>' attribute.
+	 * @see #getCost()
+	 * @generated
+	 */
+	void setCost(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Refactoring</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link logicalSpecification.Refactoring#getActions <em>Actions</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Refactoring</em>' container reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Refactoring</em>' container reference.
+	 * @see #setRefactoring(Refactoring)
+	 * @see logicalSpecification.LogicalSpecificationPackage#getAction_Refactoring()
+	 * @see logicalSpecification.Refactoring#getActions
+	 * @model opposite="actions" transient="false"
+	 * @generated
+	 */
+	Refactoring getRefactoring();
+
+	/**
+	 * Sets the value of the '{@link logicalSpecification.Action#getRefactoring <em>Refactoring</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Refactoring</em>' container reference.
+	 * @see #getRefactoring()
+	 * @generated
+	 */
+	void setRefactoring(Refactoring value);
+
+	/**
+	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
+	 * The list contents are of type {@link logicalSpecification.Parameter}.
+	 * It is bidirectional and its opposite is '{@link logicalSpecification.Parameter#getAction <em>Action</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Parameters</em>' containment reference list.
+	 * @see logicalSpecification.LogicalSpecificationPackage#getAction_Parameters()
+	 * @see logicalSpecification.Parameter#getAction
+	 * @model opposite="action" containment="true"
+	 * @generated
+	 */
+	EList<Parameter> getParameters();
+
+	/**
+	 * Returns the value of the '<em><b>Pre</b></em>' containment reference.
+	 * It is bidirectional and its opposite is '{@link logicalSpecification.PreCondition#getAction <em>Action</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Pre</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Pre</em>' containment reference.
+	 * @see #setPre(PreCondition)
+	 * @see logicalSpecification.LogicalSpecificationPackage#getAction_Pre()
+	 * @see logicalSpecification.PreCondition#getAction
+	 * @model opposite="action" containment="true"
+	 * @generated
+	 */
+	PreCondition getPre();
+
+	/**
+	 * Sets the value of the '{@link logicalSpecification.Action#getPre <em>Pre</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Pre</em>' containment reference.
+	 * @see #getPre()
+	 * @generated
+	 */
+	void setPre(PreCondition value);
+
+	/**
+	 * Returns the value of the '<em><b>Post</b></em>' containment reference.
+	 * It is bidirectional and its opposite is '{@link logicalSpecification.PostCondition#getAction <em>Action</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Post</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Post</em>' containment reference.
+	 * @see #setPost(PostCondition)
+	 * @see logicalSpecification.LogicalSpecificationPackage#getAction_Post()
+	 * @see logicalSpecification.PostCondition#getAction
+	 * @model opposite="action" containment="true"
+	 * @generated
+	 */
+	PostCondition getPost();
+
+	/**
+	 * Sets the value of the '{@link logicalSpecification.Action#getPost <em>Post</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Post</em>' containment reference.
+	 * @see #getPost()
+	 * @generated
+	 */
+	void setPost(PostCondition value);
+
+	/**
+	 * Returns the value of the '<em><b>Model</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Model</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Model</em>' attribute.
+	 * @see #setModel(Object)
+	 * @see logicalSpecification.LogicalSpecificationPackage#getAction_Model()
+	 * @model
+	 * @generated
+	 */
+	Object getModel();
+
+	/**
+	 * Sets the value of the '{@link logicalSpecification.Action#getModel <em>Model</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Model</em>' attribute.
+	 * @see #getModel()
+	 * @generated
+	 */
+	void setModel(Object value);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	void execute();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	void log();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	void setParameters();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	void createPreCondition();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	void createPostCondition();
+
+} // Action