merge

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

@@ -3,9 +3,13 @@ package fi.insomnia.bortal.model;
 import java.io.Serializable;
 import java.io.Serializable;
 
 
 import javax.persistence.Column;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.Lob;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 
+@Entity
+@Table(name = "poll_answer")
 public class PollAnswer extends GenericEventChild implements Serializable {
 public class PollAnswer extends GenericEventChild implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

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

+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2010-10-31T00:24:20.751+0300")
+@StaticMetamodel(PollAnswer.class)
+public class PollAnswer_ extends GenericEventChild_ {
+	public static volatile SingularAttribute<PollAnswer, String> answerText;
+	public static volatile SingularAttribute<PollAnswer, PossibleAnswer> choise;
+}

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

@@ -78,11 +78,11 @@ public class PollQuestion extends GenericEventChild {
         this.poll = poll;
         this.poll = poll;
     }
     }
 
 
-    public List<PossibleAnswers> getAnswers() {
+    public List<PossibleAnswer> getAnswers() {
         return answers;
         return answers;
     }
     }
 
 
-    public void setAnswers(List<PossibleAnswers> answers) {
+    public void setAnswers(List<PossibleAnswer> answers) {
         this.answers = answers;
         this.answers = answers;
     }
     }