Commit e2311567 authored 5 years ago by Chrissi

Merge branch 'develop'

parents 0cf8f28c f0cedcbe

No related branches found

No related tags found

No related merge requests found

Show whitespace changes

Inline Side-by-side

Showing

src/main/scala/org/rosi_project/model_sync/generator/acr_model/SEnum.scala 10 additions, 0 deletions

...g/rosi_project/model_sync/generator/acr_model/SEnum.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SGetter.scala 4 additions, 4 deletions

...rosi_project/model_sync/generator/acr_model/SGetter.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SInnerClass.scala 13 additions, 0 deletions

..._project/model_sync/generator/acr_model/SInnerClass.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SInnerViewNaturalClass.scala 13 additions, 0 deletions

...del_sync/generator/acr_model/SInnerViewNaturalClass.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SInnerViewRelationalClass.scala 16 additions, 0 deletions

..._sync/generator/acr_model/SInnerViewRelationalClass.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SJoinClass.scala 23 additions, 0 deletions

...i_project/model_sync/generator/acr_model/SJoinClass.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SMethod.scala 17 additions, 8 deletions

...rosi_project/model_sync/generator/acr_model/SMethod.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SMethodParameter.scala 21 additions, 3 deletions

...ect/model_sync/generator/acr_model/SMethodParameter.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SMethodStatement.scala 1 addition, 1 deletion

...ect/model_sync/generator/acr_model/SMethodStatement.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SModel.scala 68 additions, 5 deletions

.../rosi_project/model_sync/generator/acr_model/SModel.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SModelVisitor.scala 7 additions, 0 deletions

...roject/model_sync/generator/acr_model/SModelVisitor.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SNamedModelElement.scala 21 additions, 0 deletions

...t/model_sync/generator/acr_model/SNamedModelElement.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SReference.scala 55 additions, 0 deletions

...i_project/model_sync/generator/acr_model/SReference.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SRelationalCompartmentClass.scala 13 additions, 0 deletions

...ync/generator/acr_model/SRelationalCompartmentClass.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SSetter.scala 12 additions, 5 deletions

...rosi_project/model_sync/generator/acr_model/SSetter.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SSetterAdd.scala 23 additions, 0 deletions

...i_project/model_sync/generator/acr_model/SSetterAdd.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SSetterRemove.scala 23 additions, 0 deletions

...roject/model_sync/generator/acr_model/SSetterRemove.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SStructuralFeature.scala 24 additions, 0 deletions

...t/model_sync/generator/acr_model/SStructuralFeature.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/SType.scala 3 additions, 24 deletions

...g/rosi_project/model_sync/generator/acr_model/SType.scala
src/main/scala/org/rosi_project/model_sync/generator/acr_model/STypeRegistry.scala 81 additions, 32 deletions

...roject/model_sync/generator/acr_model/STypeRegistry.scala

with 448 additions and 82 deletions

Please register or to comment