Return-Path: X-Original-To: apmail-syncope-commits-archive@www.apache.org Delivered-To: apmail-syncope-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8CAA7E91F for ; Wed, 23 Jan 2013 14:00:23 +0000 (UTC) Received: (qmail 2152 invoked by uid 500); 23 Jan 2013 14:00:23 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 2123 invoked by uid 500); 23 Jan 2013 14:00:23 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 2110 invoked by uid 99); 23 Jan 2013 14:00:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2013 14:00:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2013 14:00:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 105282388A91; Wed, 23 Jan 2013 14:00:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1437396 - in /syncope/trunk/common/src/main/java/org/apache/syncope/common/to: AbstractAttributableTO.java ConnInstanceTO.java MappingTO.java NotificationTaskTO.java RoleTO.java WorkflowFormTO.java Date: Wed, 23 Jan 2013 14:00:01 -0000 To: commits@syncope.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130123140002.105282388A91@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cschneider Date: Wed Jan 23 14:00:01 2013 New Revision: 1437396 URL: http://svn.apache.org/viewvc?rev=1437396&view=rev Log: SYNCOPE-288 Changing setters of TO classes to make them compatible with jaxb Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnInstanceTO.java syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MappingTO.java syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTaskTO.java syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java?rev=1437396&r1=1437395&r2=1437396&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java Wed Jan 23 14:00:01 2013 @@ -165,7 +165,9 @@ public abstract class AbstractAttributab } public void setPropagationTOs(final List propagationTOs) { - this.propagationTOs.clear(); - this.propagationTOs.addAll(propagationTOs); + if (this.propagationTOs != propagationTOs) { + this.propagationTOs.clear(); + this.propagationTOs.addAll(propagationTOs); + } } } Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnInstanceTO.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnInstanceTO.java?rev=1437396&r1=1437395&r2=1437396&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnInstanceTO.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnInstanceTO.java Wed Jan 23 14:00:01 2013 @@ -118,9 +118,11 @@ public class ConnInstanceTO extends Abst } public void setConfiguration(Set configuration) { - this.configuration.clear(); - if (configuration != null && !configuration.isEmpty()) { - this.configuration.addAll(configuration); + if (this.configuration != configuration) { + this.configuration.clear(); + if (configuration != null && !configuration.isEmpty()) { + this.configuration.addAll(configuration); + } } } @@ -147,9 +149,11 @@ public class ConnInstanceTO extends Abst } public void setCapabilities(final Set capabilities) { - this.capabilities.clear(); - if (capabilities != null && !capabilities.isEmpty()) { - this.capabilities.addAll(capabilities); + if (this.capabilities != capabilities) { + this.capabilities.clear(); + if (capabilities != null && !capabilities.isEmpty()) { + this.capabilities.addAll(capabilities); + } } } Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MappingTO.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MappingTO.java?rev=1437396&r1=1437395&r2=1437396&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MappingTO.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/MappingTO.java Wed Jan 23 14:00:01 2013 @@ -117,9 +117,11 @@ public class MappingTO extends AbstractB } public void setItems(final Collection items) { - this.items.clear(); - if (items != null && !items.isEmpty()) { - this.items.addAll(items); + if (this.items != items) { + this.items.clear(); + if (items != null && !items.isEmpty()) { + this.items.addAll(items); + } } } } Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTaskTO.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTaskTO.java?rev=1437396&r1=1437395&r2=1437396&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTaskTO.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/NotificationTaskTO.java Wed Jan 23 14:00:01 2013 @@ -60,9 +60,11 @@ public class NotificationTaskTO extends } public void setRecipients(final Set recipients) { - this.recipients.clear(); - if (recipients != null) { - this.recipients.addAll(recipients); + if (this.recipients != recipients) { + this.recipients.clear(); + if (recipients != null) { + this.recipients.addAll(recipients); + } } } Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java?rev=1437396&r1=1437395&r2=1437396&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/RoleTO.java Wed Jan 23 14:00:01 2013 @@ -135,9 +135,11 @@ public class RoleTO extends AbstractAttr } public void setEntitlements(final List entitlements) { - this.entitlements.clear(); - if (entitlements != null && !entitlements.isEmpty()) { - this.entitlements.addAll(entitlements); + if (this.entitlements != entitlements) { + this.entitlements.clear(); + if (entitlements != null && !entitlements.isEmpty()) { + this.entitlements.addAll(entitlements); + } } } Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java?rev=1437396&r1=1437395&r2=1437396&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java Wed Jan 23 14:00:01 2013 @@ -113,10 +113,11 @@ public class WorkflowFormTO extends Abst } public void setProperties(final Collection properties) { - - this.properties.clear(); - if (properties != null) { - this.properties.addAll(properties); + if (this.properties != properties) { + this.properties.clear(); + if (properties != null) { + this.properties.addAll(properties); + } } }