You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/09 19:08:40 UTC

svn commit: r526835 - in /incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl: CompositeImpl.java ConstrainingTypeImpl.java

Author: jsdelfino
Date: Mon Apr  9 10:08:39 2007
New Revision: 526835

URL: http://svn.apache.org/viewvc?view=rev&rev=526835
Log:
Fixed implementations of hashCode and equals to use getter methods instead of the fields directly, as they may not represent the correct state of the model object.

Modified:
    incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeImpl.java
    incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ConstrainingTypeImpl.java

Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeImpl.java?view=diff&rev=526835&r1=526834&r2=526835
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeImpl.java Mon Apr  9 10:08:39 2007
@@ -133,14 +133,14 @@
 
     @Override
     public int hashCode() {
-        return String.valueOf(name).hashCode();
+        return String.valueOf(getName()).hashCode();
     }
     
     @Override
     public boolean equals(Object obj) {
         if (obj == this)
             return true;
-        else if (obj instanceof Composite && name.equals(((Composite)obj).getName()))
+        else if (obj instanceof Composite && getName().equals(((Composite)obj).getName()))
              return true;
         else
             return false;

Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ConstrainingTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ConstrainingTypeImpl.java?view=diff&rev=526835&r1=526834&r2=526835
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ConstrainingTypeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ConstrainingTypeImpl.java Mon Apr  9 10:08:39 2007
@@ -90,14 +90,14 @@
 
     @Override
     public int hashCode() {
-        return String.valueOf(name).hashCode();
+        return String.valueOf(getName()).hashCode();
     }
     
     @Override
     public boolean equals(Object obj) {
         if (obj == this)
             return true;
-        else if (obj instanceof ConstrainingType && name.equals(((ConstrainingType)obj).getName()))
+        else if (obj instanceof ConstrainingType && getName().equals(((ConstrainingType)obj).getName()))
              return true;
         else
             return false;



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org