Skip to content
This repository has been archived by the owner on May 17, 2021. It is now read-only.

This allows group items who are not exactly the same base item to be inc... #1460

Merged
merged 1 commit into from
Sep 22, 2014
Merged

This allows group items who are not exactly the same base item to be inc... #1460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ab.core.library/src/main/java/org/openhab/core/library/types/ArithmeticGroupFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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;
}
}
Expand Down