Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 07BF010969 for ; Wed, 24 Apr 2013 15:15:20 +0000 (UTC) Received: (qmail 62303 invoked by uid 500); 24 Apr 2013 15:15:20 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 62283 invoked by uid 500); 24 Apr 2013 15:15:19 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 62275 invoked by uid 99); 24 Apr 2013 15:15:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Apr 2013 15:15:19 +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, 24 Apr 2013 15:15:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 98A2F23888EA; Wed, 24 Apr 2013 15:14:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1471470 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java Date: Wed, 24 Apr 2013 15:14:56 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130424151456.98A2F23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Wed Apr 24 15:14:56 2013 New Revision: 1471470 URL: http://svn.apache.org/r1471470 Log: more accurate variance annotations: reduce IDE warnings: Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java?rev=1471470&r1=1471469&r2=1471470&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java Wed Apr 24 15:14:56 2013 @@ -18,30 +18,29 @@ */ package org.apache.jackrabbit.oak.plugins.memory; +import static com.google.common.base.Preconditions.checkNotNull; + import java.util.Map; import java.util.Map.Entry; +import com.google.common.base.Function; +import com.google.common.collect.Iterables; import org.apache.jackrabbit.oak.spi.state.AbstractChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; -import com.google.common.base.Function; -import com.google.common.collect.Iterables; - -import static com.google.common.base.Preconditions.checkNotNull; - /** * Basic JavaBean implementation of a child node entry. */ public class MemoryChildNodeEntry extends AbstractChildNodeEntry { - public static Iterable iterable( - Iterable> set) { + public static > Iterable iterable( + Iterable set) { return Iterables.transform( set, - new Function, ChildNodeEntry>() { + new Function, ChildNodeEntry>() { @Override - public ChildNodeEntry apply(Entry input) { + public ChildNodeEntry apply(Entry input) { return new MemoryChildNodeEntry(input); } });