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

Renamed Standard to TDL + updated HTTP

parent 4f42dd03

plugins/org.etsi.mts.tdl.model/library/predefined.tdl

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

<tdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tdl="http://www.etsi.org/spec/TDL/1.4.1" name="Standard">

<tdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tdl="http://www.etsi.org/spec/TDL/1.4.1" name="TDL">

  <packagedElement xsi:type="tdl:ConstraintType" name="length"/>

  <packagedElement xsi:type="tdl:ConstraintType" name="range"/>

  <packagedElement xsi:type="tdl:ConstraintType" name="format"/>

plugins/org.etsi.mts.tdl.tx.ui/src/org/etsi/mts/tdl/ui/wizard/TDLtxFileTemplateProvider.xtend

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ final class TDLtxFile { 
final class TDLtxLibrary {

	//TODO: make it more sensible

	//TODO: name should not be asked for...

	val name = text("Name:", "Standard")

	val packageName = combo("Library:", #["Standard", "HTTP"], "The library to be added.")

	val name = text("Name:", "TDL")

	val packageName = combo("Library:", #["TDL", "HTTP"], "The library to be added.")

	var validated = false



	override protected updateVariables() {

plugins/org.etsi.mts.tdl.tx.ui/src/org/etsi/mts/tdl/ui/wizard/TDLtxProject.xtend

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ final class TDLtxProject { 
    val name = text("Main Package Name:", "Main", "The name of the main package")

	val path = text("Path:", "tdl", "The package path to place the files in", advancedGroup)

	//TODO: add other options

	val importStandard = check("Import Standard Library", true, "Import TDL standard library definitions.", advancedGroup)

	val importStandard = check("Import TDL Library", true, "Import TDL standard library definitions.", advancedGroup)

	val importHTTP = check("Import HTTP Library", false, "Import TDL HTTP library definitions.", advancedGroup)

	val extendedNature = check("Add additional natures", false, "Add Eclipse Plug-in and Java natures", advancedGroup)
@@ -74,8 +74,8 @@ final class TDLtxProject { 
			//TODO: remove hardcoded import

			var imports = ""

			if (importStandard.value) {

	            addFile('''src/«path»/Standard.tdltx''', TemplateHelper.getLibrary("Standard"))

	            imports += "Import all from Standard\n"

	            addFile('''src/«path»/TDL.tdltx''', TemplateHelper.getLibrary("TDL"))

	            imports += "Import all from TDL\n"

			}

			if (importHTTP.value) {

				addFile('''src/«path»/HTTP.tdltx''', TemplateHelper.getLibrary("HTTP"))

plugins/org.etsi.mts.tdl.tx.ui/src/org/etsi/mts/tdl/ui/wizard/TDLtxProjectBase.xtend

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ final class TDLtxProjectBase { 
    val name = text("Main Package Name:", "Main", "The name of the main package")

	val path = text("Path:", "tdl", "The package path to place the files in", advancedGroup)

	//TODO: add other options

	val importStandard = check("Import Standard Library", true, "Import TDL standard library definitions.", advancedGroup)

	val importStandard = check("Import TDL Library", true, "Import TDL standard library definitions.", advancedGroup)

	val importHTTP = check("Import HTTP Library", false, "Import TDL HTTP library definitions.", advancedGroup)

	val extendedNature = check("Add additional natures", false, "Add Eclipse Plug-in and Java natures", advancedGroup)
@@ -74,8 +74,8 @@ final class TDLtxProjectBase { 
			//TODO: remove hardcoded import

			var imports = ""

			if (importStandard.value) {

	            addFile('''src/«path»/Standard.tdltx''', TemplateHelper.getLibrary("Standard"))

	            imports += "Import all from Standard\n"

	            addFile('''src/«path»/TDL.tdltx''', TemplateHelper.getLibrary("TDL"))

	            imports += "Import all from TDL\n"

			}

			if (importHTTP.value) {

				addFile('''src/«path»/HTTP.tdltx''', TemplateHelper.getLibrary("HTTP"))

plugins/org.etsi.mts.tdl.tx.ui/src/org/etsi/mts/tdl/ui/wizard/TDLtxProjectWithOpenAPI.xtend

+4 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ final class TDLtxProjectWithOpenAPI { 
//	val name = combo("Package Name:", #["Example", "Sample", "Tutorial", "Pack"], "The name of the package", advancedGroup)

    val name = text("Main Package Name:", "Main", "The name of the main package")

	//TODO: add other options

	val importStandard = check("Import Standard Library", true, "Import TDL standard library definitions.", advancedGroup)

	val importStandard = check("Import TDL Library", true, "Import TDL standard library definitions.", advancedGroup)

	val importHTTP = check("Import HTTP Library", false, "Import TDL HTTP library definitions.", advancedGroup)

	val extendedNature = check("Add additional natures", false, "Add Eclipse Plug-in and Java natures", advancedGroup)

    val path = text("Path:", "tdl", "The package path to place the files in", advancedGroup)
@@ -99,8 +99,8 @@ final class TDLtxProjectWithOpenAPI { 
			//TODO: remove hardcoded import

			var imports = ""

			if (importStandard.value) {

	            addFile('''src/«path»/Standard.tdltx''', TemplateHelper.getLibrary("Standard"))

	            imports += "Import all from Standard\n"

	            addFile('''src/«path»/TDL.tdltx''', TemplateHelper.getLibrary("TDL"))

	            imports += "Import all from TDL\n"

			}

			if (importHTTP.value) {

				addFile('''src/«path»/HTTP.tdltx''', TemplateHelper.getLibrary("HTTP"))
@@ -120,7 +120,7 @@ final class TDLtxProjectWithOpenAPI { 
                 * This is an example package

                 */

                Package «name» {

                    Import all from Standard

                    Import all from TDL

                    Import all from «importsName»

                    Type simple

                }