This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.6.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit d6876f66260312e7cc39b1c93aab6fd833f54817 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Sun Oct 30 12:47:48 2016 +0000 SLING-6218 : Make usage of MergeOptions easier git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1767152 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/provisioning/model/MergeUtility.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/sling/provisioning/model/MergeUtility.java b/src/main/java/org/apache/sling/provisioning/model/MergeUtility.java index 265643f..9cfdc3e 100644 --- a/src/main/java/org/apache/sling/provisioning/model/MergeUtility.java +++ b/src/main/java/org/apache/sling/provisioning/model/MergeUtility.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; /** - * Utility for merging two model. + * Utility for merging two models. * * @since 1.4 */ @@ -49,10 +49,12 @@ public abstract class MergeUtility { /** * Set to {@code true} if the remove run mode should be respected. - * @param handleRemoveRunMode + * @param handleRemoveRunMode Whether the remove run mode should be respected. + * @return This instance. */ - public void setHandleRemoveRunMode(boolean handleRemoveRunMode) { + public MergeOptions setHandleRemoveRunMode(boolean handleRemoveRunMode) { this.handleRemoveRunMode = handleRemoveRunMode; + return this; } /** @@ -67,9 +69,12 @@ public abstract class MergeUtility { /** * Set to {@code true} if the latest artifact should win on a merge. * Set to {@code false} if the artifact with the highest version should win + * @param latestArtifactWins Whether the latest artifact should win + * @return This instance. */ - public void setLatestArtifactWins(boolean latestArtifactWins) { + public MergeOptions setLatestArtifactWins(boolean latestArtifactWins) { this.latestArtifactWins = latestArtifactWins; + return this; } } -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.