[virtualcommons-svn] SF.net SVN: virtualcommons:[131] mentalmodels/trunk/src/main

[<al...@us...>]

Revision: 131
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=131&view=rev
Author:   alllee
Date:     2009-04-29 01:13:56 +0000 (Wed, 29 Apr 2009)

Log Message:
-----------
adding insert statements

Modified Paths:
--------------
    mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Categorical.java
    mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Forecasting.java
    mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Psychometric.java
    mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Question.java
    mentalmodels/trunk/src/main/webapp/WEB-INF/hibernate.cfg.xml

Added Paths:
-----------
    mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/CategoricalOption.java

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Categorical.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Categorical.java	2009-04-28 23:57:14 UTC (rev 130)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Categorical.java	2009-04-29 01:13:56 UTC (rev 131)
@@ -1,32 +1,28 @@
 package edu.asu.commons.mme.entity;
 
 
-import java.util.Map;
+import java.util.List;
 
 import javax.persistence.Entity;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.CollectionOfElements;
 
-
 @Entity
 @Table(name="categorical")
 public class Categorical extends Question {
 	
-
 	private static final long serialVersionUID = 5399081841291536902L;
-	
-	@CollectionOfElements
-	@org.hibernate.annotations.MapKey
-	private Map<String,java.util.ArrayList<String>> choices;
 
-	public void setChoices(Map<String,java.util.ArrayList<String>> choices) {
+	@OneToMany(mappedBy="categorical")
+	private List<CategoricalOption> choices;
+
+	public void setChoices(List<CategoricalOption> choices) {
 		this.choices = choices;
 	}
 
-	public Map<String,java.util.ArrayList<String>> getChoices() {
+	public List<CategoricalOption> getChoices() {
 		return choices;
 	}
-	
 
 }

Added: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/CategoricalOption.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/CategoricalOption.java	                        (rev 0)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/CategoricalOption.java	2009-04-29 01:13:56 UTC (rev 131)
@@ -0,0 +1,51 @@
+package edu.asu.commons.mme.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.CollectionOfElements;
+
+@Entity
+@Table(name="categorical_option")
+public class CategoricalOption extends Persistable.Base<Long> {
+	
+	@Column(nullable=false)
+	private String optionKey;
+	
+	@CollectionOfElements
+	private List<String> choices = new ArrayList<String>();
+	
+	@ManyToOne
+	private Categorical categorical;
+
+
+	public String getOptionKey() {
+		return optionKey;
+	}
+
+	public void setOptionKey(String optionKey) {
+		this.optionKey = optionKey;
+	}
+
+	public List<String> getChoices() {
+		return choices;
+	}
+
+	public void setChoices(List<String> choices) {
+		this.choices = choices;
+	}
+
+	public Categorical getCategorical() {
+		return categorical;
+	}
+
+	public void setCategorical(Categorical categorical) {
+		this.categorical = categorical;
+	}
+
+}

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Forecasting.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Forecasting.java	2009-04-28 23:57:14 UTC (rev 130)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Forecasting.java	2009-04-29 01:13:56 UTC (rev 131)
@@ -22,7 +22,5 @@
 	public Integer getDayNo() {
 		return dayNo;
 	}
-
 	
-	
 }

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Psychometric.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Psychometric.java	2009-04-28 23:57:14 UTC (rev 130)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Psychometric.java	2009-04-29 01:13:56 UTC (rev 131)
@@ -16,6 +16,7 @@
 
 	private static final long serialVersionUID = -6604568936880631100L;
 
+	// FIXME: should be an enum, can be unipolar or bipolar
 	@Column(nullable=false)
 	private String scale;
 		

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Question.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Question.java	2009-04-28 23:57:14 UTC (rev 130)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Question.java	2009-04-29 01:13:56 UTC (rev 131)
@@ -36,7 +36,6 @@
 	@Column(name = "sequence_no",nullable=false)
 	private Integer sequenceNo;
 	
-	
 	public void setId(Long id) {
 		this.id = id;
 	}

Modified: mentalmodels/trunk/src/main/webapp/WEB-INF/hibernate.cfg.xml
===================================================================
--- mentalmodels/trunk/src/main/webapp/WEB-INF/hibernate.cfg.xml	2009-04-28 23:57:14 UTC (rev 130)
+++ mentalmodels/trunk/src/main/webapp/WEB-INF/hibernate.cfg.xml	2009-04-29 01:13:56 UTC (rev 131)
@@ -25,6 +25,7 @@
 
 
     <mapping class='edu.asu.commons.mme.entity.Categorical'/>
+    <mapping class='edu.asu.commons.mme.entity.CategoricalOption'/>
     <mapping class='edu.asu.commons.mme.entity.Psychometric'/>   
     <mapping class='edu.asu.commons.mme.entity.StudentResponse'/>   
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.