[gee-svn] SF.net SVN: gabel: [180] trunk/gee/src/java/edu/indiana/psych/gee
Status: Alpha
Brought to you by:
alllee
Menu
▾
▴
[gee-svn] SF.net SVN: gabel: [180] trunk/gee/src/java/edu/indiana/psych/gee
|
From: <al...@us...> - 2006-05-18 05:18:39
|
Revision: 180 Author: alllee Date: 2006-05-17 22:18:18 -0700 (Wed, 17 May 2006) ViewCVS: http://svn.sourceforge.net/gabel/?rev=180&view=rev Log Message: ----------- some relatively major package restructuring, and removing Identifier.NULL's confused equals method (Object.equals() pointer equality is sufficient). Modified Paths: -------------- trunk/gee/src/java/edu/indiana/psych/gee/AbstractExperiment.java trunk/gee/src/java/edu/indiana/psych/gee/Experiment.java trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java trunk/gee/src/java/edu/indiana/psych/gee/Identifier.java trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java trunk/gee/src/java/edu/indiana/psych/gee/event/EndRoundEvent.java trunk/gee/src/java/edu/indiana/psych/gee/event/RoundStartedEvent.java trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperiment.java trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClient.java trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerGameWindow.java trunk/gee/src/java/edu/indiana/psych/gee/forager/event/ClientPositionUpdateEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/AbstractDispatcher.java trunk/gee/src/java/edu/indiana/psych/gee/net/AbstractServerDispatcher.java trunk/gee/src/java/edu/indiana/psych/gee/net/ClientSocketDispatcher.java trunk/gee/src/java/edu/indiana/psych/gee/net/NioDispatcher.java trunk/gee/src/java/edu/indiana/psych/gee/net/ServerSocketDispatcher.java trunk/gee/src/java/edu/indiana/psych/gee/net/SocketDispatcherWorker.java trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormDao.java trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormService.java trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationService.java trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateConsentFormDao.java Added Paths: ----------- trunk/gee/src/java/edu/indiana/psych/gee/bean/ConsentForm.java trunk/gee/src/java/edu/indiana/psych/gee/net/event/ trunk/gee/src/java/edu/indiana/psych/gee/net/event/ClientReadyEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/event/ConnectionEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/event/DisconnectionEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/event/DisconnectionRequest.java trunk/gee/src/java/edu/indiana/psych/gee/net/event/ExperimentUpdateEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/event/ServerAssignedIdentifierEvent.java Removed Paths: ------------- trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java trunk/gee/src/java/edu/indiana/psych/gee/net/ClientReadyEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/ConnectionEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/DisconnectionEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/DisconnectionRequest.java trunk/gee/src/java/edu/indiana/psych/gee/net/ExperimentUpdateEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/ServerAssignedIdentifierEvent.java Modified: trunk/gee/src/java/edu/indiana/psych/gee/AbstractExperiment.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/AbstractExperiment.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/AbstractExperiment.java 2006-05-18 05:18:18 UTC (rev 180) @@ -5,6 +5,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import edu.indiana.psych.gee.bean.ConsentForm; import edu.indiana.psych.gee.event.Event; import edu.indiana.psych.gee.event.EventChannel; import edu.indiana.psych.gee.net.DispatcherFactory; @@ -33,7 +34,7 @@ private boolean running; private ExperimentService experimentService; - private ExperimentConfigurationService configurationService; +// private ExperimentConfigurationService configurationService; private String name; private C configuration; Deleted: trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java 2006-05-18 05:18:18 UTC (rev 180) @@ -1,130 +0,0 @@ -package edu.indiana.psych.gee; - -import java.util.Calendar; -import java.util.Date; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -/** - * $Id$ - * - * Persistent bean representing a consent form. - * - * @author <a href='al...@cs...'>Allen Lee</a> - * @version $Revision$ - */ - -@Entity -@Table(name="consent_form") -public class ConsentForm { - - // are longs overkill? - private Long id = Long.valueOf(-1); - - private String studyNumber; - private String description; - private String deception; - private String confidentiality; - private String compensation; - private String risks; - private String benefits; - private String contact; - private String participation; - - private Date irbDateApproved; - - @Id @GeneratedValue - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - public String getBenefits() { - return benefits; - } - public void setBenefits(String benefits) { - this.benefits = benefits; - } - public String getCompensation() { - return compensation; - } - public void setCompensation(String compensation) { - this.compensation = compensation; - } - public String getConfidentiality() { - return confidentiality; - } - public void setConfidentiality(String confidentiality) { - this.confidentiality = confidentiality; - } - public String getContact() { - return contact; - } - public void setContact(String contact) { - this.contact = contact; - } - public String getDeception() { - return deception; - } - public void setDeception(String deception) { - this.deception = deception; - } - public String getDescription() { - return description; - } - public void setDescription(String description) { - this.description = description; - } - @Transient - public Date getIrbDateApprovalExpires() { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(getIrbDateApproved()); - calendar.add(Calendar.DAY_OF_MONTH, 364); - return calendar.getTime(); - } - @Temporal(TemporalType.DATE) - public Date getIrbDateApproved() { - if (irbDateApproved == null || isToday(irbDateApproved)) { - Calendar calendar = Calendar.getInstance(); - calendar.set(2005, 9, 26); - irbDateApproved = calendar.getTime(); - } - return irbDateApproved; - } - - public void setIrbDateApproved(Date irbDateApproved) { - this.irbDateApproved = irbDateApproved; - } - - // FIXME: atrocity - private boolean isToday(Date date) { - Calendar now = Calendar.getInstance(); - now.setTime(new Date()); - Calendar then = Calendar.getInstance(); - then.setTime(date); - return (now.get(Calendar.MONTH) == then.get(Calendar.MONTH) - && now.get(Calendar.YEAR) == then.get(Calendar.YEAR) - && now.get(Calendar.DAY_OF_MONTH) == then.get(Calendar.DAY_OF_MONTH)); - } - - public String getParticipation() { - return participation; - } - public void setParticipation(String participation) { - this.participation = participation; - } - public String getRisks() { - return risks; - } - public void setRisks(String risks) { - this.risks = risks; - } - -} Modified: trunk/gee/src/java/edu/indiana/psych/gee/Experiment.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/Experiment.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/Experiment.java 2006-05-18 05:18:18 UTC (rev 180) @@ -3,6 +3,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import edu.indiana.psych.gee.bean.ConsentForm; import edu.indiana.psych.gee.net.Dispatcher; /** Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java 2006-05-18 05:18:18 UTC (rev 180) @@ -3,10 +3,13 @@ import java.util.List; import java.net.InetSocketAddress; +import edu.indiana.psych.gee.bean.ConsentForm; import edu.indiana.psych.gee.time.Duration; /** * $Id: Exp $ + * + * * * @author <a href='al...@cs...'>Allen Lee</a> * @version $Revision: $ Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java 2006-05-18 05:18:18 UTC (rev 180) @@ -9,12 +9,11 @@ import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Transient; +import edu.indiana.psych.gee.bean.ConsentForm; import edu.indiana.psych.gee.time.Duration; /** Modified: trunk/gee/src/java/edu/indiana/psych/gee/Identifier.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/Identifier.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/Identifier.java 2006-05-18 05:18:18 UTC (rev 180) @@ -18,9 +18,5 @@ public String toString() { return "[ <NULL Identifier> ]"; } - - public boolean equals(Object object) { - return (this == object) || ((object instanceof Identifier) && object.toString().equals(toString())); - } }; } Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java 2006-05-18 05:18:18 UTC (rev 180) @@ -1,7 +1,7 @@ package edu.indiana.psych.gee.action; -import edu.indiana.psych.gee.ConsentForm; import edu.indiana.psych.gee.Experiment; +import edu.indiana.psych.gee.bean.ConsentForm; import edu.indiana.psych.gee.bean.Participant; /** Copied: trunk/gee/src/java/edu/indiana/psych/gee/bean/ConsentForm.java (from rev 179, trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java) =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/bean/ConsentForm.java (rev 0) +++ trunk/gee/src/java/edu/indiana/psych/gee/bean/ConsentForm.java 2006-05-18 05:18:18 UTC (rev 180) @@ -0,0 +1,136 @@ +package edu.indiana.psych.gee.bean; + +import java.util.Calendar; +import java.util.Date; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +/** + * $Id$ + * + * Persistent bean representing a consent form. + * + * @author <a href='al...@cs...'>Allen Lee</a> + * @version $Revision$ + */ + +@Entity +@Table(name="consent_form") +public class ConsentForm { + + // are longs overkill? + private Long id = Long.valueOf(-1); + + private String studyNumber; + private String description; + private String deception; + private String confidentiality; + private String compensation; + private String risks; + private String benefits; + private String contact; + private String participation; + + private Date irbDateApproved; + + @Id @GeneratedValue + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + public String getBenefits() { + return benefits; + } + public void setBenefits(String benefits) { + this.benefits = benefits; + } + public String getCompensation() { + return compensation; + } + public void setCompensation(String compensation) { + this.compensation = compensation; + } + public String getConfidentiality() { + return confidentiality; + } + public void setConfidentiality(String confidentiality) { + this.confidentiality = confidentiality; + } + public String getContact() { + return contact; + } + public void setContact(String contact) { + this.contact = contact; + } + public String getDeception() { + return deception; + } + public void setDeception(String deception) { + this.deception = deception; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + @Transient + public Date getIrbDateApprovalExpires() { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(getIrbDateApproved()); + calendar.add(Calendar.DAY_OF_MONTH, 364); + return calendar.getTime(); + } + @Temporal(TemporalType.DATE) + public Date getIrbDateApproved() { + if (irbDateApproved == null || isToday(irbDateApproved)) { + Calendar calendar = Calendar.getInstance(); + calendar.set(2005, 9, 26); + irbDateApproved = calendar.getTime(); + } + return irbDateApproved; + } + + public void setIrbDateApproved(Date irbDateApproved) { + this.irbDateApproved = irbDateApproved; + } + + // FIXME: atrocity + private boolean isToday(Date date) { + Calendar now = Calendar.getInstance(); + now.setTime(new Date()); + Calendar then = Calendar.getInstance(); + then.setTime(date); + return (now.get(Calendar.MONTH) == then.get(Calendar.MONTH) + && now.get(Calendar.YEAR) == then.get(Calendar.YEAR) + && now.get(Calendar.DAY_OF_MONTH) == then.get(Calendar.DAY_OF_MONTH)); + } + + public String getParticipation() { + return participation; + } + public void setParticipation(String participation) { + this.participation = participation; + } + public String getRisks() { + return risks; + } + public void setRisks(String risks) { + this.risks = risks; + } + public String getStudyNumber() { + return studyNumber; + } + public void setStudyNumber(String studyNumber) { + this.studyNumber = studyNumber; + } + +} Property changes on: trunk/gee/src/java/edu/indiana/psych/gee/bean/ConsentForm.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/EndRoundEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/EndRoundEvent.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/EndRoundEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -3,7 +3,7 @@ import java.util.SortedSet; import edu.indiana.psych.gee.Identifier; -import edu.indiana.psych.gee.net.ExperimentUpdateEvent; +import edu.indiana.psych.gee.net.event.ExperimentUpdateEvent; import edu.indiana.psych.gee.time.Duration; /** Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/RoundStartedEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/RoundStartedEvent.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/RoundStartedEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -3,7 +3,7 @@ import edu.indiana.psych.gee.ExperimentRoundParameters; import edu.indiana.psych.gee.Identifier; -import edu.indiana.psych.gee.net.ExperimentUpdateEvent; +import edu.indiana.psych.gee.net.event.ExperimentUpdateEvent; Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperiment.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperiment.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperiment.java 2006-05-18 05:18:18 UTC (rev 180) @@ -23,9 +23,9 @@ import edu.indiana.psych.gee.forager.ForagerAgentFactory.ForagerAgent; import edu.indiana.psych.gee.forager.event.ClientPositionUpdateEvent; import edu.indiana.psych.gee.forager.event.ClientUpdateEvent; -import edu.indiana.psych.gee.net.ClientReadyEvent; -import edu.indiana.psych.gee.net.ConnectionEvent; import edu.indiana.psych.gee.net.Dispatcher; +import edu.indiana.psych.gee.net.event.ClientReadyEvent; +import edu.indiana.psych.gee.net.event.ConnectionEvent; import edu.indiana.psych.gee.service.ExperimentConfigurationService; import edu.indiana.psych.gee.time.Duration; import edu.indiana.psych.gee.util.GeeUtils; Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClient.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClient.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClient.java 2006-05-18 05:18:18 UTC (rev 180) @@ -22,10 +22,10 @@ import edu.indiana.psych.gee.forager.event.ClientUpdateEvent; import edu.indiana.psych.gee.forager.event.StartExperimentRoundRequest; import edu.indiana.psych.gee.net.ClientDispatcher; -import edu.indiana.psych.gee.net.ClientReadyEvent; -import edu.indiana.psych.gee.net.DisconnectionEvent; import edu.indiana.psych.gee.net.DispatcherFactory; -import edu.indiana.psych.gee.net.ExperimentUpdateEvent; +import edu.indiana.psych.gee.net.event.ClientReadyEvent; +import edu.indiana.psych.gee.net.event.DisconnectionEvent; +import edu.indiana.psych.gee.net.event.ExperimentUpdateEvent; Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerGameWindow.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerGameWindow.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerGameWindow.java 2006-05-18 05:18:18 UTC (rev 180) @@ -37,7 +37,7 @@ import edu.indiana.psych.gee.forager.Direction; import edu.indiana.psych.gee.forager.event.ClientUpdateEvent; import edu.indiana.psych.gee.forager.event.StartExperimentRoundRequest; -import edu.indiana.psych.gee.net.ClientReadyEvent; +import edu.indiana.psych.gee.net.event.ClientReadyEvent; import edu.indiana.psych.gee.time.Duration; Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/event/ClientPositionUpdateEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/forager/event/ClientPositionUpdateEvent.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/forager/event/ClientPositionUpdateEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -6,7 +6,7 @@ import edu.indiana.psych.gee.Identifier; import edu.indiana.psych.gee.event.AbstractEvent; -import edu.indiana.psych.gee.net.ExperimentUpdateEvent; +import edu.indiana.psych.gee.net.event.ExperimentUpdateEvent; Modified: trunk/gee/src/java/edu/indiana/psych/gee/net/AbstractDispatcher.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/AbstractDispatcher.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/AbstractDispatcher.java 2006-05-18 05:18:18 UTC (rev 180) @@ -5,6 +5,7 @@ import edu.indiana.psych.gee.event.Event; import edu.indiana.psych.gee.event.EventChannel; import edu.indiana.psych.gee.event.EventHandler; +import edu.indiana.psych.gee.net.event.DisconnectionRequest; /** * $Id$ Modified: trunk/gee/src/java/edu/indiana/psych/gee/net/AbstractServerDispatcher.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/AbstractServerDispatcher.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/AbstractServerDispatcher.java 2006-05-18 05:18:18 UTC (rev 180) @@ -11,6 +11,7 @@ import edu.indiana.psych.gee.Identifier; import edu.indiana.psych.gee.event.EventChannel; import edu.indiana.psych.gee.event.EventTypeProcessor; +import edu.indiana.psych.gee.net.event.DisconnectionRequest; /** * $Id$ Deleted: trunk/gee/src/java/edu/indiana/psych/gee/net/ClientReadyEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/ClientReadyEvent.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/ClientReadyEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -1,24 +0,0 @@ -package edu.indiana.psych.gee.net; - -import edu.indiana.psych.gee.Identifier; -import edu.indiana.psych.gee.event.AbstractEvent; - - -/** - * $Id$ - * - * This Event signifies that the ForagerClient is ready and willing to - * join the game whenever the next one starts. - * - * @author Allen Lee - * @version $Revision$ - */ -public class ClientReadyEvent extends AbstractEvent { - - private static final long serialVersionUID = -3226895587981309363L; - - public ClientReadyEvent(Identifier id) { - super(id); - } - -} Modified: trunk/gee/src/java/edu/indiana/psych/gee/net/ClientSocketDispatcher.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/ClientSocketDispatcher.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/ClientSocketDispatcher.java 2006-05-18 05:18:18 UTC (rev 180) @@ -8,6 +8,9 @@ import edu.indiana.psych.gee.event.Event; import edu.indiana.psych.gee.event.EventChannel; import edu.indiana.psych.gee.event.EventTypeProcessor; +import edu.indiana.psych.gee.net.event.ConnectionEvent; +import edu.indiana.psych.gee.net.event.DisconnectionRequest; +import edu.indiana.psych.gee.net.event.ServerAssignedIdentifierEvent; /** * $Id$ Deleted: trunk/gee/src/java/edu/indiana/psych/gee/net/ConnectionEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/ConnectionEvent.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/ConnectionEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -1,23 +0,0 @@ -package edu.indiana.psych.gee.net; - -import edu.indiana.psych.gee.Identifier; -import edu.indiana.psych.gee.event.AbstractEvent; - -/** - * $Id$ - * - * Used to signify that a successful connection was made. - * - * @author Allen Lee - * @version $Revision$ - */ - -public class ConnectionEvent extends AbstractEvent { - - private static final long serialVersionUID = -7374984013354707218L; - - public ConnectionEvent(Identifier id) { - super(id); - } -} - Deleted: trunk/gee/src/java/edu/indiana/psych/gee/net/DisconnectionEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/DisconnectionEvent.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/DisconnectionEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -1,23 +0,0 @@ -package edu.indiana.psych.gee.net; - -import edu.indiana.psych.gee.Identifier; -import edu.indiana.psych.gee.event.AbstractEvent; - -/** - * $Id$ - * - * Signifies that a disconnection happened for the given id. - * - * - * @author Allen Lee - * @version $Revision$ - */ -public class DisconnectionEvent extends AbstractEvent { - - private static final long serialVersionUID = 1116488025527784177L; - - public DisconnectionEvent(Identifier id) { - super(id); - } -} - Deleted: trunk/gee/src/java/edu/indiana/psych/gee/net/DisconnectionRequest.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/DisconnectionRequest.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/DisconnectionRequest.java 2006-05-18 05:18:18 UTC (rev 180) @@ -1,32 +0,0 @@ -package edu.indiana.psych.gee.net; - -import edu.indiana.psych.gee.Identifier; -import edu.indiana.psych.gee.event.AbstractEvent; - -/** - * $Id$ - * - * Signifies that a disconnection should happen for the given identifier. - * - * @author Allen Lee - * @version $Revision$ - */ -public class DisconnectionRequest extends AbstractEvent { - - private static final long serialVersionUID = 8135584626891675116L; - - private final Exception exception; - - public DisconnectionRequest(Identifier id) { - this(id, null); - } - - public DisconnectionRequest(Identifier id, Exception exception) { - super(id); - this.exception = exception; - } - - public Exception getException() { - return exception; - } -} Deleted: trunk/gee/src/java/edu/indiana/psych/gee/net/ExperimentUpdateEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/ExperimentUpdateEvent.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/ExperimentUpdateEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -1,16 +0,0 @@ -package edu.indiana.psych.gee.net; - -import edu.indiana.psych.gee.event.Event; - - -/** - * $Id$ - * - * Marker interface for events originating from an Experiment server. - * - * @author <a href='al...@cs...'>Allen Lee</a> - * @version $Revision$ - */ -public interface ExperimentUpdateEvent extends Event { - -} Modified: trunk/gee/src/java/edu/indiana/psych/gee/net/NioDispatcher.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/NioDispatcher.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/NioDispatcher.java 2006-05-18 05:18:18 UTC (rev 180) @@ -22,6 +22,9 @@ import edu.indiana.psych.gee.Identifier; import edu.indiana.psych.gee.event.Event; import edu.indiana.psych.gee.event.EventChannel; +import edu.indiana.psych.gee.net.event.ConnectionEvent; +import edu.indiana.psych.gee.net.event.DisconnectionEvent; +import edu.indiana.psych.gee.net.event.ServerAssignedIdentifierEvent; /** * $Id$ Deleted: trunk/gee/src/java/edu/indiana/psych/gee/net/ServerAssignedIdentifierEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/ServerAssignedIdentifierEvent.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/ServerAssignedIdentifierEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -1,23 +0,0 @@ -package edu.indiana.psych.gee.net; - -import edu.indiana.psych.gee.Identifier; -import edu.indiana.psych.gee.event.AbstractEvent; - -/** - * $Id$ - * - * Used to inform the client of the server assigned Identifier. - * - * - * @author Allen Lee - * @version $Revision$ - */ -public class ServerAssignedIdentifierEvent extends AbstractEvent -implements ExperimentUpdateEvent { - - private static final long serialVersionUID = -2258127108062718367L; - - public ServerAssignedIdentifierEvent(Identifier id) { - super(id); - } -} Modified: trunk/gee/src/java/edu/indiana/psych/gee/net/ServerSocketDispatcher.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/ServerSocketDispatcher.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/ServerSocketDispatcher.java 2006-05-18 05:18:18 UTC (rev 180) @@ -9,6 +9,9 @@ import edu.indiana.psych.gee.Identifier; import edu.indiana.psych.gee.event.Event; import edu.indiana.psych.gee.event.EventChannel; +import edu.indiana.psych.gee.net.event.ConnectionEvent; +import edu.indiana.psych.gee.net.event.DisconnectionEvent; +import edu.indiana.psych.gee.net.event.ServerAssignedIdentifierEvent; /** * $Id$ Modified: trunk/gee/src/java/edu/indiana/psych/gee/net/SocketDispatcherWorker.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/SocketDispatcherWorker.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/SocketDispatcherWorker.java 2006-05-18 05:18:18 UTC (rev 180) @@ -8,6 +8,7 @@ import edu.indiana.psych.gee.Identifier; import edu.indiana.psych.gee.event.Event; +import edu.indiana.psych.gee.net.event.DisconnectionRequest; /** * $Id$ @@ -66,9 +67,11 @@ public void write(Event event) { try { // FIXME: consider caching the object output stream? - ObjectOutputStream out = new ObjectOutputStream(socket.getOutputStream()); - out.writeObject(event); - out.flush(); + synchronized (socket) { + ObjectOutputStream out = new ObjectOutputStream(socket.getOutputStream()); + out.writeObject(event); + out.flush(); + } // XXX: don't close() the stream. It closes the wrapped Socket // output stream and essentially fubars the socket. } @@ -92,8 +95,8 @@ return (Event) in.readObject(); } - public Event readEvent() throws IOException, ClassNotFoundException { - return readEvent(socket); + public synchronized Event readEvent() throws IOException, ClassNotFoundException { + return SocketDispatcherWorker.readEvent(socket); } public Socket getSocket() { Copied: trunk/gee/src/java/edu/indiana/psych/gee/net/event/ClientReadyEvent.java (from rev 179, trunk/gee/src/java/edu/indiana/psych/gee/net/ClientReadyEvent.java) =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/event/ClientReadyEvent.java (rev 0) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/event/ClientReadyEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -0,0 +1,24 @@ +package edu.indiana.psych.gee.net.event; + +import edu.indiana.psych.gee.Identifier; +import edu.indiana.psych.gee.event.AbstractEvent; + + +/** + * $Id$ + * + * This Event signifies that the ForagerClient is ready and willing to + * join the game whenever the next one starts. + * + * @author Allen Lee + * @version $Revision$ + */ +public class ClientReadyEvent extends AbstractEvent { + + private static final long serialVersionUID = -3226895587981309363L; + + public ClientReadyEvent(Identifier id) { + super(id); + } + +} Property changes on: trunk/gee/src/java/edu/indiana/psych/gee/net/event/ClientReadyEvent.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/gee/src/java/edu/indiana/psych/gee/net/event/ConnectionEvent.java (from rev 179, trunk/gee/src/java/edu/indiana/psych/gee/net/ConnectionEvent.java) =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/event/ConnectionEvent.java (rev 0) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/event/ConnectionEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -0,0 +1,23 @@ +package edu.indiana.psych.gee.net.event; + +import edu.indiana.psych.gee.Identifier; +import edu.indiana.psych.gee.event.AbstractEvent; + +/** + * $Id$ + * + * Used to signify that a successful connection was made. + * + * @author Allen Lee + * @version $Revision$ + */ + +public class ConnectionEvent extends AbstractEvent { + + private static final long serialVersionUID = -7374984013354707218L; + + public ConnectionEvent(Identifier id) { + super(id); + } +} + Property changes on: trunk/gee/src/java/edu/indiana/psych/gee/net/event/ConnectionEvent.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/gee/src/java/edu/indiana/psych/gee/net/event/DisconnectionEvent.java (from rev 179, trunk/gee/src/java/edu/indiana/psych/gee/net/DisconnectionEvent.java) =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/event/DisconnectionEvent.java (rev 0) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/event/DisconnectionEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -0,0 +1,23 @@ +package edu.indiana.psych.gee.net.event; + +import edu.indiana.psych.gee.Identifier; +import edu.indiana.psych.gee.event.AbstractEvent; + +/** + * $Id$ + * + * Signifies that a disconnection happened for the given id. + * + * + * @author Allen Lee + * @version $Revision$ + */ +public class DisconnectionEvent extends AbstractEvent { + + private static final long serialVersionUID = 1116488025527784177L; + + public DisconnectionEvent(Identifier id) { + super(id); + } +} + Property changes on: trunk/gee/src/java/edu/indiana/psych/gee/net/event/DisconnectionEvent.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/gee/src/java/edu/indiana/psych/gee/net/event/DisconnectionRequest.java (from rev 179, trunk/gee/src/java/edu/indiana/psych/gee/net/DisconnectionRequest.java) =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/event/DisconnectionRequest.java (rev 0) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/event/DisconnectionRequest.java 2006-05-18 05:18:18 UTC (rev 180) @@ -0,0 +1,32 @@ +package edu.indiana.psych.gee.net.event; + +import edu.indiana.psych.gee.Identifier; +import edu.indiana.psych.gee.event.AbstractEvent; + +/** + * $Id$ + * + * Signifies that a disconnection should happen for the given identifier. + * + * @author Allen Lee + * @version $Revision$ + */ +public class DisconnectionRequest extends AbstractEvent { + + private static final long serialVersionUID = 8135584626891675116L; + + private final Exception exception; + + public DisconnectionRequest(Identifier id) { + this(id, null); + } + + public DisconnectionRequest(Identifier id, Exception exception) { + super(id); + this.exception = exception; + } + + public Exception getException() { + return exception; + } +} Property changes on: trunk/gee/src/java/edu/indiana/psych/gee/net/event/DisconnectionRequest.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/gee/src/java/edu/indiana/psych/gee/net/event/ExperimentUpdateEvent.java (from rev 179, trunk/gee/src/java/edu/indiana/psych/gee/net/ExperimentUpdateEvent.java) =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/event/ExperimentUpdateEvent.java (rev 0) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/event/ExperimentUpdateEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -0,0 +1,16 @@ +package edu.indiana.psych.gee.net.event; + +import edu.indiana.psych.gee.event.Event; + + +/** + * $Id$ + * + * Marker interface for events originating from an Experiment server. + * + * @author <a href='al...@cs...'>Allen Lee</a> + * @version $Revision$ + */ +public interface ExperimentUpdateEvent extends Event { + +} Property changes on: trunk/gee/src/java/edu/indiana/psych/gee/net/event/ExperimentUpdateEvent.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/gee/src/java/edu/indiana/psych/gee/net/event/ServerAssignedIdentifierEvent.java (from rev 179, trunk/gee/src/java/edu/indiana/psych/gee/net/ServerAssignedIdentifierEvent.java) =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/event/ServerAssignedIdentifierEvent.java (rev 0) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/event/ServerAssignedIdentifierEvent.java 2006-05-18 05:18:18 UTC (rev 180) @@ -0,0 +1,23 @@ +package edu.indiana.psych.gee.net.event; + +import edu.indiana.psych.gee.Identifier; +import edu.indiana.psych.gee.event.AbstractEvent; + +/** + * $Id$ + * + * Used to inform the client of the server assigned Identifier. + * + * + * @author Allen Lee + * @version $Revision$ + */ +public class ServerAssignedIdentifierEvent extends AbstractEvent +implements ExperimentUpdateEvent { + + private static final long serialVersionUID = -2258127108062718367L; + + public ServerAssignedIdentifierEvent(Identifier id) { + super(id); + } +} Property changes on: trunk/gee/src/java/edu/indiana/psych/gee/net/event/ServerAssignedIdentifierEvent.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormDao.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormDao.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormDao.java 2006-05-18 05:18:18 UTC (rev 180) @@ -2,7 +2,7 @@ import org.springframework.transaction.annotation.Transactional; -import edu.indiana.psych.gee.ConsentForm; +import edu.indiana.psych.gee.bean.ConsentForm; /** * $Id: Exp$ Modified: trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormService.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormService.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/service/ConsentFormService.java 2006-05-18 05:18:18 UTC (rev 180) @@ -2,7 +2,7 @@ import java.util.List; -import edu.indiana.psych.gee.ConsentForm; +import edu.indiana.psych.gee.bean.ConsentForm; /** * $Id: Exp $ Modified: trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationService.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationService.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentConfigurationService.java 2006-05-18 05:18:18 UTC (rev 180) @@ -20,11 +20,6 @@ private ExperimentConfigurationDao experimentConfigurationDao; private ConsentFormDao consentFormDao; - public <E extends ExperimentConfiguration> E load(Class<E> configurationClass, InputStream stream) { - - return null; - } - public <E extends ExperimentConfiguration> E find(Class<E> configurationClass, Integer id) { return experimentConfigurationDao.find(configurationClass, id); } Modified: trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateConsentFormDao.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateConsentFormDao.java 2006-05-17 23:11:47 UTC (rev 179) +++ trunk/gee/src/java/edu/indiana/psych/gee/service/HibernateConsentFormDao.java 2006-05-18 05:18:18 UTC (rev 180) @@ -2,7 +2,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport; -import edu.indiana.psych.gee.ConsentForm; +import edu.indiana.psych.gee.bean.ConsentForm; /** * $Id$ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
