[virtualcommons-svn] commit/foraging: alllee: storing group along with the strategies / results

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

1 new commit in foraging:


https://bitbucket.org/virtualcommons/foraging/changeset/bd870a566539/
changeset:   bd870a566539
user:        alllee
date:        2012-03-19 22:16:04
summary:     storing group along with the strategies / results
affected #:  2 files

diff -r 32416ca0f7224851a587cf05df6ec6f4db522556 -r bd870a5665395d74ceddf92845795f604c4dcda1 src/main/java/edu/asu/commons/foraging/event/RuleSelectedUpdateEvent.java
--- a/src/main/java/edu/asu/commons/foraging/event/RuleSelectedUpdateEvent.java
+++ b/src/main/java/edu/asu/commons/foraging/event/RuleSelectedUpdateEvent.java
@@ -5,6 +5,7 @@
 import java.util.Map;
 
 import edu.asu.commons.event.AbstractPersistableEvent;
+import edu.asu.commons.foraging.model.GroupDataModel;
 import edu.asu.commons.foraging.rules.Strategy;
 import edu.asu.commons.net.Identifier;
 
@@ -23,11 +24,13 @@
     private static final long serialVersionUID = 4360213814026474451L;
     private final List<Strategy> selectedStrategies;
     private final Map<Strategy, Integer> votingResults;
+    private final GroupDataModel group;
   
-    public RuleSelectedUpdateEvent(Identifier id, List<Strategy> selectedStrategies, Map<Strategy, Integer> votingResults) {
+    public RuleSelectedUpdateEvent(Identifier id, GroupDataModel group, List<Strategy> selectedStrategies, Map<Strategy, Integer> votingResults) {
         super(id, String.format("Strategies (first is tiebreaker): %s, All nominations: %s", selectedStrategies, votingResults));
         this.selectedStrategies = selectedStrategies;
         this.votingResults = votingResults;
+        this.group = group;
     }
     
     public Strategy getSelectedRule() {
@@ -42,5 +45,12 @@
         return votingResults;
     }
 
+    /**
+     * @return the group
+     */
+    public GroupDataModel getGroup() {
+        return group;
+    }
+
 
 }


diff -r 32416ca0f7224851a587cf05df6ec6f4db522556 -r bd870a5665395d74ceddf92845795f604c4dcda1 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
@@ -416,10 +416,10 @@
                         group, selectedRules, votingResults, imposedStrategyEnabled));
                 if (! imposedStrategyEnabled) {
                     for (Identifier id : group.getClientIdentifiers()) {
-                        transmit(new RuleSelectedUpdateEvent(id, selectedRules, votingResults));
+                        transmit(new RuleSelectedUpdateEvent(id, group, selectedRules, votingResults));
                     }
         		}
-        		store(new RuleSelectedUpdateEvent(getFacilitatorId(), selectedRules, votingResults));
+        		store(new RuleSelectedUpdateEvent(getFacilitatorId(), group, selectedRules, votingResults));
         	}
         }

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.