Author: sseifert
Date: Tue Dec 9 23:01:37 2014
New Revision: 1644220
URL: http://svn.apache.org/r1644220
Log:
fix some javadoc errors/warnings
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockHelper.java
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java?rev=1644220&r1=1644219&r2=1644220&view=diff
==============================================================================
---
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
(original)
+++
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContext.java
Tue Dec 9 23:01:37 2014
@@ -58,7 +58,6 @@ public final class OsgiContext extends O
* @param tearDownCallback Allows the application to register an own
* callback function that is called before the built-in teardown
* rules are executed.
- * @param resourceResolverType Resource resolver type.
*/
public OsgiContext(final OsgiContextCallback setUpCallback, final
OsgiContextCallback tearDownCallback) {
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java?rev=1644220&r1=1644219&r2=1644220&view=diff
==============================================================================
---
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java
(original)
+++
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/junit/OsgiContextCallback.java
Tue Dec 9 23:01:37 2014
@@ -29,8 +29,7 @@ public interface OsgiContextCallback {
/**
* Execute callback action
* @param context OSGi context
- * @throws IOException
- * @throws PersistenceException
+ * @throws IOException I/O exception
*/
void execute(OsgiContext context) throws IOException;
Modified:
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockHelper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockHelper.java?rev=1644220&r1=1644219&r2=1644220&view=diff
==============================================================================
---
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockHelper.java
(original)
+++
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockHelper.java
Tue Dec 9 23:01:37 2014
@@ -49,16 +49,19 @@ public class MockHelper {
/**
* Create a new helper
+ * @param resolver Resource resolver
+ * @return this
*/
public static MockHelper create(final ResourceResolver resolver) {
return new MockHelper(resolver);
}
/**
- * Add a new resource
+ * Add a new resource.
* If the path is relative, this resource is added as a child to the
previous resource.
- * If the path is relative and starts with a dot, this resource is added
as a peer to
- * the previous resource.
+ * If the path is relative and starts with a dot, this resource is added
as a peer to the previous resource.
+ * @param path Resource path
+ * @return this
*/
public MockHelper resource(final String path) {
final String fullPath;
@@ -80,6 +83,9 @@ public class MockHelper {
/**
* Add a property to the current resource
+ * @param name Property name
+ * @param value Property value
+ * @return this
*/
public MockHelper p(final String name, final Object value) {
final Description d = this.stack.peek();
@@ -90,6 +96,7 @@ public class MockHelper {
/**
* Finish building and add all resources to the resource tree.
+ * @throws PersistenceException Persistence exception
*/
public void add() throws PersistenceException {
for(int i=0; i<this.stack.size(); i++) {
@@ -100,9 +107,8 @@ public class MockHelper {
}
/**
- * Finish building, add all resources to the resource tree and commit
- * changes.
- * @throws PersistenceException
+ * Finish building, add all resources to the resource tree and commit
changes.
+ * @throws PersistenceException Persistence exception
*/
public void commit() throws PersistenceException {
this.add();
Modified:
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java?rev=1644220&r1=1644219&r2=1644220&view=diff
==============================================================================
---
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
(original)
+++
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
Tue Dec 9 23:01:37 2014
@@ -55,6 +55,7 @@ public class MockResourceResolverFactory
/**
* Create a new resource resolver factory.
+ * @param options Options
*/
public MockResourceResolverFactory(final
MockResourceResolverFactoryOptions options) {
this.options = options;
@@ -111,11 +112,12 @@ public class MockResourceResolverFactory
/**
* Inform about a closed resource resolver.
* Make sure to remove it from the current thread context.
+ * @param resolver Resource resolver
*/
- public void closed(final ResourceResolver resourceResolverImpl) {
+ public void closed(final ResourceResolver resolver) {
final Stack<ResourceResolver> resolverStack =
resolverStackHolder.get();
if ( resolverStack != null ) {
- resolverStack.remove(resourceResolverImpl);
+ resolverStack.remove(resolver);
}
}
}
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java?rev=1644220&r1=1644219&r2=1644220&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextCallback.java
Tue Dec 9 23:01:37 2014
@@ -31,8 +31,8 @@ public interface SlingContextCallback {
/**
* Execute callback action
* @param context Sling context
- * @throws IOException
- * @throws PersistenceException
+ * @throws IOException I/O exception
+ * @throws PersistenceException Persistence exception
*/
void execute(SlingContext context) throws IOException,
PersistenceException;
