From 3ded433af820aae000913fa0305380a0f7988c2c Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 17 Mar 2010 01:40:44 +0000
Subject: Fix the equals and hashCode to avoid componentType conflicts

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@924089 13f79535-47bb-0310-9956-ffa450edef68
---
 .../widget/impl/WidgetImplementationImpl.java      | 40 ++++++++++++++++------
 1 file changed, 30 insertions(+), 10 deletions(-)

(limited to 'sca-java-2.x/trunk/modules/implementation-widget/src/main/java')

diff --git a/sca-java-2.x/trunk/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java b/sca-java-2.x/trunk/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java
index 7bdecc2c3a..58edfdd3ba 100644
--- a/sca-java-2.x/trunk/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java
+++ b/sca-java-2.x/trunk/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java
@@ -80,16 +80,6 @@ public class WidgetImplementationImpl extends ImplementationImpl implements Widg
         return TYPE;
     }
     
-    @Override
-    public String getURI() {
-        return location;
-    }
-
-    @Override
-    public void setURI(String uri) {
-        this.location = uri;
-    }
-    
     public String getLocation() {
         return location;
     }
@@ -111,4 +101,34 @@ public class WidgetImplementationImpl extends ImplementationImpl implements Widg
     public String toString() {
         return "Widget : " + getLocation(); 
     }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + ((location == null) ? 0 : location.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (!(obj instanceof WidgetImplementationImpl)) {
+            return false;
+        }
+        WidgetImplementationImpl other = (WidgetImplementationImpl)obj;
+        if (location == null) {
+            if (other.location != null) {
+                return false;
+            }
+        } else if (!location.equals(other.location)) {
+            return false;
+        }
+        return true;
+    }
 }
-- 
cgit v1.2.3