Author: sseifert
Date: Sat Oct 3 00:18:13 2015
New Revision: 1706512
URL: http://svn.apache.org/viewvc?rev=1706512&view=rev
Log:
cosmetic: fix javadoc errors
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java?rev=1706512&r1=1706511&r2=1706512&view=diff
==============================================================================
---
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
(original)
+++
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
Sat Oct 3 00:18:13 2015
@@ -51,6 +51,7 @@ public final class MockBundle implements
/**
* Constructor
+ * @param bundleContext Bundle context
*/
public MockBundle(BundleContext bundleContext) {
this.bundleId = ++bundleCounter;
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java?rev=1706512&r1=1706511&r2=1706512&view=diff
==============================================================================
---
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java
(original)
+++
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java
Sat Oct 3 00:18:13 2015
@@ -152,7 +152,7 @@ public final class MockOsgi {
* @param target Service instance.
* @param properties Properties
* @return true if activation method was called. False if no activate
method is defined.
- * @deprecated Please use {@link #activate(Object, BundleContext,
Dictionary))}
+ * @deprecated Please use {@link #activate(Object, BundleContext,
Dictionary)}
* and shutdown the bundle context after usage.
*/
@Deprecated
@@ -167,7 +167,7 @@ public final class MockOsgi {
* @param target Service instance.
* @param properties Properties
* @return true if activation method was called. False if no activate
method is defined.
- * @deprecated Please use {@link #activate(Object, BundleContext, Map)))}
+ * @deprecated Please use {@link #activate(Object, BundleContext, Map)}
* and shutdown the bundle context after usage.
*/
@Deprecated
@@ -226,7 +226,7 @@ public final class MockOsgi {
* @param target Service instance.
* @param properties Properties
* @return true if deactivation method was called. False if no deactivate
method is defined.
- * @deprecated Please use {@link #deactivate(Object, BundleContext,
Dictionary))}
+ * @deprecated Please use {@link #deactivate(Object, BundleContext,
Dictionary)}
* and shutdown the bundle context after usage.
*/
@Deprecated
@@ -241,7 +241,7 @@ public final class MockOsgi {
* @param target Service instance.
* @param properties Properties
* @return true if deactivation method was called. False if no deactivate
method is defined.
- * @deprecated Please use {@link #deactivate(Object, BundleContext, Map)))}
+ * @deprecated Please use {@link #deactivate(Object, BundleContext, Map)}
* and shutdown the bundle context after usage.
*/
@Deprecated
@@ -298,6 +298,7 @@ public final class MockOsgi {
/**
* Deactivates all bundles registered in the mocked bundle context.
+ * @param bundleContext Bundle context
*/
public static void shutdown(BundleContext bundleContext) {
((MockBundleContext)bundleContext).shutdown();
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java?rev=1706512&r1=1706511&r2=1706512&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
Sat Oct 3 00:18:13 2015
@@ -159,6 +159,7 @@ public final class MockSling {
/**
* Creates new sling resource resolver instance.
* @param type Type of underlying repository.
+ * @param bundleContext Bundle context
* @return Resource resolver instance
*/
public static ResourceResolver newResourceResolver(final
ResourceResolverType type, BundleContext bundleContext) {
@@ -173,6 +174,7 @@ public final class MockSling {
/**
* Creates new sling resource resolver instance using
* {@link #DEFAULT_RESOURCERESOLVER_TYPE}.
+ * @param bundleContext Bundle context
* @return Resource resolver instance
*/
public static ResourceResolver newResourceResolver(BundleContext
bundleContext) {
@@ -207,6 +209,7 @@ public final class MockSling {
/**
* Creates a new sling script helper instance using
* {@link #DEFAULT_RESOURCERESOLVER_TYPE} for the resource resolver.
+ * @param bundleContext Bundle context
* @return Sling script helper instance
*/
public static SlingScriptHelper newSlingScriptHelper(BundleContext
bundleContext) {
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java?rev=1706512&r1=1706511&r2=1706512&view=diff
==============================================================================
---
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
(original)
+++
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java
Sat Oct 3 00:18:13 2015
@@ -118,6 +118,7 @@ public class MockSlingHttpServletRequest
/**
* Instantiate with default resource resolver
+ * @param bundleContext Bundle context
*/
public MockSlingHttpServletRequest(BundleContext bundleContext) {
this(MockSling.newResourceResolver(bundleContext));
