From 7188effbec840e3ed86b09017d7d675322b5e349 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Wed, 18 Apr 2018 20:49:29 +0200 Subject: [PATCH] Set access level to protected for all next*Cmd --- .../openscale/core/bluetooth/BluetoothBeurerSanitas.java | 6 +++--- .../openscale/core/bluetooth/BluetoothCommunication.java | 6 +++--- .../openscale/core/bluetooth/BluetoothCustomOpenScale.java | 6 +++--- .../openscale/core/bluetooth/BluetoothDigooDGSO38H.java | 6 +++--- .../openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java | 6 +++--- .../openscale/core/bluetooth/BluetoothExingtechY1.java | 6 +++--- .../health/openscale/core/bluetooth/BluetoothHesley.java | 6 +++--- .../openscale/core/bluetooth/BluetoothIhealthHS3.java | 6 +++--- .../com/health/openscale/core/bluetooth/BluetoothMGB.java | 6 +++--- .../openscale/core/bluetooth/BluetoothMedisanaBS444.java | 6 +++--- .../health/openscale/core/bluetooth/BluetoothMiScale.java | 6 +++--- .../health/openscale/core/bluetooth/BluetoothMiScale2.java | 6 +++--- .../health/openscale/core/bluetooth/BluetoothOneByone.java | 6 +++--- .../openscale/core/bluetooth/BluetoothYunmaiSE_Mini.java | 6 +++--- 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java index 38305a2c..d2b87051 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java @@ -146,7 +146,7 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication { } @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { switch (stateNr) { case 0: @@ -245,7 +245,7 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication { } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { switch (stateNr) { case 0: @@ -274,7 +274,7 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication { } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { switch (stateNr) { case 0: // Force disconnect diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java index 561a5bca..1dca1c5d 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java @@ -126,7 +126,7 @@ public abstract class BluetoothCommunication { * @param stateNr the current step number * @return false if no next step is available otherwise true */ - abstract boolean nextInitCmd(int stateNr); + abstract protected boolean nextInitCmd(int stateNr); /** * State machine for the normal/command process of the Bluetooth device. @@ -136,7 +136,7 @@ public abstract class BluetoothCommunication { * @param stateNr the current step number * @return false if no next step is available otherwise true */ - abstract boolean nextBluetoothCmd(int stateNr); + abstract protected boolean nextBluetoothCmd(int stateNr); /** * Set the next command number of the current state. @@ -165,7 +165,7 @@ public abstract class BluetoothCommunication { * @param stateNr the current step number * @return false if no next step is available otherwise true */ - abstract boolean nextCleanUpCmd(int stateNr); + abstract protected boolean nextCleanUpCmd(int stateNr); /** * Method is triggered if a Bluetooth data is read from a device. diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java index 4f89d14b..c593656e 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java @@ -47,17 +47,17 @@ public class BluetoothCustomOpenScale extends BluetoothCommunication { } @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { return false; } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { return false; } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { return false; } diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothDigooDGSO38H.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothDigooDGSO38H.java index dfa4f6f5..93384699 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothDigooDGSO38H.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothDigooDGSO38H.java @@ -56,7 +56,7 @@ public class BluetoothDigooDGSO38H extends BluetoothCommunication { @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { switch (stateNr) { case 0: //Tell device to send us weight measurements @@ -68,7 +68,7 @@ public class BluetoothDigooDGSO38H extends BluetoothCommunication { } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { switch (stateNr) { default: return false; @@ -76,7 +76,7 @@ public class BluetoothDigooDGSO38H extends BluetoothCommunication { } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { switch (stateNr) { default: diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java index 27415c63..7b04a100 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java @@ -46,12 +46,12 @@ public class BluetoothExcelvanCF369BLE extends BluetoothCommunication { } @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { return false; } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { switch (stateNr) { case 0: final ScaleUser selectedUser = OpenScale.getInstance(context).getSelectedScaleUser(); @@ -87,7 +87,7 @@ public class BluetoothExcelvanCF369BLE extends BluetoothCommunication { } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { return false; } diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExingtechY1.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExingtechY1.java index 39d5b2d8..e4257584 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExingtechY1.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExingtechY1.java @@ -43,7 +43,7 @@ public class BluetoothExingtechY1 extends BluetoothCommunication { } @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { switch (stateNr) { case 0: setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG); @@ -69,12 +69,12 @@ public class BluetoothExingtechY1 extends BluetoothCommunication { } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { return false; } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { return false; } diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothHesley.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothHesley.java index 4e81b9af..00fa2b92 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothHesley.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothHesley.java @@ -41,7 +41,7 @@ public class BluetoothHesley extends BluetoothCommunication { } @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { switch (stateNr) { case 0: setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG); @@ -58,12 +58,12 @@ public class BluetoothHesley extends BluetoothCommunication { } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { return false; } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { return false; } diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothIhealthHS3.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothIhealthHS3.java index ebe5f9ae..9e2a406b 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothIhealthHS3.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothIhealthHS3.java @@ -54,19 +54,19 @@ public class BluetoothIhealthHS3 extends BluetoothCommunication { } @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { Log.w("openscale","ihealthHS3 - nextInitCmd - returning false"); return false; } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { Log.w("openscale","ihealthHS3 - nextBluetoothCmd - returning false"); return false; } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { Log.w("openscale","ihealthHS3 - nextCleanUpCmd - returning false"); return false; } diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMGB.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMGB.java index 9036bdd7..c313cea3 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMGB.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMGB.java @@ -84,7 +84,7 @@ public class BluetoothMGB extends BluetoothCommunication { } @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { switch (stateNr) { case 0: setNotificationOn(uuid_service, uuid_char_ctrl, uuid_desc_ctrl); @@ -125,13 +125,13 @@ public class BluetoothMGB extends BluetoothCommunication { @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { return false; } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { return false; } diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMedisanaBS444.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMedisanaBS444.java index ab17dd5f..20d844c6 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMedisanaBS444.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMedisanaBS444.java @@ -46,12 +46,12 @@ public class BluetoothMedisanaBS444 extends BluetoothCommunication { } @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { return false; } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { switch (stateNr) { case 0: // set indication on for feature characteristic @@ -89,7 +89,7 @@ public class BluetoothMedisanaBS444 extends BluetoothCommunication { } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { return false; } diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java index 3c93fc35..bff3b2e2 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java @@ -98,7 +98,7 @@ public class BluetoothMiScale extends BluetoothCommunication { @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { switch (stateNr) { case 0: // read device time @@ -136,7 +136,7 @@ public class BluetoothMiScale extends BluetoothCommunication { } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { switch (stateNr) { case 0: // set notification on for weight measurement history @@ -173,7 +173,7 @@ public class BluetoothMiScale extends BluetoothCommunication { } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { switch (stateNr) { case 0: diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java index 44950297..99efd95a 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java @@ -85,7 +85,7 @@ public class BluetoothMiScale2 extends BluetoothCommunication { @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { switch (stateNr) { case 0: // set scale units @@ -119,7 +119,7 @@ public class BluetoothMiScale2 extends BluetoothCommunication { } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { switch (stateNr) { case 0: // configure scale to get only last measurements @@ -148,7 +148,7 @@ public class BluetoothMiScale2 extends BluetoothCommunication { } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { switch (stateNr) { case 0: diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothOneByone.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothOneByone.java index f13e14c1..d39b99f5 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothOneByone.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothOneByone.java @@ -45,7 +45,7 @@ public class BluetoothOneByone extends BluetoothCommunication { } @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { switch (stateNr) { case 0: setIndicationOn(WEIGHT_MEASUREMENT_SERVICE_BODY_COMPOSITION, WEIGHT_MEASUREMENT_CHARACTERISTIC_BODY_COMPOSITION, WEIGHT_MEASUREMENT_CONFIG); @@ -69,12 +69,12 @@ public class BluetoothOneByone extends BluetoothCommunication { } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { return false; } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { return false; } diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiSE_Mini.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiSE_Mini.java index 7f1ae210..663fcf85 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiSE_Mini.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiSE_Mini.java @@ -52,7 +52,7 @@ public class BluetoothYunmaiSE_Mini extends BluetoothCommunication { } @Override - boolean nextInitCmd(int stateNr) { + protected boolean nextInitCmd(int stateNr) { switch (stateNr) { case 0: byte[] userId = Converters.toUnsignedInt16Be(getUniqueNumber()); @@ -94,12 +94,12 @@ public class BluetoothYunmaiSE_Mini extends BluetoothCommunication { } @Override - boolean nextBluetoothCmd(int stateNr) { + protected boolean nextBluetoothCmd(int stateNr) { return false; } @Override - boolean nextCleanUpCmd(int stateNr) { + protected boolean nextCleanUpCmd(int stateNr) { return false; }