| commit | 73e467b2d2015979e1231e6ebaa5fcbf20f8c52b | [log] [tgz] |
|---|---|---|
| author | Ralf Mollik <ramollik@compex-commerce.com> | Wed May 29 10:43:01 2019 +0200 |
| committer | Ralf Mollik <ramollik@compex-commerce.com> | Wed May 29 10:43:01 2019 +0200 |
| tree | 8f43ce374c2e41e0b916e021ce601b989e3b5146 | |
| parent | 306d8e2eb4091caa0b7ec337a888e4115c45872b [diff] |
catch up with branch daily Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.xtext.signal/emf-gen/org/eclipse/osbp/xtext/signal/impl/SignalDSLPackageImpl.java b/org.eclipse.osbp.xtext.signal/emf-gen/org/eclipse/osbp/xtext/signal/impl/SignalDSLPackageImpl.java index 819b91b..da85700 100644 --- a/org.eclipse.osbp.xtext.signal/emf-gen/org/eclipse/osbp/xtext/signal/impl/SignalDSLPackageImpl.java +++ b/org.eclipse.osbp.xtext.signal/emf-gen/org/eclipse/osbp/xtext/signal/impl/SignalDSLPackageImpl.java
@@ -245,7 +245,6 @@ // Initialize simple dependencies DataDSLPackage.eINSTANCE.eClass(); - FunctionLibraryDSLPackage.eINSTANCE.eClass(); // Create package meta-data objects theSignalDSLPackage.createPackageContents();
diff --git a/org.eclipse.osbp.xtext.signal/src/org/eclipse/osbp/xtext/signal/jvmmodel/SignalDSLJvmModelInferrer.xtend b/org.eclipse.osbp.xtext.signal/src/org/eclipse/osbp/xtext/signal/jvmmodel/SignalDSLJvmModelInferrer.xtend index f6491b2..beb44a2 100644 --- a/org.eclipse.osbp.xtext.signal/src/org/eclipse/osbp/xtext/signal/jvmmodel/SignalDSLJvmModelInferrer.xtend +++ b/org.eclipse.osbp.xtext.signal/src/org/eclipse/osbp/xtext/signal/jvmmodel/SignalDSLJvmModelInferrer.xtend Binary files differ
diff --git a/org.eclipse.osbp.xtext.signal/xtend-gen/org/eclipse/osbp/xtext/signal/jvmmodel/SignalDSLJvmModelInferrer.java b/org.eclipse.osbp.xtext.signal/xtend-gen/org/eclipse/osbp/xtext/signal/jvmmodel/SignalDSLJvmModelInferrer.java index 148555f..ea2ecdd 100644 --- a/org.eclipse.osbp.xtext.signal/xtend-gen/org/eclipse/osbp/xtext/signal/jvmmodel/SignalDSLJvmModelInferrer.java +++ b/org.eclipse.osbp.xtext.signal/xtend-gen/org/eclipse/osbp/xtext/signal/jvmmodel/SignalDSLJvmModelInferrer.java
@@ -1747,7 +1747,7 @@ StringConcatenation _builder_4 = new StringConcatenation(); String _defaultVariableName_3 = this.df.getDefaultVariableName(interchange.getDataRef()); _builder_4.append(_defaultVariableName_3); - _builder_4.append(".setFileURL(getTriggerfile().getParent().toString() + \"\\\\"); + _builder_4.append(".setFileURL(getTriggerfile().getParent().toString() + File.separator + \""); String _dataInterchangeFileName = this.df.getDataInterchangeFileName(interchange.getDataRef()); _builder_4.append(_dataInterchangeFileName); _builder_4.append("\");"); @@ -1893,7 +1893,7 @@ StringConcatenation _builder_4 = new StringConcatenation(); String _defaultVariableName_3 = this.df.getDefaultVariableName(interchange.getDataRef()); _builder_4.append(_defaultVariableName_3); - _builder_4.append(".setFileURL(getTriggerfile().getParent().toString() + \"\\\\"); + _builder_4.append(".setFileURL(getTriggerfile().getParent().toString() + File.separator + \""); String _dataInterchangeFileName = this.df.getDataInterchangeFileName(interchange.getDataRef()); _builder_4.append(_dataInterchangeFileName); _builder_4.append("\");");