[Pojomatic-commits] SF.net SVN: pojomatic:[215] trunk/PojomaticAll/Pojomatic/src

[<chr...@us...>]

Revision: 215
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=215&view=rev
Author:   chriswhansen
Date:     2010-04-18 15:50:33 +0000 (Sun, 18 Apr 2010)

Log Message:
-----------
Get rid of PMD warnings.

Modified Paths:
--------------
    trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/PojomatorImpl.java
    trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/EqualsInheritanceTest.java

Modified: trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/PojomatorImpl.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/PojomatorImpl.java	2010-04-16 05:04:34 UTC (rev 214)
+++ trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/PojomatorImpl.java	2010-04-18 15:50:33 UTC (rev 215)
@@ -76,10 +76,9 @@
     if (other == null) {
       return false;
     }
-    if (!instance.getClass().equals(other.getClass())) {
-      if (!isCompatibleForEquality(other.getClass())) {
-        return false;
-      }
+    if (!instance.getClass().equals(other.getClass())
+        && !isCompatibleForEquality(other.getClass())) {
+      return false;
     }
 
     for (PropertyElement prop: classProperties.getEqualsProperties()) {

Modified: trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/EqualsInheritanceTest.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/EqualsInheritanceTest.java	2010-04-16 05:04:34 UTC (rev 214)
+++ trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/EqualsInheritanceTest.java	2010-04-18 15:50:33 UTC (rev 215)
@@ -11,9 +11,14 @@
     @SuppressWarnings("unused") @Property int x = 3;
 
     @Override
-    public boolean equals(Object obj) {
-      return Pojomatic.equals(this, obj);
+    public int hashCode() {
+      return Pojomatic.hashCode(this);
     }
+
+    @Override
+    public boolean equals(Object o) {
+      return Pojomatic.equals(this, o);
+    }
   }
 
   private static Pojomator<Parent> PARENT_POJOMATOR = new PojomatorImpl<Parent>(Parent.class);


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