Code cleaning

Alignment with the semantic model
Add some comments 

Change-Id: I85797880a1da9c404ffc56b8b9c2fe213ed75537
Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>

5 files changed, 15 insertions, 19 deletions

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/Pseudostate/ConnectionPointActivation.java b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/Pseudostate/ConnectionPointActivation.java
index 0e586cb5067..5ddcb567c3a 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/Pseudostate/ConnectionPointActivation.java
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/Pseudostate/ConnectionPointActivation.java
@@ -15,12 +15,10 @@ package org.eclipse.papyrus.moka.fuml.statemachines.Semantics.StateMachines.Beha
 

 import org.eclipse.papyrus.moka.fuml.statemachines.Semantics.StateMachines.BehaviorStateMachines.VertexActivation;

 

-public class ConnectionPointActivation extends PseudostateActivation{

+public abstract class ConnectionPointActivation extends PseudostateActivation{

 	

-	/**

-	 * The parent state of a connection point reference is its owning state

-	 */

 	public VertexActivation getParentState(){

+		// The parent state of a connection point reference is its owning state

 		return (VertexActivation)this.getParent();

 	}

 }

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/RegionActivation.java b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/RegionActivation.java
index 8ef454e981f..3147439873b 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/RegionActivation.java
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/RegionActivation.java
@@ -47,10 +47,8 @@ public class RegionActivation extends StateMachineSemanticVisitor{
 		this.transitionActivations = new ArrayList<TransitionActivation>();

 	}

 	

-	/**

-	 * Create visitors for all vertices owned by the region

-	 */

 	public void activate(){

+		// Create visitors for all vertices owned by the region

 		Locus locus = this.getExecutionLocus();

 		VertexActivation activation = null;

 		Region region = (Region)this.getNode();

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/StateActivation.java b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/StateActivation.java
index 31ff6f07e75..23933e70791 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/StateActivation.java
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/StateActivation.java
@@ -199,7 +199,7 @@ public class StateActivation extends VertexActivation {
 		}

 	}

 	

-	protected void tryExecuteDoExit(){

+	protected void tryExecuteExit(){

 		// Execute the exit behavior if any

 		State state = (State) this.getNode();

 		Execution execution = this.getExecutionFor(state.getExit());

@@ -314,7 +314,7 @@ public class StateActivation extends VertexActivation {
 		}

 		// If there is an exit behavior specified for the state it is executed

 		if(!this.isExitCompleted){

-			this.tryExecuteDoExit();

+			this.tryExecuteExit();

 		}

 		super.exit(exitingTransition, leastCommonAncestor);

 		// When the state is exited then it is removed from the state-machine configuration

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/TransitionActivation.java b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/TransitionActivation.java
index 7e6187c5b85..23e326e9755 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/TransitionActivation.java
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/TransitionActivation.java
@@ -55,11 +55,11 @@ public abstract class TransitionActivation extends StateMachineSemanticVisitor {
 	// by the region activation that is the common ancestor of the source and the target. 

 	private RegionActivation leastCommonAncestor;

 	

-	public TransitionMetadata getState() {

+	public TransitionMetadata getStatus() {

 		return status;

 	}

 

-	public void setState(TransitionMetadata state) {

+	public void setStatus(TransitionMetadata state) {

 		this.status = state;

 	}

 

@@ -177,7 +177,7 @@ public abstract class TransitionActivation extends StateMachineSemanticVisitor {
 		FUMLExecutionEngine.eInstance.getControlDelegate().control(this); 

 		this.executeEffect();

 		((SM_ControlDelegate)FUMLExecutionEngine.eInstance.getControlDelegate()).inactive(this.getNode()); 

-		this.setState(TransitionMetadata.TRAVERSED);

+		this.setStatus(TransitionMetadata.TRAVERSED);

 		logger.info(this.getNode().getName()+" => TRAVERSED");

 		this.enterTarget();

 	}

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/VertexActivation.java b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/VertexActivation.java
index bf62314fa93..52fb73f311e 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/VertexActivation.java
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/BehaviorStateMachines/VertexActivation.java
@@ -42,7 +42,7 @@ public abstract class VertexActivation extends StateMachineSemanticVisitor {
 	

 	public VertexActivation(){

 		super();

-		this.setState(StateMetadata.IDLE);

+		this.setStatus(StateMetadata.IDLE);

 		this.incomingTransitionActivations = new ArrayList<TransitionActivation>();

 		this.outgoingTransitionActivations = new ArrayList<TransitionActivation>();

 	}

@@ -60,11 +60,11 @@ public abstract class VertexActivation extends StateMachineSemanticVisitor {
 		return null;

 	}

 	

-	public void setState(StateMetadata state){

+	public void setStatus(StateMetadata state){

 		this.status = state;

 	}

 	

-	public StateMetadata getState(){

+	public StateMetadata getStatus(){

 		return this.status;

 	}

 	

@@ -92,14 +92,14 @@ public abstract class VertexActivation extends StateMachineSemanticVisitor {
 	public final void tagOutgoingTransitions(TransitionMetadata status){

 		// Assign the given status to all outgoing transitions of this vertex 

 		for(TransitionActivation transitionActivation: this.outgoingTransitionActivations){

-			transitionActivation.setState(status);

+			transitionActivation.setStatus(status);

 		}

 	}

 	

 	public final void tagIncomingTransitions(TransitionMetadata status){

 		// Assign the given status to all incoming transitions of this vertex

 		for(TransitionActivation transitionActivation: this.incomingTransitionActivations){

-			transitionActivation.setState(status);

+			transitionActivation.setStatus(status);

 		}

 	}

 	

@@ -121,7 +121,7 @@ public abstract class VertexActivation extends StateMachineSemanticVisitor {
 		// 2-Outgoing transitions of this vertex are tagged as being REACHED

 		// 3-The vertex starts to be highlighted

 		logger.info(this.getNode().getName()+" => ACTIVE");

-		this.setState(StateMetadata.ACTIVE);

+		this.setStatus(StateMetadata.ACTIVE);

 		this.tagOutgoingTransitions(TransitionMetadata.REACHED);

 		FUMLExecutionEngine.eInstance.getControlDelegate().control(this);

 	}

@@ -132,7 +132,7 @@ public abstract class VertexActivation extends StateMachineSemanticVisitor {
 		// 3- The vertex becomes IDLE

 		((SM_ControlDelegate)FUMLExecutionEngine.eInstance.getControlDelegate()).inactive(this.getNode());

 		this.tagIncomingTransitions(TransitionMetadata.NONE);

-		this.setState(StateMetadata.IDLE);

+		this.setStatus(StateMetadata.IDLE);

 		logger.info(this.getNode().getName()+" => IDLE");

 	}