svn commit: r596997 - in /incubator/ivy/core/trunk/src/java/org/apache/ivy: core/module/id/ModuleRevisionId.java util/extendable/UnmodifiableExtendableItem.java

[gscokart]

Author: gscokart
Date: Wed Nov 21 00:57:55 2007
New Revision: 596997

URL: http://svn.apache.org/viewvc?rev=596997&view=rev
Log:
help for debugging

Modified:
    
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java
    
incubator/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java

Modified: 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java?rev=596997&r1=596996&r2=596997&view=diff
==============================================================================
--- 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java
 (original)
+++ 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java
 Wed Nov 21 00:57:55 2007
@@ -61,11 +61,11 @@
                 .getExtraAttributes());
     }
 
-    private ModuleId moduleId;
+    private final ModuleId moduleId;
 
-    private String branch;
+    private final String branch;
 
-    private String revision;
+    private final String revision;
 
     private int hash;
 
@@ -115,10 +115,18 @@
             return false;
         }
         ModuleRevisionId other = (ModuleRevisionId) obj;
-        return other.getRevision().equals(getRevision())
-                && (other.getBranch() == null ? getBranch() == null : 
other.getBranch().equals(
-                    getBranch())) && other.getModuleId().equals(getModuleId())
-                && other.getExtraAttributes().equals(getExtraAttributes());
+
+        if (!other.getRevision().equals(getRevision())) {
+            return false;
+        } else if (other.getBranch() == null && getBranch() != null) {
+            return false;
+        } else if (other.getBranch() != null && 
!other.getBranch().equals(getBranch())) {
+            return false;
+        } else if (!other.getModuleId().equals(getModuleId())) {
+            return false;
+        } else {
+            return other.getExtraAttributes().equals(getExtraAttributes());
+        }
     }
 
     public int hashCode() {

Modified: 
incubator/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java?rev=596997&r1=596996&r2=596997&view=diff
==============================================================================
--- 
incubator/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java
 (original)
+++ 
incubator/ivy/core/trunk/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java
 Wed Nov 21 00:57:55 2007
@@ -22,17 +22,18 @@
 import java.util.Map;
 
 public class UnmodifiableExtendableItem implements ExtendableItem {
-    private Map attributes = new HashMap();
+    private final Map attributes = new HashMap();
 
-    private Map unmodifiableAttributesView = 
Collections.unmodifiableMap(attributes);
+    private final Map unmodifiableAttributesView = 
Collections.unmodifiableMap(attributes);
 
-    private Map stdAttributes = new HashMap();
+    private final Map stdAttributes = new HashMap();
 
-    private Map unmodifiableStdAttributesView = 
Collections.unmodifiableMap(stdAttributes);
+    private final Map unmodifiableStdAttributesView = 
Collections.unmodifiableMap(stdAttributes);
 
-    private Map extraAttributes = new HashMap();
+    private final Map extraAttributes = new HashMap();
 
-    private Map unmodifiableExtraAttributesView = 
Collections.unmodifiableMap(extraAttributes);
+    private final Map unmodifiableExtraAttributesView = 
+                                    
Collections.unmodifiableMap(extraAttributes);
 
     public UnmodifiableExtendableItem(Map stdAttributes, Map extraAttributes) {
         if (stdAttributes != null) {