commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly TagSupport.java
Date Thu, 12 Aug 2004 05:07:54 GMT
dion        2004/08/11 22:07:54

  Modified:    jelly/src/java/org/apache/commons/jelly TagSupport.java
  Log:
  Jelly-113
  
  Revision  Changes    Path
  1.30      +87 -86    jakarta-commons/jelly/src/java/org/apache/commons/jelly/TagSupport.java
  
  Index: TagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/TagSupport.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- TagSupport.java	24 Feb 2004 14:15:40 -0000	1.29
  +++ TagSupport.java	12 Aug 2004 05:07:53 -0000	1.30
  @@ -25,7 +25,7 @@
   import org.apache.commons.jelly.impl.ScriptBlock;
   import org.apache.commons.jelly.impl.TextScript;
   
  -/** <p><code>TagSupport</code> an abstract base class which is useful
to 
  +/** <p><code>TagSupport</code> an abstract base class which is useful
to
     * inherit from if developing your own tag.</p>
     *
     * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  @@ -33,29 +33,29 @@
     */
   
   public abstract class TagSupport implements Tag {
  -    
  +
       /** the parent of this tag */
       protected Tag parent;
   
  -    /** the body of the tag */  
  +    /** the body of the tag */
       protected Script body;
       /** The current context */
   
       protected Boolean shouldTrim;
       protected boolean hasTrimmed;
  -    
  +
       protected JellyContext context;
   
  -    /** 
  -     * Searches up the parent hierarchy from the given tag 
  -     * for a Tag of the given type 
  +    /**
  +     * Searches up the parent hierarchy from the given tag
  +     * for a Tag of the given type
        *
        * @param from the tag to start searching from
        * @param tagClass the type of the tag to find
        * @return the tag of the given type or null if it could not be found
        */
       public static Tag findAncestorWithClass(Tag from, Class tagClass) {
  -        // we could implement this as 
  +        // we could implement this as
           //  return findAncestorWithClass(from,Collections.singleton(tagClass));
           // but this is so simple let's save the object creation for now
           while (from != null) {
  @@ -67,8 +67,8 @@
           return null;
       }
   
  -    /** 
  -     * Searches up the parent hierarchy from the given tag 
  +    /**
  +     * Searches up the parent hierarchy from the given tag
        * for a Tag matching one or more of given types.
        *
        * @param from the tag to start searching from
  @@ -85,11 +85,11 @@
               }
               from = from.getParent();
           }
  -        return null;        
  +        return null;
       }
   
  -    /** 
  -     * Searches up the parent hierarchy from the given tag 
  +    /**
  +     * Searches up the parent hierarchy from the given tag
        * for a Tag matching one or more of given types.
        *
        * @param from the tag to start searching from
  @@ -100,7 +100,7 @@
       public static Tag findAncestorWithClass(Tag from, Class[] tagClasses) {
           return findAncestorWithClass(from,Arrays.asList(tagClasses));
       }
  -    
  +
       public TagSupport() {
       }
   
  @@ -109,13 +109,13 @@
       }
   
       /**
  -     * Sets whether whitespace inside this tag should be trimmed or not. 
  +     * Sets whether whitespace inside this tag should be trimmed or not.
        * Defaults to true so whitespace is trimmed
        */
       public void setTrim(boolean shouldTrim) {
           if ( shouldTrim ) {
               this.shouldTrim = Boolean.TRUE;
  -        } 
  +        }
           else {
               this.shouldTrim = Boolean.FALSE;
           }
  @@ -126,13 +126,13 @@
               Tag parent = getParent();
               if ( parent == null ) {
                   return true;
  -            } 
  +            }
               else {
                   if ( parent instanceof TagSupport ) {
                       TagSupport parentSupport = (TagSupport) parent;
   
                       this.shouldTrim = ( parentSupport.isTrim() ? Boolean.TRUE : Boolean.FALSE
);
  -                } 
  +                }
                   else {
                       this.shouldTrim = Boolean.TRUE;
                   }
  @@ -141,17 +141,17 @@
   
           return this.shouldTrim.booleanValue();
       }
  -    
  +
       /** @return the parent of this tag */
       public Tag getParent() {
           return parent;
       }
  -    
  +
       /** Sets the parent of this tag */
       public void setParent(Tag parent) {
           this.parent = parent;
       }
  -    
  +
       /** @return the body of the tag */
       public Script getBody() {
           if (! hasTrimmed) {
  @@ -162,42 +162,42 @@
           }
           return body;
       }
  -    
  +
       /** Sets the body of the tag */
       public void setBody(Script body) {
           this.body = body;
           this.hasTrimmed = false;
       }
  -    
  +
       /** @return the context in which the tag will be run */
       public JellyContext getContext() {
           return context;
       }
  -    
  +
       /** Sets the context in which the tag will be run */
       public void setContext(JellyContext context) throws JellyTagException {
           this.context = context;
  -    }    
  -    
  +    }
  +
       /**
        * Invokes the body of this tag using the given output
        */
       public void invokeBody(XMLOutput output) throws JellyTagException {
           getBody().run(context, output);
       }
  -    
  +
       // Implementation methods
  -    //-------------------------------------------------------------------------       
        
  -    /** 
  +    //-------------------------------------------------------------------------
  +    /**
        * Searches up the parent hierarchy for a Tag of the given type.
        * @return the tag of the given type or null if it could not be found
        */
       protected Tag findAncestorWithClass(Class parentClass) {
           return findAncestorWithClass(getParent(), parentClass);
       }
  -    
  -    /** 
  -     * Searches up the parent hierarchy for a Tag of one of the given types. 
  +
  +    /**
  +     * Searches up the parent hierarchy for a Tag of one of the given types.
        * @return the tag of the given type or null if it could not be found
        * @see #findAncestorWithClass(Collection)
        */
  @@ -205,14 +205,14 @@
           return findAncestorWithClass(getParent(),parentClasses);
       }
   
  -    /** 
  -     * Searches up the parent hierarchy for a Tag of one of the given types. 
  +    /**
  +     * Searches up the parent hierarchy for a Tag of one of the given types.
        * @return the tag of the given type or null if it could not be found
        */
       protected Tag findAncestorWithClass(Collection parentClasses) {
           return findAncestorWithClass(getParent(),parentClasses);
       }
  -    
  +
       /**
        * Executes the body of the tag and returns the result as a String.
        *
  @@ -238,56 +238,57 @@
       }
   
   
  -    /** 
  -     * Find all text nodes inside the top level of this body and 
  +    /**
  +     * Find all text nodes inside the top level of this body and
        * if they are just whitespace then remove them
        */
  -    protected void trimBody() { 
  -        
  -        // #### should refactor this code into
  -        // #### trimWhitespace() methods on the Script objects
  -        
  -        if ( body instanceof CompositeTextScriptBlock ) {
  -            CompositeTextScriptBlock block = (CompositeTextScriptBlock) body;
  -            List list = block.getScriptList();
  -            int size = list.size();
  -            if ( size > 0 ) {
  -                Script script = (Script) list.get(0);
  -                if ( script instanceof TextScript ) {
  -                    TextScript textScript = (TextScript) script;
  -                    textScript.trimStartWhitespace();
  -                }
  -                if ( size > 1 ) {
  -                    script = (Script) list.get(size - 1);
  -	                if ( script instanceof TextScript ) {
  -	                    TextScript textScript = (TextScript) script;
  -	                    textScript.trimEndWhitespace();
  -	                }
  -                }
  -            }
  -        }
  -        else
  -        if ( body instanceof ScriptBlock ) {
  -            ScriptBlock block = (ScriptBlock) body;
  -            List list = block.getScriptList();
  -            for ( int i = list.size() - 1; i >= 0; i-- ) {
  -                Script script = (Script) list.get(i);
  -                if ( script instanceof TextScript ) {
  -                    TextScript textScript = (TextScript) script;
  -                    String text = textScript.getText();
  -                    text = text.trim();
  -                    if ( text.length() == 0 ) {
  -                        list.remove(i);
  -                    }
  -                    else {
  -                        textScript.setText(text);
  -                    }
  -                }
  -            }                
  -        }
  -        else if ( body instanceof TextScript ) {
  -            TextScript textScript = (TextScript) body;
  -            textScript.trimWhitespace();
  -        }
  -    }
  +    protected void trimBody() {
  +        synchronized(body) {
  +			// #### should refactor this code into
  +			// #### trimWhitespace() methods on the Script objects
  +
  +			if ( body instanceof CompositeTextScriptBlock ) {
  +				CompositeTextScriptBlock block = (CompositeTextScriptBlock) body;
  +				List list = block.getScriptList();
  +				int size = list.size();
  +				if ( size > 0 ) {
  +					Script script = (Script) list.get(0);
  +					if ( script instanceof TextScript ) {
  +						TextScript textScript = (TextScript) script;
  +						textScript.trimStartWhitespace();
  +					}
  +					if ( size > 1 ) {
  +						script = (Script) list.get(size - 1);
  +						if ( script instanceof TextScript ) {
  +							TextScript textScript = (TextScript) script;
  +							textScript.trimEndWhitespace();
  +						}
  +					}
  +				}
  +			}
  +			else
  +			if ( body instanceof ScriptBlock ) {
  +				ScriptBlock block = (ScriptBlock) body;
  +				List list = block.getScriptList();
  +				for ( int i = list.size() - 1; i >= 0; i-- ) {
  +					Script script = (Script) list.get(i);
  +					if ( script instanceof TextScript ) {
  +						TextScript textScript = (TextScript) script;
  +						String text = textScript.getText();
  +						text = text.trim();
  +						if ( text.length() == 0 ) {
  +							list.remove(i);
  +						}
  +						else {
  +							textScript.setText(text);
  +						}
  +					}
  +				}
  +			}
  +			else if ( body instanceof TextScript ) {
  +				TextScript textScript = (TextScript) body;
  +				textScript.trimWhitespace();
  +			}
  +		}
  +	}
   }
  
  
  

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


Mime
View raw message