From ea3149d3ead4d0a791c964bf773d7104e998b147 Mon Sep 17 00:00:00 2001
From: Stefan Suhren <suhren.stefan@fh-swf.de>
Date: Wed, 2 Dec 2015 08:29:58 +0100
Subject: Only return null in StringConverter if really necessary

---
 .../util/OverLimitIntegerStringConverter.java       | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'src/de/fhswf/in')

diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/util/OverLimitIntegerStringConverter.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/util/OverLimitIntegerStringConverter.java
index 07d1e16..bec0ec0 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/util/OverLimitIntegerStringConverter.java
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/util/OverLimitIntegerStringConverter.java
@@ -36,7 +36,7 @@ public class OverLimitIntegerStringConverter extends StringConverter<Integer>
       // String
       if (object == null || object.intValue() < minAllowedValue)
       {
-         return "";
+         return Integer.toString(minAllowedValue);
       }
 
       return (Integer.toString(object.intValue()));
@@ -60,17 +60,24 @@ public class OverLimitIntegerStringConverter extends StringConverter<Integer>
 
       if (string.length() < 1)
       {
-         return null;
+         return minAllowedValue;
       }
 
-      // If the specified value is 0 or negative, return null
-      Integer object = Integer.valueOf(string);
+      try
+      {
+         // If the specified value is 0 or negative, return null
+         Integer object = Integer.valueOf(string);
 
-      if (object.intValue() < minAllowedValue)
+         if (object.intValue() >= minAllowedValue)
+         {
+            return object;
+         }
+      }
+      catch (NumberFormatException e)
       {
-         return null;
+         // ignored
       }
 
-      return object;
+      return minAllowedValue;
    }
 }
-- 
cgit v1.2.3-70-g09d2