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/02/19 00:41:06 UTC
svn commit: r1660766 - in
/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling:
MockAdapterManager.java services/MockModelAdapterFactory.java
Author: sseifert
Date: Wed Feb 18 23:41:06 2015
New Revision: 1660766
URL: http://svn.apache.org/r1660766
Log:
cosmetic code formatting changes
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManager.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/services/MockModelAdapterFactory.java
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManager.java?rev=1660766&r1=1660765&r2=1660766&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManager.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManager.java Wed Feb 18 23:41:06 2015
@@ -45,8 +45,7 @@ class MockAdapterManager implements Adap
// iterate over all adapter factories and try to adapt the object
if (this.bundleContext != null) {
try {
- ServiceReference[] references = bundleContext
- .getServiceReferences(AdapterFactory.class.getName(), null);
+ ServiceReference[] references = bundleContext.getServiceReferences(AdapterFactory.class.getName(), null);
for (ServiceReference serviceReference : references) {
AdapterFactory adapterFactory = (AdapterFactory) bundleContext.getService(serviceReference);
AdapterType instance = adapterFactory.getAdapter(adaptable, type);
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/services/MockModelAdapterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/services/MockModelAdapterFactory.java?rev=1660766&r1=1660765&r2=1660766&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/services/MockModelAdapterFactory.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/services/MockModelAdapterFactory.java Wed Feb 18 23:41:06 2015
@@ -66,10 +66,8 @@ public final class MockModelAdapterFacto
bundleContext = componentContext.getBundleContext();
// register service listener to collect injectors
- // this allows detecting injectors even if they are registered after
- // this bundle
- // (which is otherwise currently not supported in the osgi mock
- // environment)
+ // this allows detecting injectors even if they are registered after this bundle
+ // (which is otherwise currently not supported in the osgi mock environment)
bundleContext.addServiceListener(new InjectorServiceListener());
// activate service in simulated OSGi environment