[miio] cleanup several SAT warnings (#10871)

Signed-off-by: Marcel Verpaalen <marcel@verpaalen.com>

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoHandlerFactory.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoHandlerFactory.java
index 08fa2c001702f683752c6c77dad0991d76bb1391..47896deed838fac4762d8ee0b6a20a736522ee9b 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoHandlerFactory.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoHandlerFactory.java
@@ -88,7 +88,7 @@ public class MiIoHandlerFactory extends BaseThingHandlerFactory {
     }
 
     @Deactivate
-    private void dispose() {
+    public void dispose() {
         final Future<Boolean> scheduledTask = this.scheduledTask;
         if (scheduledTask != null && !scheduledTask.isDone()) {
             scheduledTask.cancel(true);

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoBasicChannel.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoBasicChannel.java
index 4374cbbbb262824590e79bed4c9249077299c78a..9571e154fe3f30e25817f4611ac9d5f541fc9287 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoBasicChannel.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoBasicChannel.java
@@ -121,11 +121,7 @@ public class MiIoBasicChannel {
     }
 
     public boolean isMiOt() {
-        if (piid != null && siid != null && (getPiid() != 0 || getSiid() != 0)) {
-            return true;
-        } else {
-            return false;
-        }
+        return (piid != null && siid != null && (getPiid() != 0 || getSiid() != 0));
     }
 
     public String getFriendlyName() {

diff --git a/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/MiIoQuantityTypesTest.java b/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/MiIoQuantityTypesTest.java
index 0eda350c8d032269665c536a6514f6b968cea695..76242a37a8fcc843a0c4f0d39b7b861ddbbccccd 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/MiIoQuantityTypesTest.java
+++ b/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/MiIoQuantityTypesTest.java
@@ -29,15 +29,13 @@ import org.openhab.core.library.unit.Units;
 public class MiIoQuantityTypesTest {
 
     @Test
-    public void UnknownUnitTest() {
-
+    public void unknownUnitTest() {
         String unitName = "some none existent unit";
         assertNull(MiIoQuantiyTypes.get(unitName));
     }
 
     @Test
     public void regularsUnitTest() {
-
         String unitName = "minute";
         assertEquals(Units.MINUTE, MiIoQuantiyTypes.get(unitName));
 
@@ -47,7 +45,6 @@ public class MiIoQuantityTypesTest {
 
     @Test
     public void aliasUnitsTest() {
-
         String unitName = "square_meter";
         assertEquals(SIUnits.SQUARE_METRE, MiIoQuantiyTypes.get(unitName));
 

diff --git a/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/RoboMapViewer.java b/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/RoboMapViewer.java
index 59555bfb1aacd250b90c66a060ec7c9094105c4a..57a078d9c6d2a7454af66afc3260259b3057f356 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/RoboMapViewer.java
+++ b/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/RoboMapViewer.java
@@ -149,7 +149,7 @@ public class RoboMapViewer extends JFrame {
             @Override
             public void mouseMoved(@Nullable MouseEvent e) {
                 if (e != null) {
-                    MapPoint roboMouseLocation = MapCoordstoRoboCoords(localCoordtoMapCoords(e.getPoint()));
+                    MapPoint roboMouseLocation = mapCoordstoRoboCoords(localCoordtoMapCoords(e.getPoint()));
                     updateStatusLine(roboMouseLocation);
                 }
             }
@@ -164,7 +164,7 @@ public class RoboMapViewer extends JFrame {
                     repaint();
 
                     if (rrDrawPanel.hasDrawZone()) {
-                        final MapPoint endLocation = MapCoordstoRoboCoords(localCoordtoMapCoords(e.getPoint()));
+                        final MapPoint endLocation = mapCoordstoRoboCoords(localCoordtoMapCoords(e.getPoint()));
                         double minX = Math.min(fromLocation.getX(), endLocation.getX());
                         double maxX = Math.max(fromLocation.getX(), endLocation.getX());
                         double minY = Math.min(fromLocation.getY(), endLocation.getY());
@@ -173,7 +173,7 @@ public class RoboMapViewer extends JFrame {
                                 "Zone coordinates:\t%s, %s\t\tZone clean command:  app_zoned_clean[[ %.0f,%.0f,%.0f,%.0f,1 ]]\r\n",
                                 endLocation, fromLocation, minX, minY, maxX, maxY));
                     } else {
-                        final MapPoint pointLocation = MapCoordstoRoboCoords(localCoordtoMapCoords(e.getPoint()));
+                        final MapPoint pointLocation = mapCoordstoRoboCoords(localCoordtoMapCoords(e.getPoint()));
                         textArea.append(String.format(
                                 "GoTo coordinates:\t[X=%.0f, Y=%.0f]\t\tGoto command:  app_goto_target[ %.0f,%.0f ]\r\n",
                                 pointLocation.getX(), pointLocation.getY(), pointLocation.getX(),
@@ -186,7 +186,7 @@ public class RoboMapViewer extends JFrame {
             public void mousePressed(@Nullable MouseEvent e) {
                 if (e != null) {
                     rrDrawPanel.setStartPoint(e.getX(), e.getY());
-                    fromLocation = MapCoordstoRoboCoords(localCoordtoMapCoords(e.getPoint()));
+                    fromLocation = mapCoordstoRoboCoords(localCoordtoMapCoords(e.getPoint()));
                 }
             }
 
@@ -296,7 +296,7 @@ public class RoboMapViewer extends JFrame {
         }
     }
 
-    private MapPoint MapCoordstoRoboCoords(MapPoint imagePoint) {
+    private MapPoint mapCoordstoRoboCoords(MapPoint imagePoint) {
         final RRMapDraw rrMap = this.rrMap;
         if (rrMap != null) {
             final RRMapFileParser mapDetails = rrMap.getMapParseDetails();
@@ -484,10 +484,7 @@ class RRDrawPanel extends JPanel {
     public boolean hasDrawZone() {
         int pw = Math.abs(x - x2);
         int ph = Math.abs(y - y2);
-        if (pw != 0 && ph != 0) {
-            return true;
-        }
-        return false;
+        return pw != 0 && ph != 0;
     }
 
     public void drawZoneRect(Graphics g, int x, int y, int x2, int y2) {