Author: ymartel Date: 2012-06-18 17:26:12 +0200 (Mon, 18 Jun 2012) New Revision: 182 Url: http://chorem.org/repositories/revision/chorem/182 Log: prevent null values in display Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-06-11 08:51:58 UTC (rev 181) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-06-18 15:26:12 UTC (rev 182) @@ -102,8 +102,13 @@ protected void viewBinary(JspWriter output, String contextPath, String name, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { - String url = contextPath + "/wikitty/view/" + wikitty.getId() + "/" + extName + "/" + fieldName; - /*{<%=name%> : <a href="<%=url%>">Download</a>}*/ + byte[] fieldAsBytes = wikitty.getFieldAsBytes(extName, fieldName); + if (fieldAsBytes != null) { + String url = contextPath + "/wikitty/view/" + wikitty.getId() + "/" + extName + "/" + fieldName; + /*{<%=name%> : <a href="<%=url%>">Download</a>}*/ + } else { + /*{<%=name%> : }*/ + } } protected void viewBoolean(JspWriter output, String contextPath, String name, @@ -156,7 +161,9 @@ List<String> values = wikitty.getFieldAsList(extName, fieldName, String.class); /*{<%=fieldName%> : <ul>}*/ for (String value : values) { - /*{<li><%=value%></li>}*/ + if (value != null) { + /*{<li><%=value%></li>}*/ + } } /*{</ul>}*/ } @@ -164,7 +171,8 @@ protected void viewString(JspWriter output, String contextPath, String name, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { - String value = wikitty.getFieldAsString(extName, fieldName); + String fieldAsString = wikitty.getFieldAsString(extName, fieldName); + String value = fieldAsString != null ? fieldAsString : ""; /*{<%=fieldName%> : <%=value%>}*/ } @@ -174,8 +182,10 @@ List<Wikitty> values = wikitty.getFieldAsWikittyList(extName, fieldName, false); /*{<%=fieldName%> : <ul>}*/ for (Wikitty value : values) { - String url = contextPath + "/wikitty/view/" + value.getId(); - /*{<li><a href="<%=url%>"><%=value%></a></li>}*/ + if (value != null) { + String url = contextPath + "/wikitty/view/" + value.getId(); + /*{<li><a href="<%=url%>"><%=value%></a></li>}*/ + } } /*{</ul>}*/ @@ -186,9 +196,11 @@ throws JspException, IOException { String value = wikitty.getFieldAsWikitty(extName, fieldName); Wikitty wikittyValue = wikitty.getFieldAsWikitty(extName, fieldName, false); - String url = contextPath + "/wikitty/view/" + value; if (wikittyValue != null) { - /*{<%=fieldName%>: <a href="<%=url%>"><%=wikittyValue%></a>}*/ + String url = contextPath + "/wikitty/view/" + value; + if (wikittyValue != null) { + /*{<%=fieldName%>: <a href="<%=url%>"><%=wikittyValue%></a>}*/ + } } }