Merge pull request #156 from LorenzoBettini/task_154-Remove_interpret…

…er_interface

Task 154 remove interpreter interface

edelta.parent/edelta.tests/src/edelta/tests/EdeltaInjectorProviderDerivedStateComputerWithoutInterpreter.java

@@ -5,14 +5,13 @@
 
 import edelta.EdeltaRuntimeModule;
 import edelta.interpreter.EdeltaInterpreter;
-import edelta.interpreter.IEdeltaInterpreter;
 import edelta.tests.additional.EdeltaDerivedStateComputerWithoutInterpreter;
 import edelta.tests.additional.MockJavaReflectAccess;
 
 /**
  * Avoids the derived state computer run the interpreter since the tests in this
  * class must concern interpreter only and we don't want side effects from the
- * derived state computer running the interpreter. The {@link IEdeltaInterpreter} can
+ * derived state computer running the interpreter. The {@link EdeltaInterpreter} can
  * still be injected in the tests and it will be a {@link EdeltaInterpreter}.
  * 
  * @author Lorenzo Bettini
@@ -24,7 +23,7 @@ public class EdeltaInjectorProviderDerivedStateComputerWithoutInterpreter extend
 	protected EdeltaRuntimeModule createRuntimeModule() {
 		return new EdeltaRuntimeModule() {
 			@Override
-			public Class<? extends IEdeltaInterpreter> bindIEdeltaInterpreter() {
+			public Class<? extends EdeltaInterpreter> bindEdeltaInterpreter() {
 				return EdeltaInterpreter.class;
 			}
 

edelta.parent/edelta.tests/src/edelta/tests/EdeltaInjectorProviderDerivedStateComputerWithoutSafeInterpreter.java

@@ -4,15 +4,15 @@
 import org.eclipse.xtext.resource.IDerivedStateComputer;
 
 import edelta.EdeltaRuntimeModule;
+import edelta.interpreter.EdeltaInterpreter;
 import edelta.interpreter.EdeltaSafeInterpreter;
-import edelta.interpreter.IEdeltaInterpreter;
 import edelta.tests.additional.EdeltaDerivedStateComputerWithoutInterpreter;
 import edelta.tests.additional.MockJavaReflectAccess;
 
 /**
  * Avoids the derived state computer run the interpreter since the tests in this
  * class must concern interpreter only and we don't want side effects from the
- * derived state computer running the interpreter. The {@link IEdeltaInterpreter} can
+ * derived state computer running the interpreter. The {@link EdeltaInterpreter} can
  * still be injected in the tests and it will be a {@link EdeltaSafeInterpreter}.
  * 
  * @author Lorenzo Bettini

edelta.parent/edelta.tests/src/edelta/tests/EdeltaInterpreterTest.xtend

@@ -7,7 +7,6 @@ import edelta.edelta.EdeltaProgram
 import edelta.interpreter.EdeltaInterpreter
 import edelta.interpreter.EdeltaInterpreter.EdeltaInterpreterWrapperException
 import edelta.interpreter.EdeltaInterpreterRuntimeException
-import edelta.interpreter.IEdeltaInterpreter
 import edelta.tests.additional.MyCustomEdeltaThatCannotBeLoadedAtRuntime
 import edelta.tests.additional.MyCustomException
 import edelta.util.EdeltaCopiedEPackagesMap
@@ -29,11 +28,11 @@ import java.util.List
 @InjectWith(EdeltaInjectorProviderDerivedStateComputerWithoutInterpreter)
 class EdeltaInterpreterTest extends EdeltaAbstractTest {
 
-	protected IEdeltaInterpreter interpreter
+	protected EdeltaInterpreter interpreter
 
 	@Inject Injector injector
 
-	def IEdeltaInterpreter createInterpreter() {
+	def EdeltaInterpreter createInterpreter() {
 		injector.getInstance(EdeltaInterpreter)
 	}
 
@@ -726,7 +725,7 @@ class EdeltaInterpreterTest extends EdeltaAbstractTest {
 	}
 
 	def private assertAfterInterpretationOfEdeltaModifyEcoreOperation(
-		IEdeltaInterpreter interpreter, EdeltaProgram program,
+		EdeltaInterpreter interpreter, EdeltaProgram program,
 		boolean doValidate, (EPackage)=>void testExecutor
 	) {
 		val it = program.lastModifyEcoreOperation

edelta.parent/edelta.tests/xtend-gen/edelta/tests/EdeltaInterpreterTest.java

@@ -8,7 +8,6 @@
 import edelta.interpreter.EdeltaInterpreter;
 import edelta.interpreter.EdeltaInterpreterFactory;
 import edelta.interpreter.EdeltaInterpreterRuntimeException;
-import edelta.interpreter.IEdeltaInterpreter;
 import edelta.tests.EdeltaAbstractTest;
 import edelta.tests.EdeltaInjectorProviderDerivedStateComputerWithoutInterpreter;
 import edelta.tests.additional.MyCustomEdeltaThatCannotBeLoadedAtRuntime;
@@ -43,12 +42,12 @@
 @InjectWith(EdeltaInjectorProviderDerivedStateComputerWithoutInterpreter.class)
 @SuppressWarnings("all")
 public class EdeltaInterpreterTest extends EdeltaAbstractTest {
-  protected IEdeltaInterpreter interpreter;
+  protected EdeltaInterpreter interpreter;
 
   @Inject
   private Injector injector;
 
-  public IEdeltaInterpreter createInterpreter() {
+  public EdeltaInterpreter createInterpreter() {
     return this.injector.<EdeltaInterpreter>getInstance(EdeltaInterpreter.class);
   }
 
@@ -62,7 +61,7 @@ public void setupInterpreter() {
   public void sanityTestCheck() {
     try {
       final EdeltaInterpreterFactory interpreterFactory = this.injector.<EdeltaInterpreterFactory>getInstance(EdeltaInterpreterFactory.class);
-      final IEdeltaInterpreter anotherInterprter = interpreterFactory.create(this._parseHelper.parse("").eResource());
+      final EdeltaInterpreter anotherInterprter = interpreterFactory.create(this._parseHelper.parse("").eResource());
       Assertions.assertThat(anotherInterprter.getClass()).isSameAs(this.interpreter.getClass());
     } catch (Throwable _e) {
       throw Exceptions.sneakyThrow(_e);
@@ -1064,7 +1063,7 @@ protected void assertAfterInterpretationOfEdeltaModifyEcoreOperation(final Edelt
     }
   }
 
-  private void assertAfterInterpretationOfEdeltaModifyEcoreOperation(final IEdeltaInterpreter interpreter, final EdeltaProgram program, final boolean doValidate, final Procedure1<? super EPackage> testExecutor) {
+  private void assertAfterInterpretationOfEdeltaModifyEcoreOperation(final EdeltaInterpreter interpreter, final EdeltaProgram program, final boolean doValidate, final Procedure1<? super EPackage> testExecutor) {
     final EdeltaModifyEcoreOperation it = this.lastModifyEcoreOperation(program);
     final Function1<EPackage, String> _function = (EPackage it_1) -> {
       return it_1.getName();

edelta.parent/edelta.tests/xtend-gen/edelta/tests/EdeltaSafeInterpreterTest.java

@@ -2,9 +2,9 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Injector;
+import edelta.interpreter.EdeltaInterpreter;
 import edelta.interpreter.EdeltaInterpreterRuntimeException;
 import edelta.interpreter.EdeltaSafeInterpreter;
-import edelta.interpreter.IEdeltaInterpreter;
 import edelta.tests.EdeltaInjectorProviderDerivedStateComputerWithoutSafeInterpreter;
 import edelta.tests.EdeltaInterpreterTest;
 import org.eclipse.emf.ecore.EClass;
@@ -25,7 +25,7 @@ public class EdeltaSafeInterpreterTest extends EdeltaInterpreterTest {
   private Injector injector;
 
   @Override
-  public IEdeltaInterpreter createInterpreter() {
+  public EdeltaInterpreter createInterpreter() {
     return this.injector.<EdeltaSafeInterpreter>getInstance(EdeltaSafeInterpreter.class);
   }
 

edelta.parent/edelta/src/edelta/EdeltaRuntimeModule.xtend

@@ -6,8 +6,8 @@ package edelta
 import edelta.compiler.EdeltaGeneratorConfigProvider
 import edelta.compiler.EdeltaOutputConfigurationProvider
 import edelta.compiler.EdeltaXbaseCompiler
+import edelta.interpreter.EdeltaInterpreter
 import edelta.interpreter.EdeltaSafeInterpreter
-import edelta.interpreter.IEdeltaInterpreter
 import edelta.resource.EdeltaDerivedStateComputer
 import edelta.resource.EdeltaEObjectAtOffsetHelper
 import edelta.resource.EdeltaLocationInFileProvider
@@ -59,7 +59,7 @@ class EdeltaRuntimeModule extends AbstractEdeltaRuntimeModule {
 		EdeltaDerivedStateComputer
 	}
 
-	def Class<? extends IEdeltaInterpreter> bindIEdeltaInterpreter() {
+	def Class<? extends EdeltaInterpreter> bindEdeltaInterpreter() {
 		EdeltaSafeInterpreter
 	}
 

edelta.parent/edelta/src/edelta/interpreter/EdeltaInterpreter.java

@@ -45,7 +45,7 @@
  * 
  * @author Lorenzo Bettini
  */
-public class EdeltaInterpreter extends XbaseInterpreter implements IEdeltaInterpreter {
+public class EdeltaInterpreter extends XbaseInterpreter {
 	@Inject
 	private EdeltaInterpreterFactory edeltaInterpreterFactory;
 
@@ -103,12 +103,10 @@ public Exception getException() {
 		}
 	}
 
-	@Override
 	public void setInterpreterTimeout(final int interpreterTimeout) {
 		this.interpreterTimeout = interpreterTimeout;
 	}
 
-	@Override
 	public void evaluateModifyEcoreOperations(final EdeltaProgram program, final EdeltaCopiedEPackagesMap copiedEPackagesMap) {
 		this.currentProgram = program;
 		thisObject = new EdeltaInterpreterEdeltaImpl
@@ -258,7 +256,7 @@ protected Object invokeOperation(final JvmOperation operation, final Object rece
 			} else {
 				// create a new interpreter since the edelta operation is in
 				// another edelta source file.
-				IEdeltaInterpreter newInterpreter =
+				EdeltaInterpreter newInterpreter =
 						edeltaInterpreterFactory.create(containingProgram.eResource());
 				return newInterpreter
 					.evaluateEdeltaOperation(thisObject, containingProgram, edeltaOperation, argumentValues, indicator);
@@ -278,8 +276,8 @@ private void configureContextForParameterArguments(final IEvaluationContext cont
 		);
 	}
 
-	@Override
-	public Object evaluateEdeltaOperation(AbstractEdelta other, EdeltaProgram program, EdeltaOperation edeltaOperation,
+	protected Object evaluateEdeltaOperation(AbstractEdelta other,
+			EdeltaProgram program, EdeltaOperation edeltaOperation,
 			List<Object> argumentValues, CancelIndicator indicator) {
 		this.currentProgram = program;
 		this.thisObject = new AbstractEdelta(other) {

edelta.parent/edelta/src/edelta/interpreter/EdeltaInterpreterFactory.java

@@ -20,13 +20,13 @@
 public class EdeltaInterpreterFactory {
 
 	@Inject
-	private Provider<IEdeltaInterpreter> provider;
+	private Provider<EdeltaInterpreter> provider;
 
 	@Inject
 	private EdeltaInterpreterConfigurator configurator;
 
-	public IEdeltaInterpreter create(Resource resource) {
-		IEdeltaInterpreter interpreter = provider.get();
+	public EdeltaInterpreter create(Resource resource) {
+		EdeltaInterpreter interpreter = provider.get();
 		configurator.configureInterpreter(interpreter, resource);
 		return interpreter;
 	}

edelta.parent/edelta/src/edelta/interpreter/internal/EdeltaInterpreterConfigurator.java

@@ -22,7 +22,7 @@
 
 import com.google.inject.Inject;
 
-import edelta.interpreter.IEdeltaInterpreter;
+import edelta.interpreter.EdeltaInterpreter;
 
 /**
  * Sets the classloader of the interpreter so that if finds classes in
@@ -36,7 +36,7 @@ public class EdeltaInterpreterConfigurator {
 	@Inject
 	private ClassLoader parentClassLoader;
 
-	public void configureInterpreter(IEdeltaInterpreter interpreter, Resource resource) {
+	public void configureInterpreter(EdeltaInterpreter interpreter, Resource resource) {
 		ResourceSet set = resource.getResourceSet();
 		if (set instanceof XtextResourceSet) {
 			Object context = ((XtextResourceSet) set).getClasspathURIContext();