Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesOutputTag.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesOutputTag.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesOutputTag.java (revision 7c80e612ca4ad46d0a87795159ed00e581238912) @@ -0,0 +1,49 @@ +package org.lamsfoundation.lams.web.tag; + +import java.io.IOException; + +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.tagext.SimpleTagSupport; + +import org.apache.commons.lang.StringUtils; +/** + * JSP tag. It converts text from \n or \r\n to <BR> before rendering. + * @jsp.tag name="out" + * body-content="empty" + * display-name="converts text from \n or \r\n to <BR> before rendering" + * description="converts text from \n or \r\n to <BR> before rendering" + * @jsp. + * @author steven + * + */ +public class MultiLinesOutputTag extends SimpleTagSupport{ + private static String os = (String) System.getProperties().get("os.name"); + + private String value; + + @Override + public void doTag() throws JspException, IOException { + if(StringUtils.isEmpty(value)) + getJspContext().getOut().write(value); + + //change back + if(os.toLowerCase().indexOf("win") != -1) + value = value.replaceAll("\r\n","
"); + else + value = value.replaceAll("\n","
"); + getJspContext().getOut().write(value.toString()); + } + + /** + * @jsp.attribute required="true" rtexprvalue="true" + * @return + */ + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + +} Index: lams_central/web/WEB-INF/lams.tld =================================================================== diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -r7c80e612ca4ad46d0a87795159ed00e581238912 --- lams_central/web/WEB-INF/lams.tld (.../lams.tld) (revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672) +++ lams_central/web/WEB-INF/lams.tld (.../lams.tld) (revision 7c80e612ca4ad46d0a87795159ed00e581238912) @@ -24,6 +24,26 @@ + converts text from \n or \r\n to <BR> before rendering + converts text from \n or \r\n to <BR> before rendering + + + out + org.lamsfoundation.lams.web.tag.MultiLinesOutputTag + empty + + + converts text from \n or \r\n to <BR> before rendering + value + true + + true + + + + + + Render html tag with direction and language Render html tag with direction and language