[gee-svn] SF.net SVN: gabel: [137] trunk/gee/src/java/edu/indiana/psych/gee
Status: Alpha
Brought to you by:
alllee
Menu
▾
▴
[gee-svn] SF.net SVN: gabel: [137] trunk/gee/src/java/edu/indiana/psych/gee
|
From: <al...@us...> - 2006-03-04 18:55:31
|
Revision: 137 Author: alllee Date: 2006-03-04 10:55:18 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/gabel/?rev=137&view=rev Log Message: ----------- cleaning imports, added getters/setters to ExperimentConfigurationEntity for server name, client jar name, experiment name, and description. Modified Paths: -------------- 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/ExperimentParametersEntity.java trunk/gee/src/java/edu/indiana/psych/gee/event/generics/EventTypeProcessor.java trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerAgentFactory.java trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerConfiguration.java trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperimentParameters.java trunk/gee/src/java/edu/indiana/psych/gee/forager/event/ClientPositionUpdateEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/NioDispatcher.java Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java 2006-03-04 18:50:24 UTC (rev 136) +++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java 2006-03-04 18:55:18 UTC (rev 137) @@ -1,6 +1,5 @@ package edu.indiana.psych.gee; -import java.io.File; import java.net.InetSocketAddress; import java.util.List; Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java 2006-03-04 18:50:24 UTC (rev 136) +++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java 2006-03-04 18:55:18 UTC (rev 137) @@ -1,22 +1,16 @@ package edu.indiana.psych.gee; -import java.io.File; import java.net.InetSocketAddress; -import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Transient; -import edu.indiana.psych.gee.forager.*; +import edu.indiana.psych.gee.forager.ForagerExperimentParameters; /** * $Id$ @@ -29,7 +23,6 @@ * @version $Revision$ */ -@Entity @Table(name="experiment_configuration") @Inheritance(strategy=InheritanceType.JOINED) public abstract class ExperimentConfigurationEntity<T extends ExperimentRoundParameters> @@ -132,6 +125,30 @@ } return currentParameters; } + + public String getClientJarName() { + return clientJarName; + } + + public void setClientJarName(String clientJarName) { + this.clientJarName = clientJarName; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getExperimentName() { + return experimentName; + } + + public void setExperimentName(String experimentName) { + this.experimentName = experimentName; + } } Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentParametersEntity.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentParametersEntity.java 2006-03-04 18:50:24 UTC (rev 136) +++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentParametersEntity.java 2006-03-04 18:55:18 UTC (rev 137) @@ -5,9 +5,7 @@ import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; import javax.persistence.Table; -import javax.persistence.Transient; /** * $Id: Exp$ Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/generics/EventTypeProcessor.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/generics/EventTypeProcessor.java 2006-03-04 18:50:24 UTC (rev 136) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/generics/EventTypeProcessor.java 2006-03-04 18:55:18 UTC (rev 137) @@ -4,7 +4,6 @@ import edu.indiana.psych.gee.event.EventConstraint; import edu.indiana.psych.gee.event.EventInstanceofConstraint; import edu.indiana.psych.gee.event.EventProcessor; -import edu.indiana.psych.gee.net.ConnectionEvent; /** * $Id$ Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerAgentFactory.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerAgentFactory.java 2006-03-04 18:50:24 UTC (rev 136) +++ trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerAgentFactory.java 2006-03-04 18:55:18 UTC (rev 137) @@ -3,7 +3,6 @@ import java.awt.Point; import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerConfiguration.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerConfiguration.java 2006-03-04 18:50:24 UTC (rev 136) +++ trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerConfiguration.java 2006-03-04 18:55:18 UTC (rev 137) @@ -2,8 +2,6 @@ import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.PrimaryKeyJoinColumn; Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperimentParameters.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperimentParameters.java 2006-03-04 18:50:24 UTC (rev 136) +++ trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperimentParameters.java 2006-03-04 18:55:18 UTC (rev 137) @@ -7,20 +7,16 @@ import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.JoinColumn; -import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; +import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.Table; -import javax.persistence.ManyToOne; import javax.persistence.Transient; import org.hibernate.annotations.Proxy; -import edu.indiana.psych.gee.ExperimentConfiguration; import edu.indiana.psych.gee.ExperimentParametersEntity; import edu.indiana.psych.gee.ExperimentRoundParameters; 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-03-04 18:50:24 UTC (rev 136) +++ trunk/gee/src/java/edu/indiana/psych/gee/forager/event/ClientPositionUpdateEvent.java 2006-03-04 18:55:18 UTC (rev 137) @@ -5,7 +5,6 @@ import java.util.Map; import java.util.Set; - import edu.indiana.psych.gee.Identifier; import edu.indiana.psych.gee.event.AbstractEvent; import edu.indiana.psych.gee.net.ExperimentUpdateEvent; @@ -82,9 +81,4 @@ // } } -/** - * $Log$ - * Revision 1.1 2006/01/15 00:17:09 alllee - * huge commit to commemorate compilability, but not fully working code. Using the notion of time intervals inspird by the http://timeandmoney.sourceforge.net project to improve the handling of durations and points in time when an experiment is supposed to start and stop. Ported over almost all of the functionality needed to run the forager experiment inside the webapp framework. - * - */ + Modified: trunk/gee/src/java/edu/indiana/psych/gee/net/NioDispatcher.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/net/NioDispatcher.java 2006-03-04 18:50:24 UTC (rev 136) +++ trunk/gee/src/java/edu/indiana/psych/gee/net/NioDispatcher.java 2006-03-04 18:55:18 UTC (rev 137) @@ -16,13 +16,13 @@ import java.util.LinkedList; import java.util.Map; +import org.apache.commons.collections.BidiMap; +import org.apache.commons.collections.bidimap.DualHashBidiMap; + import edu.indiana.psych.gee.Identifier; import edu.indiana.psych.gee.event.Event; import edu.indiana.psych.gee.event.EventChannel; -import org.apache.commons.collections.BidiMap; -import org.apache.commons.collections.bidimap.DualHashBidiMap; - /** * $Id$ * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
