Update of /cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21587/src/xdoclet/tagshandler
Modified Files:
MergeTagsHandler.java
Log Message:
Better logic for parent-child merges, if parent ID is specified then the
ifParentIdEquals block should not be evaluated regardless of whether or not an
ID is specified
Index: MergeTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/MergeTagsHandler.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** MergeTagsHandler.java 12 Jul 2005 17:16:45 -0000 1.14
--- MergeTagsHandler.java 19 Jul 2005 19:12:16 -0000 1.15
***************
*** 187,191 ****
}
! if (id == null || id.length() == 0 || mergeStack.peek().equals(id)) {
generate(template);
}
--- 187,197 ----
}
! if (id == null || id.length() == 0) {
! if (mergeStack.size() == 0 ||
! mergeStack.peek().equals("__UNSPECIFIED__")) {
! generate(template);
! }
! }
! else if (mergeStack.size() > 0 && mergeStack.peek().equals(id)) {
generate(template);
}
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
