Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollAnswer.java

@@ -20,6 +20,9 @@ public class PollAnswer extends GenericEventChild implements Serializable {
     @Column(name = "answer_text", nullable = true)
     @Column(name = "answer_text", nullable = true)
     private String answerText;
     private String answerText;
 
 
+    @Column(name = "answer_boolean", nullable = true)
+    private Boolean answerBoolean;
+
     @ManyToOne
     @ManyToOne
     @JoinColumns({
     @JoinColumns({
             @JoinColumn(name = "possible_answer_id", referencedColumnName = "id", nullable = false),
             @JoinColumn(name = "possible_answer_id", referencedColumnName = "id", nullable = false),
@@ -34,11 +37,14 @@ public class PollAnswer extends GenericEventChild implements Serializable {
         this.answerText = answerText;
         this.answerText = answerText;
     }
     }
 
 
-    public PollAnswer(PollQuestion q)
-    {
+    public PollAnswer() {
+        super();
+    }
+
+    public PollAnswer(PollQuestion q) {
         super(new EventPk(q.getId().getId()));
         super(new EventPk(q.getId().getId()));
     }
     }
-    
+
     public String getAnswerText() {
     public String getAnswerText() {
         return answerText;
         return answerText;
     }
     }
@@ -58,4 +64,12 @@ public class PollAnswer extends GenericEventChild implements Serializable {
     public User getUser() {
     public User getUser() {
         return user;
         return user;
     }
     }
+
+    public void setAnswerBoolean(Boolean answerBoolean) {
+        this.answerBoolean = answerBoolean;
+    }
+
+    public Boolean getAnswerBoolean() {
+        return answerBoolean;
+    }
 }
 }