Loading plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/transform/AbstractTranslator.java +5 −4 Changes for plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/transform/AbstractTranslator.java: 5 added lines, 4 removed lines. Original line number Original line Diff line number Diff line Loading @@ -87,10 +87,11 @@ public abstract class AbstractTranslator { public static String cleanName(String name) { public static String cleanName(String name) { //TODO: use keywords filter? //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", "type", "name", "instance", "size", "component"); List<String> keywords = List.of("Message", "Time", "Type", "instance", "size", "component"); //TODO: is this redundant now for TDLtx? if (keywords.contains(name)) { // List<String> keywords = List.of("Message", "Time", "Type", "instance", "size", "component"); name = "^"+name; // if (keywords.contains(name)) { } // name = "^"+name; // } name = name.replaceAll("-", "_") name = name.replaceAll("-", "_") .replaceAll(" ", "_") .replaceAll(" ", "_") .replaceAll(":", "_") .replaceAll(":", "_") Loading plugins/org.etsi.mts.tdl.constraints.ui/src/org/etsi/mts/tdl/constraints/ui/handlers/.project −1 File deleted. Show changes plugins/org.etsi.mts.tdl.importers.ui/src/org/etsi/mts/tdl/importers/ui/handlers/.project −1 File deleted. Show changes plugins/org.etsi.mts.tdl.model/model/tdl-constraints.ocl +2 Changes for plugins/org.etsi.mts.tdl.model/model/tdl-constraints.ocl: 2 added lines, 0 removed lines. Original line number Original line Diff line number Diff line Loading @@ -420,6 +420,8 @@ context DataElementUse -- Matching parameters for 'Function's -- Matching parameters for 'Function's inv FunctionCallParameters ('All \'FormalParameter\'s shall be bound if the \'dataElement\' refers to a \'Function\'.' + self.toString()): 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) not self.dataElement.oclIsKindOf(Function) or self.dataElement.oclAsType(Function).formalParameter->forAll(p | self.argument->exists(a | a.parameter = p)) or self.dataElement.oclAsType(Function).formalParameter->forAll(p | self.argument->exists(a | a.parameter = p)) Loading plugins/org.etsi.mts.tdl.rt.ui/src/org/etsi/mts/tdl/tools/rt/ui/handlers/.project −1 File deleted. Show changes Loading
plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/transform/AbstractTranslator.java +5 −4 Changes for plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/transform/AbstractTranslator.java: 5 added lines, 4 removed lines. Original line number Original line Diff line number Diff line Loading @@ -87,10 +87,11 @@ public abstract class AbstractTranslator { public static String cleanName(String name) { public static String cleanName(String name) { //TODO: use keywords filter? //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", "type", "name", "instance", "size", "component"); List<String> keywords = List.of("Message", "Time", "Type", "instance", "size", "component"); //TODO: is this redundant now for TDLtx? if (keywords.contains(name)) { // List<String> keywords = List.of("Message", "Time", "Type", "instance", "size", "component"); name = "^"+name; // if (keywords.contains(name)) { } // name = "^"+name; // } name = name.replaceAll("-", "_") name = name.replaceAll("-", "_") .replaceAll(" ", "_") .replaceAll(" ", "_") .replaceAll(":", "_") .replaceAll(":", "_") Loading
plugins/org.etsi.mts.tdl.constraints.ui/src/org/etsi/mts/tdl/constraints/ui/handlers/.project −1 File deleted. Show changes
plugins/org.etsi.mts.tdl.importers.ui/src/org/etsi/mts/tdl/importers/ui/handlers/.project −1 File deleted. Show changes
plugins/org.etsi.mts.tdl.model/model/tdl-constraints.ocl +2 Changes for plugins/org.etsi.mts.tdl.model/model/tdl-constraints.ocl: 2 added lines, 0 removed lines. Original line number Original line Diff line number Diff line Loading @@ -420,6 +420,8 @@ context DataElementUse -- Matching parameters for 'Function's -- Matching parameters for 'Function's inv FunctionCallParameters ('All \'FormalParameter\'s shall be bound if the \'dataElement\' refers to a \'Function\'.' + self.toString()): 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) not self.dataElement.oclIsKindOf(Function) or self.dataElement.oclAsType(Function).formalParameter->forAll(p | self.argument->exists(a | a.parameter = p)) or self.dataElement.oclAsType(Function).formalParameter->forAll(p | self.argument->exists(a | a.parameter = p)) Loading
plugins/org.etsi.mts.tdl.rt.ui/src/org/etsi/mts/tdl/tools/rt/ui/handlers/.project −1 File deleted. Show changes