public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use renamed Units class (#9267)

Browse Source 
Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-12-07 10:34:02 +01:00
committed by GitHub
parent d0480d0f2e
commit ac6f08908f
208 changed files with 1087 additions and 1169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/handler/OpenSprinklerDeviceHandler.java
View File

@@ -14,7 +14,7 @@ package org.openhab.binding.opensprinkler.internal.handler;
import static org.openhab.binding.opensprinkler.internal.OpenSprinklerBindingConstants.*;
import static org.openhab.core.library.unit.MetricPrefix.MILLI;
import static org.openhab.core.library.unit.SmartHomeUnits.PERCENT;
import static org.openhab.core.library.unit.Units.PERCENT;
import javax.measure.quantity.ElectricCurrent;
@@ -23,7 +23,7 @@ import org.openhab.binding.opensprinkler.internal.api.exception.CommunicationApi
import org.openhab.binding.opensprinkler.internal.model.NoCurrentDrawSensorException;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.unit.SmartHomeUnits;
import org.openhab.core.library.unit.Units;
import org.openhab.core.thing.Channel;
import org.openhab.core.thing.ChannelUID;
import org.openhab.core.thing.Thing;
@@ -62,7 +62,7 @@ public class OpenSprinklerDeviceHandler extends OpenSprinklerBaseHandler {
break;
case SENSOR_CURRENT_DRAW:
updateState(channel,
new QuantityType<ElectricCurrent>(getApi().currentDraw(), MILLI(SmartHomeUnits.AMPERE)));
new QuantityType<ElectricCurrent>(getApi().currentDraw(), MILLI(Units.AMPERE)));
break;
default:
logger.debug("Not updating unknown channel {}", channel);

8
bundles/org.openhab.binding.opensprinkler/src/main/java/org/openhab/binding/opensprinkler/internal/handler/OpenSprinklerStationHandler.java
View File

@@ -27,7 +27,7 @@ import org.openhab.binding.opensprinkler.internal.api.exception.GeneralApiExcept
import org.openhab.binding.opensprinkler.internal.config.OpenSprinklerStationConfig;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.unit.SmartHomeUnits;
import org.openhab.core.library.unit.Units;
import org.openhab.core.thing.Channel;
import org.openhab.core.thing.ChannelUID;
import org.openhab.core.thing.Thing;
@@ -90,7 +90,7 @@ public class OpenSprinklerStationHandler extends OpenSprinklerBaseHandler {
return;
}
QuantityType<?> quantity = (QuantityType<?>) command;
this.nextDurationTime = quantity.toUnit(SmartHomeUnits.SECOND).toBigDecimal();
this.nextDurationTime = quantity.toUnit(Units.SECOND).toBigDecimal();
updateState(channelUID, quantity);
}
@@ -182,7 +182,7 @@ public class OpenSprinklerStationHandler extends OpenSprinklerBaseHandler {
+ " for the OpenSprinkler device. Exception received: " + exp);
}
return new QuantityType<>(remainingWaterTime, SmartHomeUnits.SECOND);
return new QuantityType<>(remainingWaterTime, Units.SECOND);
}
@Override
@@ -203,7 +203,7 @@ public class OpenSprinklerStationHandler extends OpenSprinklerBaseHandler {
case NEXT_DURATION:
BigDecimal duration = nextDurationValue();
if (duration != null) {
updateState(channel, new QuantityType<>(duration, SmartHomeUnits.SECOND));
updateState(channel, new QuantityType<>(duration, Units.SECOND));
}
break;
case STATION_QUEUED: