[seam-commits] Seam SVN: r11553 - in branches/community/Seam_2_2/examples/wiki: src/test/org/jboss/seam/wiki/test and 1 other directories.

Author: christian.bauer(a)jboss.com Date: 2009-10-07 08:59:16 -0400 (Wed, 07 Oct 2009) New Revision: 11553 Modified: branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml branches/community/Seam_2_2/examples/wiki/view/userHome_d.xhtml Log: Minor Modified: branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java =================================================================== --- branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java 2009-10-07 04:57:01 UTC (rev 11552) +++ branches/community/Seam_2_2/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/forum/ForumDAO.java 2009-10-07 12:59:16 UTC (rev 11553) @@ -146,7 +146,10 @@ if (forumInfoMap.containsKey((Long)result[0])) { ForumInfo info = forumInfoMap.get( (Long)result[0] ); info.setTotalNumOfTopics((Long)result[1]); - info.setTotalNumOfPosts(info.getTotalNumOfTopics() + (Long)result[2]); + info.setTotalNumOfPosts(info.getTotalNumOfTopics()); + if (result[2] != null) { + info.setTotalNumOfPosts(info.getTotalNumOfPosts() + (Long)result[2]); + } } return null; } Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml =================================================================== --- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml 2009-10-07 04:57:01 UTC (rev 11552) +++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/FAQData.dbunit.xml 2009-10-07 12:59:16 UTC (rev 11553) @@ -139,4 +139,8 @@ LAST_COMMENT_CREATED_ON="2006-09-23 13:45:00" LAST_COMMENT_ID="309"/> + <WIKI_DOCUMENT_COUNT_COMMENT + WIKI_DOCUMENT_ID="308" + COMMENT_COUNT="1"/> + </dataset> \ No newline at end of file Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml =================================================================== --- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml 2009-10-07 04:57:01 UTC (rev 11552) +++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/ForumData.dbunit.xml 2009-10-07 12:59:16 UTC (rev 11553) @@ -129,6 +129,10 @@ LAST_COMMENT_CREATED_ON="2007-04-10 10:00:00" LAST_COMMENT_ID="106"/> + <WIKI_DOCUMENT_COUNT_COMMENT + WIKI_DOCUMENT_ID="104" + COMMENT_COUNT="2"/> + <!-- Second (sticky) posting --> <WIKI_NODE NODE_ID="107" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="102" @@ -166,6 +170,10 @@ LAST_COMMENT_CREATED_ON="2007-04-04 08:01:00" LAST_COMMENT_ID="108"/> + <WIKI_DOCUMENT_COUNT_COMMENT + WIKI_DOCUMENT_ID="107" + COMMENT_COUNT="1"/> + <!-- Third posting <WIKI_NODE NODE_ID="112" OBJ_VERSION="0" RATING="0" PARENT_NODE_ID="102" Modified: branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml =================================================================== --- branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2009-10-07 04:57:01 UTC (rev 11552) +++ branches/community/Seam_2_2/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2009-10-07 12:59:16 UTC (rev 11553) @@ -364,6 +364,10 @@ LAST_COMMENT_CREATED_ON="2006-09-28 13:49:00" LAST_COMMENT_ID="15"/> + <WIKI_DOCUMENT_COUNT_COMMENT + WIKI_DOCUMENT_ID="6" + COMMENT_COUNT="6"/> + <WIKI_DOCUMENT_HISTORY FILE_HISTORY_ID="1" FILE_ID="6" FILE_REVISION="0" NAME="One" LAST_MODIFIED_ON="[NULL]" LAST_MODIFIED_BY_USERNAME="admin" content="Original text of Testdocument One"/> Modified: branches/community/Seam_2_2/examples/wiki/view/userHome_d.xhtml =================================================================== --- branches/community/Seam_2_2/examples/wiki/view/userHome_d.xhtml 2009-10-07 04:57:01 UTC (rev 11552) +++ branches/community/Seam_2_2/examples/wiki/view/userHome_d.xhtml 2009-10-07 12:59:16 UTC (rev 11553) @@ -116,7 +116,7 @@ <ui:param name="fieldId" value="password"/> <ui:define name="label">#{messages['lacewiki.label.userHome.Password']}</ui:define> <h:inputSecret styleClass="ajaxSupport" tabindex="1" size="15" maxlength="15" - redisplay="true" value="#{userHome.password}" + redisplay="true" value="#{userHome.password}" autocomplete="off" disabled="#{userHome.instance.username == guestUser.username}"> <a:support status="globalStatus" event="onchange" action="#{userHome.validatePassword}" reRender="passwordDecorate" oncomplete="onAjaxRequestComplete()"/> @@ -130,7 +130,7 @@ <ui:param name="fieldId" value="passwordControl"/> <ui:define name="label">#{messages['lacewiki.label.userHome.RepeatPassword']}</ui:define> <h:inputSecret styleClass="ajaxSupport" tabindex="1" size="15" maxlength="15" - redisplay="true" value="#{userHome.passwordControl}" + redisplay="true" value="#{userHome.passwordControl}" autocomplete="off" disabled="#{userHome.instance.username == guestUser.username}"> <a:support status="globalStatus" event="onchange" action="#{userHome.validatePasswordControl}" reRender="passwordControlDecorate" oncomplete="onAjaxRequestComplete()"/>