Commit 2239f8c8 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* yay! java 8 all the way!

parent 9e6359e0

plugins/org.etsi.mts.tdl.asn2tdl/.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/org.etsi.mts.tdl.asn2tdl/META-INF/MANIFEST.MF

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.etsi.mts.tdl.asn2tdl 
Bundle-Version: 1.0.0.qualifier

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

Bundle-Vendor: ETSI

Bundle-RequiredExecutionEnvironment: JavaSE-11

Bundle-RequiredExecutionEnvironment: JavaSE-1.8

Require-Bundle: org.eclipse.core.runtime,

 org.eclipse.core.resources,

 org.eclipse.emf.ecore,

plugins/org.etsi.mts.tdl.asn2tdl/src/org/etsi/mts/tdl/asn2tdl/ASN2TDLTranslator.java

+6 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.beanit.asn1bean.compiler.model.AsnModule; 
import com.beanit.asn1bean.compiler.model.AsnNull;

import com.beanit.asn1bean.compiler.model.AsnObjectIdentifier;

import com.beanit.asn1bean.compiler.model.AsnOctetString;

import com.beanit.asn1bean.compiler.model.AsnParameter;

import com.beanit.asn1bean.compiler.model.AsnSequenceOf;

import com.beanit.asn1bean.compiler.model.AsnSequenceSet;

import com.beanit.asn1bean.compiler.model.AsnTaggedType;
@@ -61,19 +62,19 @@ public class ASN2TDLTranslator extends AbstractTranslator { 
	private void translateTypes(AsnModule module) {

		if (module.typesByName!=null) {

			//First pass

			for (var e : module.typesByName.keySet()) {

			for (String e : module.typesByName.keySet()) {

				AsnType type = module.typesByName.get(e);

				System.out.println("Type: "+type.name);

				translateType(type, "", true);

				

			}

			//Second pass

			for (var e : module.typesByName.keySet()) {

			for (String e : module.typesByName.keySet()) {

				AsnType type = module.typesByName.get(e);

				System.out.println("Type: "+type.name);

				if (type.parameters!=null) {

					//TODO: parameters?

					for (var p : type.parameters) {

					for (AsnParameter p : type.parameters) {

						System.out.println("    "+p.dummyReference+" : "+p.paramGovernor);

					}

				}
@@ -88,7 +89,7 @@ public class ASN2TDLTranslator extends AbstractTranslator { 
		if (type instanceof AsnSequenceSet) {

			generatedType = getStructuredDataTypeFor(type.name);

			if (!flat) {

				for (var c : ((AsnSequenceSet) type).componentTypes) {

				for (AsnElementType c : ((AsnSequenceSet) type).componentTypes) {

					translateMember((StructuredDataType)generatedType, c);						

				}

			}
@@ -98,7 +99,7 @@ public class ASN2TDLTranslator extends AbstractTranslator { 
			if (!flat) {

				//TODO: change to union constraint

				annotateWith(generatedType, "CHOICE");

				for (var c : ((AsnChoice) type).componentTypes) {

				for (AsnElementType c : ((AsnChoice) type).componentTypes) {

					translateMember((StructuredDataType)generatedType, c);						

				}

			}

plugins/org.etsi.mts.tdl.importers.ui/.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-1.7"/>

	<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/org.etsi.mts.tdl.importers.ui/.settings/org.eclipse.jdt.core.prefs

+4 −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=1.7

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

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.enumIdentifier=error

org.eclipse.jdt.core.compiler.source=1.7
 
org.eclipse.jdt.core.compiler.release=disabled

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