Removing lots of warnings - no real changes

ebousse · ebousse · commit 253a7cd43193 · 2017-04-12T09:56:04.000+02:00
diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine.ui/src/org/gemoc/executionframework/engine/ui/debug/AbstractGemocDebugger.java
@@ -495,11 +495,11 @@ public void engineStatusChanged(IExecutionEngine engine, RunStatus newStatus) {
 	}
 
 	@Override
-	public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> logicalSteps) {
+	public void aboutToSelectStep(IExecutionEngine engine, Collection<Step<?>> logicalSteps) {
 	}
 
 	@Override
-	public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> logicalSteps) {
+	public void proposedStepsChanged(IExecutionEngine engine, Collection<Step<?>> logicalSteps) {
 	}
 
 	@Override
diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java b/framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java
@@ -25,7 +25,7 @@
 import org.gemoc.xdsmlframework.api.extensions.languages.LanguageDefinitionExtension;
 import org.osgi.framework.Bundle;
 
-abstract public class ModelExecutionContext implements IExecutionContext {
+public abstract class ModelExecutionContext implements IExecutionContext {
 
 	protected IRunConfiguration _runConfiguration;
 
@@ -103,7 +103,7 @@ protected IExecutionPlatform createExecutionPlatform() throws CoreException {
 		return new DefaultExecutionPlatform(_languageDefinition, _runConfiguration);
 	}
 
-	abstract protected LanguageDefinitionExtension getLanguageDefinition(String languageName) throws EngineContextException;
+	protected abstract LanguageDefinitionExtension getLanguageDefinition(String languageName) throws EngineContextException;
 
 	private ResourceSet getResourceSet() {
 		return _resourceModel.getResourceSet();
diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java b/framework/execution_framework/plugins/org.gemoc.executionframework.eventmanager/src/org/gemoc/executionframework/eventmanager/views/EventManagerRenderer.java
@@ -237,10 +237,10 @@ public List<String> validate(List<IEngineAddon> otherAddons) {
 	}
 
 	@Override
-	public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> steps) {
+	public void aboutToSelectStep(IExecutionEngine engine, Collection<Step<?>> steps) {
 	}
 
 	@Override
-	public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> steps) {
+	public void proposedStepsChanged(IExecutionEngine engine, Collection<Step<?>> steps) {
 	}
 }
diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java b/framework/execution_framework/plugins/org.gemoc.executionframework.extensions.sirius/src/org/gemoc/executionframework/extensions/sirius/services/AbstractGemocAnimatorServices.java
@@ -363,7 +363,7 @@ public boolean isRepresentationToRefresh(String representationId,
 		}
 
 		@Override
-		public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> logicalSteps) {
+		public void proposedStepsChanged(IExecutionEngine engine, Collection<Step<?>> logicalSteps) {
 		}
 
 		@Override
@@ -384,7 +384,7 @@ public List<String> validate(List<IEngineAddon> otherAddons) {
 		}
 
 		@Override
-		public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> logicalSteps) {
+		public void aboutToSelectStep(IExecutionEngine engine, Collection<Step<?>> logicalSteps) {
 		}
 
 		@Override
diff --git a/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java b/framework/execution_framework/plugins/org.gemoc.executionframework.ui/src/org/gemoc/executionframework/ui/views/engine/EnginesStatusView.java
@@ -410,7 +410,7 @@ public void engineStarted(IExecutionEngine engine)
 	}
 
 	@Override
-	public void aboutToExecuteStep(IExecutionEngine executionEngine, Step logicalStepToApply) 
+	public void aboutToExecuteStep(IExecutionEngine executionEngine, Step<?> logicalStepToApply) 
 	{
 	}
 
@@ -426,19 +426,19 @@ public void engineStopped(IExecutionEngine engine)
 	}
 
 	@Override
-	public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> logicalSteps) 
+	public void aboutToSelectStep(IExecutionEngine engine, Collection<Step<?>> logicalSteps) 
 	{
 		reselectEngine(engine);
 	}
 
 	@Override
-	public void stepSelected(IExecutionEngine engine, Step selectedLogicalStep) {
+	public void stepSelected(IExecutionEngine engine, Step<?> selectedLogicalStep) {
 		// TODO Auto-generated method stub
 		
 	}
 
 	@Override
-	public void stepExecuted(IExecutionEngine engine, Step logicalStepExecuted) {
+	public void stepExecuted(IExecutionEngine engine, Step<?> logicalStepExecuted) {
 		reselectEngine(engine); // need to update the executed step count in the view
 		
 	}
@@ -450,7 +450,7 @@ public void engineStatusChanged(IExecutionEngine engine, RunStatus newStatus) {
 	}
 
 	@Override
-	public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> logicalSteps) {
+	public void proposedStepsChanged(IExecutionEngine engine, Collection<Step<?>> logicalSteps) {
 		reselectEngine(engine);
 		
 	}
diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/core/EngineStatus.java
@@ -15,7 +15,7 @@
 public class  EngineStatus {
 	long nbLogicalStepRun = 0;
 	
-	Step chosenLogicalStep;
+	Step<?> chosenLogicalStep;
 
 
 	public enum RunStatus { Initializing, Running, WaitingLogicalStepSelection, Stopped}
diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/DefaultEngineAddon.java
@@ -30,7 +30,7 @@ public void engineStarted(IExecutionEngine executionEngine) {
 	}
 
 	@Override
-	public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> steps) {
+	public void aboutToSelectStep(IExecutionEngine engine, Collection<Step<?>> steps) {
 	}
 
 	@Override
@@ -58,7 +58,7 @@ public void stepExecuted(IExecutionEngine engine, Step<?> stepExecuted) {
 	}
 
 	@Override
-	public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> steps) {
+	public void proposedStepsChanged(IExecutionEngine engine, Collection<Step<?>> steps) {
 	}
 
 	@Override
diff --git a/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java b/framework/framework_commons/plugins/org.gemoc.xdsmlframework.api/src/org/gemoc/xdsmlframework/api/engine_addon/IEngineAddon.java
@@ -51,9 +51,9 @@ default public void engineInitialized(IExecutionEngine executionEngine) {
 	/**
 	 * Operation called before the Step has been chosen
 	 */
-	public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> steps);
+	public void aboutToSelectStep(IExecutionEngine engine, Collection<Step<?>> steps);
 
-	public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> steps);
+	public void proposedStepsChanged(IExecutionEngine engine, Collection<Step<?>> steps);
 
 	/**
 	 * Operation called after the Step has been chosen It also returns the
diff --git a/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStepFactory.java b/trace/commons/plugins/fr.inria.diverse.trace.gemoc.api/src/fr/inria/diverse/trace/gemoc/api/IStepFactory.java
@@ -17,7 +17,7 @@
 
 public interface IStepFactory {
 
-	public Step createStep(
+	public Step<?> createStep(
 			MSE mse, List<Object> parameters, List<Object> result);
 	
 }
diff --git a/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend b/trace/generator/plugins/fr.inria.diverse.trace.metamodel.generator/src/fr/inria/diverse/trace/metamodel/generator/TraceMMGenerator.xtend
@@ -12,20 +12,19 @@ package fr.inria.diverse.trace.metamodel.generator
 
 import fr.inria.diverse.trace.commons.EMFUtil
 import java.io.IOException
+import java.util.Set
+import opsemanticsview.OperationalSemanticsView
+import org.eclipse.emf.codegen.ecore.genmodel.GenPackage
+import org.eclipse.emf.common.util.Diagnostic
 import org.eclipse.emf.common.util.URI
+import org.eclipse.emf.ecore.EClass
 import org.eclipse.emf.ecore.EPackage
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.resource.ResourceSet
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl
+import org.eclipse.emf.ecore.util.Diagnostician
 import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl
 import org.eclipse.xtend.lib.annotations.Accessors
-import org.eclipse.emf.ecore.EClass
-import org.eclipse.emf.ecore.util.Diagnostician
-import org.eclipse.emf.common.util.Diagnostic
-import java.util.Set
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage
-import fr.inria.diverse.trace.commons.EcoreCraftingUtil
-import opsemanticsview.OperationalSemanticsView
 
 class TraceMMGenerator {
 
diff --git a/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF b/trace/tests_and_benchmarks/fr.inria.diverse.trace.commons.testutil/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Require-Bundle: com.google.guava,
  org.eclipse.ui,
  org.eclipse.emf.ecore;bundle-version="2.10.2"
 Export-Package: fr.inria.diverse.trace.commons.testutil
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 

Original file line number	Diff line number	Diff line change
`@@ -495,11 +495,11 @@ public void engineStatusChanged(IExecutionEngine engine, RunStatus newStatus) {`
`495`	`495`	`}`
`496`	`496`
`497`	`497`	`@Override`
`498`		`- public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> logicalSteps) {`
	`498`	`+ public void aboutToSelectStep(IExecutionEngine engine, Collection<Step<?>> logicalSteps) {`
`499`	`499`	`}`
`500`	`500`
`501`	`501`	`@Override`
`502`		`- public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> logicalSteps) {`
	`502`	`+ public void proposedStepsChanged(IExecutionEngine engine, Collection<Step<?>> logicalSteps) {`
`503`	`503`	`}`
`504`	`504`
`505`	`505`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -237,10 +237,10 @@ public List<String> validate(List<IEngineAddon> otherAddons) {`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`@Override`
`240`		`- public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> steps) {`
	`240`	`+ public void aboutToSelectStep(IExecutionEngine engine, Collection<Step<?>> steps) {`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`@Override`
`244`		`- public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> steps) {`
	`244`	`+ public void proposedStepsChanged(IExecutionEngine engine, Collection<Step<?>> steps) {`
`245`	`245`	`}`
`246`	`246`	`}`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ public boolean isRepresentationToRefresh(String representationId,`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`@Override`
`366`		`- public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> logicalSteps) {`
	`366`	`+ public void proposedStepsChanged(IExecutionEngine engine, Collection<Step<?>> logicalSteps) {`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`@Override`
`@@ -384,7 +384,7 @@ public List<String> validate(List<IEngineAddon> otherAddons) {`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`@Override`
`387`		`- public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> logicalSteps) {`
	`387`	`+ public void aboutToSelectStep(IExecutionEngine engine, Collection<Step<?>> logicalSteps) {`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ public void engineStarted(IExecutionEngine engine)`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`@Override`
`413`		`- public void aboutToExecuteStep(IExecutionEngine executionEngine, Step logicalStepToApply)`
	`413`	`+ public void aboutToExecuteStep(IExecutionEngine executionEngine, Step<?> logicalStepToApply)`
`414`	`414`	`{`
`415`	`415`	`}`
`416`	`416`
`@@ -426,19 +426,19 @@ public void engineStopped(IExecutionEngine engine)`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`@Override`
`429`		`- public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> logicalSteps)`
	`429`	`+ public void aboutToSelectStep(IExecutionEngine engine, Collection<Step<?>> logicalSteps)`
`430`	`430`	`{`
`431`	`431`	`reselectEngine(engine);`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`@Override`
`435`		`- public void stepSelected(IExecutionEngine engine, Step selectedLogicalStep) {`
	`435`	`+ public void stepSelected(IExecutionEngine engine, Step<?> selectedLogicalStep) {`
`436`	`436`	`// TODO Auto-generated method stub`
`437`	`437`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`@Override`
`441`		`- public void stepExecuted(IExecutionEngine engine, Step logicalStepExecuted) {`
	`441`	`+ public void stepExecuted(IExecutionEngine engine, Step<?> logicalStepExecuted) {`
`442`	`442`	`reselectEngine(engine); // need to update the executed step count in the view`
`443`	`443`
`444`	`444`	`}`
`@@ -450,7 +450,7 @@ public void engineStatusChanged(IExecutionEngine engine, RunStatus newStatus) {`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`@Override`
`453`		`- public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> logicalSteps) {`
	`453`	`+ public void proposedStepsChanged(IExecutionEngine engine, Collection<Step<?>> logicalSteps) {`
`454`	`454`	`reselectEngine(engine);`
`455`	`455`
`456`	`456`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public void engineStarted(IExecutionEngine executionEngine) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
`33`		`- public void aboutToSelectStep(IExecutionEngine engine, Collection<Step> steps) {`
	`33`	`+ public void aboutToSelectStep(IExecutionEngine engine, Collection<Step<?>> steps) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
`@@ -58,7 +58,7 @@ public void stepExecuted(IExecutionEngine engine, Step<?> stepExecuted) {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- public void proposedStepsChanged(IExecutionEngine engine, Collection<Step> steps) {`
	`61`	`+ public void proposedStepsChanged(IExecutionEngine engine, Collection<Step<?>> steps) {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`public interface IStepFactory {`
`19`	`19`
`20`		`- public Step createStep(`
	`20`	`+ public Step<?> createStep(`
`21`	`21`	`MSE mse, List<Object> parameters, List<Object> result);`
`22`	`22`
`23`	`23`	`}`