You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by po...@apache.org on 2005/01/11 23:42:29 UTC
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl TagScript.java
polx 2005/01/11 14:42:29
Modified: jelly/src/java/org/apache/commons/jelly JellyContext.java
jelly/src/java/org/apache/commons/jelly/impl TagScript.java
Log:
Fixed the test-issues in define taglib by allowing getTagOfScript to walk
the parent contexts.
maven multiproject:artifact runs fine with me now.
paul
Revision Changes Path
1.64 +6 -1 jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java
Index: JellyContext.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- JellyContext.java 6 Jan 2005 09:00:12 -0000 1.63
+++ JellyContext.java 11 Jan 2005 22:42:28 -0000 1.64
@@ -391,7 +391,12 @@
public Tag getTagOfTagScript(TagScript script) {
if( script == null )
return null;
- return (Tag) tagHolderMap.get(script);
+ Tag tag = (Tag) tagHolderMap.get(script);
+ if( tag == null && getParent() != null) {
+ return getParent().getTagOfTagScript(script);
+ } else {
+ return tag;
+ }
}
/** @return the Map that associates the the Tags to Scripts */
1.49 +2 -2 jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/TagScript.java
Index: TagScript.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/TagScript.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- TagScript.java 28 Dec 2004 04:07:34 -0000 1.48
+++ TagScript.java 11 Jan 2005 22:42:29 -0000 1.49
@@ -291,9 +291,9 @@
tag = createTag();
if ( tag != null ) {
context.setTagForScript(this,tag);
+ configureTag(tag,context);
}
}
- configureTag(tag,context);
return tag;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org