[AbstractTraceAddon] Remove singleton + make manageStep private

ebousse · ebousse · commit 583da36f67ad · 2017-04-13T16:04:01.000+02:00
diff --git a/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend b/trace/generator/plugins/fr.inria.diverse.trace.gemoc/src/fr/inria/diverse/trace/gemoc/traceaddon/AbstractTraceAddon.xtend
@@ -56,11 +56,8 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi
 	private BatchModelChangeListener traceListener
 	private boolean shouldSave = true
 	private var boolean needTransaction = true
-
 	private BatchModelChangeListener listenerAddon
 	
-	public static AbstractTraceAddon instance
-
 	protected abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map<EObject, TracedObject<?>> exeToTraced)
 	
 	protected abstract def IStateManager<State<?,?>> constructStateManager(Resource modelResource, Map<TracedObject<?>, EObject> tracedToExe)
@@ -110,7 +107,7 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi
 		manageStep(step, false)
 	}
 
-	protected def manageStep(Step<?> step, boolean add) {
+	private def manageStep(Step<?> step, boolean add) {
 		if (step != null) {
 			modifyTrace([
 				traceConstructor.addState(listenerAddon.getChanges(this))
@@ -184,7 +181,6 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi
 				traceNotifier.addListener(traceExplorer)
 			}
 		}
-		instance = this;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,8 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi`
`56`	`56`	`private BatchModelChangeListener traceListener`
`57`	`57`	`private boolean shouldSave = true`
`58`	`58`	`private var boolean needTransaction = true`
`59`		`-`
`60`	`59`	`private BatchModelChangeListener listenerAddon`
`61`	`60`
`62`		`- public static AbstractTraceAddon instance`
`63`		`-`
`64`	`61`	`protected abstract def ITraceConstructor constructTraceConstructor(Resource modelResource, Resource traceResource, Map<EObject, TracedObject<?>> exeToTraced)`
`65`	`62`
`66`	`63`	`protected abstract def IStateManager<State<?,?>> constructStateManager(Resource modelResource, Map<TracedObject<?>, EObject> tracedToExe)`
`@@ -110,7 +107,7 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi`
`110`	`107`	`manageStep(step, false)`
`111`	`108`	`}`
`112`	`109`
`113`		`- protected def manageStep(Step<?> step, boolean add) {`
	`110`	`+ private def manageStep(Step<?> step, boolean add) {`
`114`	`111`	`if (step != null) {`
`115`	`112`	`modifyTrace([`
`116`	`113`	`traceConstructor.addState(listenerAddon.getChanges(this))`
`@@ -184,7 +181,6 @@ abstract class AbstractTraceAddon extends DefaultEngineAddon implements IMultiDi`
`184`	`181`	`traceNotifier.addListener(traceExplorer)`
`185`	`182`	`}`
`186`	`183`	`}`
`187`		`- instance = this;`
`188`	`184`	`}`
`189`	`185`
`190`	`186`	`/**`