Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-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 B2A3318C5B for ; Mon, 14 Dec 2015 12:17:36 +0000 (UTC) Received: (qmail 91252 invoked by uid 500); 14 Dec 2015 12:17:36 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 91186 invoked by uid 500); 14 Dec 2015 12:17:36 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 91177 invoked by uid 99); 14 Dec 2015 12:17:36 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Dec 2015 12:17:36 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 299CB1A02D6 for ; Mon, 14 Dec 2015 12:17:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.246 X-Spam-Level: * X-Spam-Status: No, score=1.246 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id PLLfkUsbYlNB for ; Mon, 14 Dec 2015 12:17:35 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id E9639265DB for ; Mon, 14 Dec 2015 12:17:34 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 84E39E04C1 for ; Mon, 14 Dec 2015 12:17:34 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 861A13A024F for ; Mon, 14 Dec 2015 12:17:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1719887 - in /sling/trunk/bundles/commons/resourcebuilder/src: main/java/org/apache/sling/resourcebuilder/api/ main/java/org/apache/sling/resourcebuilder/impl/ test/java/org/apache/sling/resourcebuilder/impl/ Date: Mon, 14 Dec 2015 12:17:34 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151214121734.861A13A024F@svn01-us-west.apache.org> Author: bdelacretaz Date: Mon Dec 14 12:17:34 2015 New Revision: 1719887 URL: http://svn.apache.org/viewvc?rev=1719887&view=rev Log: SLING-5356 - better name for atParent() method Modified: sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java sling/trunk/bundles/commons/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java Modified: sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java?rev=1719887&r1=1719886&r2=1719887&view=diff ============================================================================== --- sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java (original) +++ sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java Mon Dec 14 12:17:34 2015 @@ -86,5 +86,5 @@ public interface ResourceBuilder { /** Reset the current parent Resource to the original one. * Also activates hierarchyMode which is the default mode. */ - ResourceBuilder resetParent(); + ResourceBuilder atParent(); } \ No newline at end of file Modified: sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java?rev=1719887&r1=1719886&r2=1719887&view=diff ============================================================================== --- sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java (original) +++ sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java Mon Dec 14 12:17:34 2015 @@ -56,7 +56,7 @@ public class ResourceBuilderImpl impleme originalParent = parent; resourceResolver = originalParent.getResourceResolver(); withIntermediatePrimaryType(null); - resetParent(); + atParent(); } @Override @@ -65,7 +65,7 @@ public class ResourceBuilderImpl impleme } @Override - public ResourceBuilder resetParent() { + public ResourceBuilder atParent() { currentParent = originalParent; hierarchyMode(); return this; Modified: sling/trunk/bundles/commons/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java?rev=1719887&r1=1719886&r2=1719887&view=diff ============================================================================== --- sling/trunk/bundles/commons/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java (original) +++ sling/trunk/bundles/commons/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java Mon Dec 14 12:17:34 2015 @@ -144,7 +144,7 @@ public class ResourceBuilderImplTest { .siblingsMode() .resource("one") .resource("two") - .resetParent() // also sets hierarchyMode + .atParent() // also sets hierarchyMode .resource("d/e") .resource("f/g") .siblingsMode() @@ -223,12 +223,12 @@ public class ResourceBuilderImplTest { .siblingsMode() .file("models.js", getClass().getResourceAsStream("/files/models.js"), "MT1", 42) .file("text.html", getClass().getResourceAsStream("/files/text.html"), "MT2", 43) - .resetParent() + .atParent() .resource("apps") .file("myapp.json", getClass().getResourceAsStream("/files/myapp.json"), "MT3", 44) - .resetParent() + .atParent() .resource("apps/content/myapp/resource") - .resetParent() + .atParent() .resource("apps/content", "title", "foo") .file("myapp.json", getClass().getResourceAsStream("/files/myapp.json"), "MT4", 45) .commit()