From 52a87e1d9ffb0b1a0ed45e3af71b0ccc9c05142a Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 12 Jan 2018 01:14:07 +0100 Subject: Revert "Implement equality check" This reverts commit 09b631e Signed-off-by: pacien --- src/main/java/fr/umlv/java/wallj/model/Block.java | 15 --------------- src/main/java/fr/umlv/java/wallj/model/BombBlock.java | 17 ----------------- 2 files changed, 32 deletions(-) diff --git a/src/main/java/fr/umlv/java/wallj/model/Block.java b/src/main/java/fr/umlv/java/wallj/model/Block.java index 25265d1..7f32087 100644 --- a/src/main/java/fr/umlv/java/wallj/model/Block.java +++ b/src/main/java/fr/umlv/java/wallj/model/Block.java @@ -72,19 +72,4 @@ public abstract class Block { .collect(Collectors.toList()); } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Block)) return false; - Block block = (Block) o; - return type == block.type && - Objects.equals(controllers, block.controllers) && - Objects.equals(pos, block.pos); - } - - @Override - public int hashCode() { - return Objects.hash(type, controllers, pos); - } - } diff --git a/src/main/java/fr/umlv/java/wallj/model/BombBlock.java b/src/main/java/fr/umlv/java/wallj/model/BombBlock.java index 4eca843..9ba4a68 100644 --- a/src/main/java/fr/umlv/java/wallj/model/BombBlock.java +++ b/src/main/java/fr/umlv/java/wallj/model/BombBlock.java @@ -2,8 +2,6 @@ package fr.umlv.java.wallj.model; import org.jbox2d.common.Vec2; -import java.util.Objects; - /** * A bomb block. * @@ -27,19 +25,4 @@ public class BombBlock extends Block { return timer; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof BombBlock)) return false; - if (!super.equals(o)) return false; - BombBlock bombBlock = (BombBlock) o; - return timer == bombBlock.timer && - super.equals(o); - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode(), timer); - } - } -- cgit v1.2.3