From a0ba8572794f209f33506e7c4d92c3256d9b9164 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Sat, 25 Nov 2017 21:18:12 +0100 Subject: [PATCH] Move WarningOrErrorCode class to parent package. (cherry picked from commit 38922ba) --- .../nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java | 2 +- ruffy-spi/src/main/java/de/jotomo/ruffy/spi/PumpState.java | 2 -- .../de/jotomo/ruffy/spi/{history => }/WarningOrErrorCode.java | 3 +-- .../src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java | 2 +- .../java/de/jotomo/ruffyscripter/commands/BolusCommand.java | 3 +-- 5 files changed, 4 insertions(+), 8 deletions(-) rename ruffy-spi/src/main/java/de/jotomo/ruffy/spi/{history => }/WarningOrErrorCode.java (95%) 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 ed3120edcc..290cc72b61 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 @@ -22,7 +22,7 @@ import de.jotomo.ruffy.spi.history.Bolus; import de.jotomo.ruffy.spi.history.PumpHistory; import de.jotomo.ruffy.spi.history.PumpHistoryRequest; import de.jotomo.ruffy.spi.history.Tbr; -import de.jotomo.ruffy.spi.history.WarningOrErrorCode; +import de.jotomo.ruffy.spi.WarningOrErrorCode; import de.jotomo.ruffyscripter.RuffyCommandsV1Impl; import info.nightscout.androidaps.BuildConfig; import info.nightscout.androidaps.MainApp; diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/PumpState.java b/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/PumpState.java index 45b5890ba6..2db2a5b569 100644 --- a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/PumpState.java +++ b/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/PumpState.java @@ -1,7 +1,5 @@ package de.jotomo.ruffy.spi; -import de.jotomo.ruffy.spi.history.WarningOrErrorCode; - /** State displayed on the main screen of the pump. */ public class PumpState { /** Time the state was captured, rounded to a full second */ diff --git a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/WarningOrErrorCode.java b/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/WarningOrErrorCode.java similarity index 95% rename from ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/WarningOrErrorCode.java rename to ruffy-spi/src/main/java/de/jotomo/ruffy/spi/WarningOrErrorCode.java index 92e66e5460..1f8740f071 100644 --- a/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/history/WarningOrErrorCode.java +++ b/ruffy-spi/src/main/java/de/jotomo/ruffy/spi/WarningOrErrorCode.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffy.spi.history; +package de.jotomo.ruffy.spi; import android.support.annotation.Nullable; @@ -28,4 +28,3 @@ public class WarningOrErrorCode { '}'; } } - diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java index d7701dd0c6..7375317503 100644 --- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java +++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java @@ -31,7 +31,7 @@ import de.jotomo.ruffy.spi.CommandResult; import de.jotomo.ruffy.spi.PumpState; import de.jotomo.ruffy.spi.RuffyCommands; import de.jotomo.ruffy.spi.history.PumpHistoryRequest; -import de.jotomo.ruffy.spi.history.WarningOrErrorCode; +import de.jotomo.ruffy.spi.WarningOrErrorCode; import de.jotomo.ruffyscripter.commands.BolusCommand; import de.jotomo.ruffyscripter.commands.CancelTbrCommand; import de.jotomo.ruffyscripter.commands.Command; diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java index c8fa185711..cf0c639639 100644 --- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java +++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java @@ -12,9 +12,8 @@ import java.util.List; import java.util.Objects; import de.jotomo.ruffy.spi.BolusProgressReporter; -import de.jotomo.ruffy.spi.CommandResult; import de.jotomo.ruffy.spi.PumpWarningCodes; -import de.jotomo.ruffy.spi.history.WarningOrErrorCode; +import de.jotomo.ruffy.spi.WarningOrErrorCode; import de.jotomo.ruffyscripter.RuffyScripter; import static de.jotomo.ruffy.spi.BolusProgressReporter.State.DELIVERED;