X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FDefaultRequiredInterface.java;h=4e0db74be375620f8f60dd5b383a2e1a5017de32;hb=e1975449f1bf16ccb441632d68e440f3e3704a79;hp=7fc965308d4603e2386325c86c7f40c07e763c0d;hpb=29f061959f55f18df17ff1df114d262cdecfe7a4;p=utils diff --git a/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java b/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java index 7fc96530..4e0db74b 100644 --- a/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java +++ b/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java @@ -17,6 +17,8 @@ package org.wamblee.system.core; import java.util.Arrays; +import org.wamblee.reflection.ReflectionUtils; + public class DefaultRequiredInterface implements RequiredInterface { private String _name; @@ -74,6 +76,8 @@ public class DefaultRequiredInterface implements RequiredInterface { private boolean serviceProvided(Class aRequired, Class[] aProvided) { for (Class provided: aProvided) { try { + provided = ReflectionUtils.wrapIfNeeded(provided); + aRequired = ReflectionUtils.wrapIfNeeded(aRequired); provided.asSubclass(aRequired); return true; } catch (ClassCastException e) { @@ -96,7 +100,13 @@ public class DefaultRequiredInterface implements RequiredInterface { } @Override - public boolean equals(Object obj) { + public boolean equals(Object obj) { + return this == obj; + } + + @Override + public boolean covers(RequiredInterface obj) { + // TODO do more than equals. if ( !(obj instanceof DefaultRequiredInterface)) { return false; }