You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by aw...@apache.org on 2007/05/23 02:33:03 UTC
svn commit: r540798 -
/myfaces/trinidad/branches/faces-1_2-0705022/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
Author: awiner
Date: Tue May 22 17:33:02 2007
New Revision: 540798
URL: http://svn.apache.org/viewvc?view=rev&rev=540798
Log:
TRINIDAD-36: XMLMenuModel: MenuContentHandlerImpl.setRootModelRowKey() writes to static variable
Modified:
myfaces/trinidad/branches/faces-1_2-0705022/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
Modified: myfaces/trinidad/branches/faces-1_2-0705022/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2-0705022/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java?view=diff&rev=540798&r1=540797&r2=540798
==============================================================================
--- myfaces/trinidad/branches/faces-1_2-0705022/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java (original)
+++ myfaces/trinidad/branches/faces-1_2-0705022/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java Tue May 22 17:33:02 2007
@@ -489,7 +489,7 @@
*
* @return root, top-level XMLMenuModel's Request Map Key.
*/
- public static String getRootModelKey()
+ public String getRootModelKey()
{
return _rootModelKey;
}
@@ -951,8 +951,7 @@
private String _localModelUri = null;
// Root Menu model's Session map key
- // FIXME: this is static, but written to from instances!
- private static String _rootModelKey = null;
+ private String _rootModelKey = null;
// Nodes
private final static String _GROUP_NODE = "groupNode";