From b129224aa5ca1b6ceb9b6ed00d5f6caa1e80fddb Mon Sep 17 00:00:00 2001
From: Chrissi <christopher@hbsc-werner.de>
Date: Thu, 6 Jun 2019 17:18:48 +0200
Subject: [PATCH] remove errors because of new dependencies

---
 build.sbt                                      |  6 ++----
 .../generator/acr_model/SJoinClass.scala       |  2 +-
 .../model_sync/generator/io/SClassWriter.scala |  6 +++---
 .../generator/sync/JoinGeneratingVisitor.scala |  2 +-
 .../sync/ModelJoinViewGeneratingVisitor.scala  |  2 +-
 .../generator/sync/PredefRsumTypes.scala       | 18 +++++++-----------
 .../generator/sync/PredefSyncTypes.scala       |  2 +-
 7 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/build.sbt b/build.sbt
index 46f2d89..662f258 100644
--- a/build.sbt
+++ b/build.sbt
@@ -8,8 +8,7 @@ val scoptVersion = "3.7.0"
 val liftVersion = "3.3.0"
 val gsonVersion = "2.8.5"
 
-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 modelmanagementprovider = ProjectRef(uri("https://git-st.inf.tu-dresden.de/cwerner/role_model_management_provider.git#master"), "modelmanagementprovider")
 val uiProvider = ProjectRef(uri("https://git-st.inf.tu-dresden.de/cwerner/role_ui_provider.git"), "uiprovider")
 
 lazy val generator = (project in file("."))
@@ -44,8 +43,7 @@ lazy val generator = (project in file("."))
         oldStrategy(x)
     },
   ).dependsOn(
-    syncProvider,
-    rsumProvider,
+    modelmanagementprovider,
     uiProvider
   ).enablePlugins(Antlr4Plugin)
 
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/SJoinClass.scala b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/SJoinClass.scala
index 2e46cd4..82f3453 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/acr_model/SJoinClass.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/acr_model/SJoinClass.scala
@@ -1,6 +1,6 @@
 package org.rosi_project.model_sync.generator.acr_model
 
-import org.rosi_project.rsum.join.RsumJoinType
+import org.rosi_project.model_management.sum.join.RsumJoinType
 
 class SJoinClass(_name: String,
              _sPackage: String = "",
diff --git 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
index 47e735e..ac922d2 100644
--- 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
@@ -70,13 +70,13 @@ class SClassWriter(val modelClass: SClass, val isView: Boolean, val isObject: Bo
   /** Writes the "''companion fixture''" for views.
     */
   protected def generateCompanionFixture: String = {
-    s"""object ${modelClass.getName} extends ViewTypeInfo {
+    s"""object ${modelClass.getName} extends ${PredefRsumTypes.VIEWTYPE_INFO_STYPE.getName} {
        |
        |  override def getViewName(): String = "${modelClass.getName}"
        |  
-       |  def getJoinInfos(): Set[JoinInfo] = Set.empty
+       |  def getJoinInfos(): Set[${PredefRsumTypes.JOIN_INFO_STYPE.getName}] = Set.empty
        |
-       |  protected def getNewInstance(): IViewCompartment = new ${modelClass.getName}()
+       |  protected def getNewInstance(): ${PredefRsumTypes.IVIEW_COMPARTMENT_STYPE.getName} = new ${modelClass.getName}()
        |
        |  def getNewView(): ${modelClass.getName} = getNewViewTypeInstance().asInstanceOf[${modelClass.getName}]
        |}
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/sync/JoinGeneratingVisitor.scala b/src/main/scala/org/rosi_project/model_sync/generator/sync/JoinGeneratingVisitor.scala
index 15e2367..b651db9 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/sync/JoinGeneratingVisitor.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/sync/JoinGeneratingVisitor.scala
@@ -2,7 +2,7 @@ package org.rosi_project.model_sync.generator.sync
 
 import org.rosi_project.model_sync.generator.acr_model._
 import org.rosi_project.model_sync.model_join.representation.grammar.ModelJoinExpression
-import org.rosi_project.rsum.join.RsumJoinType
+import org.rosi_project.model_management.sum.join.RsumJoinType
 import org.rosi_project.model_sync.model_join.representation.grammar.JoinExpression.JoinType
 
 class JoinGeneratingVisitor(joinExpression: ModelJoinExpression) extends SModelVisitor {
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/sync/ModelJoinViewGeneratingVisitor.scala b/src/main/scala/org/rosi_project/model_sync/generator/sync/ModelJoinViewGeneratingVisitor.scala
index 8ef5182..f819390 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/sync/ModelJoinViewGeneratingVisitor.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/sync/ModelJoinViewGeneratingVisitor.scala
@@ -5,7 +5,7 @@ import org.rosi_project.model_sync.generator.acr_model.types._
 import org.rosi_project.model_sync.model_join.representation.grammar._
 import scala.collection.JavaConverters._
 import scala.collection.convert.AsScalaConverters
-import org.rosi_project.rsum.join.RsumJoinType
+import org.rosi_project.model_management.sum.join.RsumJoinType
 
 class ModelJoinViewGeneratingVisitor(joinExpression: ModelJoinExpression) extends SModelVisitor {
 
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/sync/PredefRsumTypes.scala b/src/main/scala/org/rosi_project/model_sync/generator/sync/PredefRsumTypes.scala
index d3edd51..994c2f6 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/sync/PredefRsumTypes.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/sync/PredefRsumTypes.scala
@@ -1,16 +1,12 @@
 package org.rosi_project.model_sync.generator.sync
 
-import org.rosi_project.rsum.compartments._
-import org.rosi_project.rsum.IViewCompartment
 import org.rosi_project.model_sync.generator.acr_model.SType
-import org.rosi_project.rsum.ViewTypeInfo
-import org.rosi_project.query.QueryHelper
-import org.rosi_project.query.IQueryViewCompartment
-import org.rosi_project.query.CheckingOption
 import org.rosi_project.model_sync.generator.acr_model.SEnum
-import org.rosi_project.rsum.join.JoinInfo
-import org.rosi_project.rsum.join.IJoinCompartment
-import org.rosi_project.rsum.join.RsumJoinType
+import org.rosi_project.model_management.sum.IViewCompartment
+import org.rosi_project.model_management.sum.IViewTypeInfo
+import org.rosi_project.model_management.sum.query._
+import org.rosi_project.model_management.sum.join._
+import org.rosi_project.model_management.sum.compartments._
 
 object PredefRsumTypes {
 
@@ -18,7 +14,7 @@ object PredefRsumTypes {
   private val IJOIN_COMPARTMENT_CLASS = classOf[IJoinCompartment]
   val         IJOIN_COMPARTMENT_STYPE = SType(IJOIN_COMPARTMENT_CLASS.getSimpleName, IJOIN_COMPARTMENT_CLASS.getPackage.getName) 
   
-  private val JOIN_INFO_CLASS = classOf[JoinInfo]
+  private val JOIN_INFO_CLASS = classOf[IJoinInfo]
   val         JOIN_INFO_STYPE = SType(JOIN_INFO_CLASS.getSimpleName, JOIN_INFO_CLASS.getPackage.getName)
   
   private val RSUM_JOIN_TYPE_CLASS = RsumJoinType.getClass
@@ -28,7 +24,7 @@ object PredefRsumTypes {
   private val IVIEW_COMPARTMENT_CLASS = classOf[IViewCompartment]
   val         IVIEW_COMPARTMENT_STYPE = SType(IVIEW_COMPARTMENT_CLASS.getSimpleName, IVIEW_COMPARTMENT_CLASS.getPackage.getName) 
   
-  private val VIEWTYPE_INFO_CLASS = classOf[ViewTypeInfo]
+  private val VIEWTYPE_INFO_CLASS = classOf[IViewTypeInfo]
   val         VIEWTYPE_INFO_STYPE = SType(VIEWTYPE_INFO_CLASS.getSimpleName, VIEWTYPE_INFO_CLASS.getPackage.getName) 
     
   private val AVIEW_ROLE_CLASS = classOf[IViewCompartment#AViewRole]
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/sync/PredefSyncTypes.scala b/src/main/scala/org/rosi_project/model_sync/generator/sync/PredefSyncTypes.scala
index 5492250..052a048 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/sync/PredefSyncTypes.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/sync/PredefSyncTypes.scala
@@ -1,7 +1,7 @@
 package org.rosi_project.model_sync.generator.sync
 
-import org.rosi_project.model_sync.sync.PlayerSync
 import org.rosi_project.model_sync.generator.acr_model.SType
+import org.rosi_project.model_management.core.PlayerSync
 
 object PredefSyncTypes {
   
-- 
GitLab