[virtualcommons-svn] commit/foraging: alllee: conforming with upstream csidex API changes, removing setter protection from GroupDataModel

[Bitbucket <com...@bi...>]

1 new commit in foraging:


https://bitbucket.org/virtualcommons/foraging/changeset/aacbab9ce97f/
changeset:   aacbab9ce97f
user:        alllee
date:        2012-03-08 00:11:26
summary:     conforming with upstream csidex API changes, removing setter protection from GroupDataModel
affected #:  5 files

diff -r 7fb3d9c088469392fd84733fbd2e5b45afcc97a8 -r aacbab9ce97f6c0c6a47f509adbfbb557466701f src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
--- a/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
+++ b/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
@@ -43,7 +43,7 @@
  * @author <a href='mailto:All...@as...'>Allen Lee</a>
  * @version $Rev: 534 $
  */
-public class RoundConfiguration extends ExperimentRoundParameters.Base<ServerConfiguration> {
+public class RoundConfiguration extends ExperimentRoundParameters.Base<ServerConfiguration, RoundConfiguration> {
 
     private static final long serialVersionUID = 8575239803733029326L;
 


diff -r 7fb3d9c088469392fd84733fbd2e5b45afcc97a8 -r aacbab9ce97f6c0c6a47f509adbfbb557466701f src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java
--- a/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java
+++ b/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java
@@ -24,7 +24,7 @@
  * @see 
  * @version $Revision$
  */
-public class ServerConfiguration extends ExperimentConfiguration.Base<RoundConfiguration> {
+public class ServerConfiguration extends ExperimentConfiguration.Base<ServerConfiguration, RoundConfiguration> {
     
     private static final long serialVersionUID = -1737412253553943902L;
     


diff -r 7fb3d9c088469392fd84733fbd2e5b45afcc97a8 -r aacbab9ce97f6c0c6a47f509adbfbb557466701f src/main/java/edu/asu/commons/foraging/facilitator/Facilitator.java
--- a/src/main/java/edu/asu/commons/foraging/facilitator/Facilitator.java
+++ b/src/main/java/edu/asu/commons/foraging/facilitator/Facilitator.java
@@ -183,7 +183,7 @@
      * Send a request to set the configuration object
      */
     public void sendSetConfigRequest() {
-        transmit(new ConfigurationEvent<ServerConfiguration>(getId(), getServerConfiguration()));
+        transmit(new ConfigurationEvent<ServerConfiguration, RoundConfiguration>(getId(), getServerConfiguration()));
     }
 
     public FacilitatorWindow getFacilitatorWindow() {


diff -r 7fb3d9c088469392fd84733fbd2e5b45afcc97a8 -r aacbab9ce97f6c0c6a47f509adbfbb557466701f src/main/java/edu/asu/commons/foraging/model/GroupDataModel.java
--- a/src/main/java/edu/asu/commons/foraging/model/GroupDataModel.java
+++ b/src/main/java/edu/asu/commons/foraging/model/GroupDataModel.java
@@ -831,10 +831,7 @@
 	}
 
 	public void setImposedStrategy(Strategy imposedStrategy) {
-	    // XXX: defensive set, don't override an already imposed strategy.
-	    if (this.imposedStrategy == null) {
-	        this.imposedStrategy = imposedStrategy;
-	    }
+	    this.imposedStrategy = imposedStrategy;
 	}
 
 }


diff -r 7fb3d9c088469392fd84733fbd2e5b45afcc97a8 -r aacbab9ce97f6c0c6a47f509adbfbb557466701f src/main/java/edu/asu/commons/foraging/server/ForagingServer.java
--- a/src/main/java/edu/asu/commons/foraging/server/ForagingServer.java
+++ b/src/main/java/edu/asu/commons/foraging/server/ForagingServer.java
@@ -253,7 +253,7 @@
                         clients.put(identifier, new ClientData(identifier));
                     }
                     // send welcome instructions and experiment configuration
-                    transmit(new SetConfigurationEvent<RoundConfiguration>(identifier, getCurrentRoundConfiguration()));
+                    transmit(new SetConfigurationEvent<ServerConfiguration, RoundConfiguration>(identifier, getCurrentRoundConfiguration()));
                 }
             });
             addEventProcessor(new EventTypeProcessor<DisconnectionRequest>(DisconnectionRequest.class) {
@@ -922,9 +922,9 @@
             getLogger().info("Advancing to round # " + getConfiguration().getCurrentRoundNumber());
             // send the next round configuration to each client
             for (Identifier id : clients.keySet()) {
-                transmit(new SetConfigurationEvent<RoundConfiguration>(id, nextRoundConfiguration));
+                transmit(new SetConfigurationEvent<ServerConfiguration, RoundConfiguration>(id, nextRoundConfiguration));
             }
-            transmit(new SetConfigurationEvent<RoundConfiguration>(getFacilitatorId(), nextRoundConfiguration));
+            transmit(new SetConfigurationEvent<ServerConfiguration, RoundConfiguration>(getFacilitatorId(), nextRoundConfiguration));
         }
 
         private void processRound() {

Repository URL: https://bitbucket.org/virtualcommons/foraging/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.