Author: mfortun Date: 2011-06-27 12:42:43 +0200 (Mon, 27 Jun 2011) New Revision: 979 Url: http://nuiton.org/repositories/revision/wikitty/979 Log: * remove old version of wikitty tag * update dependency Removed: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/ Modified: trunk/pom.xml trunk/wikitty-struts/pom.xml trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-27 10:16:49 UTC (rev 978) +++ trunk/pom.xml 2011-06-27 10:42:43 UTC (rev 979) @@ -261,6 +261,13 @@ <version>${strutsxworksVersion}</version> </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>${jspapiversion}</version> + </dependency> + </dependencies> </dependencyManagement> @@ -452,7 +459,7 @@ <javassistVersion>3.8.0.GA</javassistVersion> <strutsxworksVersion>2.2.3</strutsxworksVersion> - + <jspapiversion>2.0</jspapiversion> </properties> <!-- ************************************************************* --> Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2011-06-27 10:16:49 UTC (rev 978) +++ trunk/wikitty-struts/pom.xml 2011-06-27 10:42:43 UTC (rev 979) @@ -27,7 +27,6 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>jsp-api</artifactId> - <version>2.0</version> <scope>provided</scope> </dependency> Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-27 10:16:49 UTC (rev 978) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-27 10:42:43 UTC (rev 979) @@ -14,8 +14,8 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.struts.component.ExtensionFieldStrutsBean.Option; + public class WikittyFieldHandler { protected Wikitty wikitty; @@ -152,12 +152,10 @@ Object valueObject = wikitty.getFieldAsObject( ext.getName(), fieldName); String valueString = ""; - String checkedNull = ""; + if (valueObject != null) { valueString = String.valueOf(valueObject); - } else { - checkedNull = "checked='true'"; - } + } temp.setValue(valueString); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-06-27 10:16:49 UTC (rev 978) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-06-27 10:42:43 UTC (rev 979) @@ -2,7 +2,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.struts2.components.Component; import org.apache.struts2.views.jsp.ui.AbstractClosingTag; import org.nuiton.wikitty.WikittyProxy;