You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2009/05/19 23:13:54 UTC
svn commit: r776462 - in
/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu:
ImmutableGroupNode.java ImmutableItemNode.java MenuContentHandlerImpl.java
MenuNode.java
Author: matzew
Date: Tue May 19 21:13:53 2009
New Revision: 776462
URL: http://svn.apache.org/viewvc?rev=776462&view=rev
Log:
TRINIDAD-1477 - XMLMenuModel GroupNode Functionality Broken
Thanks to Gary Kind for the patch;
Modified:
myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableGroupNode.java
myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableItemNode.java
myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java
Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableGroupNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableGroupNode.java?rev=776462&r1=776461&r2=776462&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableGroupNode.java (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableGroupNode.java Tue May 19 21:13:53 2009
@@ -57,6 +57,7 @@
_accessKey = node.getAccessKeyProperty();
_id = node.getIdProperty();
_modelId = node.getModelIdProperty();
+ _uniqueId = node.getUniqueIdProperty();
_labelAndAccessKey = node.getLabelAndAccessKeyProperty();
_defaultFocusPathStr = node.getDefaultFocusPathProperty();
@@ -237,6 +238,11 @@
return _children;
}
+ public void setChildren(List<MenuNode> children)
+ {
+ _children = children;
+ }
+
public final String getFocusViewId()
{
return _focusViewId;
@@ -433,6 +439,11 @@
return _modelId;
}
+ public final String getUniqueId()
+ {
+ return _uniqueId;
+ }
+
//TODO make this work
// public final String getLabelAndAccessKey()
// {
@@ -516,7 +527,7 @@
}
private final String _icon;
- private List<MenuNode> _children;
+ private List<MenuNode> _children = null;
private final String _focusViewId;
private final String _renderedStr;
private final String _disabledStr;
@@ -530,6 +541,7 @@
private final String _modelId;
private final String _labelAndAccessKey;
private final String _defaultFocusPathStr;
+ private final String _uniqueId;
// Root Menu model's Request Map Key
private final String _rootModelKey;
Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableItemNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableItemNode.java?rev=776462&r1=776461&r2=776462&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableItemNode.java (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableItemNode.java Tue May 19 21:13:53 2009
@@ -60,6 +60,7 @@
_accessKey = node.getAccessKeyProperty();
_id = node.getIdProperty();
_modelId = node.getModelIdProperty();
+ _uniqueId = node.getUniqueIdProperty();
_labelAndAccessKey = node.getLabelAndAccessKeyProperty();
_defaultFocusPathStr = node.getDefaultFocusPathProperty();
@@ -450,6 +451,11 @@
return _modelId;
}
+ public final String getUniqueId()
+ {
+ return _uniqueId;
+ }
+
public final String getLabelAndAccessKey()
{
String labelAndAcessKeyEval;
@@ -583,7 +589,7 @@
}
private final String _icon;
- private List<MenuNode> _children;
+ private List<MenuNode> _children = null;
private final String _focusViewId;
private final String _renderedStr;
private final String _disabledStr;
@@ -597,6 +603,7 @@
private final String _modelId;
private final String _labelAndAccessKey;
private final String _defaultFocusPathStr;
+ private final String _uniqueId;
// Root Menu model's Request Map Key
private final String _rootModelKey;
Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java?rev=776462&r1=776461&r2=776462&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuContentHandlerImpl.java Tue May 19 21:13:53 2009
@@ -1050,7 +1050,7 @@
private String _resBundleKey;
private String _resBundleName;
- private Map<String, String> _attrMap;
+ private Map<String, String> _attrMap;
private Stack<Object> _saveDataStack;
private Map<String, List<Object>> _viewIdFocusPathMap;
private Map<Object, List<Object>> _nodeFocusPathMap;
Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java?rev=776462&r1=776461&r2=776462&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java (original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java Tue May 19 21:13:53 2009
@@ -575,11 +575,11 @@
public int getRootId()
{
- return _rootId;
+ return _rootId;
}
public void setRootId(int id)
{
- _rootId = id;
+ _rootId = id;
}
@@ -653,6 +653,11 @@
return _modelId;
}
+ public final String getUniqueIdProperty()
+ {
+ return getIdProperty() + getModelIdProperty();
+ }
+
public final String getLabelAndAccessKeyProperty()
{