pojomatic-commits Mailing List for Pojomatic (Page 3)

Status: Beta

Brought to you by: chriswhansen, iroberts

pojomatic-commits — commit messages from subversion

You can subscribe to this list here.

2008	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (12)	_Nov (2)	_Dec (15)
2009	_Jan (7)	_Feb (2)	_Mar	_Apr (22)	_May	_Jun	_Jul (1)	_Aug (29)	_Sep (17)	_Oct (4)	_Nov	_Dec (19)
2010	_Jan	_Feb (9)	_Mar (2)	_Apr (34)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2011	_Jan (2)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2012	_Jan	_Feb	_Mar	_Apr	_May (2)	_Jun	_Jul	_Aug	_Sep (2)	_Oct	_Nov	_Dec
2013	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (25)	_Nov (22)	_Dec (3)
2014	_Jan (1)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 2 3 4 5 .. 10 > >> (Page 3 of 10)

[Pojomatic-commits] [239] ignore eclipse detrius

From: Ian R. <iro...@us...> - 2013-10-06 17:26:17

Revision: 239
Author:   iroberts
Date:     2013-10-06 17:26:15 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
ignore eclipse detrius

Property Changed:
----------------
    trunk/pojomatic-all/pojomatic-benchmark/

[Pojomatic-commits] [238] and it appears notification works

From: Ian R. <iro...@us...> - 2012-09-15 20:19:04

Revision: 238
Author:   iroberts
Date:     2012-09-15 20:19:03 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
and it appears notification works

Removed Paths:
-------------
    trunk/pojomatic-all/foo

[Pojomatic-commits] [237] testing notify script

From: Ian R. <iro...@us...> - 2012-09-15 20:18:22

Revision: 237
Author:   iroberts
Date:     2012-09-15 20:18:20 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
testing notify script

Added Paths:
-----------
    trunk/pojomatic-all/foo

[Pojomatic-commits] SF.net SVN: pojomatic:[236] trunk/pojomatic-all/pojomatic/src/main/java/org /pojomatic/Pojomatic.java

From: <iro...@us...> - 2012-05-16 17:11:17

Revision: 236
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=236&view=rev
Author:   iroberts
Date:     2012-05-16 17:11:11 +0000 (Wed, 16 May 2012)
Log Message:
-----------
warning cleanup

Modified Paths:
--------------
    trunk/pojomatic-all/pojomatic/src/main/java/org/pojomatic/Pojomatic.java

Modified: trunk/pojomatic-all/pojomatic/src/main/java/org/pojomatic/Pojomatic.java
===================================================================
--- trunk/pojomatic-all/pojomatic/src/main/java/org/pojomatic/Pojomatic.java	2012-05-16 17:01:09 UTC (rev 235)
+++ trunk/pojomatic-all/pojomatic/src/main/java/org/pojomatic/Pojomatic.java	2012-05-16 17:11:11 UTC (rev 236)
@@ -71,7 +71,7 @@
   private final static SelfPopulatingMap<Class<?>, Pojomator<?>> POJOMATORS =
     new SelfPopulatingMap<Class<?>, Pojomator<?>>() {
       @Override
-      @SuppressWarnings("unchecked")
+      @SuppressWarnings({ "unchecked", "rawtypes" })
       // compiler does not know that the type parameter to Pojomator is the same as the type
       // parameter to Class
       protected Pojomator<?> create(Class<?> key) {

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

[Pojomatic-commits] SF.net SVN: pojomatic:[235] trunk/pojomatic-all/pojomatic-test-utils/

From: <iro...@us...> - 2012-05-16 17:01:19

Revision: 235
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=235&view=rev
Author:   iroberts
Date:     2012-05-16 17:01:09 +0000 (Wed, 16 May 2012)
Log Message:
-----------
ignore eclipse detrius

Property Changed:
----------------
    trunk/pojomatic-all/pojomatic-test-utils/


Property changes on: trunk/pojomatic-all/pojomatic-test-utils
___________________________________________________________________
Modified: svn:ignore
   - target
.settings
.project
.classpath

   + target
.settings
.project
.classpath
bin


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

[Pojomatic-commits] SF.net SVN: pojomatic:[234] trunk/pojomatic-all/pojomatic-test-utils/src/ site/xdoc/changes.xml

From: <chr...@us...> - 2011-01-14 19:27:40

Revision: 234
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=234&view=rev
Author:   chriswhansen
Date:     2011-01-14 19:27:34 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
Added a warning to the SiteDocs about the backward-incompatible change to the JUnit version of assertEqualsWithDiff().

Modified Paths:
--------------
    trunk/pojomatic-all/pojomatic-test-utils/src/site/xdoc/changes.xml

Modified: trunk/pojomatic-all/pojomatic-test-utils/src/site/xdoc/changes.xml
===================================================================
--- trunk/pojomatic-all/pojomatic-test-utils/src/site/xdoc/changes.xml	2011-01-14 19:20:25 UTC (rev 233)
+++ trunk/pojomatic-all/pojomatic-test-utils/src/site/xdoc/changes.xml	2011-01-14 19:27:34 UTC (rev 234)
@@ -7,6 +7,15 @@
   </properties>
   <body>
     <section name="Changes in Pojomatic Test Utils">
+      <subsection name="Version ..., released ...">
+        <ul>
+          <li>
+            Changed the signature of org.pojomatic.junit.PojomaticAssert.assertEqualsWithDiff()
+            such that the message parameter appears first in order to match the style of the
+            standard JUnit assertions. Warning: this is a backward-incompatible change.
+          </li>
+        </ul>
+      </subsection>
       <subsection name="Version 1.0, released 2010-04-25">
         <ul>
           <li>


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

[Pojomatic-commits] SF.net SVN: pojomatic:[233] trunk/pojomatic-all/pojomatic-test-utils/src

From: <chr...@us...> - 2011-01-14 19:20:32

Revision: 233
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=233&view=rev
Author:   chriswhansen
Date:     2011-01-14 19:20:25 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
Correct the signature of the JUnit version of PojomaticAssert.assertEqualsWithDiff() to make it look more like the methods in org.junit.Assert.* (i.e. message first)

Modified Paths:
--------------
    trunk/pojomatic-all/pojomatic-test-utils/src/main/java/org/pojomatic/junit/PojomaticAssert.java
    trunk/pojomatic-all/pojomatic-test-utils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java

Modified: trunk/pojomatic-all/pojomatic-test-utils/src/main/java/org/pojomatic/junit/PojomaticAssert.java
===================================================================
--- trunk/pojomatic-all/pojomatic-test-utils/src/main/java/org/pojomatic/junit/PojomaticAssert.java	2010-04-25 07:11:23 UTC (rev 232)
+++ trunk/pojomatic-all/pojomatic-test-utils/src/main/java/org/pojomatic/junit/PojomaticAssert.java	2011-01-14 19:20:25 UTC (rev 233)
@@ -18,10 +18,10 @@
    * @param expected the expected object
    * @param actual the object which should be tested to equal the expected object
    * @throws AssertionError if the objects are not equal.
-   * @see #assertEqualsWithDiff(Object, Object, String)
+   * @see #assertEqualsWithDiff(String, Object, Object)
    */
   public static void assertEqualsWithDiff(Object expected, Object actual) {
-    assertEqualsWithDiff(expected, actual, null);
+    assertEqualsWithDiff(null, expected, actual);
   }
 
   /**
@@ -29,14 +29,14 @@
    * {@link Object#equals(Object)}. If not, an {@code AssertionError} is thrown. If the objects are
    * not equal, but the types of two objects are compatible for equality, then the differences as
    * determined by {@link Pojomatic#diff(Object, Object)} are included in the failure message.
-   *
+   * @param message a message (possibly {@code null}) to include at the beginning of the
+   *   {@code AssertionError} message.
    * @param expected the expected object
    * @param actual the object which should be tested to equal the expected object
-   * @param message a message (possibly {@code null}) to include at the beginning of the
-   *   {@code AssertionError} message.
+   *
    * @throws AssertionError if the objects are not equal.
    */
-  public static void assertEqualsWithDiff(Object expected, Object actual, String message) {
+  public static void assertEqualsWithDiff(String message, Object expected, Object actual) {
     AssertUtils.assertEquals(message, expected, actual);
   }
 

Modified: trunk/pojomatic-all/pojomatic-test-utils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java
===================================================================
--- trunk/pojomatic-all/pojomatic-test-utils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java	2010-04-25 07:11:23 UTC (rev 232)
+++ trunk/pojomatic-all/pojomatic-test-utils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java	2011-01-14 19:20:25 UTC (rev 233)
@@ -10,7 +10,7 @@
 
   @Override
   protected void performAssertEquals(Object expected, Object actual, String message) {
-    PojomaticAssert.assertEqualsWithDiff(expected, actual, message);
+    PojomaticAssert.assertEqualsWithDiff(message, expected, actual);
   }
 
 


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

[Pojomatic-commits] SF.net SVN: pojomatic:[232] trunk/pojomatic-all

From: <iro...@us...> - 2010-04-25 07:11:29

Revision: 232
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=232&view=rev
Author:   iroberts
Date:     2010-04-25 07:11:23 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/pojomatic-all/pojomatic/pom.xml
    trunk/pojomatic-all/pojomatic-test-utils/pom.xml
    trunk/pojomatic-all/pom.xml

Modified: trunk/pojomatic-all/pojomatic/pom.xml
===================================================================
--- trunk/pojomatic-all/pojomatic/pom.xml	2010-04-25 07:11:18 UTC (rev 231)
+++ trunk/pojomatic-all/pojomatic/pom.xml	2010-04-25 07:11:23 UTC (rev 232)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>pojomatic-all</artifactId>
     <groupId>org.pojomatic</groupId>
-    <version>1.0</version>
+    <version>trunk-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/pojomatic-all/pojomatic-test-utils/pom.xml
===================================================================
--- trunk/pojomatic-all/pojomatic-test-utils/pom.xml	2010-04-25 07:11:18 UTC (rev 231)
+++ trunk/pojomatic-all/pojomatic-test-utils/pom.xml	2010-04-25 07:11:23 UTC (rev 232)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>pojomatic-all</artifactId>
     <groupId>org.pojomatic</groupId>
-    <version>1.0</version>
+    <version>trunk-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/pojomatic-all/pom.xml
===================================================================
--- trunk/pojomatic-all/pom.xml	2010-04-25 07:11:18 UTC (rev 231)
+++ trunk/pojomatic-all/pom.xml	2010-04-25 07:11:23 UTC (rev 232)
@@ -3,7 +3,7 @@
   <groupId>org.pojomatic</groupId>
   <artifactId>pojomatic-all</artifactId>
   <packaging>pom</packaging>
-  <version>1.0</version>
+  <version>trunk-SNAPSHOT</version>
   <name>PojomaticAll</name>
   <description>
     Parent and aggregator for all artifacts related to the Pojomatic project.
@@ -11,9 +11,9 @@
   <url>http://www.pojomatic.org</url>
   <inceptionYear>2008</inceptionYear>
   <scm>
-    <connection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</connection>
-    <developerConnection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</developerConnection>
-    <url>https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</url>
+    <connection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</connection>
+    <developerConnection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</developerConnection>
+    <url>https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</url>
   </scm>
 
   <dependencies>


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

[Pojomatic-commits] SF.net SVN: pojomatic:[231] tags/pojomatic-all-1.0/

From: <iro...@us...> - 2010-04-25 07:11:27

Revision: 231
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=231&view=rev
Author:   iroberts
Date:     2010-04-25 07:11:18 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
[maven-scm] copy for tag pojomatic-all-1.0

Added Paths:
-----------
    tags/pojomatic-all-1.0/


Property changes on: tags/pojomatic-all-1.0
___________________________________________________________________
Added: svn:ignore
   + target
.settings
.project

Added: svn:mergeinfo
   + /branches/TestUtils:133-144


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

[Pojomatic-commits] SF.net SVN: pojomatic:[230] trunk/pojomatic-all

From: <iro...@us...> - 2010-04-25 07:11:14

Revision: 230
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=230&view=rev
Author:   iroberts
Date:     2010-04-25 07:11:07 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
[maven-release-plugin] prepare release pojomatic-all-1.0

Modified Paths:
--------------
    trunk/pojomatic-all/pojomatic/pom.xml
    trunk/pojomatic-all/pojomatic-test-utils/pom.xml
    trunk/pojomatic-all/pom.xml

Modified: trunk/pojomatic-all/pojomatic/pom.xml
===================================================================
--- trunk/pojomatic-all/pojomatic/pom.xml	2010-04-25 07:09:46 UTC (rev 229)
+++ trunk/pojomatic-all/pojomatic/pom.xml	2010-04-25 07:11:07 UTC (rev 230)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>pojomatic-all</artifactId>
     <groupId>org.pojomatic</groupId>
-    <version>trunk-SNAPSHOT</version>
+    <version>1.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/pojomatic-all/pojomatic-test-utils/pom.xml
===================================================================
--- trunk/pojomatic-all/pojomatic-test-utils/pom.xml	2010-04-25 07:09:46 UTC (rev 229)
+++ trunk/pojomatic-all/pojomatic-test-utils/pom.xml	2010-04-25 07:11:07 UTC (rev 230)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>pojomatic-all</artifactId>
     <groupId>org.pojomatic</groupId>
-    <version>trunk-SNAPSHOT</version>
+    <version>1.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/pojomatic-all/pom.xml
===================================================================
--- trunk/pojomatic-all/pom.xml	2010-04-25 07:09:46 UTC (rev 229)
+++ trunk/pojomatic-all/pom.xml	2010-04-25 07:11:07 UTC (rev 230)
@@ -3,7 +3,7 @@
   <groupId>org.pojomatic</groupId>
   <artifactId>pojomatic-all</artifactId>
   <packaging>pom</packaging>
-  <version>trunk-SNAPSHOT</version>
+  <version>1.0</version>
   <name>PojomaticAll</name>
   <description>
     Parent and aggregator for all artifacts related to the Pojomatic project.
@@ -11,9 +11,9 @@
   <url>http://www.pojomatic.org</url>
   <inceptionYear>2008</inceptionYear>
   <scm>
-    <connection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</connection>
-    <developerConnection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</developerConnection>
-    <url>https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</url>
+    <connection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</connection>
+    <developerConnection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</developerConnection>
+    <url>https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</url>
   </scm>
 
   <dependencies>


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

[Pojomatic-commits] SF.net SVN: pojomatic:[229] tags/pojomatic-all-1.0/

From: <iro...@us...> - 2010-04-25 07:09:52

Revision: 229
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=229&view=rev
Author:   iroberts
Date:     2010-04-25 07:09:46 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
premature release

Removed Paths:
-------------
    tags/pojomatic-all-1.0/


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

[Pojomatic-commits] SF.net SVN: pojomatic:[228] trunk/pojomatic-all/pojomatic

From: <iro...@us...> - 2010-04-25 07:09:05

Revision: 228
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=228&view=rev
Author:   iroberts
Date:     2010-04-25 07:08:59 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
prepare for release

Modified Paths:
--------------
    trunk/pojomatic-all/pojomatic/src/site/xdoc/changes.xml
    trunk/pojomatic-all/pojomatic-test-utils/src/site/xdoc/changes.xml

Modified: trunk/pojomatic-all/pojomatic/src/site/xdoc/changes.xml
===================================================================
--- trunk/pojomatic-all/pojomatic/src/site/xdoc/changes.xml	2010-04-25 06:17:40 UTC (rev 227)
+++ trunk/pojomatic-all/pojomatic/src/site/xdoc/changes.xml	2010-04-25 07:08:59 UTC (rev 228)
@@ -7,6 +7,18 @@
   </properties>
   <body>
     <section name="Changes in Pojomatic">
+      <subsection name="Release 1.0 (2010-04-25)">
+        <ul>
+          <li>
+            Simplification of the Differences API.  As part of this simplification,
+            <code><a href="apidocs/org/pojomatic/Pojomatic.html#diff%28T,%20S%29">Pojomatic.diff</a></code>
+            now requires that both arguments be non-null.
+          </li>
+          <li>
+            Add new method, <a href="apidocs/org/pojomatic/Pojomatic.html#areCompatibleForEquals(java.lang.Class,%20java.lang.Class)">Pojomatic.areCompatibleForEquals</a>.
+          </li>
+        </ul>
+      </subsection>
       <subsection name="Release 1.0-RC3 (2009-12-06)">
         <ul>
           <li>

Modified: trunk/pojomatic-all/pojomatic-test-utils/src/site/xdoc/changes.xml
===================================================================
--- trunk/pojomatic-all/pojomatic-test-utils/src/site/xdoc/changes.xml	2010-04-25 06:17:40 UTC (rev 227)
+++ trunk/pojomatic-all/pojomatic-test-utils/src/site/xdoc/changes.xml	2010-04-25 07:08:59 UTC (rev 228)
@@ -7,13 +7,20 @@
   </properties>
   <body>
     <section name="Changes in Pojomatic Test Utils">
-      <subsection name="Version 1.0, released 2010-04-16">
+      <subsection name="Version 1.0, released 2010-04-25">
         <ul>
           <li>
+            Updates to handle changes to Pojomatic's differences API.
+          </li>
+        </ul>
+      </subsection>
+      <subsection name="Version 1.0-RC3, released 2009-12-07">
+        <ul>
+          <li>
             Initial Release.
           </li>
         </ul>
       </subsection>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>


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

[Pojomatic-commits] SF.net SVN: pojomatic:[227] trunk/pojomatic-all

From: <iro...@us...> - 2010-04-25 06:17:49

Revision: 227
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=227&view=rev
Author:   iroberts
Date:     2010-04-25 06:17:40 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/pojomatic-all/pojomatic/pom.xml
    trunk/pojomatic-all/pojomatic-test-utils/pom.xml
    trunk/pojomatic-all/pom.xml

Modified: trunk/pojomatic-all/pojomatic/pom.xml
===================================================================
--- trunk/pojomatic-all/pojomatic/pom.xml	2010-04-25 06:17:35 UTC (rev 226)
+++ trunk/pojomatic-all/pojomatic/pom.xml	2010-04-25 06:17:40 UTC (rev 227)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>pojomatic-all</artifactId>
     <groupId>org.pojomatic</groupId>
-    <version>1.0</version>
+    <version>trunk-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/pojomatic-all/pojomatic-test-utils/pom.xml
===================================================================
--- trunk/pojomatic-all/pojomatic-test-utils/pom.xml	2010-04-25 06:17:35 UTC (rev 226)
+++ trunk/pojomatic-all/pojomatic-test-utils/pom.xml	2010-04-25 06:17:40 UTC (rev 227)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>pojomatic-all</artifactId>
     <groupId>org.pojomatic</groupId>
-    <version>1.0</version>
+    <version>trunk-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/pojomatic-all/pom.xml
===================================================================
--- trunk/pojomatic-all/pom.xml	2010-04-25 06:17:35 UTC (rev 226)
+++ trunk/pojomatic-all/pom.xml	2010-04-25 06:17:40 UTC (rev 227)
@@ -3,7 +3,7 @@
   <groupId>org.pojomatic</groupId>
   <artifactId>pojomatic-all</artifactId>
   <packaging>pom</packaging>
-  <version>1.0</version>
+  <version>trunk-SNAPSHOT</version>
   <name>PojomaticAll</name>
   <description>
     Parent and aggregator for all artifacts related to the Pojomatic project.
@@ -11,9 +11,9 @@
   <url>http://www.pojomatic.org</url>
   <inceptionYear>2008</inceptionYear>
   <scm>
-    <connection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</connection>
-    <developerConnection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</developerConnection>
-    <url>https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</url>
+    <connection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</connection>
+    <developerConnection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</developerConnection>
+    <url>https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</url>
   </scm>
 
   <dependencies>


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

[Pojomatic-commits] SF.net SVN: pojomatic:[226] tags/pojomatic-all-1.0/

From: <iro...@us...> - 2010-04-25 06:17:41

Revision: 226
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=226&view=rev
Author:   iroberts
Date:     2010-04-25 06:17:35 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
[maven-scm] copy for tag pojomatic-all-1.0

Added Paths:
-----------
    tags/pojomatic-all-1.0/


Property changes on: tags/pojomatic-all-1.0
___________________________________________________________________
Added: svn:ignore
   + target
.settings
.project

Added: svn:mergeinfo
   + /branches/TestUtils:133-144


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

[Pojomatic-commits] SF.net SVN: pojomatic:[225] trunk/pojomatic-all

From: <iro...@us...> - 2010-04-25 06:17:31

Revision: 225
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=225&view=rev
Author:   iroberts
Date:     2010-04-25 06:17:25 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
[maven-release-plugin] prepare release pojomatic-all-1.0

Modified Paths:
--------------
    trunk/pojomatic-all/pojomatic/pom.xml
    trunk/pojomatic-all/pojomatic-test-utils/pom.xml
    trunk/pojomatic-all/pom.xml

Modified: trunk/pojomatic-all/pojomatic/pom.xml
===================================================================
--- trunk/pojomatic-all/pojomatic/pom.xml	2010-04-25 06:15:18 UTC (rev 224)
+++ trunk/pojomatic-all/pojomatic/pom.xml	2010-04-25 06:17:25 UTC (rev 225)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>pojomatic-all</artifactId>
     <groupId>org.pojomatic</groupId>
-    <version>trunk-SNAPSHOT</version>
+    <version>1.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/pojomatic-all/pojomatic-test-utils/pom.xml
===================================================================
--- trunk/pojomatic-all/pojomatic-test-utils/pom.xml	2010-04-25 06:15:18 UTC (rev 224)
+++ trunk/pojomatic-all/pojomatic-test-utils/pom.xml	2010-04-25 06:17:25 UTC (rev 225)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>pojomatic-all</artifactId>
     <groupId>org.pojomatic</groupId>
-    <version>trunk-SNAPSHOT</version>
+    <version>1.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/pojomatic-all/pom.xml
===================================================================
--- trunk/pojomatic-all/pom.xml	2010-04-25 06:15:18 UTC (rev 224)
+++ trunk/pojomatic-all/pom.xml	2010-04-25 06:17:25 UTC (rev 225)
@@ -3,7 +3,7 @@
   <groupId>org.pojomatic</groupId>
   <artifactId>pojomatic-all</artifactId>
   <packaging>pom</packaging>
-  <version>trunk-SNAPSHOT</version>
+  <version>1.0</version>
   <name>PojomaticAll</name>
   <description>
     Parent and aggregator for all artifacts related to the Pojomatic project.
@@ -11,9 +11,9 @@
   <url>http://www.pojomatic.org</url>
   <inceptionYear>2008</inceptionYear>
   <scm>
-    <connection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</connection>
-    <developerConnection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</developerConnection>
-    <url>https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</url>
+    <connection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</connection>
+    <developerConnection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</developerConnection>
+    <url>https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/tags/pojomatic-all-1.0</url>
   </scm>
 
   <dependencies>


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

[Pojomatic-commits] SF.net SVN: pojomatic:[224] trunk/pojomatic-all

From: <iro...@us...> - 2010-04-25 06:15:24

Revision: 224
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=224&view=rev
Author:   iroberts
Date:     2010-04-25 06:15:18 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
misc maven fixes; say equals, hashCode and toString

Modified Paths:
--------------
    trunk/pojomatic-all/pojomatic/pom.xml
    trunk/pojomatic-all/pom.xml

Modified: trunk/pojomatic-all/pojomatic/pom.xml
===================================================================
--- trunk/pojomatic-all/pojomatic/pom.xml	2010-04-25 06:01:11 UTC (rev 223)
+++ trunk/pojomatic-all/pojomatic/pom.xml	2010-04-25 06:15:18 UTC (rev 224)
@@ -11,13 +11,8 @@
   <name>Pojomatic</name>
   <description>
     Automatically provides configurable implementations of the
-    equals(Object), toString() and hashCode() methods inherited from java.lang.Object
+    equals(Object), hashCode() and toString() methods inherited from java.lang.Object
   </description>
-  <scm>
-    <connection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all/pojomatic</connection>
-    <developerConnection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all/pojomatic</developerConnection>
-    <url>https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all/pojomatic</url>
-  </scm>
 
   <dependencies>
     <dependency>

Modified: trunk/pojomatic-all/pom.xml
===================================================================
--- trunk/pojomatic-all/pom.xml	2010-04-25 06:01:11 UTC (rev 223)
+++ trunk/pojomatic-all/pom.xml	2010-04-25 06:15:18 UTC (rev 224)
@@ -11,9 +11,9 @@
   <url>http://www.pojomatic.org</url>
   <inceptionYear>2008</inceptionYear>
   <scm>
-    <connection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/PojomaticAll</connection>
-    <developerConnection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/PojomaticAll</developerConnection>
-    <url>https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/PojomaticAll</url>
+    <connection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</connection>
+    <developerConnection>scm:svn:https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</developerConnection>
+    <url>https://pojomatic.svn.sourceforge.net/svnroot/pojomatic/trunk/pojomatic-all</url>
   </scm>
 
   <dependencies>
@@ -136,8 +136,8 @@
   </build>
 
   <modules>
-    <module>Pojomatic</module>
-    <module>PojomaticTestUtils</module>
+    <module>pojomatic</module>
+    <module>pojomatic-test-utils</module>
   </modules>
 
   <reporting>


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

[Pojomatic-commits] SF.net SVN: pojomatic:[223] trunk/pojomatic-all

From: <iro...@us...> - 2010-04-25 06:01:17

Revision: 223
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=223&view=rev
Author:   iroberts
Date:     2010-04-25 06:01:11 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
it appears maven will be happier if artifact ids match directory names

Added Paths:
-----------
    trunk/pojomatic-all/pojomatic-test-utils/

Removed Paths:
-------------
    trunk/pojomatic-all/PojomaticTestUtils/


Property changes on: trunk/pojomatic-all/pojomatic-test-utils
___________________________________________________________________
Added: svn:ignore
   + target
.settings
.project
.classpath

Added: svn:mergeinfo
   + /branches/TestUtils/PojomaticTestUtils:133-144


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

[Pojomatic-commits] SF.net SVN: pojomatic:[222] trunk/pojomatic-all

From: <iro...@us...> - 2010-04-25 06:00:48

Revision: 222
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=222&view=rev
Author:   iroberts
Date:     2010-04-25 06:00:42 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
it appears maven will be happier if artifact ids match directory names

Added Paths:
-----------
    trunk/pojomatic-all/pojomatic/

Removed Paths:
-------------
    trunk/pojomatic-all/Pojomatic/


Property changes on: trunk/pojomatic-all/pojomatic
___________________________________________________________________
Added: svn:ignore
   + target
.settings
.project
.classpath

Added: svn:mergeinfo
   + /branches/TestUtils/Pojomatic:133-144


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

[Pojomatic-commits] SF.net SVN: pojomatic:[221] trunk

From: <iro...@us...> - 2010-04-25 05:59:54

Revision: 221
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=221&view=rev
Author:   iroberts
Date:     2010-04-25 05:59:48 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
It appears maven will be happier if artifact ids match directory names

Added Paths:
-----------
    trunk/pojomatic-all/

Removed Paths:
-------------
    trunk/PojomaticAll/


Property changes on: trunk/pojomatic-all
___________________________________________________________________
Added: svn:ignore
   + target
.settings
.project

Added: svn:mergeinfo
   + /branches/TestUtils:133-144


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

[Pojomatic-commits] SF.net SVN: pojomatic:[220] trunk/PojomaticAll/PojomaticTestUtils

From: <iro...@us...> - 2010-04-25 05:46:19

Revision: 220
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=220&view=rev
Author:   iroberts
Date:     2010-04-25 05:46:13 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
javadoc fixes

Modified Paths:
--------------
    trunk/PojomaticAll/PojomaticTestUtils/pom.xml
    trunk/PojomaticAll/PojomaticTestUtils/src/main/java/org/pojomatic/junit/PojomaticAssert.java
    trunk/PojomaticAll/PojomaticTestUtils/src/main/javadoc/overview.html

Modified: trunk/PojomaticAll/PojomaticTestUtils/pom.xml
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/pom.xml	2010-04-25 05:21:42 UTC (rev 219)
+++ trunk/PojomaticAll/PojomaticTestUtils/pom.xml	2010-04-25 05:46:13 UTC (rev 220)
@@ -35,6 +35,15 @@
           <includeTests>true</includeTests>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <links>
+            <link>http://kentbeck.github.com/junit/javadoc/latest/</link>
+            <link>http://testng.org/javadoc/</link>
+          </links>
+        </configuration>
+      </plugin>
     </plugins>
   </reporting>
 </project>

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/main/java/org/pojomatic/junit/PojomaticAssert.java
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/main/java/org/pojomatic/junit/PojomaticAssert.java	2010-04-25 05:21:42 UTC (rev 219)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/main/java/org/pojomatic/junit/PojomaticAssert.java	2010-04-25 05:46:13 UTC (rev 220)
@@ -32,7 +32,7 @@
    *
    * @param expected the expected object
    * @param actual the object which should be tested to equal the expected object
-   * @param message a message (possibly {@code null) to include at the begining of the
+   * @param message a message (possibly {@code null}) to include at the beginning of the
    *   {@code AssertionError} message.
    * @throws AssertionError if the objects are not equal.
    */

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/main/javadoc/overview.html
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/main/javadoc/overview.html	2010-04-25 05:21:42 UTC (rev 219)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/main/javadoc/overview.html	2010-04-25 05:46:13 UTC (rev 220)
@@ -13,7 +13,7 @@
   the same basic behavior as the original, with the added feature that if the two objects being
   asserted to be equal are in fact not equal, but have types compatible for equality, then the
   message of the thrown {@code AssertionError} will include the differences between the two objects
-  as determined by {@link Pojomatic#diff(Object, Object)}.
+  as determined by {@link org.pojomatic.Pojomatic#diff(Object, Object) Pojomatic.diff}.
 </p>
 <p>
   Because Junit and TestNG disagree as to the order of the expected and actual parameters to


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

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

From: <iro...@us...> - 2010-04-25 05:21:48

Revision: 219
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=219&view=rev
Author:   iroberts
Date:     2010-04-25 05:21:42 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
misc spelling and javadoc corrections

Modified Paths:
--------------
    trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/Pojomator.java
    trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/AutoDetectPolicy.java
    trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/Property.java
    trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/SubclassCannotOverrideEquals.java
    trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/formatter/DefaultPropertyFormatter.java
    trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/formatter/PropertyFormatter.java
    trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/ClassProperties.java
    trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/PojomatorImpl.java
    trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/PropertyRole.java
    trunk/PojomaticAll/Pojomatic/src/main/javadoc/overview.html
    trunk/PojomaticAll/Pojomatic/src/site/xdoc/changes.xml
    trunk/PojomaticAll/Pojomatic/src/test/java/examples/Auto.java
    trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/formatter/DefaultPropertyFormatterTest.java
    trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/ClassPropertiesTest.java
    trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/PojomatorImplTest.java
    trunk/PojomaticAll/PojomaticTestUtils/src/main/java/org/pojomatic/test/AssertUtils.java
    trunk/PojomaticAll/PojomaticTestUtils/src/main/javadoc/overview.html

Modified: trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/Pojomator.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/Pojomator.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/Pojomator.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -121,7 +121,7 @@
    * </ul>
    * If {@code T} is an interface or is annotated with {@link SubclassCannotOverrideEquals},
    * then all subclasses of {@code T} are automatically assumed by {@code T}'s {@code Pojomator}
-   * to be comapatible for equals with each other and with {@code T}.  Note that in this case.
+   * to be compatible for equals with each other and with {@code T}.  Note that in this case.
    * to add an {@link OverridesEquals} annotation or additional
    * properties for inclusion in {@code equals} to a subclass of {@code T} will
    * result in a violation of the contract for {@link Object#equals(Object)}.
@@ -143,10 +143,10 @@
    * @return the differences between {@code instance} and {@code other}
    * among the properties examined by {@link #doEquals(Object, Object)}.
    * @throws NullPointerException if {@code instance} or {@code other} is null
-   * (this behavoir may change in future releases).
+   * (this behavior may change in future releases).
    * @throws IllegalArgumentException the type of {@code instance} or of {@code other} is not a
    * class which is compatible for equality with {@code T}
-   * (this behavoir may change in future releases).
+   * (this behavior may change in future releases).
    * @see #doEquals(Object, Object)
    */
   Differences doDiff(T instance, T other);

Modified: trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/AutoDetectPolicy.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/AutoDetectPolicy.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/AutoDetectPolicy.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -21,5 +21,5 @@
    *    a different {@link PojomaticPolicy} in {@link AutoProperty} without enabling
    *    property auto-detection.
    */
-  NONE;
+  NONE
 }

Modified: trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/Property.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/Property.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/Property.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -27,7 +27,7 @@
 
   /**
    * The name used to identify the property in the standard {@code toString} representation.  If
-   * empty, the following algorithm is used to determine the name.  For a propertiy referenced by
+   * empty, the following algorithm is used to determine the name.  For a property referenced by
    * field, the name of the field is used.  For a property referenced by a method whose name is of
    * the form {@code getSomeField}, the name {@code someField} will be used.  For a boolean property
    * referenced by a method whose name is of the form {@code isSomeField}, the name

Modified: trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/SubclassCannotOverrideEquals.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/SubclassCannotOverrideEquals.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/annotations/SubclassCannotOverrideEquals.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -7,7 +7,7 @@
 /**
  * Declares that a subclass of the annotated type cannot override the behavior of equals.
  *
- * Abent this annotation, it is assumed that subclasses cannot override {@code equals} for interface
+ * Absent this annotation, it is assumed that subclasses cannot override {@code equals} for interface
  * types, and can for other types.
  *
  * @see Pojomator#doEquals(Object, Object)

Modified: trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/formatter/DefaultPropertyFormatter.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/formatter/DefaultPropertyFormatter.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/formatter/DefaultPropertyFormatter.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -65,7 +65,7 @@
           return Arrays.toString((double[]) value);
         }
         else {
-          throw new IllegalStateException("unexpected primative array base type: " + componentClass);
+          throw new IllegalStateException("unexpected primitive array base type: " + componentClass);
         }
       }
       else {

Modified: trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/formatter/PropertyFormatter.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/formatter/PropertyFormatter.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/formatter/PropertyFormatter.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -11,7 +11,7 @@
    * Initialize the formatter for use; this method will be called exactly once on an instance, prior
    * to any calls to {@link #format(Object)}.  This method does not need to be
    * thread-safe.
-   * @param element
+   * @param element the field or method this formatter will be used for.
    */
   public void initialize(AnnotatedElement element);
 

Modified: trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/ClassProperties.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/ClassProperties.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/ClassProperties.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -106,10 +106,11 @@
 
   /**
    * Whether instances of {@code otherClass} are candidates for being equal to instances of
-   * {@code pojoClass}
-   * @param otherClass
+   * the class this {@code ClassProperties} instance was created for.
+   * @param otherClass the class to check for compatibility for equals with. 
    * @return {@code true} if instances of {@code otherClass} are candidates for being equal to
-   * instances of {@code pojoClass}, or {@code false} otherwise.
+   * instances of the class this {@code ClassProperties} instance was created for, or {@code false}
+   * otherwise.
    */
   public boolean isCompatibleForEquals(Class<?> otherClass) {
     if (!equalsParentClass.isAssignableFrom(otherClass)) {

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-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/PojomatorImpl.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -143,7 +143,7 @@
           else {
             // should NEVER happen
             throw new IllegalStateException(
-              "unknown primative type " + instanceComponentClass.getName());
+              "unknown primitive type " + instanceComponentClass.getName());
           }
         }
       }
@@ -299,7 +299,7 @@
             return false;
           }
         }
-        else { // instanceComponentClass is primative
+        else { // instanceComponentClass is primitive
           if (otherComponentClass != instanceComponentClass) {
             return false;
           }
@@ -347,7 +347,7 @@
           else {
             // should NEVER happen
             throw new IllegalStateException(
-              "unknown primative type " + instanceComponentClass.getName());
+              "unknown primitive type " + instanceComponentClass.getName());
           }
         }
       }

Modified: trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/PropertyRole.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/PropertyRole.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/internal/PropertyRole.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -1,5 +1,5 @@
 package org.pojomatic.internal;
 
 public enum PropertyRole {
-  EQUALS, HASH_CODE, TO_STRING;
+  EQUALS, HASH_CODE, TO_STRING
 }

Modified: trunk/PojomaticAll/Pojomatic/src/main/javadoc/overview.html
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/main/javadoc/overview.html	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/main/javadoc/overview.html	2010-04-25 05:21:42 UTC (rev 219)
@@ -133,7 +133,7 @@
 {@link org.pojomatic.formatter.DefaultPojoFormatter DefaultPojoFormatter}; you can specify your
 own formatting by providing an alternate implementation of
 {@link org.pojomatic.formatter.PojoFormatter PojoFormatter} and using the
-{@link org.pojomatic.annotations.PojoFormat PojoFormat} annotation.  In addition to controling the
+{@link org.pojomatic.annotations.PojoFormat PojoFormat} annotation.  In addition to controlling the
 overall format of {@code toString}, the formatting of individual properties can be controlled by
 a {@link org.pojomatic.annotations.PropertyFormat PropertyFormat} annotation referencing an
 implementation of {@link org.pojomatic.formatter.PropertyFormatter PropertyFormatter}.  In addition

Modified: trunk/PojomaticAll/Pojomatic/src/site/xdoc/changes.xml
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/site/xdoc/changes.xml	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/site/xdoc/changes.xml	2010-04-25 05:21:42 UTC (rev 219)
@@ -29,7 +29,7 @@
           </li>
           <li>
             Pojomatic will no longer add a method property multiple times if it is overridden
-            (even if the overridden method is explicitely annotated).
+            (even if the overridden method is explicitly annotated).
           </li>
           <li>
             <code><a href="apidocs/org/pojomatic/Pojomatic.html#diff%28T,%20S%29">Pojomatic.diff</a></code>
@@ -64,4 +64,4 @@
       </subsection>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>

Modified: trunk/PojomaticAll/Pojomatic/src/test/java/examples/Auto.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/test/java/examples/Auto.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/test/java/examples/Auto.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -11,7 +11,7 @@
   private boolean test; //included by default
 
   @Property(policy=NONE)
-  private int exlude;
+  private int exclude;
 
   @Property //include a method as well, even though it does not follow the getX convention
   public String derived() {
@@ -39,12 +39,12 @@
     this.test = test;
   }
 
-  public int getExlude() {
-    return exlude;
+  public int getExclude() {
+    return exclude;
   }
 
-  public void setExlude(int exlude) {
-    this.exlude = exlude;
+  public void setExclude(int exclude) {
+    this.exclude = exclude;
   }
 
 }

Modified: trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/formatter/DefaultPropertyFormatterTest.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/formatter/DefaultPropertyFormatterTest.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/formatter/DefaultPropertyFormatterTest.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -69,7 +69,7 @@
       formatter.format(new Integer[][] {new Integer[] { 1, 2 }, new Integer[] {3, 4} }));
   }
 
-  @Test public void testFormatDoubleArrayOfPrimatives() {
+  @Test public void testFormatDoubleArrayOfPrimitives() {
     assertEquals(
       "[[1, 2], [3, 4]]",
       formatter.format(new int[][] {new int[] { 1, 2 }, new int[] {3, 4} }));

Modified: trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/ClassPropertiesTest.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/ClassPropertiesTest.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/ClassPropertiesTest.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -363,12 +363,12 @@
 
     // not getters
     public boolean isaEnabled() { return true; }
-    public int gettyIsAMueseum() { return 1; }
+    public int gettyIsAMuseum() { return 1; }
     public String thisIsNotAGetter() { return "really, it's not"; }
 
     // some methods we should not grab
     public void getHello() {}
-    public int getTripple(int arg) { return arg * 3; }
+    public int getTriple(int arg) { return arg * 3; }
 
 
     /* static fields are not detected */

Modified: trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/PojomatorImplTest.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/PojomatorImplTest.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/Pojomatic/src/test/java/org/pojomatic/internal/PojomatorImplTest.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -34,7 +34,7 @@
   private static final Pojomator<AccessCheckedProperties> ACCESS_CHECKED_PROPERTIES_POJOMATOR =
     makePojomatorImpl(AccessCheckedProperties.class);
 
-  private static final List<Class<?>> PRIMATIVE_TYPES = Arrays.<Class<?>>asList(
+  private static final List<Class<?>> PRIMITIVE_TYPES = Arrays.<Class<?>>asList(
     Boolean.TYPE, Byte.TYPE, Character.TYPE, Short.TYPE,
     Integer.TYPE, Long.TYPE, Float.TYPE, Double.TYPE);
 
@@ -80,7 +80,7 @@
       new ObjectProperty(null), new ObjectProperty("not null over here")));
   }
 
-  @Test public void testPrimativePropertyEquals() {
+  @Test public void testPrimitivePropertyEquals() {
     assertTrue(INT_PROPERTY_POJOMATOR.doEquals(new IntProperty(3), new IntProperty(3)));
     assertFalse(INT_PROPERTY_POJOMATOR.doEquals(new IntProperty(3), new IntProperty(4)));
   }
@@ -108,7 +108,7 @@
   @Test public void testPrimitiveArrayEquals() throws Exception {
     final ObjectProperty nullProperty = new ObjectProperty(null);
     final ObjectProperty objectArrayProperty = new ObjectProperty(new String[] {"foo"});
-    for (Class<?> primitiveType : PRIMATIVE_TYPES) {
+    for (Class<?> primitiveType : PRIMITIVE_TYPES) {
       ObjectProperty main = new ObjectProperty(Array.newInstance(primitiveType, 3));
       ObjectProperty other = new ObjectProperty(Array.newInstance(primitiveType, 3));
       ObjectProperty different = new ObjectProperty(Array.newInstance(primitiveType, 4));
@@ -181,7 +181,7 @@
       OBJECT_PAIR_PROPERTY_POJOMATOR.doHashCode(new ObjectPairProperty("foo", "bar")));
   }
 
-  @Test public void testPrimativeHashCode() {
+  @Test public void testPrimitiveHashCode() {
     assertEquals(
       HASH_CODE_MULTIPLIER * HASH_CODE_SEED + 7,
       INT_PROPERTY_POJOMATOR.doHashCode(new IntProperty(7)));
@@ -194,17 +194,17 @@
       OBJECT_PROPERTY_POJOMATOR.doHashCode(new ObjectProperty(strings)));
   }
 
-  @Test public void testPrimativeArrayHashCode() throws Exception {
-    for (Class<?> primitiveType : PRIMATIVE_TYPES) {
-      Object primativeArray = Array.newInstance(primitiveType, 2);
+  @Test public void testPrimitiveArrayHashCode() throws Exception {
+    for (Class<?> primitiveType : PRIMITIVE_TYPES) {
+      Object primitiveArray = Array.newInstance(primitiveType, 2);
       int expected = HASH_CODE_MULTIPLIER * HASH_CODE_SEED +
-        (Integer) Arrays.class.getDeclaredMethod("hashCode", primativeArray.getClass())
-        .invoke(null, primativeArray);
+        (Integer) Arrays.class.getDeclaredMethod("hashCode", primitiveArray.getClass())
+        .invoke(null, primitiveArray);
       assertEquals(
-        "primative type " + primitiveType,
+        "primitive type " + primitiveType,
         expected,
         OBJECT_PROPERTY_POJOMATOR.doHashCode(
-          new ObjectProperty(primativeArray)));
+          new ObjectProperty(primitiveArray)));
     }
   }
 
@@ -276,7 +276,7 @@
     @SuppressWarnings("unchecked") Pojomator<Object> misCastPojomator = (Pojomator<Object>) pojomator;
     try {
       misCastPojomator.doDiff(new ObjectPairProperty(1,2), "wrong");
-      fail("exception expcected");
+      fail("exception expected");
     }
     catch (IllegalArgumentException e) {
       assertEquals(
@@ -290,7 +290,7 @@
     @SuppressWarnings("unchecked") Pojomator<Object> misCastPojomator = (Pojomator<Object>) pojomator;
     try {
       misCastPojomator.doDiff("wrong", new ObjectPairProperty(1,2));
-      fail("exception expcected");
+      fail("exception expected");
     }
     catch (IllegalArgumentException e) {
       assertEquals(

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/main/java/org/pojomatic/test/AssertUtils.java
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/main/java/org/pojomatic/test/AssertUtils.java	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/main/java/org/pojomatic/test/AssertUtils.java	2010-04-25 05:21:42 UTC (rev 219)
@@ -12,6 +12,8 @@
    * Determines if two objects are both null or are equal according to
    * {@link Object#equals(Object)}.
    *
+   * @param first the first object to compare
+   * @param second the second object to compare
    * @return {@code true} if both objects are null,
    * or {@code first} is non-null and {@code first.equals(second)},
    * {@code false} otherwise

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/main/javadoc/overview.html
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/main/javadoc/overview.html	2010-04-24 23:58:36 UTC (rev 218)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/main/javadoc/overview.html	2010-04-25 05:21:42 UTC (rev 219)
@@ -16,7 +16,7 @@
   as determined by {@link Pojomatic#diff(Object, Object)}.
 </p>
 <p>
-  Because Junit and TestNG disagree as to the order of the expected and actual paramters to
+  Because Junit and TestNG disagree as to the order of the expected and actual parameters to
   {@code assertEquals}, two {@code PojomaticAssert} classes are provided:
   {@link org.pojomatic.junit.PojomaticAssert} and {@link org.pojomatic.testng.PojomaticAssert}.
 </p>


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

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

From: <iro...@us...> - 2010-04-24 23:58:42

Revision: 218
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=218&view=rev
Author:   iroberts
Date:     2010-04-24 23:58:36 +0000 (Sat, 24 Apr 2010)

Log Message:
-----------
The order should be equals, hashCode, toString.

Modified Paths:
--------------
    trunk/PojomaticAll/Pojomatic/src/site/xdoc/index.xml
    trunk/PojomaticAll/src/site/apt/index.apt

Modified: trunk/PojomaticAll/Pojomatic/src/site/xdoc/index.xml
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/site/xdoc/index.xml	2010-04-24 23:57:33 UTC (rev 217)
+++ trunk/PojomaticAll/Pojomatic/src/site/xdoc/index.xml	2010-04-24 23:58:36 UTC (rev 218)
@@ -14,8 +14,8 @@
   </head>
   <body>
 <p>
-Pojomatic provides configurable implementations of the <code>equals(Object)</code>, <code>toString()</code>
-and <code>hashCode()</code> methods inherited from <code>java.lang.Object</code>.
+Pojomatic provides configurable implementations of the <code>equals(Object)</code>, <code>hashCode()</code>
+and <code>toString()</code> methods inherited from <code>java.lang.Object</code>.
 </p>
 <p>For example, the following bean has been "pojomated":</p>
 <div class="source"><pre>
@@ -38,6 +38,10 @@
   </span><span class="s0">public </span><span class="s1">String getLastName() { return this</span><span class="s1">.lastName; }
   </span><span class="s0">public int </span><span class="s1">getAge() { return this</span><span class="s1">.age; }
 
+  @Override </span><span class="s0">public boolean </span><span class="s1">equals(Object o) {
+    </span><span class="s0">return </span><span class="s1">Pojomatic.equals(</span><span class="s0">this</span><span class="s1">, o);
+  }
+
   @Override </span><span class="s0">public int </span><span class="s1">hashCode() {
     </span><span class="s0">return </span><span class="s1">Pojomatic.hashCode(</span><span class="s0">this</span><span class="s1">);
   }
@@ -45,10 +49,6 @@
   @Override </span><span class="s0">public </span><span class="s1">String toString() {
     </span><span class="s0">return </span><span class="s1">Pojomatic.toString(</span><span class="s0">this</span><span class="s1">);
   }
-
-  @Override </span><span class="s0">public boolean </span><span class="s1">equals(Object o) {
-    </span><span class="s0">return </span><span class="s1">Pojomatic.equals(</span><span class="s0">this</span><span class="s1">, o);
-  }
 }
 </span></pre></div>
 <p>

Modified: trunk/PojomaticAll/src/site/apt/index.apt
===================================================================
--- trunk/PojomaticAll/src/site/apt/index.apt	2010-04-24 23:57:33 UTC (rev 217)
+++ trunk/PojomaticAll/src/site/apt/index.apt	2010-04-24 23:58:36 UTC (rev 218)
@@ -6,8 +6,8 @@
 
 {{{pojomatic/index.html}Pojomatic}}
 
-   Pojomatic provides configurable implementations of the <<<equals(Object)>>>, <<<toString()>>>
- and <<<hashCode()>>> methods inherited from <<<java.lang.Object>>>.
+   Pojomatic provides configurable implementations of the <<<equals(Object)>>>, <<<hashCode()>>>
+ and <<<toString()>>> methods inherited from <<<java.lang.Object>>>.
 
    For examples and a quick start guide, see the {{{pojomatic/index.html}pojomatic site}}. You can download Pojomatic from the {{{http://repo1.maven.org/maven2/org/pojomatic/}Maven central repository}} or {{{http://sourceforge.net/projects/pojomatic/files/}SourceForge}}. For more information, see the {{{http://sourceforge.net/projects/pojomatic/}SourceForge project page}}.
 


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

[Pojomatic-commits] SF.net SVN: pojomatic:[217] trunk/PojomaticAll/Pojomatic/src/main/java/org/ pojomatic/Pojomator.java

From: <iro...@us...> - 2010-04-24 23:57:39

Revision: 217
          http://pojomatic.svn.sourceforge.net/pojomatic/?rev=217&view=rev
Author:   iroberts
Date:     2010-04-24 23:57:33 +0000 (Sat, 24 Apr 2010)

Log Message:
-----------
Spelling.

Modified Paths:
--------------
    trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/Pojomator.java

Modified: trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/Pojomator.java
===================================================================
--- trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/Pojomator.java	2010-04-18 15:51:10 UTC (rev 216)
+++ trunk/PojomaticAll/Pojomatic/src/main/java/org/pojomatic/Pojomator.java	2010-04-24 23:57:33 UTC (rev 217)
@@ -16,7 +16,7 @@
 /**
  * A provider of the three standard {@code Object} methods,
  * {@link Object#equals(Object)}, {@link Object#hashCode()} and {@link Object#toString()}, as
- * well as a usefull method to aid in debugging, {@link #doDiff(Object, Object)}.
+ * well as a useful method to aid in debugging, {@link #doDiff(Object, Object)}.
  *
  * @param <T> the class this {@code Pojomator} is generated for.
  */


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

[Pojomatic-commits] SF.net SVN: pojomatic:[216] trunk/PojomaticAll/PojomaticTestUtils/src/test/ java/org/pojomatic

From: <chr...@us...> - 2010-04-18 15:51:16

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

Log Message:
-----------
Improve code coverage for PojomaticAssert.

Modified Paths:
--------------
    trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java
    trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertTest.java
    trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertUtilsTest.java
    trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/testng/PojomaticAssertTest.java

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java	2010-04-18 15:50:33 UTC (rev 215)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/junit/PojomaticAssertTest.java	2010-04-18 15:51:10 UTC (rev 216)
@@ -3,10 +3,15 @@
 import org.pojomatic.test.AssertTest;
 
 public class PojomaticAssertTest extends AssertTest {
+  @Override
+  protected void performAssertEquals(Object expected, Object actual) {
+    PojomaticAssert.assertEqualsWithDiff(expected, actual);
+  }
 
   @Override
   protected void performAssertEquals(Object expected, Object actual, String message) {
     PojomaticAssert.assertEqualsWithDiff(expected, actual, message);
   }
 
+
 }

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertTest.java
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertTest.java	2010-04-18 15:50:33 UTC (rev 215)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertTest.java	2010-04-18 15:51:10 UTC (rev 216)
@@ -11,12 +11,22 @@
  */
 public abstract class AssertTest {
 
+
   /**
    * Only the unit under test should throw {@link AssertionError}, so no assertions are allowed
-   * within the implementation of this method.
+   * to be thrown from within the implementation of this method.
    *
    * @param expected the expected object
    * @param actual the actual object
+   */
+  protected abstract void performAssertEquals(Object expected, Object actual);
+
+  /**
+   * Only the unit under test should throw {@link AssertionError}, so no assertions are allowed
+   * to be thrown from within the implementation of this method.
+   *
+   * @param expected the expected object
+   * @param actual the actual object
    * @param message the messaage to include with the assertion
    */
   protected abstract void performAssertEquals(Object expected, Object actual, String message);
@@ -34,15 +44,25 @@
 
   @Test
   public final void assertEqualsWhenEqual() {
-    performAssertEquals(new Container(3), new Container(3), "message");  
+    performAssertEquals(new Container(3), new Container(3), "message");
   }
 
   @Test
+  public final void assertEqualsWhenEqualNoMessage() {
+    performAssertEquals(new Container(3), new Container(3));
+  }
+
+  @Test
   public final void assertEqualsBothNull() {
     performAssertEquals(null, null, null);
   }
 
   @Test
+  public final void assertEqualsBothNullNoMessage() {
+    performAssertEquals(null, null);
+  }
+
+  @Test
   public final void assertEqualsNullExpected() {
     performAssertEquals(
       null, new Container(null), null,
@@ -50,6 +70,13 @@
   }
 
   @Test
+  public final void assertEqualsNullExpectedNoMessage() {
+    performAssertEquals(
+      null, new Container(null), null,
+      "expected is null, but actual is Container{test: {null}}");
+  }
+
+  @Test
   public final void assertEqualsNullActual() {
     performAssertEquals(
       new Container(null), null, null, "actual is null, but expected is Container{test: {null}}");
@@ -71,6 +98,17 @@
 
   @Test
   public final void assertEqualsNoMessage() {
+    try {
+      performAssertEquals(new Container("foo"), new Container("bar"));
+    }
+    catch (AssertionError e) {
+      assertEquals("differences between expected and actual:[test: {foo} versus {bar}]" +
+          " (expected:<Container{test: {foo}}> but was:<Container{test: {bar}}>)", e.getMessage());
+    }
+  }
+
+  @Test
+  public final void assertEqualsNullMessage() {
     performAssertEquals(
       new Container("foo"), new Container("bar"), null,
       "differences between expected and actual:[test: {foo} versus {bar}]" +
@@ -78,7 +116,7 @@
   }
 
   @Test
-  public final void assertEqualsMessag2() {
+  public final void assertEqualsMessage2() {
     String first = "foo";
     String second = "bar";
     performAssertEquals(

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertUtilsTest.java
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertUtilsTest.java	2010-04-18 15:50:33 UTC (rev 215)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/test/AssertUtilsTest.java	2010-04-18 15:51:10 UTC (rev 216)
@@ -7,6 +7,11 @@
 public class AssertUtilsTest extends AssertTest {
 
   @Override
+  protected void performAssertEquals(Object first, Object second) {
+    AssertUtils.assertEquals(null, first, second);
+  }
+
+  @Override
   protected void performAssertEquals(Object first, Object second, String message) {
     AssertUtils.assertEquals(message, first, second);
   }

Modified: trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/testng/PojomaticAssertTest.java
===================================================================
--- trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/testng/PojomaticAssertTest.java	2010-04-18 15:50:33 UTC (rev 215)
+++ trunk/PojomaticAll/PojomaticTestUtils/src/test/java/org/pojomatic/testng/PojomaticAssertTest.java	2010-04-18 15:51:10 UTC (rev 216)
@@ -5,9 +5,16 @@
 public class PojomaticAssertTest extends AssertTest {
 
   @Override
+  protected void performAssertEquals(Object expected, Object actual) {
+    //in TestNG, the arguments are included in any failure message in reverse order
+    PojomaticAssert.assertEqualsWithDiff(actual, expected);
+  }
+
+  @Override
   protected void performAssertEquals(Object expected, Object actual, String message) {
     //in TestNG, the arguments are included in any failure message in reverse order
     PojomaticAssert.assertEqualsWithDiff(actual, expected, message);
   }
 
+
 }


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

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

From: <chr...@us...> - 2010-04-18 15:50:39

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.

Flat | Threaded

<< < 1 2 3 4 5 .. 10 > >> (Page 3 of 10)

2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (12)	Nov (2)	Dec (15)
2009	Jan (7)	Feb (2)	Mar	Apr (22)	May	Jun	Jul (1)	Aug (29)	Sep (17)	Oct (4)	Nov	Dec (19)
2010	Jan	Feb (9)	Mar (2)	Apr (34)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2012	Jan	Feb	Mar	Apr	May (2)	Jun	Jul	Aug	Sep (2)	Oct	Nov	Dec
2013	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (25)	Nov (22)	Dec (3)
2014	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec