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.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit 5154296138f2584800a1c5f2939b88db62b41984 Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Oct 1 09:22:39 2014 +0000 Correct method name git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/slingstart-model@1628658 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/provisioning/model/Feature.java | 2 +- src/main/java/org/apache/sling/provisioning/model/ModelUtility.java | 4 ++-- .../java/org/apache/sling/provisioning/model/io/ModelReader.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/sling/provisioning/model/Feature.java b/src/main/java/org/apache/sling/provisioning/model/Feature.java index fd16df7..480e1b8 100644 --- a/src/main/java/org/apache/sling/provisioning/model/Feature.java +++ b/src/main/java/org/apache/sling/provisioning/model/Feature.java @@ -98,7 +98,7 @@ public class Feature * @param runModes The run modes. * @return The feature for the given run modes. */ - public RunMode getOrCreateFeature(final String[] runModes) { + public RunMode getOrCreateRunMode(final String[] runModes) { RunMode result = getRunMode(runModes); if ( result == null ) { result = new RunMode(runModes); diff --git a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java index d479810..3188d1c 100644 --- a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java +++ b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java @@ -49,7 +49,7 @@ public abstract class ModelUtility { // run modes for(final RunMode runMode : feature.getRunModes()) { - final RunMode baseRunMode = baseFeature.getOrCreateFeature(runMode.getRunModes()); + final RunMode baseRunMode = baseFeature.getOrCreateRunMode(runMode.getRunModes()); // artifact groups for(final ArtifactGroup group : runMode.getArtifactGroups()) { @@ -120,7 +120,7 @@ public abstract class ModelUtility { newFeature.getVariables().putAll(feature.getVariables()); for(final RunMode runMode : feature.getRunModes()) { - final RunMode newRunMode = newFeature.getOrCreateFeature(runMode.getRunModes()); + final RunMode newRunMode = newFeature.getOrCreateRunMode(runMode.getRunModes()); newRunMode.setComment(runMode.getComment()); newRunMode.setLocation(runMode.getLocation()); diff --git a/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java b/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java index 431fc42..c3833df 100644 --- a/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java +++ b/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java @@ -187,7 +187,7 @@ public class ModelReader { if ( this.feature.getRunMode(rm) != null ) { throw new IOException(exceptionPrefix + "Duplicate run mode in line " + this.lineNumberReader.getLineNumber() + ": " + line); } - this.runMode = this.feature.getOrCreateFeature(rm); + this.runMode = this.feature.getOrCreateRunMode(rm); this.init(this.runMode); this.artifactGroup = null; break; @@ -198,7 +198,7 @@ public class ModelReader { if ( this.feature.getRunMode(null) != null ) { throw new IOException(exceptionPrefix + "Duplicate global run mode in line " + this.lineNumberReader.getLineNumber() + ": " + line); } - this.runMode = this.feature.getOrCreateFeature(null); + this.runMode = this.feature.getOrCreateRunMode(null); this.init(this.runMode); this.artifactGroup = null; break; @@ -337,7 +337,7 @@ public class ModelReader { */ private void checkRunMode() throws IOException { if ( runMode == null ) { - runMode = this.feature.getOrCreateFeature(null); + runMode = this.feature.getOrCreateRunMode(null); } } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
