Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv17437
Modified Files:
ListRelationsTag.java
Log Message:
fix for MMB-1681 makes a bit more reliable implemetnation of getRelatedNode
necessary
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1681
Index: ListRelationsTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ListRelationsTag.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- ListRelationsTag.java 10 Feb 2007 16:42:26 -0000 1.22
+++ ListRelationsTag.java 15 Jul 2008 19:54:37 -0000 1.23
@@ -21,7 +21,7 @@
* ListRelationsTag, a tag around bridge.Node.getRelations.
*
* @author Michiel Meeuwissen
- * @version $Id: ListRelationsTag.java,v 1.22 2007/02/10 16:42:26 nklasens Exp
$
+ * @version $Id: ListRelationsTag.java,v 1.23 2008/07/15 19:54:37 michiel Exp $
*/
public class ListRelationsTag extends AbstractNodeListTag {
@@ -78,20 +78,12 @@
}
public Node getRelatedNode() throws JspTagException {
- if (relatedNodes == null) {
- NodesAndTrim result = getNodesAndTrim(getRelatedQuery());
- relatedNodes = result.nodeList;
- if (getId() != null) {
- getRelatedQuery();
- listHelper.getReturnList().setProperty("relatedNodes",
relatedNodes);
+ Relation rel = getNodeVar().toRelation();
+ if (rel.getIntValue("snumber") == relatedFromNode.getNumber()) {
+ return rel.getDestination();
+ } else {
+ return rel.getSource();
}
-
- }
- int i = listHelper.getIndex();
- if (i >= relatedNodes.size()) i = relatedNodes.size() - 1;
- if (i < 0) i = 0;
- return relatedNodes.get(i);
-
}
public int doStartTag() throws JspTagException{
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
