Backport of openhab#1460

This allows group items who are not exactly the same base item to be included in logic operations, for example a dimmer can now be included in a group switch item.
digitaldan · Feb 22, 2016 · 8c15096 · 8c15096
1 parent 290cc11
commit 8c15096
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...b.core.compat1x/src/main/java/org/openhab/core/library/types/ArithmeticGroupFunction.java b/...b.core.compat1x/src/main/java/org/openhab/core/library/types/ArithmeticGroupFunction.java
@@ -57,7 +57,7 @@ public And(State activeValue, State passiveValue) {
 		public State calculate(List<Item> items) {
 			if(items!=null && items.size()>0) {
 				for(Item item : items) {
-					if(!activeState.equals(item.getState())) {
+					if(!activeState.equals(item.getStateAs(activeState.getClass()))) {
 						return passiveState;
 					}
 				}
@@ -132,7 +132,7 @@ public Or(State activeValue, State passiveValue) {
 		public State calculate(List<Item> items) {	
 			if(items!=null) {
 				for(Item item : items) {
-					if(activeState.equals(item.getState())) {
+					if(activeState.equals(item.getStateAs(activeState.getClass()))) {
 						return activeState;
 					}
 				}