Changeset 22 for events/src/main

Timestamp:

09/22/20 16:26:36 (4 years ago)

Author:

bart

Message:

Minor fixes

File:

• events/src/main/java/geniusweb/actions/Vote.java (modified) (6 diffs)

events/src/main/java/geniusweb/actions/Vote.java

@@ -14 +14 @@
 public class Vote extends ActionWithBid {
         private final Integer minPower;
+        private final Integer maxPower;
 
         /**
@@ -19 +20 @@
          * @param bid      the bid that is voted on
          * @param minPower the minimum power this bid must get in order for the vote
-         *                 to be valid. If power=1 for all participants (usually the
-         *                 default) power can be interpreted as number of votes
+         *                 to be valid. Power is the sum of the powers of the
+         *                 parties that are in the deal. If power=1 for all
+         *                 participants (usually the default) power can be
+         *                 interpreted as number of votes
+         * @param maxPower the maximum power this bid must get in order for the vote
+         *                 to be valid. See {@link #minPower}
          */
         @JsonCreator
         public Vote(@JsonProperty("actor") PartyId id, @JsonProperty("bid") Bid bid,
-                        @JsonProperty("minPower") Integer minPower) {
+                        @JsonProperty("minPower") Integer minPower,
+                        @JsonProperty("maxPower") Integer maxPower) {
                 super(id, bid);
                 this.minPower = minPower;
-                if (bid == null || minPower == null || minPower < 1) {
+                this.maxPower = maxPower;
+                if (bid == null || minPower == null || minPower < 1 || maxPower == null
+                                || maxPower < minPower) {
                         throw new IllegalArgumentException(
-                                        "Vote must have non-null bid and minVotes, and minVotes must be >=1");
+                                        "Vote must have non-null bid and minVotes, and minPower must be >=1 and maxPower must be >=minPower");
                 }
         }
@@ -35 +43 @@
         /**
          * 
-         * @return the minimum number of votes this bid must get in order for the
-         *         vote to be valid.
+         * @return the minimum power this bid must get in order for the vote to be
+         *         valid.
          */
         public Integer getMinPower() {
@@ -42 +50 @@
         }
 
+        /**
+         * 
+         * @return the max power this bid must get in order for the vote to be
+         *         valid.
+         */
+
+        public Integer getMaxPower() {
+                return maxPower;
+        }
+
         @Override
         public String toString() {
-                return "Vote[" + getActor() + "," + getBid() + "," + minPower + "]";
+                return "Vote[" + getActor() + "," + getBid() + "," + minPower + ","
+                                + maxPower + "]";
         }
 
@@ -51 +70 @@
                 final int prime = 31;
                 int result = super.hashCode();
+                result = prime * result
+                                + ((maxPower == null) ? 0 : maxPower.hashCode());
                 result = prime * result
                                 + ((minPower == null) ? 0 : minPower.hashCode());
@@ -65 +86 @@
                         return false;
                 Vote other = (Vote) obj;
+                if (maxPower == null) {
+                        if (other.maxPower != null)
+                                return false;
+                } else if (!maxPower.equals(other.maxPower))
+                        return false;
                 if (minPower == null) {
                         if (other.minPower != null)