Commit 463b523b authored by Philip Makedonski's avatar Philip Makedonski
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request !7
parents 399eb9ff ed18f569

plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/transform/AbstractTranslator.java

+5 −4
Original line number Diff line number Diff line
@@ -87,10 +87,11 @@ public abstract class AbstractTranslator { 
	public static String cleanName(String name) {

		//TODO: use keywords filter?

//		List<String> keywords = List.of("Message", "Time", "Type", "type", "name", "instance", "size", "component");

		List<String> keywords = List.of("Message", "Time", "Type", "instance", "size", "component");

		if (keywords.contains(name)) {

			name = "^"+name;

		}

		//TODO: is this redundant now for TDLtx?

//		List<String> keywords = List.of("Message", "Time", "Type", "instance", "size", "component");

//		if (keywords.contains(name)) {

//			name = "^"+name;

//		}

		name = name.replaceAll("-", "_")

				.replaceAll(" ", "_")

				.replaceAll(":", "_")

plugins/org.etsi.mts.tdl.constraints.ui/src/org/etsi/mts/tdl/constraints/ui/handlers/.project

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>DUMMY</name><comment></comment><projects></projects><buildSpec></buildSpec><natures></natures></projectDescription>
 
 No newline at end of file

plugins/org.etsi.mts.tdl.importers.ui/src/org/etsi/mts/tdl/importers/ui/handlers/.project

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>DUMMY</name><comment></comment><projects></projects><buildSpec></buildSpec><natures></natures></projectDescription>
 
 No newline at end of file

plugins/org.etsi.mts.tdl.model/model/tdl-constraints.ocl

+2 −0
Original line number Diff line number Diff line
@@ -420,6 +420,8 @@ context DataElementUse 


  -- Matching parameters for 'Function's

  inv FunctionCallParameters ('All \'FormalParameter\'s shall be bound if the \'dataElement\' refers to a \'Function\'.' + self.toString()):

        self.dataElement.oclIsUndefined()

        or 

        not self.dataElement.oclIsKindOf(Function)

      or self.dataElement.oclAsType(Function).formalParameter->forAll(p | self.argument->exists(a | a.parameter = p))

plugins/org.etsi.mts.tdl.rt.ui/src/org/etsi/mts/tdl/tools/rt/ui/handlers/.project

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>DUMMY</name><comment></comment><projects></projects><buildSpec></buildSpec><natures></natures></projectDescription>
 
 No newline at end of file