[gee-svn] SF.net SVN: gabel: [141] trunk/gee/src/java/edu/indiana/psych/gee
Status: Alpha
Brought to you by:
alllee
Menu
▾
▴
[gee-svn] SF.net SVN: gabel: [141] trunk/gee/src/java/edu/indiana/psych/gee
|
From: <al...@us...> - 2006-03-05 04:41:05
|
Revision: 141 Author: alllee Date: 2006-03-04 20:40:28 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/gabel/?rev=141&view=rev Log Message: ----------- removed $Log$ changelogs and improving persistence mappings for ConsentForm and ForagerConfiguration/ForagerExperimentParameters Modified Paths: -------------- trunk/gee/src/java/edu/indiana/psych/gee/AbstractExperiment.java trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.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/ExperimentLifecycleException.java trunk/gee/src/java/edu/indiana/psych/gee/ExperimentRoundParameters.java trunk/gee/src/java/edu/indiana/psych/gee/Identifier.java trunk/gee/src/java/edu/indiana/psych/gee/action/AdminAction.java trunk/gee/src/java/edu/indiana/psych/gee/action/CreateExperiment.java trunk/gee/src/java/edu/indiana/psych/gee/action/GeeAction.java trunk/gee/src/java/edu/indiana/psych/gee/action/ListExperiments.java trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java trunk/gee/src/java/edu/indiana/psych/gee/agent/Agent.java trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentConfiguration.java trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentFactory.java trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentIdentifier.java trunk/gee/src/java/edu/indiana/psych/gee/event/AbortExperimentRequest.java trunk/gee/src/java/edu/indiana/psych/gee/event/AbstractEvent.java trunk/gee/src/java/edu/indiana/psych/gee/event/AbstractPersistableEvent.java trunk/gee/src/java/edu/indiana/psych/gee/event/BeginExperimentRequest.java trunk/gee/src/java/edu/indiana/psych/gee/event/ClientErrorMessageEvent.java trunk/gee/src/java/edu/indiana/psych/gee/event/EndRoundEvent.java trunk/gee/src/java/edu/indiana/psych/gee/event/Event.java trunk/gee/src/java/edu/indiana/psych/gee/event/EventChannel.java trunk/gee/src/java/edu/indiana/psych/gee/event/EventConstraint.java trunk/gee/src/java/edu/indiana/psych/gee/event/EventGenerator.java trunk/gee/src/java/edu/indiana/psych/gee/event/EventHandler.java trunk/gee/src/java/edu/indiana/psych/gee/event/EventInstanceofConstraint.java trunk/gee/src/java/edu/indiana/psych/gee/event/EventProcessor.java trunk/gee/src/java/edu/indiana/psych/gee/event/EventTypeProcessor.java trunk/gee/src/java/edu/indiana/psych/gee/event/OpenBrowserEvent.java trunk/gee/src/java/edu/indiana/psych/gee/event/OrEventConstraint.java trunk/gee/src/java/edu/indiana/psych/gee/event/PersistableEvent.java trunk/gee/src/java/edu/indiana/psych/gee/event/RegistrationEvent.java trunk/gee/src/java/edu/indiana/psych/gee/event/RoundStartedEvent.java trunk/gee/src/java/edu/indiana/psych/gee/event/generics/EventTypeProcessor.java trunk/gee/src/java/edu/indiana/psych/gee/forager/DebriefingAssistant.java trunk/gee/src/java/edu/indiana/psych/gee/forager/Direction.java trunk/gee/src/java/edu/indiana/psych/gee/forager/Food.java trunk/gee/src/java/edu/indiana/psych/gee/forager/FoodDispenser.java trunk/gee/src/java/edu/indiana/psych/gee/forager/FoodRegion.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/ForagerExperiment.java trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperimentParameters.java trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerGameState.java trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerPersister.java trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerServerGameState.java trunk/gee/src/java/edu/indiana/psych/gee/forager/GridView.java trunk/gee/src/java/edu/indiana/psych/gee/forager/Visibility.java trunk/gee/src/java/edu/indiana/psych/gee/forager/client/DebriefingView.java trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerApplet.java trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClient.java trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClientGameState.java trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerGameWindow.java trunk/gee/src/java/edu/indiana/psych/gee/forager/client/SubjectView.java trunk/gee/src/java/edu/indiana/psych/gee/forager/event/AddClientEvent.java trunk/gee/src/java/edu/indiana/psych/gee/forager/event/ClientUpdateEvent.java trunk/gee/src/java/edu/indiana/psych/gee/forager/event/FoodAddedEvent.java trunk/gee/src/java/edu/indiana/psych/gee/forager/event/MovementEvent.java trunk/gee/src/java/edu/indiana/psych/gee/forager/event/StartExperimentRoundRequest.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/ClientDispatcher.java trunk/gee/src/java/edu/indiana/psych/gee/net/ClientSocketDispatcher.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/Dispatcher.java trunk/gee/src/java/edu/indiana/psych/gee/net/DispatcherFactory.java trunk/gee/src/java/edu/indiana/psych/gee/net/ExperimentUpdateEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/NioDispatcher.java trunk/gee/src/java/edu/indiana/psych/gee/net/ServerAssignedIdentifierEvent.java trunk/gee/src/java/edu/indiana/psych/gee/net/ServerDispatcher.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/net/SocketIdentifier.java trunk/gee/src/java/edu/indiana/psych/gee/net/Worker.java trunk/gee/src/java/edu/indiana/psych/gee/net/WorkerFactory.java trunk/gee/src/java/edu/indiana/psych/gee/net/WorkerPool.java trunk/gee/src/java/edu/indiana/psych/gee/service/ExperimentService.java trunk/gee/src/java/edu/indiana/psych/gee/time/Duration.java trunk/gee/src/java/edu/indiana/psych/gee/time/TimePoint.java trunk/gee/src/java/edu/indiana/psych/gee/util/GeeUtils.java trunk/gee/src/test/edu/indiana/psych/gee/net/SocketIdentifierTester.java Modified: trunk/gee/src/java/edu/indiana/psych/gee/AbstractExperiment.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/AbstractExperiment.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/AbstractExperiment.java 2006-03-05 04:40:28 UTC (rev 141) @@ -20,7 +20,7 @@ * @author <a href='al...@cs...'>Allen Lee</a> * @version $Revision$ */ -public abstract class AbstractExperiment implements Experiment { +public abstract class AbstractExperiment<T extends ExperimentConfiguration> implements Experiment<T> { private final Log logger = LogFactory.getLog(getClass()); private final EventChannel channel; @@ -29,7 +29,7 @@ private Thread serverThread; private boolean running; - private ExperimentConfiguration configuration; + private T configuration; private List<ExperimentRoundParameters> allParameters; private ExperimentRoundParameters currentParameters; private Iterator<ExperimentRoundParameters> parametersIterator; @@ -39,11 +39,11 @@ dispatcher = DispatcherFactory.getInstance().createServerDispatcher(channel); } - public ExperimentConfiguration getConfiguration() { + public T getConfiguration() { return configuration; } - public void setConfiguration(ExperimentConfiguration configuration) { + public void setConfiguration(T configuration) { if (configuration == null) { throw new IllegalArgumentException("Invalid configuration"); } @@ -82,7 +82,11 @@ public int getServerPort() { return configuration.getServerPort(); } - + + public ConsentForm getConsentForm() { + return getConfiguration().getConsentForm(); + } + public boolean isFull() { // TODO Auto-generated method stub return false; @@ -94,17 +98,11 @@ } public String getDescription() { - if (configuration != null) { - return configuration.getDescription(); - } - return "No description specified."; + return configuration.getDescription(); } public String getName() { - if (configuration != null) { - return configuration.getExperimentName(); - } - return "No experiment name specified."; + return configuration.getExperimentName(); } public boolean equals(Object object) { @@ -201,84 +199,3 @@ }); } } - - -/* - * $Log$ - * Revision 1.17 2006/02/24 06:05:19 alllee - * whackamoling remaining bugs. Needed to synchronize access to - * AbstractServerDispatcher's shutdown method. Added lots of spurious debugging - * output, to be removed soon. - * - * TODO: persistent experiment configuration and reloading. - * - * Revision 1.16 2006/02/23 19:45:00 alllee - * making experimentRunning a bean property. - * - * Revision 1.15 2006/02/23 18:12:21 alllee - * wiring up pages and actions for experiment configuration (via the - * AdminAction) in an effort to understand why the ForagerExperiment is not - * listed as 'running'. - * - * Revision 1.14 2006/02/06 05:33:38 alllee - * Fully adopting Java 1.5 for the client side as well as the server side and generifying more client-dependent classes. - * - * Revision 1.13 2006/02/06 04:58:48 alllee - * removing connection handling code from this base class - i think it makes more sense to just let the custom subclasses handle all connection related functionality like queuing participants vs. adding them in right away, etc. - * - * Revision 1.12 2006/02/04 06:43:40 alllee - * adding more functionality to ForagerExperiment, still need to work out experiment timing details. - * - * Revision 1.11 2006/02/03 21:42:56 alllee - * * changing log levels to DEBUG for mo better diagnostics on the server side. - * * minor presentation changes to CSS, white background behind the content. - * * client/server connection successfully happening, hang issue was resolved by - * removing the spurious dispatcher.listen() from within setConfiguration(). - * * changing ForagerExperiment port to 25000 for no apparent reason. - * - * TODO: finish wiring up the state machine inside the ForagerExperiment. iron - * out details of how to stop an experiment from listening on a port when - * redeploying, currently have to restart the tomcat container to successfully - * stop the experiment and load in the new experiment code bound to the port. - * - * Revision 1.10 2006/02/03 21:28:28 alllee - * removing dispatcher.listen() from calls to setConfiguration, think this is why the server is starting 'prematurely'. - * - * Revision 1.9 2006/01/17 08:34:53 alllee - * adding more presentation layer functionality, dynamic consent form is all set, - * but still need to hook in validation for the name. - * - * Revision 1.8 2006/01/16 07:51:23 alllee - * refining: - * - the EventProcessor abstraction, trying to keep them simple. - * - the threading and event processing model employed by the experiment and its supporting classes, mostly ironing out the responsibilities of the Dispatcher and the Experiment and figuring out what to put where. - * - Duration now has 'canonical' durations (cached, prototype durations ostensibly used to spit out durations with a set start/end time). - * - * Revision 1.7 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. - * - * Revision 1.6 2006/01/13 09:30:54 alllee - * almost have experiments running - the StartExperiment action has all the - * information it needs and can start the experiment, but the startExperiment - * page is failing because forager-client.jar isn't there. Next step - make - * forager-client.jar there. - * - * Revision 1.5 2006/01/13 07:40:12 alllee - * starting to display experiment metadata through the page. still need to fill - * in the link to actually start and begin participating in an experiment. - * - * Revision 1.4 2006/01/12 04:14:00 alllee - * switching to presentation layer development for some time to get a better feel for what needs to be done with respect to experiment configuration. - * - * Revision 1.3 2006/01/06 21:52:10 alllee - * instead of sprinkling System.currentTimeMillis() everywhere delegating to AbstractExperiment's getCurrentTime() which will switch to System.currentTimeNanos() at some unspecified time in the future. - * - * Revision 1.2 2006/01/06 08:35:27 alllee - * ironing out more of the webapp framework, still highly dysunfunctional/volatile. - * - * Revision 1.1 2006/01/04 05:54:15 alllee - * Adding skeletal support for experiment configuration. - * - ExperimentConfiguration represent the global configuration for a given Experiment server instance, mostly network parameters (hostname/port, etc.) but also some experiment parameters like should-wait-for-facilitator-signal. - * - ExperimentRoundParameters represent per-experimental-round configuration, experiment parameters that affect a single round of a given experiment. - * - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java 2006-03-05 04:40:28 UTC (rev 141) @@ -124,22 +124,3 @@ } } - - -/* - * $Log$ - * Revision 1.3 2006/02/01 18:12:23 alllee - * consent form approval date and expiration date are now being used by - * the getConsent.jsp view. Still monkeying with validation. Going to have to - * do some serious package refactoring here in a little bit to separate the 1.4 - * compliant stuff from the webapp stuff that can leverage 1.5 pieces. - * - * Revision 1.2 2006/01/17 02:51:40 alllee - * adding Action to load the consent form for the given experiment. - * - * Revision 1.1 2006/01/04 05:54:15 alllee - * Adding skeletal support for experiment configuration. - * - ExperimentConfiguration represent the global configuration for a given Experiment server instance, mostly network parameters (hostname/port, etc.) but also some experiment parameters like should-wait-for-facilitator-signal. - * - ExperimentRoundParameters represent per-experimental-round configuration, experiment parameters that affect a single round of a given experiment. - * - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/Experiment.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/Experiment.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/Experiment.java 2006-03-05 04:40:28 UTC (rev 141) @@ -12,7 +12,7 @@ * @version $Revision$ */ -public interface Experiment { +public interface Experiment<T extends ExperimentConfiguration> { public static final Experiment NULL = new Experiment() { private final Log logger = LogFactory.getLog(getClass()); @@ -67,8 +67,8 @@ public boolean isFull(); public boolean isRunning(); - public ExperimentConfiguration getConfiguration(); - public void setConfiguration(ExperimentConfiguration configuration); + public T getConfiguration(); + public void setConfiguration(T configuration); // interface State { // public final static State WAITING = new State() { @@ -96,36 +96,3 @@ } } - -/* - * $Log$ - * Revision 1.7 2006/01/17 08:34:53 alllee - * adding more presentation layer functionality, dynamic consent form is all set, - * but still need to hook in validation for the name. - * - * Revision 1.6 2006/01/13 09:30:54 alllee - * almost have experiments running - the StartExperiment action has all the - * information it needs and can start the experiment, but the startExperiment - * page is failing because forager-client.jar isn't there. Next step - make - * forager-client.jar there. - * - * Revision 1.5 2006/01/13 07:40:12 alllee - * starting to display experiment metadata through the page. still need to fill - * in the link to actually start and begin participating in an experiment. - * - * Revision 1.4 2006/01/12 04:14:00 alllee - * switching to presentation layer development for some time to get a better feel for what needs to be done with respect to experiment configuration. - * - * Revision 1.3 2006/01/06 08:35:27 alllee - * ironing out more of the webapp framework, still highly dysunfunctional/volatile. - * - * Revision 1.2 2006/01/04 05:54:15 alllee - * Adding skeletal support for experiment configuration. - * - ExperimentConfiguration represent the global configuration for a given Experiment server instance, mostly network parameters (hostname/port, etc.) but also some experiment parameters like should-wait-for-facilitator-signal. - * - ExperimentRoundParameters represent per-experimental-round configuration, experiment parameters that affect a single round of a given experiment. - * - * Revision 1.1 2005/12/22 06:44:20 alllee - * skeletal classes for the refactored webapp experiment framework. - * - */ - Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java 2006-03-05 04:40:28 UTC (rev 141) @@ -3,6 +3,9 @@ import java.net.InetSocketAddress; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import edu.indiana.psych.gee.time.Duration; /** @@ -15,6 +18,7 @@ */ public interface ExperimentConfiguration<T extends ExperimentRoundParameters> { + /** * Returns the port that the experiment server with this configuration is @@ -35,7 +39,7 @@ public List<T> getAllParameters(); - public ExperimentRoundParameters getCurrentParameters(); + public T getCurrentParameters(); public String getDescription(); @@ -43,45 +47,8 @@ public String getClientJarName(); + public ConsentForm getConsentForm(); + public Duration getDelayBetweenRounds(); } - - -/* - * $Log$ - * Revision 1.8 2006/02/24 06:05:19 alllee - * whackamoling remaining bugs. Needed to synchronize access to - * AbstractServerDispatcher's shutdown method. Added lots of spurious debugging - * output, to be removed soon. - * - * TODO: persistent experiment configuration and reloading. - * - * Revision 1.7 2006/01/16 07:51:23 alllee - * refining: - * - the EventProcessor abstraction, trying to keep them simple. - * - the threading and event processing model employed by the experiment and its supporting classes, mostly ironing out the responsibilities of the Dispatcher and the Experiment and figuring out what to put where. - * - Duration now has 'canonical' durations (cached, prototype durations ostensibly used to spit out durations with a set start/end time). - * - * Revision 1.6 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. - * - * Revision 1.5 2006/01/13 09:30:54 alllee - * almost have experiments running - the StartExperiment action has all the - * information it needs and can start the experiment, but the startExperiment - * page is failing because forager-client.jar isn't there. Next step - make - * forager-client.jar there. - * - * Revision 1.4 2006/01/13 07:40:12 alllee - * starting to display experiment metadata through the page. still need to fill - * in the link to actually start and begin participating in an experiment. - * - * Revision 1.3 2006/01/06 08:35:27 alllee - * ironing out more of the webapp framework, still highly dysunfunctional/volatile. - * - * Revision 1.2 2006/01/04 05:54:15 alllee - * Adding skeletal support for experiment configuration. - * - ExperimentConfiguration represent the global configuration for a given Experiment server instance, mostly network parameters (hostname/port, etc.) but also some experiment parameters like should-wait-for-facilitator-signal. - * - ExperimentRoundParameters represent per-experimental-round configuration, experiment parameters that affect a single round of a given experiment. - * - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java 2006-03-05 04:40:28 UTC (rev 141) @@ -8,10 +8,11 @@ import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.persistence.Transient; -import edu.indiana.psych.gee.forager.ForagerExperimentParameters; /** * $Id$ @@ -28,7 +29,7 @@ @Table(name="experiment_configuration") @Inheritance(strategy=InheritanceType.JOINED) public abstract class ExperimentConfigurationEntity<T extends ExperimentRoundParameters> -implements ExperimentConfiguration { +implements ExperimentConfiguration<T> { private final static String DEFAULT_SERVER_ADDRESS = "groups.psych.indiana.edu"; @@ -38,11 +39,10 @@ private String experimentName; private String clientJarName; private String clientMainClass; + private ConsentForm consentForm; - private ForagerExperimentParameters currentParameters; -// private List<T> allParameters; - private List<ForagerExperimentParameters> allParameters; + private T currentParameters; private InetSocketAddress serverAddress; private int serverPort; private String serverName; @@ -105,21 +105,18 @@ this.triggeredExperiment = triggeredExperiment; } - -// @OneToMany(targetEntity=ExperimentParametersEntity.class) -// @OneToMany(targetEntity=ForagerExperimentParameters.class) - // @JoinColumn(name="configuration_id") - @Transient - public List<ForagerExperimentParameters> getAllParameters() { - return allParameters; + @ManyToOne(targetEntity=ConsentForm.class) + @JoinColumn(name="consent_id") + public ConsentForm getConsentForm() { + return consentForm; } - - public void setAllParameters(List<ForagerExperimentParameters> allParameters) { - this.allParameters = allParameters; + public void setConsentForm(ConsentForm consentForm) { + this.consentForm = consentForm; } - + @Transient - public synchronized ForagerExperimentParameters getCurrentParameters() { + public synchronized T getCurrentParameters() { + List<T> allParameters = getAllParameters(); if (currentParameters == null) { if (allParameters.isEmpty()) { throw new ExperimentLifecycleException("No experiment round parameters available for : " + getExperimentName()); @@ -161,24 +158,3 @@ this.clientMainClass = clientMainClass; } } - - -/* - * $Log$ - * Revision 1.4 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. - * - * Revision 1.3 2006/01/14 03:23:06 alllee - * beating out Configuration's implementation - more to come soon from the - * Eclipse side. - * - * Revision 1.2 2006/01/13 09:30:54 alllee - * almost have experiments running - the StartExperiment action has all the - * information it needs and can start the experiment, but the startExperiment - * page is failing because forager-client.jar isn't there. Next step - make - * forager-client.jar there. - * - * Revision 1.1 2006/01/12 04:14:00 alllee - * switching to presentation layer development for some time to get a better feel for what needs to be done with respect to experiment configuration. - * - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentLifecycleException.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentLifecycleException.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentLifecycleException.java 2006-03-05 04:40:28 UTC (rev 141) @@ -26,13 +26,3 @@ } } -/* - * $Log$ - * Revision 1.2 2006/01/12 04:14:00 alllee - * switching to presentation layer development for some time to get a better feel for what needs to be done with respect to experiment configuration. - * - * Revision 1.1 2005/12/22 06:44:20 alllee - * skeletal classes for the refactored webapp experiment framework. - * - */ - Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentRoundParameters.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentRoundParameters.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentRoundParameters.java 2006-03-05 04:40:28 UTC (rev 141) @@ -30,30 +30,3 @@ public AgentConfiguration getAgentConfiguration(); } -/* - * $Log$ - * Revision 1.5 2006/02/04 06:43:40 alllee - * adding more functionality to ForagerExperiment, still need to work out experiment timing details. - * - * Revision 1.4 2006/01/16 07:51:23 alllee - * refining: - * - the EventProcessor abstraction, trying to keep them simple. - * - the threading and event processing model employed by the experiment and its supporting classes, mostly ironing out the responsibilities of the Dispatcher and the Experiment and figuring out what to put where. - * - Duration now has 'canonical' durations (cached, prototype durations ostensibly used to spit out durations with a set start/end time). - * - * Revision 1.3 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. - * - * Revision 1.2 2006/01/12 04:14:00 alllee - * switching to presentation layer development for some time to get a better feel for what needs to be done with respect to experiment configuration. - * - * Revision 1.1 2006/01/04 05:54:15 alllee - * Adding skeletal support for experiment configuration. - * - ExperimentConfiguration represent the global configuration for a given Experiment server instance, mostly network parameters (hostname/port, etc.) but also some experiment parameters like should-wait-for-facilitator-signal. - * - ExperimentRoundParameters represent per-experimental-round configuration, experiment parameters that affect a single round of a given experiment. - * - * Revision 1.1 2005/12/22 06:44:20 alllee - * skeletal classes for the refactored webapp experiment framework. - * - */ - Modified: trunk/gee/src/java/edu/indiana/psych/gee/Identifier.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/Identifier.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/Identifier.java 2006-03-05 04:40:28 UTC (rev 141) @@ -24,10 +24,3 @@ } }; } - -/* - * $Log$ - * Revision 1.1 2006/01/06 08:35:27 alllee - * ironing out more of the webapp framework, still highly dysunfunctional/volatile. - * - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/AdminAction.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/action/AdminAction.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/action/AdminAction.java 2006-03-05 04:40:28 UTC (rev 141) @@ -7,6 +7,10 @@ /** * $Id$ * + * Allows the user to administer experiments. Administrative actions include + * configuring, starting and stopping experiments as well as attaching to + * experiments as a bystander and viewing experiment statuses. + * * @author <a href='al...@cs...'>Allen Lee</a> * @version $Revision$ */ @@ -70,20 +74,3 @@ } } -/* - * $Log$ - * Revision 1.3 2006/02/24 06:05:20 alllee - * whackamoling remaining bugs. Needed to synchronize access to - * AbstractServerDispatcher's shutdown method. Added lots of spurious debugging - * output, to be removed soon. - * - * TODO: persistent experiment configuration and reloading. - * - * Revision 1.2 2006/02/23 21:12:32 alllee - * extracting WebWork/xwork dependency to GeeAction base class. Currently supplies a logger and an ExperimentService (set by Spring) to subclasses. - * - * Revision 1.1 2006/02/23 19:49:33 alllee - * trying a new kind of Action with multiple methods mapped to action URLs. - * - */ - Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/CreateExperiment.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/action/CreateExperiment.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/action/CreateExperiment.java 2006-03-05 04:40:28 UTC (rev 141) @@ -18,27 +18,3 @@ } -/* - * $Log$ - * Revision 1.4 2006/02/23 21:12:32 alllee - * extracting WebWork/xwork dependency to GeeAction base class. Currently supplies a logger and an ExperimentService (set by Spring) to subclasses. - * - * Revision 1.3 2006/02/23 18:12:22 alllee - * wiring up pages and actions for experiment configuration (via the - * AdminAction) in an effort to understand why the ForagerExperiment is not - * listed as 'running'. - * - * Revision 1.2 2006/01/17 02:51:40 alllee - * adding Action to load the consent form for the given experiment. - * - * Revision 1.1 2005/12/21 20:58:49 alllee - * - staying with the model of keeping necessary jar and config files in the - * source tree at the same location where they are going to be in the deployed - * war. For the purposes of this project at least this makes the knowledge of - * where these files live implicit, as opposed to keeping them all in a - * top-level src/conf or lib directory and then encoding the knowledge of where - * to place them in the build.xml target logic. - * - adding first stubby Actions and some basic jars needed for webwork. - * - */ - Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/GeeAction.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/action/GeeAction.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/action/GeeAction.java 2006-03-05 04:40:28 UTC (rev 141) @@ -10,7 +10,7 @@ /** * $Id$ * - * Base class for all Gee Actions, provides a logger and an event channel. + * Base class for all Gee Actions, provides a Logger and ExperimentService. * * * @author <a href='al...@cs...'>Allen Lee</a> @@ -35,11 +35,3 @@ this.experimentService = experimentService; } } - - -/* - * $Log$ - * Revision 1.1 2006/02/23 21:12:32 alllee - * extracting WebWork/xwork dependency to GeeAction base class. Currently supplies a logger and an ExperimentService (set by Spring) to subclasses. - * - */ \ No newline at end of file Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/ListExperiments.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/action/ListExperiments.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/action/ListExperiments.java 2006-03-05 04:40:28 UTC (rev 141) @@ -8,6 +8,8 @@ /** * $Id$ * + * Loads all available experiments into a bean property. + * * @author <a href='al...@cs...'>Allen Lee</a> * @version $Revision$ */ @@ -30,31 +32,3 @@ } -/* - * $Log$ - * Revision 1.6 2006/02/23 21:12:32 alllee - * extracting WebWork/xwork dependency to GeeAction base class. Currently supplies a logger and an ExperimentService (set by Spring) to subclasses. - * - * Revision 1.5 2006/01/17 02:51:40 alllee - * adding Action to load the consent form for the given experiment. - * - * Revision 1.4 2006/01/13 07:40:12 alllee - * starting to display experiment metadata through the page. still need to fill - * in the link to actually start and begin participating in an experiment. - * - * Revision 1.3 2006/01/12 20:23:48 alllee - * presentation layer inching closer towards completeness. Getting webworks tags - * hooked up with the jsps. The stack is a really nice implicit way to pass - * values around from Action to Page. Unfortunately documentation for the - * project is pretty poor, hopefully the struts integration will improve this. - * - * Revision 1.2 2006/01/04 05:54:17 alllee - * Adding skeletal support for experiment configuration. - * - ExperimentConfiguration represent the global configuration for a given Experiment server instance, mostly network parameters (hostname/port, etc.) but also some experiment parameters like should-wait-for-facilitator-signal. - * - ExperimentRoundParameters represent per-experimental-round configuration, experiment parameters that affect a single round of a given experiment. - * - * Revision 1.1 2005/12/21 21:47:27 alllee - * adding ant task to build web components and stubbed out XWork actions. - * - */ - Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/action/StartExperiment.java 2006-03-05 04:40:28 UTC (rev 141) @@ -74,47 +74,3 @@ } } -/* - * $Log$ - * Revision 1.9 2006/02/23 21:12:32 alllee - * extracting WebWork/xwork dependency to GeeAction base class. Currently supplies a logger and an ExperimentService (set by Spring) to subclasses. - * - * Revision 1.8 2006/02/03 21:28:28 alllee - * removing dispatcher.listen() from calls to setConfiguration, think this is why the server is starting 'prematurely'. - * - * Revision 1.7 2006/02/03 08:02:49 alllee - * forager experiment almost back up again, some last minute debugging left to - * do after some sleep. - * - * TODO: AbstractEvent is getting instantiated with a Null ID for some - * reasonon the client side via ClientReadyEvent it appears. - * - * Revision 1.6 2006/02/03 00:22:47 alllee - * fixing validation up some more. StartExperiment needs accessors for its - * validated fields in order for the validation to work. - * - * Revision 1.5 2006/01/17 08:34:54 alllee - * adding more presentation layer functionality, dynamic consent form is all set, - * but still need to hook in validation for the name. - * - * Revision 1.4 2006/01/14 00:36:00 alllee - * adding a brief client message if StartExperiments fails. That class is not an - * optimal place to store those kind of messages, forces recompilation in order - * to change the message. Lift to a configuration later, there should be a - * webwork way to store messages. - * - * Revision 1.3 2006/01/13 09:30:54 alllee - * almost have experiments running - the StartExperiment action has all the - * information it needs and can start the experiment, but the startExperiment - * page is failing because forager-client.jar isn't there. Next step - make - * forager-client.jar there. - * - * Revision 1.2 2006/01/13 07:40:12 alllee - * starting to display experiment metadata through the page. still need to fill - * in the link to actually start and begin participating in an experiment. - * - * Revision 1.1 2005/12/21 21:47:27 alllee - * adding ant task to build web components and stubbed out XWork actions. - * - */ - Modified: trunk/gee/src/java/edu/indiana/psych/gee/agent/Agent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/agent/Agent.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/agent/Agent.java 2006-03-05 04:40:28 UTC (rev 141) @@ -22,13 +22,3 @@ public interface Agent { public AgentIdentifier id(); } - - - -/* - * $Log$ - * Revision 1.1 2006/02/04 06:37:58 alllee - * adding base agent package support. - * - */ - Modified: trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentConfiguration.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentConfiguration.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentConfiguration.java 2006-03-05 04:40:28 UTC (rev 141) @@ -24,11 +24,3 @@ public Properties getProperties(); } - - -/* - * $Log$ - * Revision 1.1 2006/02/04 06:37:58 alllee - * adding base agent package support. - * - */ \ No newline at end of file Modified: trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentFactory.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentFactory.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentFactory.java 2006-03-05 04:40:28 UTC (rev 141) @@ -17,11 +17,3 @@ public Agent create(P parameters); } - -/* - * $Log$ - * Revision 1.1 2006/02/04 06:37:58 alllee - * adding base agent package support. - * - */ - Modified: trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentIdentifier.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentIdentifier.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/agent/AgentIdentifier.java 2006-03-05 04:40:28 UTC (rev 141) @@ -17,9 +17,6 @@ private static AgentIdentifier lastIdentifier = null; - // FIXME: may want to have a static int ordinal for imposing order? - // Actually we can simulate that easily by inserting into an - // OrderedSet and having a comparator compare creationTime and id. private final long creationTime = System.currentTimeMillis(); private long id = 0; @@ -61,14 +58,3 @@ } } - - -/* - * $Log$ - * Revision 1.1 2006/02/04 06:37:58 alllee - * adding base agent package support. - * - * 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. - * - */ \ No newline at end of file Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/AbortExperimentRequest.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/AbortExperimentRequest.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/AbortExperimentRequest.java 2006-03-05 04:40:28 UTC (rev 141) @@ -28,10 +28,3 @@ } } -/* - * $Log$ - * Revision 1.1 2006/01/15 00:17:08 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/event/AbstractEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/AbstractEvent.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/AbstractEvent.java 2006-03-05 04:40:28 UTC (rev 141) @@ -58,13 +58,3 @@ return creationTime; } } -/* - * $Log$ - * Revision 1.2 2006/02/04 23:08:02 alllee - * mindless hygiene + comment fixes. Still fixing ForagerExperiment, folding over functionality from ForagerServer and refactoring as I go. - * - * Revision 1.1 2006/01/06 08:36:02 alllee - * transferred the core event subsystem into the webapp framework. - * - */ - Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/AbstractPersistableEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/AbstractPersistableEvent.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/AbstractPersistableEvent.java 2006-03-05 04:40:28 UTC (rev 141) @@ -40,22 +40,16 @@ // System.currentTimeMillis() is not fine-grained enough to distinguish // between two Event creation times occasionally, hence the use of the // ordinal to help impose a total ordering across all persistable events. - long diff = (getCreationTime() - e.getCreationTime()); - if ( diff == 0 ) { + int comparison = compare(getCreationTime(), e.getCreationTime()); + if (comparison == 0) { // this may cause problems with overflow if that should ever happen. - diff = ordinal - e.ordinal; - return (diff > 0) ? 1 : (diff == 0) ? 0 : -1; + return compare(ordinal, e.ordinal); } - return (diff > 0) ? 1 : -1; + return comparison; } + + private int compare(long a, long b) { + return (a > b) ? 1 : (a == b) ? 0 : -1; + } } -/* - * $Log$ - * Revision 1.2 2006/02/04 23:08:02 alllee - * mindless hygiene + comment fixes. Still fixing ForagerExperiment, folding over functionality from ForagerServer and refactoring as I go. - * - * Revision 1.1 2006/01/15 00:17:08 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/event/BeginExperimentRequest.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/BeginExperimentRequest.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/BeginExperimentRequest.java 2006-03-05 04:40:28 UTC (rev 141) @@ -28,16 +28,3 @@ } } -/* - * $Log$ - * Revision 1.2 2006/02/04 23:08:02 alllee - * mindless hygiene + comment fixes. Still fixing ForagerExperiment, folding over functionality from ForagerServer and refactoring as I go. - * - * Revision 1.1 2006/02/04 06:43:40 alllee - * adding more functionality to ForagerExperiment, still need to work out experiment timing details. - * - * Revision 1.1 2006/01/15 00:17:08 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/event/ClientErrorMessageEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/ClientErrorMessageEvent.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/ClientErrorMessageEvent.java 2006-03-05 04:40:28 UTC (rev 141) @@ -36,16 +36,3 @@ } - -/* - * $Log$ - * Revision 1.1 2006/01/15 00:17:08 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. - * - * Revision 1.2 2005/09/22 03:19:23 alllee - * adding serialVersionUID to all serializable classes. - * - * Revision 1.1 2004/12/05 05:51:54 alllee - * event to convey error messages to the ForagerApplet and ForagerClient - * - */ \ No newline at end of file Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/EndRoundEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/EndRoundEvent.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/EndRoundEvent.java 2006-03-05 04:40:28 UTC (rev 141) @@ -46,61 +46,3 @@ } } -/** - * $Log$ - * Revision 1.2 2006/01/16 07:51:23 alllee - * refining: - * - the EventProcessor abstraction, trying to keep them simple. - * - the threading and event processing model employed by the experiment and its supporting classes, mostly ironing out the responsibilities of the Dispatcher and the Experiment and figuring out what to put where. - * - Duration now has 'canonical' durations (cached, prototype durations ostensibly used to spit out durations with a set start/end time). - * - * Revision 1.1 2006/01/15 00:17:08 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. - * - * Revision 1.9 2005/09/22 03:19:23 alllee - * adding serialVersionUID to all serializable classes. - * - * Revision 1.8 2004/11/22 07:55:32 alllee - * Switched back to SocketDispatcher - NioDispatcher seems to be causing problems - * once again, the debriefings aren't getting sent properly for some reason. - * SIGH. - * - anal-retentively turned ServerUpdateEvent into a marker interface instead of - * an abstract class - * - working on ForagerClient, ForagerGameWindow, ForagerServer, trying to get - * the fuckers to display properly. Unfortunately, the timeLeftLabel is still - * fubared. Swing is such a train wreck. I'd love to move this whole thing to - * the Eclipse SWT so I can half-ass learn yet another GUI toolkit. - * - * Revision 1.7 2004/10/05 20:52:39 alllee - * - refixed compareTo in PersistableEvent; compareTo is NOT equals() or - * hashCode(). It's only used for determining a total ordering on events - * within a Collection for instance. - * - adding a Set of PersistableEvents to the EndRoundEvent so that the client - * can reconstruct a graphical debriefing view. - * - * Revision 1.6 2004/08/30 20:52:37 alllee - * - trying to get the full debriefing up on the server side. Curiouser and - * curiouser; when you don't move at all during the experiment, the full - * debriefing pops up, but if you do move during the experiment, it doesn't. - * Could it be related to the persister somehow? Will probably need to use a - * standalone client to better debug this problem, but the last time I checked - * it didn't even occur on the standalone client... grrr. - * - * Revision 1.5 2004/07/29 13:54:31 andjones - * .Fixed persister to write research results to file - * .client now gets debriefing from server (with minimal stats) - * .bug fixes - * - * Revision 1.4 2004/07/29 12:54:23 andjones - * OHhhhh yea - * - * Revision 1.3 2004/07/29 06:35:25 andjones - * Getting the client closer to looking sweeeeet - * - * Revision 1.2 2004/07/12 03:42:25 alllee - * events refactoring, finalizing remote messaging protocol. - * - * Revision 1.1 2004/07/12 01:57:55 andjones - * Yea, these may help us spank it... - ADJ - * - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/Event.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/Event.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/Event.java 2006-03-05 04:40:28 UTC (rev 141) @@ -20,16 +20,3 @@ public long getCreationTime(); } - - - -/* - * $Log$ - * Revision 1.2 2006/01/17 02:19:08 alllee - * adding food dispenser, fixing logic in ForagerPersister, and propagating the introduction of Durations into the configuration levels and food-type classes. - * - * Revision 1.1 2006/01/06 08:36:02 alllee - * transferred the core event subsystem into the webapp framework. - * - * - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/EventChannel.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/EventChannel.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/EventChannel.java 2006-03-05 04:40:28 UTC (rev 141) @@ -194,38 +194,3 @@ } } } - -/* - * $Log$ - * Revision 1.8 2006/02/06 05:57:31 alllee - * for want of curried procedures, you can now 'register' with the EventChannel - * and get a List of event processors that, if you add to it directly, subscribes - * your newly added event processor to the EventChannel. - * - * Revision 1.7 2006/02/06 05:52:33 alllee - * complexifying EventChannel some more to make it easier to attach/detach anonymous event processors that still get cleaned up appropriately by associating them with owners who manage them. - * - * Revision 1.6 2006/02/06 04:59:10 alllee - * mindless hygiene - * - * Revision 1.5 2006/02/04 06:43:40 alllee - * adding more functionality to ForagerExperiment, still need to work out experiment timing details. - * - * Revision 1.4 2006/01/16 23:57:33 alllee - * EventProcessors are now EventConstraints as well to better support constraint chaining - an explicit way of doing it outside of superclass chaining would be nice in addition. Hopefully it doesn't become too confusing. - * - * Mindless hygiene of other classes, almost to the point where we can test running experiments in the webapp. - * - * Revision 1.3 2006/01/16 07:51:23 alllee - * refining: - * - the EventProcessor abstraction, trying to keep them simple. - * - the threading and event processing model employed by the experiment and its supporting classes, mostly ironing out the responsibilities of the Dispatcher and the Experiment and figuring out what to put where. - * - Duration now has 'canonical' durations (cached, prototype durations ostensibly used to spit out durations with a set start/end time). - * - * Revision 1.2 2006/01/15 00:17:08 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. - * - * Revision 1.1 2006/01/06 08:36:02 alllee - * transferred the core event subsystem into the webapp framework. - * - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/EventConstraint.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/EventConstraint.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/EventConstraint.java 2006-03-05 04:40:28 UTC (rev 141) @@ -24,16 +24,3 @@ */ public boolean accepts(Event event); } -/* - * $Log$ - * Revision 1.1 2006/01/06 08:36:02 alllee - * transferred the core event subsystem into the webapp framework. - * - * Revision 1.1 2004/05/11 02:15:57 alllee - * The beginnings of a messaging framework for GABEL. It's intended use is only - * on the server side, though extension to a remote messaging framework is also - * possible by making Events Serializable, and creating RemoteEventHandler, - * RemoveEventGenerator interfaces. The focal point is the EventChannel, which - * is a mediator, dispatching Events to EventHandlers interested in those Events. - * - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/EventGenerator.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/EventGenerator.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/EventGenerator.java 2006-03-05 04:40:28 UTC (rev 141) @@ -29,12 +29,3 @@ */ public void unsubscribe(EventHandler handler); } - -/* - * $Log$ - * Revision 1.2 2006/01/16 22:47:31 alllee - * ClientSocketDispatcher now emits a ConnectionEvent into the client's local event channel upon a successful connect(). - * - * Revision 1.1 2006/01/06 08:36:02 alllee - * transferred the core event subsystem into the webapp framework. - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/EventHandler.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/EventHandler.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/EventHandler.java 2006-03-05 04:40:28 UTC (rev 141) @@ -17,11 +17,3 @@ */ public void handle(Event event); } - -/* - * $Log$ - * Revision 1.1 2006/01/06 08:36:02 alllee - * transferred the core event subsystem into the webapp framework. - * - * - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/EventInstanceofConstraint.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/EventInstanceofConstraint.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/EventInstanceofConstraint.java 2006-03-05 04:40:28 UTC (rev 141) @@ -49,18 +49,3 @@ return target.isInstance(defendant); } } - -/* - * $Log$ - * Revision 1.1 2006/01/06 08:36:02 alllee - * transferred the core event subsystem into the webapp framework. - * - * Revision 1.1 2004/05/11 02:15:57 alllee - * The beginnings of a messaging framework for GABEL. It's intended use is only - * on the server side, though extension to a remote messaging framework is also - * possible by making Events Serializable, and creating RemoteEventHandler, - * RemoveEventGenerator interfaces. The focal point is the EventChannel, which - * is a mediator, dispatching Events to EventHandlers interested in those Events. - * - * - */ Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/EventProcessor.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/EventProcessor.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/EventProcessor.java 2006-03-05 04:40:28 UTC (rev 141) @@ -13,22 +13,3 @@ public interface EventProcessor extends EventHandler, EventConstraint { } - - -/* - * $Log$ - * Revision 1.3 2006/01/16 23:57:32 alllee - * EventProcessors are now EventConstraints as well to better support constraint chaining - an explicit way of doing it outside of superclass chaining would be nice in addition. Hopefully it doesn't become too confusing. - * - * Mindless hygiene of other classes, almost to the point where we can test running experiments in the webapp. - * - * Revision 1.2 2006/01/16 07:51:23 alllee - * refining: - * - the EventProcessor abstraction, trying to keep them simple. - * - the threading and event processing model employed by the experiment and its supporting classes, mostly ironing out the responsibilities of the Dispatcher and the Experiment and figuring out what to put where. - * - Duration now has 'canonical' durations (cached, prototype durations ostensibly used to spit out durations with a set start/end time). - * - * Revision 1.1 2006/01/15 00:17:08 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. - * - */ \ No newline at end of file Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/EventTypeProcessor.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/EventTypeProcessor.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/EventTypeProcessor.java 2006-03-05 04:40:28 UTC (rev 141) @@ -20,22 +20,3 @@ return constraint.accepts(event); } } - - -/* - * $Log$ - * Revision 1.2 2006/01/16 23:57:32 alllee - * EventProcessors are now EventConstraints as well to better support constraint chaining - an explicit way of doing it outside of superclass chaining would be nice in addition. Hopefully it doesn't become too confusing. - * - * Mindless hygiene of other classes, almost to the point where we can test running experiments in the webapp. - * - * Revision 1.1 2006/01/16 07:51:23 alllee - * refining: - * - the EventProcessor abstraction, trying to keep them simple. - * - the threading and event processing model employed by the experiment and its supporting classes, mostly ironing out the responsibilities of the Dispatcher and the Experiment and figuring out what to put where. - * - Duration now has 'canonical' durations (cached, prototype durations ostensibly used to spit out durations with a set start/end time). - * - * Revision 1.1 2006/01/15 00:17:08 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. - * - */ \ No newline at end of file Modified: trunk/gee/src/java/edu/indiana/psych/gee/event/OpenBrowserEvent.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/event/OpenBrowserEvent.java 2006-03-05 01:18:24 UTC (rev 140) +++ trunk/gee/src/java/edu/indiana/psych/gee/event/OpenB... [truncated message content] |
