[richfaces-svn-commits] JBoss Rich Faces SVN: r363 - trunk/richfaces/togglePanel/src/main/java/org/richfaces/component.

[richfaces-svn-commits at lists.jboss.org]

Author: d.bulahov
Date: 2007-04-11 10:15:14 -0400 (Wed, 11 Apr 2007)
New Revision: 363

Modified:
   trunk/richfaces/togglePanel/src/main/java/org/richfaces/component/UITogglePanel.java
Log:
Small refactoring

Modified: trunk/richfaces/togglePanel/src/main/java/org/richfaces/component/UITogglePanel.java
===================================================================
--- trunk/richfaces/togglePanel/src/main/java/org/richfaces/component/UITogglePanel.java	2007-04-11 13:38:31 UTC (rev 362)
+++ trunk/richfaces/togglePanel/src/main/java/org/richfaces/component/UITogglePanel.java	2007-04-11 14:15:14 UTC (rev 363)
@@ -69,13 +69,16 @@
 				int currentIdx = 0;
 				if (value != null) {
 					currentIdx = stateOrderList.indexOf(value);
+					if (currentIdx + 1 == stateOrderList.size()) {
+						return stateOrderList.get(0);
+					} else {
+						return stateOrderList.get(++currentIdx);
+					}					
 				}
-
-				if (currentIdx + 1 == stateOrderList.size()) {
+				else{
 					return stateOrderList.get(0);
-				} else {
-					return stateOrderList.get(++currentIdx);
 				}
+
 			}
 		} else {
 			return super.convertSwitchValue(component, object);