svn commit: r1103843 - /wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java

[mgrigorov]

Author: mgrigorov
Date: Mon May 16 18:58:13 2011
New Revision: 1103843

URL: http://svn.apache.org/viewvc?rev=1103843&view=rev
Log:
WICKET-3714 org/apache/wicket/util/lang/EnumeratedType.java method getValues 
never returns null


Modified:
    
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java

Modified: 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java?rev=1103843&r1=1103842&r2=1103843&view=diff
==============================================================================
--- 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
 (original)
+++ 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
 Mon May 16 18:58:13 2011
@@ -88,15 +88,12 @@ public abstract class EnumeratedType ext
        {
                EnumeratedType result = this;
                List<EnumeratedType> values = getValues(getClass());
-               if (values != null)
+               for (EnumeratedType value : values)
                {
-                       for (EnumeratedType value : values)
+                       if ((value.toString() != null) && 
value.toString().equals(this.toString()))
                        {
-                               if ((value.toString() != null) && 
value.toString().equals(this.toString()))
-                               {
-                                       result = value;
-                                       break;
-                               }
+                               result = value;
+                               break;
                        }
                }
                return result;