Author: sseifert Date: Thu May 4 19:50:39 2017 New Revision: 1793864 URL: http://svn.apache.org/viewvc?rev=1793864&view=rev Log: fix javadoc errors
Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/PathEntry.java sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/OrderedJsonReader.java sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReader.java Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java?rev=1793864&r1=1793863&r2=1793864&view=diff ============================================================================== --- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java (original) +++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java Thu May 4 19:50:39 2017 @@ -153,6 +153,7 @@ public interface ContentCreator { * @param order specifies the position of the ACE in the containing ACL. (may be null) * Value should be one of these: * <table> + * <caption>Values</caption> * <tr><td>first</td><td>Place the target ACE as the first amongst its siblings</td></tr> * <tr><td>last</td><td>Place the target ACE as the last amongst its siblings</td></tr> * <tr><td>before xyz</td><td>Place the target ACE immediately before the sibling whose name is xyz</td></tr> Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/PathEntry.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/PathEntry.java?rev=1793864&r1=1793863&r2=1793864&view=diff ============================================================================== --- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/PathEntry.java (original) +++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/PathEntry.java Thu May 4 19:50:39 2017 @@ -74,9 +74,9 @@ public class PathEntry extends ImportOpt public static final String AUTOCHECKOUT_DIRECTIVE = "autoCheckout"; /** - * The ignore content readers directive specifying whether the available {@link ContentReader}s - * should be used during content loading. This is a string value that defaults to the empty - * string.. + * The ignore content readers directive specifying whether the available + * {@link org.apache.sling.jcr.contentloader.ContentReader}s should be used during + * content loading. This is a string value that defaults to the emptystring. * @since 2.0.4 */ public static final String IGNORE_CONTENT_READERS_DIRECTIVE = "ignoreImportProviders"; Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java?rev=1793864&r1=1793863&r2=1793864&view=diff ============================================================================== --- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java (original) +++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java Thu May 4 19:50:39 2017 @@ -336,6 +336,9 @@ public class JsonReader implements Conte * ], * } * </code> + * @param obj Object + * @param contentCreator Content creator + * @throws RepositoryException Repository exception */ protected void createPrincipals(Object obj, ContentCreator contentCreator) throws RepositoryException { if (obj instanceof JsonObject) { Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/OrderedJsonReader.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/OrderedJsonReader.java?rev=1793864&r1=1793863&r2=1793864&view=diff ============================================================================== --- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/OrderedJsonReader.java (original) +++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/OrderedJsonReader.java Thu May 4 19:50:39 2017 @@ -39,7 +39,7 @@ import javax.json.JsonValue; /** * Specific <code>JsonReader</code>, <code>OrderedJsonReader</code> parse json document exactly the same, * but does specific look up for SLING:ordered : [{SLING:name: "first", ...},{SLING:name: "second", ...}] - * type of structure that will force import of an orderable node with first & second + * type of structure that will force import of an orderable node with first and second * children, in that order. * Note that this is the reponsability of the json file to set appropriate node type / mixins. */ Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReader.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReader.java?rev=1793864&r1=1793863&r2=1793864&view=diff ============================================================================== --- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReader.java (original) +++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReader.java Thu May 4 19:50:39 2017 @@ -96,7 +96,7 @@ import org.xmlpull.v1.XmlPullParserExcep * </pre> * * If you want to include a binary file in your loaded content, you may specify it using a - * {@link org.apache.sling.jcr.contentloader.internal.readers.XmlReader.FileDescription <code><nt:file></code>} element. + * {@link org.apache.sling.jcr.contentloader.internal.readers.XmlReader.FileDescription} <code><nt:file></code> element. */ @Component @Service @@ -531,7 +531,7 @@ public class XmlReader implements Conten /** * Represents a reference to a file that is to be loaded into the repository. The file is referenced by an * XML element named <code><nt:file></code>, with the attributes <code>src</code>, - * <code>mimeType</code> and <code>lastModified</code>. <br/><br/>Example: + * <code>mimeType</code> and <code>lastModified</code>. <br><br>Example: * <pre> * <nt:file src="../../image.png" mimeType="image/png" lastModified="1977-06-01T07:00:00+0100" /> * </pre>