Commit def55afe authored by Martti Käärik's avatar Martti Käärik
Browse files

Merge branch 'dev'

parents 463b523b c7debd5c

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

+14 −0
Original line number Diff line number Diff line
@@ -363,4 +363,18 @@ any resulting litigation. 
         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.etsi.mts.tdl.project"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>



   <plugin

         id="org.etsi.mts.tdl.openapi.generator.ui"

         download-size="0"

         install-size="0"

         version="0.0.0"

         unpack="false"/>



</feature>

org.etsi.mts.tdl.parent/pom.xml

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 
		<module>../features/org.etsi.mts.tdl.tools.to.docx.feature</module> 

		<module>../features/org.etsi.mts.tdl.graphical.editor.feature</module> 

		<module>../features/org.etsi.mts.tdl.ttcn3.feature</module> 

		<module>../features/org.etsi.mts.tdl.execution.feature</module> 

		<!-- Update Site -->

		<module>../updatesite/org.etsi.mts.tdl.updatesite</module>

		<!-- Standalone  -->

plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/TDLValueConverterService.java

+12 −3
Original line number Diff line number Diff line
@@ -34,6 +34,16 @@ public class TDLValueConverterService extends EString2XtextConverter { 
	public IValueConverter<String> TDLtxQIdentifier() {

		return this.QIdentifier();

	}



	@ValueConverter(rule = "org.etsi.mts.tdl.TDLtx.GRIdentifier")

	public IValueConverter<String> GRIdentifier() {

		return this.QIdentifier();

	}



	@ValueConverter(rule = "GRIdentifier")

	public IValueConverter<String> TDLtxGRIdentifier() {

		return this.GRIdentifier();

	}

}



class IdentifierValueConverter extends AbstractValueConverter<String> {
@@ -55,7 +65,6 @@ class IdentifierValueConverter extends AbstractValueConverter<String> { 


}





class QIdentifierValueConverter extends IdentifierValueConverter {



	public QIdentifierValueConverter(IValueConverter<String> iValueConverter) {

plugins/org.etsi.mts.tdl.execution.java.runtime/.classpath

0 → 100644
+20 −0
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">

		<attributes>

			<attribute name="maven.pomderived" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">

		<attributes>

			<attribute name="optional" value="true"/>

			<attribute name="maven.pomderived" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

		<attributes>

			<attribute name="maven.pomderived" value="true"/>

		</attributes>

	</classpathentry>

	<classpathentry kind="output" path="target/classes"/>

</classpath>

plugins/org.etsi.mts.tdl.execution.java.runtime/.project

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

	<name>org.etsi.mts.tdl.execution.java.runtime</name>

	<comment></comment>

	<projects>

	</projects>

	<buildSpec>

		<buildCommand>

			<name>org.eclipse.jdt.core.javabuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.m2e.core.maven2Builder</name>

			<arguments>

			</arguments>

		</buildCommand>

	</buildSpec>

	<natures>

		<nature>org.eclipse.m2e.core.maven2Nature</nature>

		<nature>org.eclipse.jdt.core.javanature</nature>

	</natures>

</projectDescription>