From 2cb6b0d640d4d9ff2f28d85331e3954b1579b418 Mon Sep 17 00:00:00 2001
From: Chrissi <christopher@hbsc-werner.de>
Date: Tue, 18 Jun 2019 23:43:02 +0200
Subject: [PATCH] modify creation of change methods in synchronization
---
.../generator/sync/GetterSetterGeneratingVisitor.scala | 7 ++++---
.../model_sync/generator/sync/SyncEnhancingVisitor.scala | 8 ++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/sync/GetterSetterGeneratingVisitor.scala b/src/main/scala/org/rosi_project/model_sync/generator/sync/GetterSetterGeneratingVisitor.scala
index 477d165..8577860 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/sync/GetterSetterGeneratingVisitor.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/sync/GetterSetterGeneratingVisitor.scala
@@ -17,14 +17,15 @@ class GetterSetterGeneratingVisitor extends SModelVisitor {
sClass.getStructuralFeatures.foreach(attr => {
attr.setVisibility(MethodVisibility.protectedVis)
val getter = new SGetter(attr)
- sClass.addMethod(getter)
- val setter = new SSetter(attr)
- sClass.addMethod(setter)
+ sClass.addMethod(getter)
if (attr.getTypeElement.isInstanceOf[GenericSequence]) {
val adder = new SSetterAdd(attr, attr.getTypeElement.asInstanceOf[GenericSequence].typeParam)
sClass.addMethod(adder)
val remover = new SSetterRemove(attr, attr.getTypeElement.asInstanceOf[GenericSequence].typeParam)
sClass.addMethod(remover)
+ } else {
+ val setter = new SSetter(attr)
+ sClass.addMethod(setter)
}
})
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/sync/SyncEnhancingVisitor.scala b/src/main/scala/org/rosi_project/model_sync/generator/sync/SyncEnhancingVisitor.scala
index a46a23a..71fb310 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/sync/SyncEnhancingVisitor.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/sync/SyncEnhancingVisitor.scala
@@ -36,7 +36,7 @@ class SyncEnhancingVisitor() extends SModelVisitor {
}
override def visit(sMethod: SMethod): Unit = {
- extractSetterAttr(sMethod).foreach(attr => sMethod.augmentImplementation(SMethodStatement(s"+this change$attr ()")))
+ extractSetterAttr(sMethod).foreach(attr => sMethod.augmentImplementation(SMethodStatement(s"+this $attr ()")))
}
override def visit(sType: SType): Unit = {
@@ -60,11 +60,11 @@ class SyncEnhancingVisitor() extends SModelVisitor {
private def extractSetterAttr(sMethod: SMethod): Option[String] = {
sMethod.getName match {
case SyncEnhancingVisitor.Setter(attrName) =>
- Option(attrName)
+ Option("set" + attrName)
case SyncEnhancingVisitor.Adder(attrName) =>
- Option(attrName)
+ Option("add" + attrName)
case SyncEnhancingVisitor.Remover(attrName) =>
- Option(attrName)
+ Option("remove" + attrName)
case _ =>
None
}
--
GitLab