From a9f2c8c4075cd6f085bc718b0aab274af37c71b7 Mon Sep 17 00:00:00 2001
From: vraskulin <v.raskulin@gmail.com>
Date: Mon, 9 Jan 2017 18:13:43 +0300
Subject: [PATCH] Refactoring

We don't need to override basic methods to just call the basic method again.
---
 Mage/src/main/java/mage/target/TargetSpell.java        |  2 +-
 .../java/mage/target/common/TargetCardInLibrary.java   |  1 -
 .../main/java/mage/target/common/TargetOpponent.java   | 10 ----------
 Mage/src/main/java/mage/watchers/Watchers.java         |  5 ++---
 .../mage/watchers/common/CastFromGraveyardWatcher.java |  6 +-----
 .../mage/watchers/common/FirstTimeStepWatcher.java     |  5 -----
 6 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/Mage/src/main/java/mage/target/TargetSpell.java b/Mage/src/main/java/mage/target/TargetSpell.java
index f679aadddc4..aad10b11ef8 100644
--- a/Mage/src/main/java/mage/target/TargetSpell.java
+++ b/Mage/src/main/java/mage/target/TargetSpell.java
@@ -132,6 +132,6 @@ public class TargetSpell extends TargetObject {
     private boolean canBeChosen(StackObject stackObject, UUID sourceID, UUID sourceControllerId, Game game) {
         return stackObject instanceof Spell
                 && game.getState().getPlayersInRange(sourceControllerId, game).contains(stackObject.getControllerId())
-                && filter.match((Spell) stackObject, sourceID, sourceControllerId, game);
+                && filter.match(stackObject, sourceID, sourceControllerId, game);
     }
 }
diff --git a/Mage/src/main/java/mage/target/common/TargetCardInLibrary.java b/Mage/src/main/java/mage/target/common/TargetCardInLibrary.java
index 699f7278b60..b23298e1074 100644
--- a/Mage/src/main/java/mage/target/common/TargetCardInLibrary.java
+++ b/Mage/src/main/java/mage/target/common/TargetCardInLibrary.java
@@ -28,7 +28,6 @@
 package mage.target.common;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
diff --git a/Mage/src/main/java/mage/target/common/TargetOpponent.java b/Mage/src/main/java/mage/target/common/TargetOpponent.java
index 4483f1e971c..91d813c6c85 100644
--- a/Mage/src/main/java/mage/target/common/TargetOpponent.java
+++ b/Mage/src/main/java/mage/target/common/TargetOpponent.java
@@ -56,16 +56,6 @@ public class TargetOpponent extends TargetPlayer {
         super(target);
     }
 
-    @Override
-    public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
-        return super.canChoose(sourceId, sourceControllerId, game);
-    }
-
-    @Override
-    public boolean canTarget(UUID id, Ability source, Game game) {
-        return super.canTarget(id, source, game);
-    }
-
     @Override
     public TargetOpponent copy() {
         return new TargetOpponent(this);
diff --git a/Mage/src/main/java/mage/watchers/Watchers.java b/Mage/src/main/java/mage/watchers/Watchers.java
index 70227e9d2d6..61c5b8ec264 100644
--- a/Mage/src/main/java/mage/watchers/Watchers.java
+++ b/Mage/src/main/java/mage/watchers/Watchers.java
@@ -28,7 +28,6 @@
 package mage.watchers;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.UUID;
 import mage.game.Game;
 import mage.game.events.GameEvent;
@@ -43,7 +42,7 @@ public class Watchers extends HashMap<String, Watcher> {
     }
 
     public Watchers(final Watchers watchers) {
-        watchers.entrySet().stream().forEach((entry) -> this.put(entry.getKey(), entry.getValue().copy()));
+        watchers.entrySet().forEach((entry) -> this.put(entry.getKey(), entry.getValue().copy()));
     }
 
     public Watchers copy() {
@@ -63,7 +62,7 @@ public class Watchers extends HashMap<String, Watcher> {
     }
 
     public void reset() {
-        this.values().stream().forEach(Watcher::reset);
+        this.values().forEach(Watcher::reset);
     }
 
     public Watcher get(String key, UUID id) {
diff --git a/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java b/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java
index 41d07639af4..44e831b1f58 100644
--- a/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java
@@ -66,11 +66,7 @@ public class CastFromGraveyardWatcher extends Watcher {
         if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone().equals(Zone.GRAVEYARD)) {
             Spell spell = (Spell) game.getObject(event.getTargetId());
             if (spell != null) {
-                HashSet<Integer> zcc = spellsCastFromGraveyard.get(spell.getSourceId());
-                if (zcc == null) {
-                    zcc = new HashSet<>();
-                    spellsCastFromGraveyard.put(spell.getSourceId(), zcc);
-                }
+                HashSet<Integer> zcc = spellsCastFromGraveyard.computeIfAbsent(spell.getSourceId(), k -> new HashSet<>());
                 zcc.add(spell.getZoneChangeCounter(game));
             }
 
diff --git a/Mage/src/main/java/mage/watchers/common/FirstTimeStepWatcher.java b/Mage/src/main/java/mage/watchers/common/FirstTimeStepWatcher.java
index d216f48d37a..303f4586a24 100644
--- a/Mage/src/main/java/mage/watchers/common/FirstTimeStepWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/FirstTimeStepWatcher.java
@@ -64,9 +64,4 @@ public class FirstTimeStepWatcher extends Watcher {
             condition = true;
         }
     }
-
-    @Override
-    public void reset() {
-        super.reset();
-    }
 }