Skip to content
Snippets Groups Projects
Commit b129224a authored by Chrissi's avatar Chrissi
Browse files

remove errors because of new dependencies

parent a68f2ae3
Branches
No related tags found
No related merge requests found
...@@ -8,8 +8,7 @@ val scoptVersion = "3.7.0" ...@@ -8,8 +8,7 @@ val scoptVersion = "3.7.0"
val liftVersion = "3.3.0" val liftVersion = "3.3.0"
val gsonVersion = "2.8.5" 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 modelmanagementprovider = ProjectRef(uri("https://git-st.inf.tu-dresden.de/cwerner/role_model_management_provider.git#master"), "modelmanagementprovider")
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") val uiProvider = ProjectRef(uri("https://git-st.inf.tu-dresden.de/cwerner/role_ui_provider.git"), "uiprovider")
lazy val generator = (project in file(".")) lazy val generator = (project in file("."))
...@@ -44,8 +43,7 @@ lazy val generator = (project in file(".")) ...@@ -44,8 +43,7 @@ lazy val generator = (project in file("."))
oldStrategy(x) oldStrategy(x)
}, },
).dependsOn( ).dependsOn(
syncProvider, modelmanagementprovider,
rsumProvider,
uiProvider uiProvider
).enablePlugins(Antlr4Plugin) ).enablePlugins(Antlr4Plugin)
......
package org.rosi_project.model_sync.generator.acr_model 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, class SJoinClass(_name: String,
_sPackage: String = "", _sPackage: String = "",
......
...@@ -70,13 +70,13 @@ class SClassWriter(val modelClass: SClass, val isView: Boolean, val isObject: Bo ...@@ -70,13 +70,13 @@ class SClassWriter(val modelClass: SClass, val isView: Boolean, val isObject: Bo
/** Writes the "''companion fixture''" for views. /** Writes the "''companion fixture''" for views.
*/ */
protected def generateCompanionFixture: String = { 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}" | 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}] | def getNewView(): ${modelClass.getName} = getNewViewTypeInstance().asInstanceOf[${modelClass.getName}]
|} |}
......
...@@ -2,7 +2,7 @@ package org.rosi_project.model_sync.generator.sync ...@@ -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.generator.acr_model._
import org.rosi_project.model_sync.model_join.representation.grammar.ModelJoinExpression 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 import org.rosi_project.model_sync.model_join.representation.grammar.JoinExpression.JoinType
class JoinGeneratingVisitor(joinExpression: ModelJoinExpression) extends SModelVisitor { class JoinGeneratingVisitor(joinExpression: ModelJoinExpression) extends SModelVisitor {
......
...@@ -5,7 +5,7 @@ import org.rosi_project.model_sync.generator.acr_model.types._ ...@@ -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 org.rosi_project.model_sync.model_join.representation.grammar._
import scala.collection.JavaConverters._ import scala.collection.JavaConverters._
import scala.collection.convert.AsScalaConverters 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 { class ModelJoinViewGeneratingVisitor(joinExpression: ModelJoinExpression) extends SModelVisitor {
......
package org.rosi_project.model_sync.generator.sync 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.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.model_sync.generator.acr_model.SEnum
import org.rosi_project.rsum.join.JoinInfo import org.rosi_project.model_management.sum.IViewCompartment
import org.rosi_project.rsum.join.IJoinCompartment import org.rosi_project.model_management.sum.IViewTypeInfo
import org.rosi_project.rsum.join.RsumJoinType 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 { object PredefRsumTypes {
...@@ -18,7 +14,7 @@ object PredefRsumTypes { ...@@ -18,7 +14,7 @@ object PredefRsumTypes {
private val IJOIN_COMPARTMENT_CLASS = classOf[IJoinCompartment] private val IJOIN_COMPARTMENT_CLASS = classOf[IJoinCompartment]
val IJOIN_COMPARTMENT_STYPE = SType(IJOIN_COMPARTMENT_CLASS.getSimpleName, IJOIN_COMPARTMENT_CLASS.getPackage.getName) 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) val JOIN_INFO_STYPE = SType(JOIN_INFO_CLASS.getSimpleName, JOIN_INFO_CLASS.getPackage.getName)
private val RSUM_JOIN_TYPE_CLASS = RsumJoinType.getClass private val RSUM_JOIN_TYPE_CLASS = RsumJoinType.getClass
...@@ -28,7 +24,7 @@ object PredefRsumTypes { ...@@ -28,7 +24,7 @@ object PredefRsumTypes {
private val IVIEW_COMPARTMENT_CLASS = classOf[IViewCompartment] private val IVIEW_COMPARTMENT_CLASS = classOf[IViewCompartment]
val IVIEW_COMPARTMENT_STYPE = SType(IVIEW_COMPARTMENT_CLASS.getSimpleName, IVIEW_COMPARTMENT_CLASS.getPackage.getName) 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) val VIEWTYPE_INFO_STYPE = SType(VIEWTYPE_INFO_CLASS.getSimpleName, VIEWTYPE_INFO_CLASS.getPackage.getName)
private val AVIEW_ROLE_CLASS = classOf[IViewCompartment#AViewRole] private val AVIEW_ROLE_CLASS = classOf[IViewCompartment#AViewRole]
......
package org.rosi_project.model_sync.generator.sync 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_sync.generator.acr_model.SType
import org.rosi_project.model_management.core.PlayerSync
object PredefSyncTypes { object PredefSyncTypes {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment