Code reformat

domoticz · Jun 8, 2017 · 1c4902b · 1c4902b
1 parent 2357a3a
commit 1c4902b
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 26 deletions.
diff --git a/app/src/main/java/nl/hnogames/domoticz/Containers/LocationInfo.java b/app/src/main/java/nl/hnogames/domoticz/Containers/LocationInfo.java
@@ -42,19 +42,20 @@ public class LocationInfo {
 
     private boolean isSceneOrGroup = false;
 
+    public LocationInfo(int id, String name, LatLng latLng, int radius) {
+        this.name = name;
+        this.latLng = latLng;
+        this.id = id;
+        this.radius = radius;
+    }
+
     public boolean isSceneOrGroup() {
         return isSceneOrGroup;
     }
 
     public void setSceneOrGroup(boolean sceneOrGroup) {
         isSceneOrGroup = sceneOrGroup;
     }
-    public LocationInfo(int id, String name, LatLng latLng, int radius) {
-        this.name = name;
-        this.latLng = latLng;
-        this.id = id;
-        this.radius = radius;
-    }
 
     public String getName() {
         if (UsefulBits.isEmpty(name))

diff --git a/app/src/main/java/nl/hnogames/domoticz/Containers/QRCodeInfo.java b/app/src/main/java/nl/hnogames/domoticz/Containers/QRCodeInfo.java
@@ -40,6 +40,7 @@ public boolean isSceneOrGroup() {
     public void setSceneOrGroup(boolean sceneOrGroup) {
         isSceneOrGroup = sceneOrGroup;
     }
+
     public String getId() {
         return id;
     }

diff --git a/app/src/main/java/nl/hnogames/domoticz/Containers/SpeechInfo.java b/app/src/main/java/nl/hnogames/domoticz/Containers/SpeechInfo.java
@@ -40,6 +40,7 @@ public boolean isSceneOrGroup() {
     public void setSceneOrGroup(boolean sceneOrGroup) {
         isSceneOrGroup = sceneOrGroup;
     }
+
     public String getId() {
         return id;
     }

diff --git a/app/src/main/java/nl/hnogames/domoticz/GeoSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/GeoSettingsActivity.java
@@ -164,8 +164,8 @@ private void showSwitchesDialog(
         final ArrayList<DevicesInfo> switches) {
 
         final ArrayList<DevicesInfo> supportedSwitches = new ArrayList<>();
-        for(DevicesInfo d : switches){
-            if(DeviceUtils.isAutomatedToggableDevice(d))
+        for (DevicesInfo d : switches) {
+            if (DeviceUtils.isAutomatedToggableDevice(d))
                 supportedSwitches.add(d);
         }
 

diff --git a/app/src/main/java/nl/hnogames/domoticz/MainActivity.java b/app/src/main/java/nl/hnogames/domoticz/MainActivity.java
@@ -424,9 +424,7 @@ public void onReceiveDevice(DevicesInfo mDevicesInfo) {
                             jsonAction = DomoticzValues.Device.Switch.Action.OFF;
                             break;
                     }
-                }
-                else
-                {
+                } else {
                     jsonUrl = DomoticzValues.Json.Url.Set.SCENES;
                     if (inputJSONAction < 0) {
                         if (!mDevicesInfo.getStatusBoolean()) {

diff --git a/app/src/main/java/nl/hnogames/domoticz/NFCSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/NFCSettingsActivity.java
@@ -277,8 +277,8 @@ private void showSwitchesDialog(
         ArrayList<DevicesInfo> switches) {
 
         final ArrayList<DevicesInfo> supportedSwitches = new ArrayList<>();
-        for(DevicesInfo d : switches){
-            if(DeviceUtils.isAutomatedToggableDevice(d))
+        for (DevicesInfo d : switches) {
+            if (DeviceUtils.isAutomatedToggableDevice(d))
                 supportedSwitches.add(d);
         }
 

diff --git a/app/src/main/java/nl/hnogames/domoticz/QRCodeSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/QRCodeSettingsActivity.java
@@ -174,8 +174,8 @@ private void showSwitchesDialog(
         final ArrayList<DevicesInfo> switches) {
 
         final ArrayList<DevicesInfo> supportedSwitches = new ArrayList<>();
-        for(DevicesInfo d : switches){
-            if(DeviceUtils.isAutomatedToggableDevice(d))
+        for (DevicesInfo d : switches) {
+            if (DeviceUtils.isAutomatedToggableDevice(d))
                 supportedSwitches.add(d);
         }
 

diff --git a/app/src/main/java/nl/hnogames/domoticz/Service/GeofenceReceiver.java b/app/src/main/java/nl/hnogames/domoticz/Service/GeofenceReceiver.java
@@ -105,7 +105,8 @@ private void handleSwitch(final int idx, final String password, final int inputJ
 
         domoticz.getDevice(new DevicesReceiver() {
             @Override
-            public void onReceiveDevices(ArrayList<DevicesInfo> mDevicesInfo) {}
+            public void onReceiveDevices(ArrayList<DevicesInfo> mDevicesInfo) {
+            }
 
             @Override
             public void onReceiveDevice(DevicesInfo mDevicesInfo) {
@@ -168,9 +169,7 @@ public void onReceiveDevice(DevicesInfo mDevicesInfo) {
                             jsonAction = DomoticzValues.Device.Switch.Action.OFF;
                             break;
                     }
-                }
-                else
-                {
+                } else {
                     jsonUrl = DomoticzValues.Json.Url.Set.SCENES;
                     if (inputJSONAction < 0) {
                         if (!mDevicesInfo.getStatusBoolean()) {

diff --git a/app/src/main/java/nl/hnogames/domoticz/Service/NFCServiceActivity.java b/app/src/main/java/nl/hnogames/domoticz/Service/NFCServiceActivity.java
@@ -150,9 +150,7 @@ public void onReceiveDevice(DevicesInfo mDevicesInfo) {
                             jsonAction = DomoticzValues.Device.Switch.Action.OFF;
                             break;
                     }
-                }
-                else
-                {
+                } else {
                     jsonUrl = DomoticzValues.Json.Url.Set.SCENES;
                     if (inputJSONAction < 0) {
                         if (!mDevicesInfo.getStatusBoolean()) {

diff --git a/app/src/main/java/nl/hnogames/domoticz/SpeechSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/SpeechSettingsActivity.java
@@ -184,8 +184,8 @@ private void showSwitchesDialog(
         final ArrayList<DevicesInfo> switches) {
 
         final ArrayList<DevicesInfo> supportedSwitches = new ArrayList<>();
-        for(DevicesInfo d : switches){
-            if(DeviceUtils.isAutomatedToggableDevice(d))
+        for (DevicesInfo d : switches) {
+            if (DeviceUtils.isAutomatedToggableDevice(d))
                 supportedSwitches.add(d);
         }
 

diff --git a/app/src/main/java/nl/hnogames/domoticz/Utils/DeviceUtils.java b/app/src/main/java/nl/hnogames/domoticz/Utils/DeviceUtils.java
@@ -32,8 +32,8 @@
 public class DeviceUtils {
 
     //Check is a Domoticz Device is toggable by NFC, Geofences or QRCodes
-    public static boolean isAutomatedToggableDevice(DevicesInfo mDeviceInfo){
-        if(mDeviceInfo.equals(null))
+    public static boolean isAutomatedToggableDevice(DevicesInfo mDeviceInfo) {
+        if (mDeviceInfo.equals(null))
             return false;
         if (mDeviceInfo.getSwitchTypeVal() == 0 &&
             (mDeviceInfo.getSwitchType() == null)) {