Revert "Merge branch 'develop' of...

Revert "Merge branch 'develop' of https://git-st.inf.tu-dresden.de/cwerner/code_generator into develop"

This reverts commit 33e6b9b8, reversing
changes made to 98129c40.

.gitmodules

-[submodule "lib/ModelSyncProvider"]
-	path = lib/ModelSyncProvider
-	url = https://git-st.inf.tu-dresden.de/cwerner/role_model_synchronization_provider.git
 [submodule "src/main/asciidoc"]
 	path = src/main/doc
 	url = https://git-st.inf.tu-dresden.de/cwerner/code_generator.wiki.git
-[submodule "lib/ModelSUMProvider"]
-	path = lib/ModelSUMProvider
-	url = https://git-st.inf.tu-dresden.de/cwerner/single_underlying_role_model.git

build.sbt

@@ -8,8 +8,9 @@ val scoptVersion = "3.7.0"
 val liftVersion = "3.3.0"
 val gsonVersion = "2.8.5"
 
-val syncProvider = RootProject(file("lib/ModelSyncProvider"))
-val rsumProvider = RootProject(file("lib/ModelSUMProvider"))
+val syncProvider = ProjectRef(uri("https://git-st.inf.tu-dresden.de/cwerner/role_model_synchronization_provider.git#develop"), "modelsyncprovider")
+val rsumProvider = ProjectRef(uri("https://git-st.inf.tu-dresden.de/cwerner/single_underlying_role_model.git#master"), "rsummodel")
+val uiProvider = ProjectRef(uri("https://git-st.inf.tu-dresden.de/cwerner/role_ui_provider.git"), "uiprovider")
 
 lazy val generator = (project in file("."))
   .settings(
@@ -44,7 +45,8 @@ lazy val generator = (project in file("."))
     },
   ).dependsOn(
     syncProvider,
-    rsumProvider
+    rsumProvider,
+    uiProvider
   ).enablePlugins(Antlr4Plugin)
 
 antlr4PackageName in Antlr4 := Some("org.rosi_project.model_sync.model_join.representation.parser.antlr.generated")

ModelSUMProvider @ f10627a3

-Subproject commit f10627a3d70d860e59c4924e3c0b0ecb93d8d0bc

ModelSyncProvider @ 619bbf1e

-Subproject commit 619bbf1efcfee406a134412275928322d9d28e05

src/main/scala/org/rosi_project/model_sync/generator/sync/ViewGeneratingVisitor.scala

@@ -41,8 +41,7 @@ class ViewGeneratingVisitor extends SModelVisitor {
       }
       //add initialize method if necessary
       if (!inner.isAbstract && !inner.isInterface) {
-        inner.addMethod(ViewMethods.getIsRelationalMethod(false))
-        inner.addMethod(ViewMethods.getCreationObjectMethod(inner))
+        inner.addMethod(ViewMethods.getInitializeMethod(inner))
       }
       //add delete method
       inner.addMethod(ViewMethods.getDeleteElementNaturalMethod(inner))
@@ -87,8 +86,7 @@ class ViewGeneratingVisitor extends SModelVisitor {
       val internalClass = new SInnerViewRelationalClass(r.getName + "Role", _externalClass = viewCompartment, 
           sumSource = r.asInstanceOf[SRelationalCompartmentClass], viewSource = sourceRole, viewTarget = targetRole)      
       internalClass.setAttributes(sourceAtt ++ targetAtt)
-      internalClass.addMethod(ViewMethods.getIsRelationalMethod(true))
-      internalClass.addMethod(ViewMethods.getCreationObjectMethod(internalClass))      
+      internalClass.addMethod(ViewMethods.getInitializeMethod(internalClass))
       internalClass.addMethod(ViewMethods.getDeleteElementRelationMethod(internalClass))
       ViewMethods.getSourceAndTargetGetter(internalClass).foreach(internalClass.addMethod(_))
       internalClass.addParent(PredefRsumTypes.AVIEW_ROLE_STYPE)

src/main/scala/org/rosi_project/model_sync/generator/sync/ViewMethods.scala

@@ -60,33 +60,22 @@ object ViewMethods {
     methods
   }
   
-  def getIsRelationalMethod(relational: Boolean): SMethod = {
+  def getInitializeMethod(nat: SInnerViewNaturalClass): SMethod = {
     val method = new SMethod(
-      name = "isRelational",
-      result = PredefTypes.Boolean,
-      params = Seq.empty,
-      implementation = Seq(SMethodStatement(content = s"return ${relational}", usedTypes = Set.empty)), 
-      true)    
-    method.setVisibility(MethodVisibility.protectedVis)
-    method
-  }
-  
-  def getCreationObjectMethod(nat: SInnerViewNaturalClass): SMethod = {
-    val method = new SMethod(
-      name = "getCreationObject",
-      result = PredefTypes.Object,
+      name = "initialize",
+      result = PredefTypes.Unit,
       params = Seq.empty,
-      implementation = Seq(SMethodStatement(content = s"return new ${nat.sumSource.getName}(" + 
-          s"${nat.sumSource.getAllConstructorParameters.map(m => m.getName).mkString(", ")})", usedTypes = Set.empty)), 
+      implementation = Seq(SMethodStatement(content = s"initializeElement(new ${nat.sumSource.getName}(" + 
+          s"${nat.sumSource.getAllConstructorParameters.map(m => m.getName).mkString(", ")}), false)", usedTypes = Set.empty)), 
       true)    
     method.setVisibility(MethodVisibility.protectedVis)
     method
   }
     
-  def getCreationObjectMethod(ref: SInnerViewRelationalClass): SMethod = {
+  def getInitializeMethod(ref: SInnerViewRelationalClass): SMethod = {
     val method = new SMethod(
-      name = "getCreationObject",
-      result = PredefTypes.Object,
+      name = "initialize",
+      result = PredefTypes.Unit,
       params = Seq.empty,
       implementation = Seq(SMethodStatement(content = "return", usedTypes = Set.empty)), 
       true)
@@ -101,7 +90,7 @@ object ViewMethods {
             usedTypes = Set(ref.viewTarget.sumSource)),
         SMethodStatement(content = s"val v: ${ref.sumSource.getName} = new ${ref.sumSource.getName}(sp, tp)",
             usedTypes = Set(ref.sumSource)),
-        SMethodStatement(content = s"return v",
+        SMethodStatement(content = s"initializeElement(v, true)",
             usedTypes = Set.empty))    
     method.implementation = statements
     method.setVisibility(MethodVisibility.protectedVis)