svn commit: r1628658 - in /sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model: Feature.java ModelUtility.java io/ModelReader.java

[cziegeler]

Author: cziegeler
Date: Wed Oct  1 09:22:39 2014
New Revision: 1628658

URL: http://svn.apache.org/r1628658
Log:
Correct method name

Modified:
    
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/Feature.java
    
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
    
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java

Modified: 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/Feature.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/Feature.java?rev=1628658&r1=1628657&r2=1628658&view=diff
==============================================================================
--- 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/Feature.java
 (original)
+++ 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/Feature.java
 Wed Oct  1 09:22:39 2014
@@ -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);

Modified: 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java?rev=1628658&r1=1628657&r2=1628658&view=diff
==============================================================================
--- 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
 (original)
+++ 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
 Wed Oct  1 09:22:39 2014
@@ -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());
 

Modified: 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java?rev=1628658&r1=1628657&r2=1628658&view=diff
==============================================================================
--- 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
 (original)
+++ 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
 Wed Oct  1 09:22:39 2014
@@ -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);
         }
     }