Merge branch 'develop'

e2311567 · Chrissi · 0cf8f28c · f0cedcbe · e2311567 · e2311567
Commit e2311567 authored 5 years ago by Chrissi
--- a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/STypedElement.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/STypedElement.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/SViewClass.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/SViewClass.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/SimpleSModel.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/SimpleSModel.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/GenericSequence.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/GenericSequence.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/PredefEcoreTypes.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/PredefEcoreTypes.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/PredefTypes.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/PredefTypes.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/SList.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/SList.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/SSeq.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/SSeq.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/SSet.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/types/SSet.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/conversion/Converter.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/conversion/Converter.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/conversion/EmfTypeTranslator.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/conversion/EmfTypeTranslator.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/conversion/SClassConverter.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/conversion/SClassConverter.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/conversion/SEnumConverter.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/conversion/SEnumConverter.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/conversion/SModelGenerator.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/conversion/SModelGenerator.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/env/FilesCompiler.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/env/FilesCompiler.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/env/JarPackager.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/env/JarPackager.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/io/SClassWriter.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/io/SClassWriter.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/io/SEnumWriter.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/io/SEnumWriter.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/io/SModelFSWriter.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/io/SModelFSWriter.scala
--- a/src/main/scala/org/rosi_project/model_sync/generator/sync/BasicTypeGetterSetterGeneratingVisitor.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/sync/BasicTypeGetterSetterGeneratingVisitor.scala