Author: bayard Date: Sun Jul 12 05:05:10 2009 New Revision: 793273 URL: http://svn.apache.org/viewvc?rev=793273&view=rev Log: Removing redundant evaluateString code
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/StringTagSupport.java Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/StringTagSupport.java URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/StringTagSupport.java?rev=793273&r1=793272&r2=793273&view=diff ============================================================================== --- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/StringTagSupport.java (original) +++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/StringTagSupport.java Sun Jul 12 05:05:10 2009 @@ -84,54 +84,26 @@ } } - // first, try to evaluate the string and associated the result on var - Object result = evaluateString( text ); - if ( result != null && this.var != null ) { - pageContext.setAttribute(this.var, result); - } else { - // then, try to transform it - text = changeString(text); - - // TODO: RandomString is not working if body is set... - /* - System.err.println("...."+text+"...."); - if ( text != null ) { - System.out.println( "length = " + text.length()); - } - */ + // then, try to transform it + text = changeString(text); - if(this.var == null) { + if(this.var == null) { JspWriter writer = pageContext.getOut(); try { - writer.print(text); + writer.print(text); } catch (IOException e) { - throw new JspException(e.toString()); + throw new JspException(e.toString()); } - } else { + } else { pageContext.setAttribute(this.var, text); // Use the below when running against the integration tests // pageContext.setAttribute(this.var, text, PageContext.APPLICATION_SCOPE); - } - } return (EVAL_PAGE); } /** - * Perform an operation on the passed String. - * The object returned by this operation (if not null) will be - * associated to PageContext attribute represented by this.var. - * - * @param str String to be manipulated - * - * @return Object result of operation upon passed String - */ - public Object evaluateString(String str) throws JspException { - return null; - } - - /** * Perform a transformation on the passed in String. * * @param str String to be manipulated --------------------------------------------------------------------- To unsubscribe, e-mail: taglibs-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: taglibs-dev-h...@jakarta.apache.org