[Andromda-cvs] SF.net SVN: andromda:[15224] trunk/metafacades/uml/emf/uml22/src/main/java/ org/andromda/metafacades/emf/uml22

[<wal...@us...>]

Revision: 15224
          http://andromda.svn.sourceforge.net/andromda/?rev=15224&view=rev
Author:   walterim
Date:     2012-04-23 23:54:39 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
Correction in the "equals" methods.

Modified Paths:
--------------
    trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AssociationEndImpl.java
    trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AttributeImpl.java

Modified: trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AssociationEndImpl.java
===================================================================
--- trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AssociationEndImpl.java	2012-04-22 13:05:13 UTC (rev 15223)
+++ trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AssociationEndImpl.java	2012-04-23 23:54:39 UTC (rev 15224)
@@ -48,7 +48,7 @@
  * Implementation of AssociationEnd. We extend Property, we keep a reference to
  * the original property, and we defer almost all method calls to it.
  *
- * @author C\xE9dric Jeanneret
+ * @author C�dric Jeanneret
  * @author Bob Fields
  */
 public class AssociationEndImpl
@@ -78,12 +78,12 @@
     @Override
     public boolean equals(final Object obj)
     {
-        /*if (obj instanceof AttributeImpl)
+        if (obj instanceof AttributeImpl)
         {
             Property other = ((AttributeImpl)obj).property;
             return this.property.equals(other);
-        }*/
-        if (obj instanceof AssociationEndImpl)
+        } 
+        else if (obj instanceof AssociationEndImpl)
         {
             final Property other = ((AssociationEndImpl)obj).property;
             return this.property.equals(other);

Modified: trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AttributeImpl.java
===================================================================
--- trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AttributeImpl.java	2012-04-22 13:05:13 UTC (rev 15223)
+++ trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AttributeImpl.java	2012-04-23 23:54:39 UTC (rev 15224)
@@ -50,7 +50,7 @@
  * We extend Property. We keep a reference to the original property and defer
  * almost all method calls to it.
  *
- * @author C\xE9dric Jeanneret
+ * @author C�dric Jeanneret
  */
 public class AttributeImpl
     implements Attribute
@@ -79,11 +79,11 @@
     @Override
     public boolean equals(final Object obj)
     {
-        /*if (obj instanceof AttributeImpl)
+        if (obj instanceof AttributeImpl)
         {
             Property other = ((AttributeImpl)obj).property;
             return this.property.equals(other);
-        }*/
+        }
         if (obj instanceof AssociationEndImpl)
         {
             final Property other = ((AssociationEndImpl)obj).property;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.