commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject cvs commit: jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz ProjectTag.java WerkzTagSupport.java
Date Wed, 12 Jun 2002 14:00:40 GMT
jstrachan    2002/06/12 07:00:40

  Modified:    jelly/src/java/org/apache/commons/jelly/tags/werkz
                        ProjectTag.java WerkzTagSupport.java
  Log:
  patched the Project finder methods to use JellyContext.findVariable() to handle nested Jelly
files easier
  
  Revision  Changes    Path
  1.4       +1 -1      jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/ProjectTag.java
  
  Index: ProjectTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/ProjectTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ProjectTag.java	12 Jun 2002 13:54:47 -0000	1.3
  +++ ProjectTag.java	12 Jun 2002 14:00:40 -0000	1.4
  @@ -89,7 +89,7 @@
       public Project getProject() {
           if ( project == null ) {
   	        // we may be invoked inside a child script, so lets try find the parent project
  -	        project = (Project) context.getVariable( "org.apache.commons.jelly.werkz.Project"
);
  +	        project = (Project) context.findVariable( "org.apache.commons.jelly.werkz.Project"
);
   	        if ( project == null ) {
   	            project = new Project();
   	            context.setVariable( "org.apache.commons.jelly.werkz.Project", project );
  
  
  
  1.3       +1 -1      jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/WerkzTagSupport.java
  
  Index: WerkzTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/WerkzTagSupport.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WerkzTagSupport.java	12 Jun 2002 04:32:28 -0000	1.2
  +++ WerkzTagSupport.java	12 Jun 2002 14:00:40 -0000	1.3
  @@ -103,7 +103,7 @@
           if ( tag != null) {
               return tag.getProject();
           }
  -        return (Project) context.getVariable( "org.apache.commons.jelly.werkz.Project"
);
  +        return (Project) context.findVariable( "org.apache.commons.jelly.werkz.Project"
);
       }
       
       
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message