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 477d165584cc542cc1e97177b9acf0e0f63afbd0..857786022f807999c8d2284923c3e8e4e36d5b07 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 a46a23abda9a5739abf12f3e730d7afb7c21e5f7..71fb310af2666d19503593c3d4d4f8c9f74300cb 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 }