Consolidate duplicate code and update whitespace

Author: alchemistmatt

src/main/java/edu/ucsd/msjava/params/DoubleParameter.java

@@ -24,12 +24,12 @@ public String parse(String value) {
             if (maxValue == null)
                 maxValue = Double.POSITIVE_INFINITY;
 
-            String range = (super.isMinInclusive ? "[" : "(") + minValue + "," + maxValue + (super.isMaxInclusive ? "]" : ")");
-            if (this.value < minValue ||
-                    this.value > maxValue
-                    || !super.isMinInclusive && this.value.equals(minValue)
-                    || !super.isMaxInclusive && this.value.equals(maxValue))
+            String range = getValidRange();
+            if (this.value < minValue || this.value > maxValue ||
+                    !isMinInclusive && this.value.equals(minValue) ||
+                    !isMaxInclusive && this.value.equals(maxValue)) {
                 return "must be in the range " + range;
+            }
         } catch (NumberFormatException e) {
             return "must be a double";
         }

src/main/java/edu/ucsd/msjava/params/FloatParameter.java

@@ -12,11 +12,14 @@ public FloatParameter(String key, String name, String description) {
     public String parse(String value) {
         try {
             super.value = Float.valueOf(value);
-            String range = (super.isMinInclusive ? "[" : "(") + minValue + "," + maxValue + (super.isMaxInclusive ? "]" : ")");
-            if (this.value < minValue || this.value > maxValue
-                    || !super.isMinInclusive && this.value.equals(minValue)
-                    || !super.isMaxInclusive && this.value.equals(maxValue))
+
+
+            String range = getValidRange();
+            if (this.value < minValue || this.value > maxValue ||
+                    !isMinInclusive && this.value.equals(minValue) ||
+                    !isMaxInclusive && this.value.equals(maxValue)) {
                 return "must be in the range " + range;
+            }
         } catch (NumberFormatException e) {
             return "must be a float";
         }

src/main/java/edu/ucsd/msjava/params/IntParameter.java

@@ -34,10 +34,10 @@ public String parse(String value) {
                 maxValue = Integer.MAX_VALUE;
             }
 
-            String range = (super.isMinInclusive ? "[" : "(") + minValue + "," + maxValue + (super.isMaxInclusive ? "]" : ")");
-            if (this.value < minValue || this.value > maxValue
-                    || !super.isMinInclusive && this.value.equals(minValue)
-                    || !super.isMaxInclusive && this.value.equals(maxValue)) {
+            String range = getValidRange();
+            if (this.value < minValue || this.value > maxValue ||
+                    !super.isMinInclusive && this.value.equals(minValue) ||
+                    !super.isMaxInclusive && this.value.equals(maxValue)) {
 
                 if (super.isMinInclusive && super.isMaxInclusive)
                     return "must be in the range " + minValue + " to " + maxValue;

src/main/java/edu/ucsd/msjava/params/NumberParameter.java

@@ -38,6 +38,10 @@ public NumberParameter<T> setMaxInclusive() {
         return this;
     }
 
+    protected String getValidRange() {
+        return (isMinInclusive ? "[" : "(") + minValue + "," + maxValue + (isMaxInclusive ? "]" : ")");
+    }
+
     @Override
     public abstract String parse(String value);