diff options
Diffstat (limited to 'israfil-foundation-container/src/main')
2 files changed, 5 insertions, 2 deletions
diff --git a/israfil-foundation-container/src/main/java/net/israfil/foundation/container/AbstractContainer.java b/israfil-foundation-container/src/main/java/net/israfil/foundation/container/AbstractContainer.java index fe6a978..86b05d5 100644 --- a/israfil-foundation-container/src/main/java/net/israfil/foundation/container/AbstractContainer.java +++ b/israfil-foundation-container/src/main/java/net/israfil/foundation/container/AbstractContainer.java @@ -34,7 +34,6 @@ package net.israfil.foundation.container; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import net.israfil.foundation.container.error.ComponentAlreadyRegisteredError; @@ -48,7 +47,7 @@ import net.israfil.foundation.container.error.ComponentAlreadyRegisteredError; */ public abstract class AbstractContainer implements Container { - private final Map components = new HashMap(); + private final Map<Object, Object> components = new HashMap<>(); private final Container parent; @@ -66,14 +65,17 @@ public abstract class AbstractContainer implements Container { return components.containsKey(key); } + @Override public boolean hasComponent(Object key) { return components.containsKey(key) || (parent != null && parent.hasComponent(key)); } + @Override public boolean isRunning() { return this.running; } + @Override public void start() { this.running = true; } diff --git a/israfil-foundation-container/src/main/java/net/israfil/foundation/container/util/NonDuplicateStack.java b/israfil-foundation-container/src/main/java/net/israfil/foundation/container/util/NonDuplicateStack.java index d253024..afc9e18 100644 --- a/israfil-foundation-container/src/main/java/net/israfil/foundation/container/util/NonDuplicateStack.java +++ b/israfil-foundation-container/src/main/java/net/israfil/foundation/container/util/NonDuplicateStack.java @@ -47,6 +47,7 @@ public class NonDuplicateStack<T> extends Stack<T> { private static final long serialVersionUID = -5777711467165769847L; + @Override public T push(T item) { if (contains(item)) throw new IllegalArgumentException("Duplicate item."); return super.push(item); |