diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java index e4255a2157..4918cbfacf 100644 --- a/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java +++ b/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java @@ -7,23 +7,41 @@ import info.nightscout.androidaps.data.Profile; */ public interface ConstraintsInterface { - Constraint isLoopInvokationAllowed(Constraint value); + default Constraint isLoopInvokationAllowed(Constraint value) { + return value; + } - Constraint isClosedLoopAllowed(Constraint value); + default Constraint isClosedLoopAllowed(Constraint value) { + return value; + } - Constraint isAutosensModeEnabled(Constraint value); + default Constraint isAutosensModeEnabled(Constraint value) { + return value; + } - Constraint isAMAModeEnabled(Constraint value); + default Constraint isAMAModeEnabled(Constraint value) { + return value; + } - Constraint isSMBModeEnabled(Constraint value); + default Constraint isSMBModeEnabled(Constraint value) { + return value; + } - Constraint applyBasalConstraints(Constraint absoluteRate, Profile profile); + default Constraint applyBasalConstraints(Constraint absoluteRate, Profile profile) { + return absoluteRate; + } - Constraint applyBasalPercentConstraints(Constraint percentRate, Profile profile); + default Constraint applyBasalPercentConstraints(Constraint percentRate, Profile profile) { + return percentRate; + } - Constraint applyBolusConstraints(Constraint insulin); + default Constraint applyBolusConstraints(Constraint insulin) { + return insulin; + } - Constraint applyCarbsConstraints(Constraint carbs); + default Constraint applyCarbsConstraints(Constraint carbs) { + return carbs; + } default Constraint applyMaxIOBConstraints(Constraint maxIob) { return maxIob; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java index 45e9967341..f9858d4cce 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java @@ -1432,46 +1432,6 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf return value; } - @Override - public Constraint isClosedLoopAllowed(Constraint value) { - return value; - } - - @Override - public Constraint isAutosensModeEnabled(Constraint value) { - return value; - } - - @Override - public Constraint isAMAModeEnabled(Constraint value) { - return value; - } - - @Override - public Constraint isSMBModeEnabled(Constraint value) { - return value; - } - - @Override - public Constraint applyBasalConstraints(Constraint absoluteRate, Profile profile) { - return absoluteRate; - } - - @Override - public Constraint applyBasalPercentConstraints(Constraint percentRate, Profile profile) { - return percentRate; - } - - @Override - public Constraint applyBolusConstraints(Constraint insulin) { - return insulin; - } - - @Override - public Constraint applyCarbsConstraints(Constraint carbs) { - return carbs; - } - @Override public Constraint applyMaxIOBConstraints(Constraint maxIob) { if (lowSuspendOnlyLoopEnforcedUntil > System.currentTimeMillis()) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java index 4dec62c8a8..008cecc590 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java @@ -433,31 +433,6 @@ public abstract class AbstractDanaRPlugin implements PluginBase, PumpInterface, * Constraint interface */ - @Override - public Constraint isLoopInvokationAllowed(Constraint value) { - return value; - } - - @Override - public Constraint isClosedLoopAllowed(Constraint value) { - return value; - } - - @Override - public Constraint isAutosensModeEnabled(Constraint value) { - return value; - } - - @Override - public Constraint isAMAModeEnabled(Constraint value) { - return value; - } - - @Override - public Constraint isSMBModeEnabled(Constraint value) { - return value; - } - @Override public Constraint applyBasalConstraints(Constraint absoluteRate, Profile profile) { if (pump != null) @@ -480,11 +455,6 @@ public abstract class AbstractDanaRPlugin implements PluginBase, PumpInterface, return insulin; } - @Override - public Constraint applyCarbsConstraints(Constraint carbs) { - return carbs; - } - @Nullable @Override public ProfileStore getProfile() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java index 32d2ea8f9c..4473f110d4 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java @@ -272,31 +272,6 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface, // Constraints interface - @Override - public Constraint isLoopInvokationAllowed(Constraint value) { - return value; - } - - @Override - public Constraint isClosedLoopAllowed(Constraint value) { - return value; - } - - @Override - public Constraint isAutosensModeEnabled(Constraint value) { - return value; - } - - @Override - public Constraint isAMAModeEnabled(Constraint value) { - return value; - } - - @Override - public Constraint isSMBModeEnabled(Constraint value) { - return value; - } - @Override public Constraint applyBasalConstraints(Constraint absoluteRate, Profile profile) { if (pump != null) @@ -320,11 +295,6 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface, return insulin; } - @Override - public Constraint applyCarbsConstraints(Constraint carbs) { - return carbs; - } - // Profile interface @Nullable diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPumpPlugin.java index 2416eb0d4e..9b84f56da6 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPumpPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPumpPlugin.java @@ -1088,31 +1088,6 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface, Constraints // Constraints - @Override - public Constraint isLoopInvokationAllowed(Constraint value) { - return value; - } - - @Override - public Constraint isClosedLoopAllowed(Constraint value) { - return value; - } - - @Override - public Constraint isAutosensModeEnabled(Constraint value) { - return value; - } - - @Override - public Constraint isAMAModeEnabled(Constraint value) { - return value; - } - - @Override - public Constraint isSMBModeEnabled(Constraint value) { - return value; - } - @Override public Constraint applyBasalConstraints(Constraint absoluteRate, Profile profile) { if (statusResult != null) { @@ -1136,10 +1111,4 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface, Constraints return insulin; } - @Override - public Constraint applyCarbsConstraints(Constraint carbs) { - return carbs; - } - - }