Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 58901 invoked from network); 14 Dec 2010 20:31:01 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Dec 2010 20:31:01 -0000 Received: (qmail 96171 invoked by uid 500); 14 Dec 2010 20:31:01 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 96140 invoked by uid 500); 14 Dec 2010 20:31:01 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 96133 invoked by uid 99); 14 Dec 2010 20:31:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Dec 2010 20:31:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 14 Dec 2010 20:31:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0ED7423889BF; Tue, 14 Dec 2010 20:30:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1049256 - in /cayenne/sandbox/cayenne-mixin/trunk: pom.xml src/main/java/org/apache/cayenne/mixin/changeset/ChangeSet.java src/main/java/org/apache/cayenne/mixin/changeset/GenericChangeSet.java Date: Tue, 14 Dec 2010 20:30:40 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101214203041.0ED7423889BF@eris.apache.org> Author: aadamchik Date: Tue Dec 14 20:30:40 2010 New Revision: 1049256 URL: http://svn.apache.org/viewvc?rev=1049256&view=rev Log: changeset package cleaning up Modified: cayenne/sandbox/cayenne-mixin/trunk/pom.xml cayenne/sandbox/cayenne-mixin/trunk/src/main/java/org/apache/cayenne/mixin/changeset/ChangeSet.java cayenne/sandbox/cayenne-mixin/trunk/src/main/java/org/apache/cayenne/mixin/changeset/GenericChangeSet.java Modified: cayenne/sandbox/cayenne-mixin/trunk/pom.xml URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-mixin/trunk/pom.xml?rev=1049256&r1=1049255&r2=1049256&view=diff ============================================================================== --- cayenne/sandbox/cayenne-mixin/trunk/pom.xml (original) +++ cayenne/sandbox/cayenne-mixin/trunk/pom.xml Tue Dec 14 20:30:40 2010 @@ -8,7 +8,7 @@ 3.1M1 cayenne-mixin - 3.1.0.7 + 3.1.0.8 Library: cayenne-mixin jar Modified: cayenne/sandbox/cayenne-mixin/trunk/src/main/java/org/apache/cayenne/mixin/changeset/ChangeSet.java URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-mixin/trunk/src/main/java/org/apache/cayenne/mixin/changeset/ChangeSet.java?rev=1049256&r1=1049255&r2=1049256&view=diff ============================================================================== --- cayenne/sandbox/cayenne-mixin/trunk/src/main/java/org/apache/cayenne/mixin/changeset/ChangeSet.java (original) +++ cayenne/sandbox/cayenne-mixin/trunk/src/main/java/org/apache/cayenne/mixin/changeset/ChangeSet.java Tue Dec 14 20:30:40 2010 @@ -33,5 +33,9 @@ public interface ChangeSet { public static final String OBJECT_ID_PROPERTY_NAME = "cayenne:objectId"; + /** + * Returns a map of changes for a given object in its context, keyed by property name. + * If the object is unchanged, an empty map is returned. + */ Map getChanges(Persistent object); } Modified: cayenne/sandbox/cayenne-mixin/trunk/src/main/java/org/apache/cayenne/mixin/changeset/GenericChangeSet.java URL: http://svn.apache.org/viewvc/cayenne/sandbox/cayenne-mixin/trunk/src/main/java/org/apache/cayenne/mixin/changeset/GenericChangeSet.java?rev=1049256&r1=1049255&r2=1049256&view=diff ============================================================================== --- cayenne/sandbox/cayenne-mixin/trunk/src/main/java/org/apache/cayenne/mixin/changeset/GenericChangeSet.java (original) +++ cayenne/sandbox/cayenne-mixin/trunk/src/main/java/org/apache/cayenne/mixin/changeset/GenericChangeSet.java Tue Dec 14 20:30:40 2010 @@ -18,6 +18,7 @@ ****************************************************************/ package org.apache.cayenne.mixin.changeset; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -43,13 +44,10 @@ public class GenericChangeSet implements this.diff = diff; } - /** - * Returns a map of changes for a given object in its context, keyed by property name. - * If the object is unchanged, an empty map is returned. - */ @Override public Map getChanges(Persistent object) { - return getChanges().get(object.getObjectId()); + Map changes = getChanges().get(object.getObjectId()); + return changes != null ? changes : Collections.EMPTY_MAP; } private Map> getChanges() {