Minor tweaks

d-leroy · d-leroy · commit 47d7fbf230c1 · 2016-04-07T16:54:44.000+02:00
diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AnnotationMutableFieldExtractor.xtend
@@ -18,7 +18,9 @@ import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider
 
 class AnnotationMutableFieldExtractor implements IMutableFieldExtractor {
 
-	val Map<EClass, Integer> counters = new HashMap
+	private val Map<EClass, Integer> counters = new HashMap
+	
+	private val org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider nameprovider = new DefaultDeclarativeQualifiedNameProvider()
 
 	override extractMutableField(EObject eObject) {
 
@@ -41,7 +43,6 @@ class AnnotationMutableFieldExtractor implements IMutableFieldExtractor {
 				}
 
 			} else {
-				val org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider nameprovider = new DefaultDeclarativeQualifiedNameProvider()
 				val qname = nameprovider.getFullyQualifiedName(eObject)
 				if(qname == null) 
 					eObject.toString
diff --git a/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java b/java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/GenericSequentialModelDebugger.java
@@ -49,15 +49,6 @@ public GenericSequentialModelDebugger(IDSLDebugEventProcessor target, ISequentia
 		super(target, engine);
 	}
 
-	@Override
-	public boolean control(String threadName, EObject instruction) {
-		if (!isTerminated() && instruction instanceof LogicalStep) {
-			return true;
-		} else {
-			return super.control(threadName, instruction);
-		}
-	}
-
 	@Override
 	/*
 	 * This method is eventually called within a new engine thread.
diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/WrapperSimpleTimeLine.java b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/WrapperSimpleTimeLine.java
@@ -12,7 +12,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
