svn commit: r1767152 - /sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/MergeUtility.java

[cziegeler]

Author: cziegeler
Date: Sun Oct 30 12:47:48 2016
New Revision: 1767152

URL: http://svn.apache.org/viewvc?rev=1767152&view=rev
Log:
SLING-6218 : Make usage of MergeOptions easier

Modified:
    
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/MergeUtility.java

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/MergeUtility.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/MergeUtility.java?rev=1767152&r1=1767151&r2=1767152&view=diff
==============================================================================
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/MergeUtility.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/MergeUtility.java
 Sun Oct 30 12:47:48 2016
@@ -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;
         }
     }