[jboss-svn-commits] JBL Code SVN: r7821 - labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2006-11-24 19:09:19 -0500 (Fri, 24 Nov 2006)
New Revision: 7821

Modified:
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/EditPost.java
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/PostAction.java
Log:
[JBFORUMS-148] Small bugfixes to polls functionality.

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/EditPost.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/EditPost.java	2006-11-24 23:21:52 UTC (rev 7820)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/EditPost.java	2006-11-25 00:09:19 UTC (rev 7821)
@@ -191,9 +191,9 @@
 	        List localPollOptions = new ArrayList();
             for(Iterator itr=this.options.keySet().iterator();itr.hasNext();)
             {
-                String option = (String)itr.next();
+                String key = (String)itr.next();
                 PollOption pollOption = PortalUtil.createPollOption();
-                pollOption.setQuestion(option);
+                pollOption.setQuestion((String)options.get(key));
                 pollOption.setVotes(0);
                 localPollOptions.add(pollOption);
             }

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/PostAction.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/PostAction.java	2006-11-24 23:21:52 UTC (rev 7820)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/PostAction.java	2006-11-25 00:09:19 UTC (rev 7821)
@@ -194,13 +194,21 @@
         this.option = option;
     }
     
-    public void addOption () {
+    public String addOption () {
+        if (this.options==null) {
+            this.options = new TreeMap();
+        }
         if(option!=null && option.trim().length()>0)
         {
             TreeMap map = (TreeMap)options;
-            this.options.put(Integer.toString(Integer.parseInt((String)map.lastKey())+1),option);
+            if (map.isEmpty()) {
+                this.options.put("1",option);
+            } else {
+                this.options.put(Integer.toString(Integer.parseInt((String)map.lastKey())+1),option);
+            }
         }
         this.option=null;
+        return null;
     }
     
     public Map getOptions()