Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
In directory
james.mmbase.org:/tmp/cvs-serv9461/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
Modified Files:
Tag: b1_4
NavigationUtil.java
Log Message:
CMSC-958 Copy and delete page problem.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
See also: http://www.mmbase.org/jira/browse/CMSC-958
Index: NavigationUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationUtil.java,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -b -r1.18.2.1 -r1.18.2.2
--- NavigationUtil.java 7 Mar 2008 14:58:59 -0000 1.18.2.1
+++ NavigationUtil.java 31 Dec 2008 14:06:13 -0000 1.18.2.2
@@ -78,10 +78,13 @@
}
public static void appendChild(Cloud cloud, String parent, String child) {
- TreeUtil.appendChild(cloud, parent, child, NAVREL);
+ Node parentNode = cloud.getNode(parent);
+ Node childNode = cloud.getNode(child);
+ appendChild(parentNode, childNode);
}
public static void appendChild(Node parentNode, Node childNode) {
+ TreeUtil.uniqueChild(parentNode, childNode, treeManagers, NAVREL);
TreeUtil.appendChild(parentNode, childNode, NAVREL);
}
@@ -499,7 +502,7 @@
* @param request
* @param response
* @param parentNode
- * @return
+ * @return the url of a navigation item
*/
public static String getNavigationItemUrl(HttpServletRequest request,
HttpServletResponse response, Node parentNode) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
