[virtualcommons-svn] SF.net SVN: virtualcommons:[130] mentalmodels/trunk/src/main/java/edu/asu/ com
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] SF.net SVN: virtualcommons:[130] mentalmodels/trunk/src/main/java/edu/asu/ commons/mme/entity
|
From: <al...@us...> - 2009-04-28 23:57:20
|
Revision: 130
http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=130&view=rev
Author: alllee
Date: 2009-04-28 23:57:14 +0000 (Tue, 28 Apr 2009)
Log Message:
-----------
more serializable fixes, getting rid of single/multi/misc location booleans in Question
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/Gender.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/java/edu/asu/commons/mme/entity/RoundConfig.java
mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Student.java
mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/SuspendRepetition.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:04:00 UTC (rev 129)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Categorical.java 2009-04-28 23:57:14 UTC (rev 130)
@@ -1,7 +1,6 @@
package edu.asu.commons.mme.entity;
-import java.io.Serializable;
import java.util.Map;
import javax.persistence.Entity;
@@ -12,7 +11,7 @@
@Entity
@Table(name="categorical")
-public class Categorical extends Question implements Serializable {
+public class Categorical extends Question {
private static final long serialVersionUID = 5399081841291536902L;
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:04:00 UTC (rev 129)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Forecasting.java 2009-04-28 23:57:14 UTC (rev 130)
@@ -2,17 +2,14 @@
-import java.io.Serializable;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name="forecasting")
+public class Forecasting extends Question {
-public class Forecasting extends Question implements Serializable {
-
private static final long serialVersionUID = -1130445773406872694L;
@Column(name="day_no",nullable=false)
Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Gender.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Gender.java 2009-04-28 23:04:00 UTC (rev 129)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Gender.java 2009-04-28 23:57:14 UTC (rev 130)
@@ -1,5 +1,5 @@
package edu.asu.commons.mme.entity;
public enum Gender {
-F, M
+ F, M
}
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:04:00 UTC (rev 129)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Psychometric.java 2009-04-28 23:57:14 UTC (rev 130)
@@ -2,7 +2,6 @@
-import java.io.Serializable;
import java.util.List;
import javax.persistence.Column;
@@ -13,13 +12,9 @@
@Entity
@Table(name="psychometric")
-public class Psychometric extends Question implements Serializable{
+public class Psychometric extends Question {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -6604568936880631100L;
@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:04:00 UTC (rev 129)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Question.java 2009-04-28 23:57:14 UTC (rev 130)
@@ -20,7 +20,7 @@
public class Question implements Serializable, Comparable<Question> {
private static final long serialVersionUID = -6745280629134903292L;
-
+
@Id
@GeneratedValue
private Long id;
@@ -32,16 +32,7 @@
@Lob
@Column(nullable=false)
private String question;
-
- @Column (name="single_location",nullable=false,columnDefinition="Boolean")
- private boolean singleLocation;
-
- @Column (name="multi_location",nullable=false,columnDefinition="Boolean")
- private boolean multiLocation;
-
- @Column (name="misc_location",nullable=false,columnDefinition="Boolean")
- private boolean miscLocation;
-
+
@Column(name = "sequence_no",nullable=false)
private Integer sequenceNo;
@@ -62,30 +53,6 @@
return question;
}
- public void setSingleLocation(boolean singleLocation) {
- this.singleLocation = singleLocation;
- }
-
- public boolean isSingleLocation() {
- return singleLocation;
- }
-
- public void setMultiLocation(boolean multiLocation) {
- this.multiLocation = multiLocation;
- }
-
- public boolean isMultiLocation() {
- return multiLocation;
- }
-
- public void setMiscLocation(boolean miscLocation) {
- this.miscLocation = miscLocation;
- }
-
- public boolean isMiscLocation() {
- return miscLocation;
- }
-
public void setSequenceNo(Integer sequenceNo) {
this.sequenceNo = sequenceNo;
}
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-28 23:04:00 UTC (rev 129)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/RoundConfig.java 2009-04-28 23:57:14 UTC (rev 130)
@@ -43,8 +43,8 @@
public Long getId() {
return id;
}
- public void setRoundNo(Integer round_no) {
- this.roundNo = round_no;
+ public void setRoundNo(Integer roundNo) {
+ this.roundNo = roundNo;
}
public Integer getRoundNo() {
return roundNo;
@@ -74,8 +74,4 @@
public void setLocations(Set<Location> locations) {
this.locations = locations;
}
-
-
-
-
}
Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Student.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Student.java 2009-04-28 23:04:00 UTC (rev 129)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/Student.java 2009-04-28 23:57:14 UTC (rev 130)
@@ -18,12 +18,9 @@
@Entity
@Table(name="student")
-public class Student implements Serializable{
+public class Student implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -8470518757386068187L;
@Id
@GeneratedValue
Modified: mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/SuspendRepetition.java
===================================================================
--- mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/SuspendRepetition.java 2009-04-28 23:04:00 UTC (rev 129)
+++ mentalmodels/trunk/src/main/java/edu/asu/commons/mme/entity/SuspendRepetition.java 2009-04-28 23:57:14 UTC (rev 130)
@@ -30,8 +30,8 @@
@JoinColumn(nullable=false)
private Student student;
- @Column(name="harbor_days",nullable=false)
- private Integer harborDays;
+ @Column(name="days_in_harbor",nullable=false)
+ private Integer daysInHarbor;
@Column(name="fishing_threshold",nullable=false)
private Float fishingThreshold;
@@ -44,12 +44,12 @@
return id;
}
- public void setHarborDays(Integer harborDays) {
- this.harborDays = harborDays;
+ public void setDaysInHarbor(Integer harborDays) {
+ this.daysInHarbor = harborDays;
}
- public Integer getHarborDays() {
- return harborDays;
+ public Integer getDaysInHarbor() {
+ return daysInHarbor;
}
public void setFishingThreshold(Float fishingThreshold) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
