Commits (2)
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
......
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.source=11
...@@ -4,7 +4,6 @@ Bundle-Name: Common ...@@ -4,7 +4,6 @@ Bundle-Name: Common
Bundle-SymbolicName: org.etsi.mts.tdl.common Bundle-SymbolicName: org.etsi.mts.tdl.common
Bundle-Version: 1.0.0.qualifier Bundle-Version: 1.0.0.qualifier
Automatic-Module-Name: org.etsi.mts.tdl.common Automatic-Module-Name: org.etsi.mts.tdl.common
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.xtext, Require-Bundle: org.eclipse.xtext,
org.etsi.mts.tdl.model org.etsi.mts.tdl.model
Export-Package: org.etsi.mts.tdl.scoping, Export-Package: org.etsi.mts.tdl.scoping,
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="epsilon"/> <classpathentry kind="src" path="epsilon"/>
......
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
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
...@@ -20,4 +20,3 @@ Require-Bundle: org.eclipse.emf.common, ...@@ -20,4 +20,3 @@ Require-Bundle: org.eclipse.emf.common,
org.eclipse.xtext, org.eclipse.xtext,
org.eclipse.epsilon.common.dt org.eclipse.epsilon.common.dt
Export-Package: org.etsi.mts.tdl.constraints.evl Export-Package: org.etsi.mts.tdl.constraints.evl
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
...@@ -216,7 +216,9 @@ public class Validator { ...@@ -216,7 +216,9 @@ public class Validator {
// System.out.println(lines); // System.out.println(lines);
lines.set(lines.size()-1, lines.get(lines.size()-1).substring(0, region.getEnd().getColumn())); lines.set(lines.size()-1, lines.get(lines.size()-1).substring(0, region.getEnd().getColumn()));
lines.set(0, lines.get(0).substring(region.getStart().getColumn()-1)); lines.set(0, lines.get(0).substring(region.getStart().getColumn()-1));
lines = lines.stream().filter(l -> !l.trim().startsWith("//")).toList(); lines = lines.stream()
.filter(l -> !l.trim().startsWith("//"))
.collect(Collectors.toList());
snippet = String.join(" ", lines) snippet = String.join(" ", lines)
.replaceAll("\\s+", " ") .replaceAll("\\s+", " ")
; ;
......
...@@ -8,13 +8,13 @@ Automatic-Module-Name: org.etsi.mts.tdl.helper ...@@ -8,13 +8,13 @@ Automatic-Module-Name: org.etsi.mts.tdl.helper
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext, Require-Bundle: org.eclipse.xtext,
org.etsi.mts.tdl.model, org.etsi.mts.tdl.model,
org.etsi.mts.tdl.TDLan2,
org.etsi.mts.tdl.TPLan2,
org.eclipse.xtext.xbase, org.eclipse.xtext.xbase,
org.eclipse.xtext.util, org.eclipse.xtext.util,
org.eclipse.ocl.xtext.essentialocl, org.eclipse.ocl.xtext.essentialocl,
org.apache.log4j, org.apache.log4j,
org.apache.commons.logging, org.apache.commons.logging,
org.etsi.mts.tdl.TDLan2,
org.etsi.mts.tdl.TPLan2,
org.etsi.mts.tdl.tx, org.etsi.mts.tdl.tx,
org.etsi.mts.tdl.txi org.etsi.mts.tdl.txi
Export-Package: org.etsi.mts.tdl.helper Export-Package: org.etsi.mts.tdl.helper
...@@ -20,7 +20,7 @@ Export-Package: org.etsi.mts.tdl, ...@@ -20,7 +20,7 @@ Export-Package: org.etsi.mts.tdl,
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.ocl.pivot, org.eclipse.ocl.pivot;visibility:=reexport,
org.eclipse.ocl.xtext.essentialocl, org.eclipse.ocl.xtext.essentialocl,
org.eclipse.ocl.xtext.essentialocl.ui;bundle-version="1.1.0" org.eclipse.ocl.xtext.essentialocl.ui;bundle-version="1.1.0"
Eclipse-LazyStart: true Eclipse-LazyStart: true
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="openapi-generator-cli-6.2.1.jar" sourcepath="openapi-generator-cli-6.2.1-sources.jar"> <classpathentry exported="true" kind="lib" path="openapi-generator-cli-6.2.1.jar" sourcepath="openapi-generator-cli-6.2.1-sources.jar">
<attributes> <attributes>
......
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.compiler.source=11
...@@ -668,5 +668,4 @@ Export-Package: ch.lambdaj, ...@@ -668,5 +668,4 @@ Export-Package: ch.lambdaj,
org.yaml.snakeyaml.serializer, org.yaml.snakeyaml.serializer,
org.yaml.snakeyaml.tokens, org.yaml.snakeyaml.tokens,
org.yaml.snakeyaml.util org.yaml.snakeyaml.util
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.etsi.mts.tdl.openapi.generator.wrapper Automatic-Module-Name: org.etsi.mts.tdl.openapi.generator.wrapper
...@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.etsi.mts.tdl.openapi2tdl.next ...@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.etsi.mts.tdl.openapi2tdl.next
Bundle-Version: 1.0.0.qualifier Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: European Telecommunications Standards Institute (ETSI) Bundle-Vendor: European Telecommunications Standards Institute (ETSI)
Automatic-Module-Name: org.etsi.mts.tdl.openapi2tdl.next Automatic-Module-Name: org.etsi.mts.tdl.openapi2tdl.next
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.etsi.mts.tdl.model, Require-Bundle: org.etsi.mts.tdl.model,
org.etsi.mts.tdl.common, org.etsi.mts.tdl.common,
org.etsi.mts.tdl.openapi.generator.wrapper, org.etsi.mts.tdl.openapi.generator.wrapper,
......