[xwiki-notifications] r6584 - xwiki-platform/core/trunk/xwiki-patchservice/src/main/java/org/xwiki/platform/patchservice/impl

[sdumitriu (SVN)]

Author: sdumitriu
Date: 2008-01-02 13:41:02 +0100 (Wed, 02 Jan 2008)
New Revision: 6584

Modified:
   xwiki-platform/core/trunk/xwiki-patchservice/src/main/java/org/xwiki/platform/patchservice/impl/ClassPropertySetOperation.java
Log:
XWIKI-1977: Create a patchservice data model
Fix error in ClassPropertySetOperation.equals


Modified: xwiki-platform/core/trunk/xwiki-patchservice/src/main/java/org/xwiki/platform/patchservice/impl/ClassPropertySetOperation.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-patchservice/src/main/java/org/xwiki/platform/patchservice/impl/ClassPropertySetOperation.java	2008-01-02 12:30:25 UTC (rev 6583)
+++ xwiki-platform/core/trunk/xwiki-patchservice/src/main/java/org/xwiki/platform/patchservice/impl/ClassPropertySetOperation.java	2008-01-02 12:41:02 UTC (rev 6584)
@@ -119,7 +119,8 @@
     {
         try {
             ClassPropertySetOperation otherOperation = (ClassPropertySetOperation) other;
-            return (otherOperation.propertyType == this.propertyType)
+            return otherOperation.propertyType.equals(this.propertyType)
+                && (this.getType().equals(otherOperation.getType()))
                 && (this.propertyConfig.values().containsAll(otherOperation.propertyConfig
                     .values()))
                 && (otherOperation.propertyConfig.values().containsAll(this.propertyConfig