Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
In directory
james.mmbase.org:/tmp/cvs-serv4341/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
Modified Files:
Tag: b1_4
NavigationUtil.java
Log Message:
CMSC-801 Solved by moving the check to a better position
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-801
Index: NavigationUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationUtil.java,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -b -r1.18 -r1.18.2.1
--- NavigationUtil.java 16 Jan 2008 15:43:10 -0000 1.18
+++ NavigationUtil.java 7 Mar 2008 14:58:59 -0000 1.18.2.1
@@ -341,18 +341,17 @@
}
public static Node copyPage(Node sourcePage, Node destPage) {
- if (!isParent(sourcePage, destPage)) {
Node newPage = PagesUtil.copyPage(sourcePage);
appendChild(destPage, newPage);
NodeList children = getOrderedChildren(sourcePage);
for (Iterator<Node> iter = children.iterator(); iter.hasNext();) {
Node childPage = iter.next();
+ if (!isParent(sourcePage, destPage) ||
!childPage.getStringValue("urlfragment").equals(destPage.getStringValue("urlfragment")))
{
copyPage(childPage, newPage);
}
- return newPage;
}
- return null;
+ return newPage;
}
/**
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
