Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-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 F0A067663 for ; Tue, 27 Dec 2011 22:50:49 +0000 (UTC) Received: (qmail 90438 invoked by uid 500); 27 Dec 2011 22:50:49 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 90400 invoked by uid 500); 27 Dec 2011 22:50:49 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 90393 invoked by uid 99); 27 Dec 2011 22:50:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Dec 2011 22:50:49 +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; Tue, 27 Dec 2011 22:50:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 984832388860; Tue, 27 Dec 2011 22:50:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1225045 - in /jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit: state/ChangeTree.java utils/Predicates.java Date: Tue, 27 Dec 2011 22:50:27 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111227225027.984832388860@eris.apache.org> Author: mduerig Date: Tue Dec 27 22:50:27 2011 New Revision: 1225045 URL: http://svn.apache.org/viewvc?rev=1225045&view=rev Log: Microkernel based prototype of JCR implementation (WIP) - fix hasChanges Added: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/utils/Predicates.java Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java?rev=1225045&r1=1225044&r2=1225045&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java Tue Dec 27 22:50:27 2011 @@ -4,6 +4,7 @@ import org.apache.jackrabbit.Path; import org.apache.jackrabbit.json.JsonValue; import org.apache.jackrabbit.spi.commons.iterator.Iterators; import org.apache.jackrabbit.spi.commons.iterator.Predicate; +import org.apache.jackrabbit.utils.Predicates; import javax.jcr.ItemExistsException; import javax.jcr.ItemNotFoundException; @@ -305,7 +306,14 @@ public class ChangeTree { * properties. */ public boolean hasChanges() { - return !childNodes.isEmpty() || !properties.isEmpty(); + return !properties.isEmpty() + || Predicates.exists(childNodes.values(), new Predicate() { + + @Override + public boolean evaluate(NodeDelta delta) { + return delta.isTransient(); + } + }); } /** Added: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/utils/Predicates.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/utils/Predicates.java?rev=1225045&view=auto ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/utils/Predicates.java (added) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/utils/Predicates.java Tue Dec 27 22:50:27 2011 @@ -0,0 +1,18 @@ +package org.apache.jackrabbit.utils; + +import org.apache.jackrabbit.spi.commons.iterator.Predicate; + +public final class Predicates { + + private Predicates() { } + + public static boolean exists(Iterable elements, Predicate predicate) { + for (T e : elements) { + if (predicate.evaluate(e)) { + return true; + } + } + + return false; + } +}