Commit 5f317842 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* switched to Java8 due compatibility issues, cleaned up dependencies

parent b7bfc327

plugins/Prototypes/org.etsi.mts.tdl.common/.classpath

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<classpath>

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

	<classpathentry kind="src" path="src"/>

	<classpathentry kind="output" path="bin"/>

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

+5 −4
Original line number Diff line number Diff line 
eclipse.preferences.version=1

org.eclipse.jdt.core.compiler.codegen.targetPlatform=11

org.eclipse.jdt.core.compiler.compliance=11

org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

org.eclipse.jdt.core.compiler.compliance=1.8

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.release=disabled

org.eclipse.jdt.core.compiler.source=1.8

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

+2 −8
Original line number Diff line number Diff line
@@ -4,13 +4,7 @@ Bundle-Name: Common 
Bundle-SymbolicName: org.etsi.mts.tdl.common

Bundle-Version: 1.0.0.qualifier

Automatic-Module-Name: org.etsi.mts.tdl.common

Bundle-RequiredExecutionEnvironment: JavaSE-11

Bundle-RequiredExecutionEnvironment: JavaSE-1.8

Require-Bundle: org.eclipse.xtext,

 org.etsi.mts.tdl.model,

 org.eclipse.xtext.xbase,

 org.eclipse.equinox.common;bundle-version="3.5.0",

 org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",

 org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",

 org.eclipse.xtext.util,

 org.eclipse.xtend.lib

 org.etsi.mts.tdl.model

Export-Package: org.etsi.mts.tdl.scoping

plugins/Prototypes/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/scoping/TDLScopeProvider.java

+5 −5
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ public class TDLScopeProvider extends AbstractDeclarativeScopeProvider { 
								//TODO: double check

								//TODO: Make sure this works in the normal use case too.. 

								//		-> seems to work

								var t = ((Message) context).getTarget().get(0).getTargetGate();

								GateReference t = ((Message) context).getTarget().get(0).getTargetGate();

								if (t!=null) {

									if (t == c.getEndPoint().get(0)) {

										elements.add(c.getEndPoint().get(1));
@@ -433,7 +433,7 @@ public class TDLScopeProvider extends AbstractDeclarativeScopeProvider { 
		}

	}

	

	private EList<EObject> getScopedElementsOfType(EObject context, Class c) {

	protected EList<EObject> getScopedElementsOfType(EObject context, Class c) {

		EList<EObject> elements = new BasicEList<>();

		Package p = getPackage(context);
@@ -443,7 +443,7 @@ public class TDLScopeProvider extends AbstractDeclarativeScopeProvider { 
				elements.add(e);

			} else if (e instanceof EnumDataType) {

				//TODO: naive enum handling (also below

				for (var ev : ((EnumDataType) e).getValue()) {

				for (SimpleDataInstance ev : ((EnumDataType) e).getValue()) {

					elements.add(ev);

				}

			}
@@ -460,7 +460,7 @@ public class TDLScopeProvider extends AbstractDeclarativeScopeProvider { 
							elements.add(e);

						} else if (e instanceof EnumDataType) {

							//enums

							for (var ev : ((EnumDataType) e).getValue()) {

							for (SimpleDataInstance ev : ((EnumDataType) e).getValue()) {

								elements.add(ev);

							}

						}
@@ -472,7 +472,7 @@ public class TDLScopeProvider extends AbstractDeclarativeScopeProvider { 
							elements.add(e);

						} else if (e instanceof EnumDataType) {

							//enums

							for (var ev : ((EnumDataType) e).getValue()) {

							for (SimpleDataInstance ev : ((EnumDataType) e).getValue()) {

								elements.add(ev);

							}

						}