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

[<see...@us...>]

Revision: 98
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=98&view=rev
Author:   seematalele
Date:     2009-04-14 20:08:16 +0000 (Tue, 14 Apr 2009)

Log Message:
-----------
resolved conflicts in some files.

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

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-14 19:57:10 UTC (rev 97)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Categorical.java	2009-04-14 20:08:16 UTC (rev 98)
@@ -2,6 +2,7 @@
 
 
 import java.util.List;
+import java.util.Map;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -15,18 +16,32 @@
 public class Categorical extends Question {
 	
 
+/*	@CollectionOfElements
+	@IndexColumn(name = "choices", base=1, nullable=false)
+*/	
+
 	@CollectionOfElements
-	@IndexColumn(name = "choices", base=1)
-	private List<String> choices;
+	@org.hibernate.annotations.MapKey
+	private Map<String,java.util.ArrayList<String>> choices;
 
-	public void setChoices(List<String> choices) {
+	public void setChoices(Map<String,java.util.ArrayList<String>> choices) {
 		this.choices = choices;
 	}
 
+	public Map<String,java.util.ArrayList<String>> getChoices() {
+		return choices;
+	}
+	
+	/*public void setChoices(List<String> choices) {
+		this.choices = choices;
+	}
+
 	public List<String> getChoices() {
 		return choices;
 	}
+*/
 
 	
+	
 
 }

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Communication.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Communication.java	2009-04-14 19:57:10 UTC (rev 97)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Communication.java	2009-04-14 20:08:16 UTC (rev 98)
@@ -1,8 +1,9 @@
 package edu.asu.commons.mme.entity;
 
+
 import java.sql.Timestamp;
-
-
+import java.util.Date;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/GameConfig.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/GameConfig.java	2009-04-14 19:57:10 UTC (rev 97)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/GameConfig.java	2009-04-14 20:08:16 UTC (rev 98)
@@ -2,7 +2,6 @@
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -15,10 +14,18 @@
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+<<<<<<< .mine
+import java.sql.Timestamp;
+=======
+>>>>>>> .r97
 
 
+<<<<<<< .mine
 
+=======
 
+
+>>>>>>> .r97
 @Entity
 @Table(name="game")
 public class GameConfig {

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-14 19:57:10 UTC (rev 97)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Psychometric.java	2009-04-14 20:08:16 UTC (rev 98)
@@ -15,6 +15,7 @@
 public class Psychometric extends Question {
 
 	@Column(nullable=false)
+	@Column(nullable=false)
 	private String scale;
 		
 	@Column(name="no_of_intervals",nullable=false)

Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/RoundConfig.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/RoundConfig.java	2009-04-14 19:57:10 UTC (rev 97)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/RoundConfig.java	2009-04-14 20:08:16 UTC (rev 98)
@@ -4,12 +4,12 @@
 import java.util.Set;
 
 import javax.persistence.CascadeType;
-
 import javax.persistence.Column;
 import javax.persistence.JoinColumn;
 
 import javax.persistence.Column;
 
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -28,6 +28,7 @@
 	@Column(name="round_no",nullable=false)
 	private Integer roundNo;
 
+
 	
 	@ManyToOne
 	@JoinColumn(nullable=false)
@@ -37,6 +38,7 @@
 	@Column(name="communication_flag",nullable=false,columnDefinition= "Boolean")
 	private boolean communicationFlag;
 
+
 	
 	@ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
 	private Set<QuestionGroup> questionGroup;

Modified: mentalmodels/trunk/src/main/webapp/WEB-INF/hibernate.cfg.xml
===================================================================
--- mentalmodels/trunk/src/main/webapp/WEB-INF/hibernate.cfg.xml	2009-04-14 19:57:10 UTC (rev 97)
+++ mentalmodels/trunk/src/main/webapp/WEB-INF/hibernate.cfg.xml	2009-04-14 20:08:16 UTC (rev 98)
@@ -23,6 +23,7 @@
     <mapping class='edu.asu.commons.mme.entity.Question'/>
 
 
+
       <mapping class='edu.asu.commons.mme.entity.Categorical'/>
      <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.