X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FDefaultProvidedInterface.java;h=2f9aee659d0aaae25db9ae037738ebc8643780f8;hb=db8ff5916d378aae57038356dbf2a3d2fbf9deff;hp=10b8f6184cbbf5c5c50ce192720b8037b7132138;hpb=001d69a3cfa9c4d949963d222c05a3134b594ddb;p=utils diff --git a/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java b/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java index 10b8f618..2f9aee65 100644 --- a/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java +++ b/system/general/src/main/java/org/wamblee/system/core/DefaultProvidedInterface.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.UUID; /** @@ -30,7 +31,6 @@ public class DefaultProvidedInterface implements ProvidedInterface { private String _name; private Class[] _interfaces; - private String _uniqueId; /** * Constructs the descriptor. @@ -42,8 +42,7 @@ public class DefaultProvidedInterface implements ProvidedInterface { public DefaultProvidedInterface(String aName, Class[] aInterfaces) { _name = aName; - _interfaces = Arrays.copyOf(aInterfaces, aInterfaces.length); - _uniqueId = null; + _interfaces = Arrays.copyOf(aInterfaces, aInterfaces.length); } @Override @@ -55,21 +54,6 @@ public class DefaultProvidedInterface implements ProvidedInterface { public Class[] getInterfaceTypes() { return _interfaces; } - - @Override - public void setUniqueId(String aId) { - _uniqueId = aId; - } - - @Override - public String getUniqueId() { - return _uniqueId; - } - - @Override - public void publish(Object aImplementation, Scope aScope) { - aScope.publishInterface(this, aImplementation); - } @Override public String toString() { @@ -84,11 +68,14 @@ public class DefaultProvidedInterface implements ProvidedInterface { @Override public boolean equals(Object aObj) { + return this == aObj; + /* if ( !(aObj instanceof DefaultProvidedInterface)) { return false; } DefaultProvidedInterface provided = (DefaultProvidedInterface)aObj; return getEqualsRepresentation().equals(provided.getEqualsRepresentation()); + */ } @Override @@ -96,6 +83,15 @@ public class DefaultProvidedInterface implements ProvidedInterface { return getEqualsRepresentation().hashCode(); } + @Override + public boolean covers(ProvidedInterface aInterface) { + // TODO do more than just equals. + if ( !(aInterface instanceof DefaultProvidedInterface)) { + return false; + } + return getEqualsRepresentation().equals(((DefaultProvidedInterface)aInterface).getEqualsRepresentation()); + } + private String getEqualsRepresentation() { List result = new ArrayList();