X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FDefaultProvidedInterface.java;h=d30a8c150d39c5c956cd3295f5901d87cdc0ccf0;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=90c230dcc9bf23493fcba2dd629f14c7c880e665;hpb=dea786c9d49228a37cb5fd5b4113b86d9f6cddbf;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 90c230dc..d30a8c15 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
@@ -15,7 +15,11 @@
  */ 
 package org.wamblee.system.core;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 
 /**
  * Default implementation of a service descriptor.
@@ -24,9 +28,8 @@ import java.util.Arrays;
  */
 public class DefaultProvidedInterface implements ProvidedInterface {
 	
-	private String _name; 
-	private Class[] _interfaces;
-	private String _uniqueId; 
+	private String name; 
+	private Class[] interfaces;
 	
 	/**
 	 * Constructs the descriptor. 
@@ -36,45 +39,69 @@ public class DefaultProvidedInterface implements ProvidedInterface {
 		this(aName, new Class[] { aInterface }); 
 	}
 	
-	public DefaultProvidedInterface(String aName, Class[] aInterfaces) {
-		_name = aName; 
-		_interfaces = Arrays.copyOf(aInterfaces, aInterfaces.length);
-		_uniqueId = null; 
+	public DefaultProvidedInterface(String aName, Class[] aInterfaces) { 
+		name = aName; 
+		interfaces = Arrays.copyOf(aInterfaces, aInterfaces.length); 
 	}
 
 	@Override
 	public String getName() {
-		return _name;
+		return name;
 	}
 	
 	@Override
 	public Class[] getInterfaceTypes() {
-		return _interfaces;
+		return interfaces;
 	}
-
+	
 	@Override
-	public void setUniqueId(String aId) {
-		_uniqueId = aId; 	
+	public String toString() {
+		StringBuffer buf = new StringBuffer();
+		buf.append(getName());
+		buf.append(":");
+		for (Class intf: interfaces) { 
+			buf.append(" " + intf.getName());
+		}
+		return buf.toString();
 	}
 	
 	@Override
-	public String getUniqueId() {
-		return _uniqueId;
+	public boolean equals(Object aObj) {
+	    return this == aObj;
+	    /*
+	    if ( !(aObj instanceof DefaultProvidedInterface)) { 
+	        return false; 
+	    }
+	    DefaultProvidedInterface provided = (DefaultProvidedInterface)aObj; 
+	    return getEqualsRepresentation().equals(provided.getEqualsRepresentation());
+	    */
 	}
 	
 	@Override
-	public void publish(Object aImplementation, Scope aScope) {
-		aScope.publishInterface(this, aImplementation);
+	public int hashCode() {
+	    return getEqualsRepresentation().hashCode();
 	}
 	
 	@Override
-	public String toString() {
-		StringBuffer buf = new StringBuffer();
-		buf.append(getName());
-		buf.append(":");
-		for (Class intf: _interfaces) { 
-			buf.append(" " + intf.getName());
-		}
-		return buf.toString();
+	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<String> result = new ArrayList<String>(); 
+	    for (Class cls: interfaces) { 
+	        result.add(cls.getName());
+	    }
+	    Collections.sort(result); 
+	    String value = ""; 
+	    for (String str: result) { 
+	        value += ":" + str; 
+	    }
+	    return value; 
 	}
 }