From 3fde47d283803ae33a6fff18354bc84ec98db951 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Sun, 28 Jan 2018 22:16:58 +0100 Subject: [PATCH] Move ruffyscripter to combo plugin package. --- .../PumpCombo/ComboAlertHistoryDialog.java | 2 +- .../plugins/PumpCombo/ComboFragment.java | 4 +-- .../plugins/PumpCombo/ComboPlugin.java | 24 ++++++++-------- .../plugins/PumpCombo/ComboPump.java | 10 +++---- .../PumpCombo/ComboTddHistoryDialog.java | 2 +- .../ruffyscripter/BasalProfile.java | 2 +- .../ruffyscripter/BolusProgressReporter.java | 2 +- .../ruffyscripter/CommandResult.java | 6 ++-- .../ruffyscripter/PumpErrorCodes.java | 2 +- .../PumpCombo}/ruffyscripter/PumpState.java | 2 +- .../ruffyscripter/PumpWarningCodes.java | 2 +- .../ruffyscripter/RuffyCommands.java | 4 +-- .../ruffyscripter/RuffyScripter.java | 28 +++++++++---------- .../ruffyscripter/WarningOrErrorCode.java | 2 +- .../ruffyscripter/commands/BaseCommand.java | 8 +++--- .../ruffyscripter/commands/BolusCommand.java | 22 +++++++-------- .../commands/CancelTbrCommand.java | 6 ++-- .../ruffyscripter/commands/Command.java | 6 ++-- .../commands/CommandException.java | 2 +- .../commands/ConfirmAlertCommand.java | 2 +- .../commands/ReadBasalProfileCommand.java | 6 ++-- .../commands/ReadHistoryCommand.java | 14 +++++----- .../commands/ReadPumpStateCommand.java | 2 +- .../ReadReservoirLevelAndLastBolus.java | 4 +-- .../commands/SetBasalProfileCommand.java | 6 ++-- .../ruffyscripter/commands/SetTbrCommand.java | 8 +++--- .../ruffyscripter/history/Bolus.java | 2 +- .../ruffyscripter/history/HistoryRecord.java | 2 +- .../ruffyscripter/history/PumpAlert.java | 2 +- .../ruffyscripter/history/PumpHistory.java | 2 +- .../history/PumpHistoryRequest.java | 2 +- .../PumpCombo}/ruffyscripter/history/Tbr.java | 2 +- .../PumpCombo}/ruffyscripter/history/Tdd.java | 2 +- 33 files changed, 96 insertions(+), 96 deletions(-) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/BasalProfile.java (93%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/BolusProgressReporter.java (78%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/CommandResult.java (88%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/PumpErrorCodes.java (91%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/PumpState.java (98%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/PumpWarningCodes.java (88%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/RuffyCommands.java (91%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/RuffyScripter.java (96%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/WarningOrErrorCode.java (91%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/BaseCommand.java (74%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/BolusCommand.java (92%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/CancelTbrCommand.java (84%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/Command.java (69%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/CommandException.java (76%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/ConfirmAlertCommand.java (87%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/ReadBasalProfileCommand.java (91%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/ReadHistoryCommand.java (95%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/ReadPumpStateCommand.java (83%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java (93%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/SetBasalProfileCommand.java (96%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/commands/SetTbrCommand.java (97%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/history/Bolus.java (94%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/history/HistoryRecord.java (68%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/history/PumpAlert.java (95%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/history/PumpHistory.java (95%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/history/PumpHistoryRequest.java (95%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/history/Tbr.java (93%) rename app/src/main/java/{de/jotomo => info/nightscout/androidaps/plugins/PumpCombo}/ruffyscripter/history/Tdd.java (93%) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboAlertHistoryDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboAlertHistoryDialog.java index 8873804bbc..6f30b3aed9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboAlertHistoryDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboAlertHistoryDialog.java @@ -10,7 +10,7 @@ import android.widget.TextView; import java.text.DateFormat; import java.util.List; -import de.jotomo.ruffyscripter.history.PumpAlert; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpAlert; import info.nightscout.androidaps.R; public class ComboAlertHistoryDialog extends DialogFragment { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java index 3e09d76fd9..4f4aa58460 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java @@ -14,8 +14,8 @@ import android.widget.TextView; import com.squareup.otto.Subscribe; -import de.jotomo.ruffyscripter.PumpState; -import de.jotomo.ruffyscripter.history.Bolus; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; import info.nightscout.androidaps.plugins.Common.SubscriberFragment; 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 65a38b42e4..bcd58edff5 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 @@ -11,18 +11,18 @@ import org.slf4j.LoggerFactory; import java.util.Calendar; import java.util.Date; -import de.jotomo.ruffyscripter.BasalProfile; -import de.jotomo.ruffyscripter.BolusProgressReporter; -import de.jotomo.ruffyscripter.CommandResult; -import de.jotomo.ruffyscripter.PumpState; -import de.jotomo.ruffyscripter.PumpWarningCodes; -import de.jotomo.ruffyscripter.RuffyCommands; -import de.jotomo.ruffyscripter.RuffyScripter; -import de.jotomo.ruffyscripter.WarningOrErrorCode; -import de.jotomo.ruffyscripter.history.Bolus; -import de.jotomo.ruffyscripter.history.PumpHistory; -import de.jotomo.ruffyscripter.history.PumpHistoryRequest; -import de.jotomo.ruffyscripter.history.Tbr; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyCommands; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.WarningOrErrorCode; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tbr; import info.nightscout.androidaps.BuildConfig; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java index 7c903533b6..aef0f2abd5 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java @@ -6,11 +6,11 @@ import android.support.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import de.jotomo.ruffyscripter.BasalProfile; -import de.jotomo.ruffyscripter.PumpState; -import de.jotomo.ruffyscripter.history.Bolus; -import de.jotomo.ruffyscripter.history.PumpAlert; -import de.jotomo.ruffyscripter.history.Tdd; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpAlert; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd; class ComboPump { boolean initialized = false; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboTddHistoryDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboTddHistoryDialog.java index 741691f4e4..7da1c8ba30 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboTddHistoryDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboTddHistoryDialog.java @@ -11,7 +11,7 @@ import java.text.DateFormat; import java.util.List; import java.util.Locale; -import de.jotomo.ruffyscripter.history.Tdd; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd; import info.nightscout.androidaps.R; public class ComboTddHistoryDialog extends DialogFragment { diff --git a/app/src/main/java/de/jotomo/ruffyscripter/BasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BasalProfile.java similarity index 93% rename from app/src/main/java/de/jotomo/ruffyscripter/BasalProfile.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BasalProfile.java index 5496357eae..fa9c2dceb0 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/BasalProfile.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BasalProfile.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter; import java.util.Arrays; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/BolusProgressReporter.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BolusProgressReporter.java similarity index 78% rename from app/src/main/java/de/jotomo/ruffyscripter/BolusProgressReporter.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BolusProgressReporter.java index 4422bd0ed0..59d334fe6f 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/BolusProgressReporter.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BolusProgressReporter.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter; public interface BolusProgressReporter { enum State { diff --git a/app/src/main/java/de/jotomo/ruffyscripter/CommandResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/CommandResult.java similarity index 88% rename from app/src/main/java/de/jotomo/ruffyscripter/CommandResult.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/CommandResult.java index 5b1dd6c817..a837d7781b 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/CommandResult.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/CommandResult.java @@ -1,12 +1,12 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter; import android.support.annotation.Nullable; import java.util.LinkedList; import java.util.List; -import de.jotomo.ruffyscripter.history.Bolus; -import de.jotomo.ruffyscripter.history.PumpHistory; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory; public class CommandResult { /** Whether the command was executed successfully. */ diff --git a/app/src/main/java/de/jotomo/ruffyscripter/PumpErrorCodes.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpErrorCodes.java similarity index 91% rename from app/src/main/java/de/jotomo/ruffyscripter/PumpErrorCodes.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpErrorCodes.java index 28b7ff5f08..63cd81e3a6 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/PumpErrorCodes.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpErrorCodes.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter; public class PumpErrorCodes { public static final int CARTRIDGE_EMPTY = 1; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/PumpState.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpState.java similarity index 98% rename from app/src/main/java/de/jotomo/ruffyscripter/PumpState.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpState.java index f1cb848e67..c6f08ed136 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/PumpState.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpState.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter; /** State displayed on the main screen of the pump. */ public class PumpState { diff --git a/app/src/main/java/de/jotomo/ruffyscripter/PumpWarningCodes.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpWarningCodes.java similarity index 88% rename from app/src/main/java/de/jotomo/ruffyscripter/PumpWarningCodes.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpWarningCodes.java index c846fc3cfc..60d1898834 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/PumpWarningCodes.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpWarningCodes.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter; public class PumpWarningCodes { public static final int CARTRIDGE_LOW = 1; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/RuffyCommands.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyCommands.java similarity index 91% rename from app/src/main/java/de/jotomo/ruffyscripter/RuffyCommands.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyCommands.java index 7e239f1c0c..344b63d8f9 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/RuffyCommands.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyCommands.java @@ -1,6 +1,6 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter; -import de.jotomo.ruffyscripter.history.PumpHistoryRequest; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest; public interface RuffyCommands { /** Issues a bolus issues updates on progress through via {@link BolusProgressReporter}. */ diff --git a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyScripter.java similarity index 96% rename from app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyScripter.java index e2a88481a1..d63c8b165e 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyScripter.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter; import android.content.ComponentName; import android.content.Context; @@ -28,18 +28,18 @@ import java.util.Date; import java.util.List; import java.util.Objects; -import de.jotomo.ruffyscripter.history.PumpHistoryRequest; -import de.jotomo.ruffyscripter.commands.BolusCommand; -import de.jotomo.ruffyscripter.commands.CancelTbrCommand; -import de.jotomo.ruffyscripter.commands.Command; -import de.jotomo.ruffyscripter.commands.CommandException; -import de.jotomo.ruffyscripter.commands.ConfirmAlertCommand; -import de.jotomo.ruffyscripter.commands.ReadBasalProfileCommand; -import de.jotomo.ruffyscripter.commands.ReadHistoryCommand; -import de.jotomo.ruffyscripter.commands.ReadPumpStateCommand; -import de.jotomo.ruffyscripter.commands.ReadReservoirLevelAndLastBolus; -import de.jotomo.ruffyscripter.commands.SetBasalProfileCommand; -import de.jotomo.ruffyscripter.commands.SetTbrCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.BolusCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.CancelTbrCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.Command; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.CommandException; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ConfirmAlertCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadBasalProfileCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadHistoryCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadPumpStateCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadReservoirLevelAndLastBolus; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.SetBasalProfileCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.SetTbrCommand; import info.nightscout.androidaps.BuildConfig; /** @@ -74,7 +74,7 @@ public class RuffyScripter implements RuffyCommands { @Override public void fail(String message) throws RemoteException { - // TODO 10-28 19:50:54.059 1426 1826 W RuffyScripter: [Thread-268] WARN [de.jotomo.ruffyscripter.RuffyScripter$1:78]: Ruffy warns: no connection possible + // TODO 10-28 19:50:54.059 1426 1826 W RuffyScripter: [Thread-268] WARN [info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter$1:78]: Ruffy warns: no connection possible log.warn("Ruffy warns: " + message); } diff --git a/app/src/main/java/de/jotomo/ruffyscripter/WarningOrErrorCode.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/WarningOrErrorCode.java similarity index 91% rename from app/src/main/java/de/jotomo/ruffyscripter/WarningOrErrorCode.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/WarningOrErrorCode.java index 0961d79a29..a4e21da289 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/WarningOrErrorCode.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/WarningOrErrorCode.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter; import android.support.annotation.Nullable; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BaseCommand.java similarity index 74% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BaseCommand.java index 0ef54cd955..623a3bb51f 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BaseCommand.java @@ -1,11 +1,11 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; import java.util.Collections; import java.util.List; -import de.jotomo.ruffyscripter.CommandResult; -import de.jotomo.ruffyscripter.PumpWarningCodes; -import de.jotomo.ruffyscripter.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter; public abstract class BaseCommand implements Command { // RS will inject itself here diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BolusCommand.java similarity index 92% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BolusCommand.java index 7a07b3e474..36e8c9252a 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BolusCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; import android.os.SystemClock; @@ -11,17 +11,17 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import de.jotomo.ruffyscripter.BolusProgressReporter; -import de.jotomo.ruffyscripter.PumpWarningCodes; -import de.jotomo.ruffyscripter.WarningOrErrorCode; -import de.jotomo.ruffyscripter.history.Bolus; -import de.jotomo.ruffyscripter.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.WarningOrErrorCode; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter; -import static de.jotomo.ruffyscripter.BolusProgressReporter.State.DELIVERED; -import static de.jotomo.ruffyscripter.BolusProgressReporter.State.DELIVERING; -import static de.jotomo.ruffyscripter.BolusProgressReporter.State.PROGRAMMING; -import static de.jotomo.ruffyscripter.BolusProgressReporter.State.STOPPED; -import static de.jotomo.ruffyscripter.BolusProgressReporter.State.STOPPING; +import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.DELIVERED; +import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.DELIVERING; +import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.PROGRAMMING; +import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.STOPPED; +import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.STOPPING; public class BolusCommand extends BaseCommand { private static final Logger log = LoggerFactory.getLogger(BolusCommand.class); diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CancelTbrCommand.java similarity index 84% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CancelTbrCommand.java index 15808461ec..b1787005e1 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CancelTbrCommand.java @@ -1,11 +1,11 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; import org.monkey.d.ruffy.ruffy.driver.display.MenuType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.jotomo.ruffyscripter.PumpState; -import de.jotomo.ruffyscripter.PumpWarningCodes; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes; public class CancelTbrCommand extends BaseCommand { private static final Logger log = LoggerFactory.getLogger(CancelTbrCommand.class); diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/Command.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/Command.java similarity index 69% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/Command.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/Command.java index d89a9734ac..152befe00d 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/Command.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/Command.java @@ -1,9 +1,9 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; import java.util.List; -import de.jotomo.ruffyscripter.RuffyScripter; -import de.jotomo.ruffyscripter.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.CommandResult; /** * Interface for all commands to be executed by the pump. diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/CommandException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CommandException.java similarity index 76% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/CommandException.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CommandException.java index 03b2acef2d..77c1db5437 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/CommandException.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CommandException.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; public class CommandException extends RuntimeException { public CommandException(String message) { diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ConfirmAlertCommand.java similarity index 87% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ConfirmAlertCommand.java index a561fb0003..636b6a624d 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ConfirmAlertCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; public class ConfirmAlertCommand extends BaseCommand { private final int warningCode; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadBasalProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadBasalProfileCommand.java similarity index 91% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/ReadBasalProfileCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadBasalProfileCommand.java index 87cb631694..2c23d5814b 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadBasalProfileCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadBasalProfileCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; import org.monkey.d.ruffy.ruffy.driver.display.Menu; import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute; @@ -9,8 +9,8 @@ import org.slf4j.LoggerFactory; import java.util.Arrays; -import de.jotomo.ruffyscripter.BasalProfile; -import de.jotomo.ruffyscripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState; public class ReadBasalProfileCommand extends BaseCommand { private static final Logger log = LoggerFactory.getLogger(ReadBasalProfileCommand.class); diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadHistoryCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadHistoryCommand.java similarity index 95% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/ReadHistoryCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadHistoryCommand.java index 9b8aec8391..4e94caf750 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadHistoryCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadHistoryCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; import android.support.annotation.NonNull; @@ -13,12 +13,12 @@ import org.slf4j.LoggerFactory; import java.util.Calendar; import java.util.Date; -import de.jotomo.ruffyscripter.history.Bolus; -import de.jotomo.ruffyscripter.history.PumpAlert; -import de.jotomo.ruffyscripter.history.PumpHistory; -import de.jotomo.ruffyscripter.history.PumpHistoryRequest; -import de.jotomo.ruffyscripter.history.Tbr; -import de.jotomo.ruffyscripter.history.Tdd; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpAlert; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tbr; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd; // Note: TBRs are added to history only after they've completed running // TODO remove duplication diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadPumpStateCommand.java similarity index 83% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadPumpStateCommand.java index 5b9218dd33..cfa8d0f329 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadPumpStateCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; public class ReadPumpStateCommand extends BaseCommand { @Override diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java similarity index 93% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java index 00246f3809..a1f22f2013 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; import android.support.annotation.NonNull; @@ -10,7 +10,7 @@ import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuTime; import java.util.Date; -import de.jotomo.ruffyscripter.history.Bolus; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus; public class ReadReservoirLevelAndLastBolus extends BaseCommand { @Override diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetBasalProfileCommand.java similarity index 96% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalProfileCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetBasalProfileCommand.java index ae1cb4e4e3..f959c17f36 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalProfileCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetBasalProfileCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; import android.os.SystemClock; @@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; -import de.jotomo.ruffyscripter.BasalProfile; -import de.jotomo.ruffyscripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState; public class SetBasalProfileCommand extends BaseCommand { private static final Logger log = LoggerFactory.getLogger(SetBasalProfileCommand.class); diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetTbrCommand.java similarity index 97% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetTbrCommand.java index 4a47679ac4..f618d50156 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetTbrCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands; import android.os.SystemClock; @@ -12,9 +12,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import de.jotomo.ruffyscripter.PumpState; -import de.jotomo.ruffyscripter.PumpWarningCodes; -import de.jotomo.ruffyscripter.WarningOrErrorCode; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes; +import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.WarningOrErrorCode; public class SetTbrCommand extends BaseCommand { private static final Logger log = LoggerFactory.getLogger(SetTbrCommand.class); diff --git a/app/src/main/java/de/jotomo/ruffyscripter/history/Bolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Bolus.java similarity index 94% rename from app/src/main/java/de/jotomo/ruffyscripter/history/Bolus.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Bolus.java index 1e2eebf040..a5d989c331 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/history/Bolus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Bolus.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.history; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history; import java.util.Date; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/history/HistoryRecord.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/HistoryRecord.java similarity index 68% rename from app/src/main/java/de/jotomo/ruffyscripter/history/HistoryRecord.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/HistoryRecord.java index 64ddb21f24..57e173bb49 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/history/HistoryRecord.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/HistoryRecord.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.history; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history; public abstract class HistoryRecord { public final long timestamp; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/history/PumpAlert.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpAlert.java similarity index 95% rename from app/src/main/java/de/jotomo/ruffyscripter/history/PumpAlert.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpAlert.java index d770579209..413a9ca69b 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/history/PumpAlert.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpAlert.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.history; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history; import java.util.Date; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/history/PumpHistory.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistory.java similarity index 95% rename from app/src/main/java/de/jotomo/ruffyscripter/history/PumpHistory.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistory.java index b5c8284f74..ecc8a1a29f 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/history/PumpHistory.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistory.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.history; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history; import android.support.annotation.NonNull; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/history/PumpHistoryRequest.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistoryRequest.java similarity index 95% rename from app/src/main/java/de/jotomo/ruffyscripter/history/PumpHistoryRequest.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistoryRequest.java index 2719059e32..40dd6e553e 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/history/PumpHistoryRequest.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistoryRequest.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.history; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history; import java.util.Date; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/history/Tbr.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tbr.java similarity index 93% rename from app/src/main/java/de/jotomo/ruffyscripter/history/Tbr.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tbr.java index 2d7c7c3f65..41ec245e89 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/history/Tbr.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tbr.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.history; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history; import java.util.Date; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/history/Tdd.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tdd.java similarity index 93% rename from app/src/main/java/de/jotomo/ruffyscripter/history/Tdd.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tdd.java index 0e20de59f4..5f799f229e 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/history/Tdd.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tdd.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.history; +package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history; import java.util.Date;