Avoid NPE in SwapQueue when selecting empty seat

yurloc · Jun 28, 2015 · af4ddfd · af4ddfd
1 parent 087b038
commit af4ddfd
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 1 deletion.
diff --git a/src/main/java/org/iypt/planner/gui/swap/IdleSwap.java b/src/main/java/org/iypt/planner/gui/swap/IdleSwap.java
@@ -1,5 +1,6 @@
 package org.iypt.planner.gui.swap;
 
+import java.util.Objects;
 import org.iypt.planner.domain.Juror;
 
 public class IdleSwap implements SwapArgument {
@@ -24,4 +25,26 @@ public void apply(Juror other) {
     public boolean isTarget() {
         return false;
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 29 * hash + Objects.hashCode(this.juror);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final IdleSwap other = (IdleSwap) obj;
+        if (!Objects.equals(this.juror, other.juror)) {
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/src/main/java/org/iypt/planner/gui/swap/SeatSwap.java b/src/main/java/org/iypt/planner/gui/swap/SeatSwap.java
@@ -1,5 +1,6 @@
 package org.iypt.planner.gui.swap;
 
+import java.util.Objects;
 import org.iypt.planner.domain.Juror;
 import org.iypt.planner.gui.SeatInfo;
 
@@ -25,4 +26,26 @@ public void apply(Juror other) {
     public boolean isTarget() {
         return true;
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        hash = 47 * hash + Objects.hashCode(this.seat);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final SeatSwap other = (SeatSwap) obj;
+        if (!Objects.equals(this.seat, other.seat)) {
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/src/main/java/org/iypt/planner/gui/swap/SwapQueue.java b/src/main/java/org/iypt/planner/gui/swap/SwapQueue.java
@@ -8,7 +8,7 @@ public class SwapQueue {
     public void add(SwapArgument arg) {
         if (source == null) {
             source = arg;
-        } else if (!source.getJuror().equals(arg.getJuror())) {
+        } else if (!source.equals(arg)) {
             target = source;
             source = arg;
         }