Some nullness fixes for Automation (#4438)

extends #4290 Signed-off-by: Ana Dimova <a.dimova@prosyst.bg>
eclipse-archived · Oct 24, 2017 · 29f9a70 · 29f9a70
1 parent 4049898
commit 29f9a70
Show file tree

Hide file tree

Showing 29 changed files with 805 additions and 754 deletions.
diff --git a/...eclipse.smarthome.automation.api/src/main/java/org/eclipse/smarthome/automation/Rule.java b/...eclipse.smarthome.automation.api/src/main/java/org/eclipse/smarthome/automation/Rule.java
diff --git a/...arthome.automation.api/src/main/java/org/eclipse/smarthome/automation/RulePredicates.java b/...arthome.automation.api/src/main/java/org/eclipse/smarthome/automation/RulePredicates.java
@@ -47,16 +47,12 @@ public class RulePredicates {
     public static String getPrefix(Rule rule) {
         if (null != rule) {
             final String uid = rule.getUID();
-            if (null != uid) {
-                final int index = uid.indexOf(PREFIX_SEPARATOR);
-
-                // only when a delimiter was found and the prefix is not empty
-                if (0 < index) {
-                    return uid.substring(0, index);
-                }
+            final int index = uid.indexOf(PREFIX_SEPARATOR);
+            // only when a delimiter was found and the prefix is not empty
+            if (0 < index) {
+                return uid.substring(0, index);
             }
         }
-
         return null;
     }
 

diff --git a/...e.smarthome.automation.api/src/main/java/org/eclipse/smarthome/automation/Visibility.java b/...e.smarthome.automation.api/src/main/java/org/eclipse/smarthome/automation/Visibility.java
@@ -11,24 +11,24 @@
 import org.eclipse.smarthome.automation.type.ModuleType;
 
 /**
- * Defines visibility values of {@link ModuleType}s and {@link Template}s
+ * Defines visibility values of {@link Rule}s, {@link ModuleType}s and {@link Template}s
  *
  * @author Yordan Mihaylov - Initial Contribution
  *
  */
 public enum Visibility {
     /**
-     * The UI has to show this object.
+     * The UI has always to show an object with such visibility.
      */
     VISIBLE,
 
     /**
-     * The UI has to hide this object.
+     * The UI has always to hide an object with such visibility.
      */
     HIDDEN,
 
     /**
-     * The UI has to show this object only to experts.
+     * The UI has to show an object with such visibility only to experts.
      */
     EXPERT