Do not inject previousState var into rules multiple times (#5164)

Fixes #5138 Signed-off-by: Stefan Triller <stefan.triller@telekom.de>
eclipse-archived · Feb 28, 2018 · f01d93f · f01d93f
1 parent 5024dce
commit f01d93f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/...home.model.rule/src/org/eclipse/smarthome/model/rule/jvmmodel/RulesJvmModelInferrer.xtend b/...home.model.rule/src/org/eclipse/smarthome/model/rule/jvmmodel/RulesJvmModelInferrer.xtend
@@ -38,6 +38,8 @@ import org.eclipse.xtext.xbase.jvmmodel.IJvmDeclaredTypeAcceptor
 import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import org.eclipse.xtext.common.types.JvmFormalParameter
+import org.eclipse.emf.common.util.EList
 
 /**
  * <p>Infers a JVM model from the source model.</p> 
@@ -147,15 +149,15 @@ class RulesJvmModelInferrer extends ScriptJvmModelInferrer {
                         val commandTypeRef = ruleModel.newTypeRef(Command)
                         parameters += rule.toParameter(VAR_RECEIVED_COMMAND, commandTypeRef)
                     }
-                    if (containsStateChangeTrigger(rule)) {
+                    if (containsStateChangeTrigger(rule) && !containsParam(parameters, VAR_PREVIOUS_STATE)) {
                         val stateTypeRef = ruleModel.newTypeRef(State)
                         parameters += rule.toParameter(VAR_PREVIOUS_STATE, stateTypeRef)
                     }
                     if (containsEventTrigger(rule)) {
                         val eventTypeRef = ruleModel.newTypeRef(ChannelTriggeredEvent)
                         parameters += rule.toParameter(VAR_RECEIVED_EVENT, eventTypeRef)
                     }
-                    if (containsThingStateChangedEventTrigger(rule)) {
+                    if (containsThingStateChangedEventTrigger(rule) && !containsParam(parameters, VAR_PREVIOUS_STATE)) {
                         val stateTypeRef = ruleModel.newTypeRef(State)
                         parameters += rule.toParameter(VAR_PREVIOUS_STATE, stateTypeRef)
                     }
@@ -166,6 +168,10 @@ class RulesJvmModelInferrer extends ScriptJvmModelInferrer {
         ]
     }
 
+    def private boolean containsParam(EList<JvmFormalParameter> params, String param) {
+        return params.map[name].contains(param);
+    }
+
     def private boolean containsCommandTrigger(Rule rule) {
         for (EventTrigger trigger : rule.getEventtrigger()) {
             if (trigger instanceof CommandEventTrigger) {