Commit 49597de7 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ compatibility fixes for latest Epsilon APIs 



Signed-off-by: default avatarPhilip Makedonski <philip.makedonski@gmail.com>
parent 672baffa

plugins/org.etsi.mts.tdl.constraints/src/org/etsi/mts/tdl/constraints/evl/Validator.java

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import org.eclipse.epsilon.emc.emf.EmfModel; 
import org.eclipse.epsilon.emc.emf.EmfUtil;

import org.eclipse.epsilon.emc.emf.InMemoryEmfModel;

import org.eclipse.epsilon.eol.EolModule;

import org.eclipse.epsilon.eol.IEolExecutableModule;

import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;

import org.eclipse.epsilon.eol.exceptions.models.EolModelLoadingException;

import org.eclipse.epsilon.eol.models.IModel;
@@ -66,7 +65,7 @@ public class Validator { 
		    Bundle bundle = Platform.getBundle("org.etsi.mts.tdl.constraints");

			URL url = bundle.getEntry(source);



			IEolExecutableModule module = new EvlModule();

			EvlModule module = new EvlModule();

			module.parse(url.toURI());



			//TODO: integrate error reporting
@@ -91,7 +90,8 @@ public class Validator { 
			}

			

			tdlModel.dispose();

			module.reset();

			//TODO: Needed? New API does not provide it

			//module.reset();

			

		} catch (URISyntaxException e) {

			// TODO Auto-generated catch block

plugins/org.etsi.mts.tdl.ttcn3/src/org/etsi/mts/tdl/ttcn3/Transform.java

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ import org.eclipse.emf.ecore.resource.Resource; 
import org.eclipse.epsilon.common.parse.problem.ParseProblem;

import org.eclipse.epsilon.emc.emf.EmfModel;

import org.eclipse.epsilon.emc.emf.InMemoryEmfModel;

import org.eclipse.epsilon.eol.IEolExecutableModule;

import org.eclipse.epsilon.eol.models.IModel;

import org.eclipse.epsilon.etl.EtlModule;

import org.etsi.mts.tdl.tdlPackage;
@@ -24,7 +23,7 @@ public class Transform { 
			Bundle bundle = Platform.getBundle("org.etsi.mts.tdl.ttcn3");

			URL url = bundle.getEntry(source);



			IEolExecutableModule module = new EtlModule();

			EtlModule module = new EtlModule();

			module.parse(url.toURI());



			//TODO: integrate error reporting
@@ -48,7 +47,8 @@ public class Transform { 
			

			tdlModel.dispose();

			ttcnModel.dispose();

			module.reset();

			//TODO: check if still necessary

			//module.reset();



		} catch (Exception e) {

			e.printStackTrace();