You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2015/07/14 13:45:41 UTC
svn commit: r1690903 - in
/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model:
EffectiveModelProcessor.java Model.java io/ModelWriter.java
Author: sseifert
Date: Tue Jul 14 11:45:41 2015
New Revision: 1690903
URL: http://svn.apache.org/r1690903
Log:
fix some javadoc errors java 8 complains about
Modified:
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Model.java
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
Modified: sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java?rev=1690903&r1=1690902&r2=1690903&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java Tue Jul 14 11:45:41 2015
@@ -27,7 +27,9 @@ import java.util.Map.Entry;
import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
import org.apache.sling.provisioning.model.ModelUtility.VariableResolver;
-
+/**
+ * Resolves all variables and artifact dependencies for the {@link ModelUtility#getEffectiveModel(Model)} method.
+ */
class EffectiveModelProcessor extends ModelProcessor {
private final ResolverOptions options;
Modified: sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Model.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Model.java?rev=1690903&r1=1690902&r2=1690903&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Model.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Model.java Tue Jul 14 11:45:41 2015
@@ -45,8 +45,8 @@ public class Model extends Traceable {
/**
* Get or create the feature.
- * @param runModes The run modes.
- * @return The feature for the given run modes.
+ * @param name Feature name
+ * @return The feature for the given name.
*/
public Feature getOrCreateFeature(final String name) {
Feature result = getFeature(name);
Modified: sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java?rev=1690903&r1=1690902&r2=1690903&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java Tue Jul 14 11:45:41 2015
@@ -74,8 +74,8 @@ public class ModelWriter {
/**
* Writes the model to the writer.
* The writer is not closed.
- * @param writer
- * @param subystem
+ * @param writer Writer
+ * @param model Model
* @throws IOException
*/
public static void write(final Writer writer, final Model model)