Extracted integer response casting/handling logic in SecurityDialogs to new method, added test for this method

1 files changed, 22 insertions, 39 deletions

diff --git a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java
index a2dc6eb..da70d79 100644
--- a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java
@@ -132,16 +132,7 @@ public class SecurityDialogs {
 
         Object selectedValue = getUserResponse(message);
 
-        if (selectedValue == null) {
-            return false;
-        } else if (selectedValue instanceof Integer) {
-            if (((Integer) selectedValue).intValue() == 0)
-                return true;
-            else
-                return false;
-        } else {
-            return false;
-        }
+        return getIntegerResponseAsBoolean(selectedValue);
     }
 
     /**
@@ -164,17 +155,7 @@ public class SecurityDialogs {
 
         Object selectedValue = getUserResponse(message);
 
-        if (selectedValue == null) {
-            return false;
-        } else if (selectedValue instanceof Integer) {
-            if (((Integer) selectedValue).intValue() == 0) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
+        return getIntegerResponseAsBoolean(selectedValue);
     }
 
     /**
@@ -224,16 +205,7 @@ public class SecurityDialogs {
 
         Object selectedValue = getUserResponse(message);
 
-        if (selectedValue == null) {
-            return false;
-        } else if (selectedValue instanceof Integer) {
-            if (((Integer) selectedValue).intValue() == 0)
-                return true;
-            else
-                return false;
-        } else {
-            return false;
-        }
+        return getIntegerResponseAsBoolean(selectedValue);
     }
 
     /**
@@ -263,11 +235,7 @@ public class SecurityDialogs {
         message.extras = new Object[] { host, port, prompt, type };
 
         Object response = getUserResponse(message);
-        if (response == null) {
-            return null;
-        } else {
-            return (Object[]) response;
-        }
+        return (Object[]) response;
     }
 
     /**
@@ -286,11 +254,11 @@ public class SecurityDialogs {
         Object selectedValue = getUserResponse(message);
 
         // result 0 = Yes, 1 = No, 2 = Cancel
-        if (selectedValue == null) {
-            return 2;
-        } else if (selectedValue instanceof Integer) {
+        if (selectedValue instanceof Integer) {
+            // If the selected value can be cast to Integer, use that value
             return ((Integer) selectedValue).intValue();
         } else {
+            // Otherwise default to "cancel"
             return 2;
         }
     }
@@ -376,6 +344,21 @@ public class SecurityDialogs {
     }
 
     /**
+     * Returns true iff the given Object reference can be cast to Integer and that Integer's
+     * intValue is 0.
+     * @param ref the Integer (hopefully) reference
+     * @return whether the given reference is both an Integer type and has intValue of 0
+     */
+    public static boolean getIntegerResponseAsBoolean(Object ref) {
+        boolean isInteger = ref instanceof Integer;
+        if (isInteger) {
+            Integer i = (Integer) ref;
+            return i.intValue() == 0;
+        }
+        return false;
+    }
+
+    /**
      * Returns whether the current runtime configuration allows prompting user
      * for security warnings.
      *