- removed epsilon dependencies from TX (4e3e8972) · Commits · TDL Open Source / TOP IDE

features/org.etsi.mts.tdl.tx.feature/feature.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -328,10 +328,6 @@ any resulting litigation.
		<import plugin="org.eclipse.xtext.builder"/>
		<import plugin="org.antlr.runtime"/>
		<import plugin="org.eclipse.core.runtime"/>
		<import plugin="org.eclipse.epsilon.evl.emf.validation"/>
		<import plugin="org.eclipse.epsilon.evl.engine"/>
		<import plugin="org.eclipse.epsilon.eol.engine"/>
		<import plugin="org.eclipse.epsilon.emc.emf"/>
		<import plugin="org.eclipse.jdt.core"/>
		<import plugin="org.eclipse.xtend.lib"/>
		<import plugin="org.eclipse.core.resources"/>

features/org.etsi.mts.tdl.util.feature/feature.xml

+5 −27

Original line number	Diff line number	Diff line
		@@ -337,44 +337,22 @@ any resulting litigation.

		<plugin
		id="org.etsi.mts.tdl.rt.ui"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>

		<plugin
		id="org.etsi.mts.tdl.helper"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.perspective"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.wizards"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.project"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.openapi.generator.ui"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		</feature>

plugins/org.etsi.mts.tdl.tx/.settings/org.eclipse.jdt.core.prefs

+3 −3

Original line number	Diff line number	Diff line
		eclipse.preferences.version=1
		org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
		org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
		org.eclipse.jdt.core.compiler.compliance=11
		org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
		org.eclipse.jdt.core.compiler.compliance=21
		org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
		org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
		org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
		org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
		org.eclipse.jdt.core.compiler.release=enabled
		org.eclipse.jdt.core.compiler.source=11
		org.eclipse.jdt.core.compiler.source=21

plugins/org.etsi.mts.tdl.tx/META-INF/MANIFEST.MF

+4 −8

Original line number	Diff line number	Diff line
		@@ -9,17 +9,13 @@ Bundle-ActivationPolicy: lazy
		Require-Bundle: org.etsi.mts.tdl.model,
		org.eclipse.xtext,
		org.eclipse.xtext.xbase,
		org.eclipse.equinox.common;bundle-version="3.5.0",
		org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
		org.eclipse.equinox.common;bundle-version="3.19.0",
		org.eclipse.xtext.xbase.lib;bundle-version="2.40.0",
		org.eclipse.xtext.util,
		org.eclipse.core.runtime,
		org.etsi.mts.tdl.common,
		org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
		org.eclipse.epsilon.evl.emf.validation,
		org.eclipse.epsilon.evl.engine,
		org.eclipse.epsilon.eol.engine,
		org.eclipse.epsilon.emc.emf
		Bundle-RequiredExecutionEnvironment: JavaSE-11
		org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
		Bundle-RequiredExecutionEnvironment: JavaSE-21
		Export-Package: org.etsi.mts.tdl.parser.antlr.internal,
		org.etsi.mts.tdl.scoping,
		org.etsi.mts.tdl.parser.antlr,

plugins/org.etsi.mts.tdl.tx/src/org/etsi/mts/tdl/validation/TDLtxValidator.java

+0 −56

Original line number	Diff line number	Diff line
		@@ -3,23 +3,9 @@
		*/
		package org.etsi.mts.tdl.validation;

		import java.net.URI;
		import java.net.URISyntaxException;

		import org.eclipse.core.runtime.Platform;
		import org.eclipse.emf.common.util.BasicDiagnostic;
		import org.eclipse.emf.common.util.DiagnosticChain;
		import org.eclipse.emf.ecore.EPackage;
		import org.eclipse.emf.ecore.EValidator;
		import org.eclipse.emf.ecore.util.EObjectValidator;
		import org.eclipse.epsilon.evl.emf.validation.CompositeEValidator;
		import org.eclipse.epsilon.evl.emf.validation.EvlValidator;
		import org.eclipse.ocl.pivot.internal.utilities.PivotDiagnostician.BasicDiagnosticWithRemove;
		import org.eclipse.xtext.validation.AbstractValidationDiagnostic;
		import org.eclipse.xtext.validation.Check;
		import org.etsi.mts.tdl.Element;
		import org.etsi.mts.tdl.TestConfiguration;
		import org.etsi.mts.tdl.tdlPackage;

		/**
		* This class contains custom validation rules.
		@@ -49,7 +35,6 @@ public class TDLtxValidator extends AbstractTDLtxValidator {
		// INVALID_NAME);
		// }
		// }
		private static EvlValidator evlValidator;


		public TDLtxValidator() {
		@@ -66,50 +51,9 @@ public class TDLtxValidator extends AbstractTDLtxValidator {
		if (initialised) {
		return;
		}
		//TODO: goes a bit in circles
		//TODO: extract into an activator or something? also as command
		//TODO: works in principle, occasionally causes hangs and strange errors though...
		System.out.println("Init EVL validator..");
		// Assuming you have generated the metamodel code
		EPackage ePackage = tdlPackage.eINSTANCE;

		// Pass a model name if your script uses it
		// Pass a valid bundle ID as it used for reporting (if not in a plugin use your project name or similar)

		String modelName = "TDL"; //This seems to be important! Otherwise strange hangs occur -> TDL?
		String bundleId = "org.etsi.mts.tdl.constraints";
		URI evlScriptURI = new URI("platform:/plugin/"+bundleId+"/constraints/tdl-generated-ETSI-ES-203-119-1-V1.5.1-fixed.evl");
		//TODO: try out extension point integration
		//TODO: try out fixes -> can they be in a separate module?
		//TODO: add other constraints for TO/TC
		evlValidator = new EvlValidator(
		evlScriptURI, modelName , ePackage.getNsURI(), bundleId);

		evlValidator.setShowErrorDialog(false);
		//TODO: extract to optional on demand / auto validation
		//TODO: this brings all the epsilon dependencies here as well
		//-> effectively requires constraints to be installed.. shall be plugged in ideally..
		//-> check again extension point integration..
		// registerValidator(ePackage);
		initialised = true;
		}

		private static void registerValidator(EPackage ePackage) {
		EValidator existingValidator = EValidator.Registry.INSTANCE.getEValidator(ePackage);
		if (existingValidator instanceof CompositeEValidator) {
		((CompositeEValidator) existingValidator).getDelegates().add(evlValidator);
		} else {
		if (existingValidator == null) {
		existingValidator = EObjectValidator.INSTANCE;
		}
		CompositeEValidator newValidator = new CompositeEValidator();
		newValidator.getDelegates().add(existingValidator);
		newValidator.getDelegates().add(evlValidator);
		EValidator.Registry.INSTANCE.put(ePackage, newValidator);
		}
		}


		//TODO: try to add individual element-based checks on demand with different priorities to reduce overhead when editing..

		// @Check

Admin message