svn commit: r519022 - /incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXNavigationHierarchy.java

[awiner]

Author: awiner
Date: Fri Mar 16 08:56:42 2007
New Revision: 519022

URL: http://svn.apache.org/viewvc?view=rev&rev=519022
Log:
ADFFACES-413: assert fires incorrectly in 
UIXNavigationHierarchy.getFocusRowKey()

Modified:
    
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXNavigationHierarchy.java

Modified: 
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXNavigationHierarchy.java
URL: 
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXNavigationHierarchy.java?view=diff&rev=519022&r1=519021&r2=519022
==============================================================================
--- 
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXNavigationHierarchy.java
 (original)
+++ 
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXNavigationHierarchy.java
 Fri Mar 16 08:56:42 2007
@@ -77,11 +77,12 @@
     MenuModel model = getMenuModel();
     if (model != null)
     {
-      Object currPath = null;
-      assert((currPath = model.getRowKey()) != null);
+      Object currPath  = model.getRowKey();      
       Object focusPath = model.getFocusRowKey();
-      // the path better have been reset after you call getFocusPath
-      assert(currPath.equals(model.getRowKey()));
+
+      // The row key should not change as a result of calling getFocusRowKey()
+      assert(((currPath == null) && (model.getRowKey() == null)) ||
+             ((currPath != null) && currPath.equals(model.getRowKey())));
       return focusPath;
     }