X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FDefaultProvidedInterface.java;h=10b8f6184cbbf5c5c50ce192720b8037b7132138;hb=001d69a3cfa9c4d949963d222c05a3134b594ddb;hp=b751a67144d00542804ea39354a5eafa88e83af3;hpb=4845c677310814de4c98e22aad483e49b9dfc594;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 b751a671..10b8f618 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.
@@ -26,20 +30,20 @@ public class DefaultProvidedInterface implements ProvidedInterface {
 	
 	private String _name; 
 	private Class[] _interfaces;
-	private Object _implementation; 
+	private String _uniqueId; 
 	
 	/**
 	 * Constructs the descriptor. 
 	 * @param aInterface Type of service. 
 	 */
 	public DefaultProvidedInterface(String aName, Class aInterface) {
-		_name = aName; 
-		_interfaces = new Class[] { aInterface };  
+		this(aName, new Class[] { aInterface }); 
 	}
 	
-	public DefaultProvidedInterface(String aName, Class[] aInterfaces) {
+	public DefaultProvidedInterface(String aName, Class[] aInterfaces) { 
 		_name = aName; 
-		_interfaces = Arrays.copyOf(aInterfaces, aInterfaces.length);  
+		_interfaces = Arrays.copyOf(aInterfaces, aInterfaces.length);
+		_uniqueId = null; 
 	}
 
 	@Override
@@ -51,48 +55,58 @@ public class DefaultProvidedInterface implements ProvidedInterface {
 	public Class[] getInterfaceTypes() {
 		return _interfaces;
 	}
-	
+
 	@Override
-	public void publish(Object aImplementation) {
-		_implementation = aImplementation; 	
+	public void setUniqueId(String aId) {
+		_uniqueId = aId; 	
 	}
 	
 	@Override
-	public Object getImplementation() {
-		return _implementation; 
+	public String getUniqueId() {
+		return _uniqueId;
 	}
 	
 	@Override
-	public boolean equals(Object obj) {
-		if ( !(obj instanceof DefaultProvidedInterface)) { 
-			return false; 
-		}
-		DefaultProvidedInterface descr = (DefaultProvidedInterface)obj;
-		if ( _interfaces.length != descr._interfaces.length ) { 
-			return false; 
-		}
-		String[] interfaces1 = new String[_interfaces.length];
-		String[] interfaces2 = new String[_interfaces.length];
-		for (int i = 0; i < _interfaces.length; i++) {  
-			interfaces1[i] = _interfaces[i].getName();
-			interfaces2[i] = descr._interfaces[i].getName();
-		}
-		Arrays.sort(interfaces1);
-		Arrays.sort(interfaces2);
-		return Arrays.equals(interfaces1, interfaces2);
-	}
-
-	@Override
-	public int hashCode() {
-		return _interfaces.hashCode(); 
+	public void publish(Object aImplementation, Scope aScope) {
+		aScope.publishInterface(this, aImplementation);
 	}
 	
 	@Override
 	public String toString() {
 		StringBuffer buf = new StringBuffer();
+		buf.append(getName());
+		buf.append(":");
 		for (Class intf: _interfaces) { 
-			buf.append("." + intf.getName());
+			buf.append(" " + intf.getName());
 		}
 		return buf.toString();
 	}
+	
+	@Override
+	public boolean equals(Object aObj) {
+	    if ( !(aObj instanceof DefaultProvidedInterface)) { 
+	        return false; 
+	    }
+	    DefaultProvidedInterface provided = (DefaultProvidedInterface)aObj; 
+	    return getEqualsRepresentation().equals(provided.getEqualsRepresentation());
+	}
+	
+	@Override
+	public int hashCode() {
+	    return getEqualsRepresentation().hashCode();
+	}
+	
+	
+	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; 
+	}
 }