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

Rework ThingActions (#8755)

Browse Source 
* Remove duplication by making use of default Java generated exceptions
* Make ThingActions labels/descriptions more consistent

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-10-15 10:53:53 +02:00
committed by GitHub
parent aef1d10f40
commit 978e122e00
40 changed files with 305 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/actions/MaxCubeActions.java
View File

@@ -59,12 +59,8 @@ public class MaxCubeActions implements ThingActions {
return true;
}
public static boolean backup(@Nullable ThingActions actions) {
if (actions instanceof MaxCubeActions) {
return ((MaxCubeActions) actions).backup();
} else {
throw new IllegalArgumentException("Actions is not an instance of MaxCubeActions");
}
public static boolean backup(ThingActions actions) {
return ((MaxCubeActions) actions).backup();
}
@RuleAction(label = "reset the Cube configuration", description = "Resets the MAX! Cube room and device information. Devices will need to be included again!")
@@ -78,12 +74,8 @@ public class MaxCubeActions implements ThingActions {
return true;
}
public static boolean reset(@Nullable ThingActions actions) {
if (actions instanceof MaxCubeActions) {
return ((MaxCubeActions) actions).resetConfig();
} else {
throw new IllegalArgumentException("Actions is not an instance of MaxCubeActions");
}
public static boolean reset(ThingActions actions) {
return ((MaxCubeActions) actions).resetConfig();
}
@RuleAction(label = "restart the Cube", description = "Restarts the MAX! Cube.")
@@ -97,11 +89,7 @@ public class MaxCubeActions implements ThingActions {
return true;
}
public static boolean reboot(@Nullable ThingActions actions) {
if (actions instanceof MaxCubeActions) {
return ((MaxCubeActions) actions).reboot();
} else {
throw new IllegalArgumentException("Actions is not an instance of MaxCubeActions");
}
public static boolean reboot(ThingActions actions) {
return ((MaxCubeActions) actions).reboot();
}
}

8
bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/actions/MaxDevicesActions.java
View File

@@ -59,11 +59,7 @@ public class MaxDevicesActions implements ThingActions {
return true;
}
public static boolean deleteFromCube(@Nullable ThingActions actions) {
if (actions instanceof MaxDevicesActions) {
return ((MaxDevicesActions) actions).deleteFromCube();
} else {
throw new IllegalArgumentException("Actions is not an instance of MaxDevicesActions");
}
public static boolean deleteFromCube(ThingActions actions) {
return ((MaxDevicesActions) actions).deleteFromCube();
}
}