You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2012/08/24 22:13:12 UTC
svn commit: r1377083 - in
/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager:
AbstractComponentManager.java ComponentFactoryImpl.java
ImmediateComponentManager.java
Author: djencks
Date: Fri Aug 24 20:13:12 2012
New Revision: 1377083
URL: http://svn.apache.org/viewvc?rev=1377083&view=rev
Log:
FELIX-3456 minor code cleanup
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java?rev=1377083&r1=1377082&r2=1377083&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java Fri Aug 24 20:13:12 2012
@@ -643,17 +643,14 @@ public abstract class AbstractComponentM
protected abstract void deleteComponent( int reason );
/**
- * Returns the service object to be registered if the service element is
- * specified.
- * <p>
- * Extensions of this class may overwrite this method to return a
- * ServiceFactory to register in the case of a delayed or a service
- * factory component.
+ * All ComponentManagers are ServiceFactory instances
*
- * @return
+ * @return this as a ServiceFactory.
*/
- protected abstract Object getService();
-
+ private Object getService()
+ {
+ return this;
+ }
abstract State getSatisfiedState();
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java?rev=1377083&r1=1377082&r2=1377083&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java Fri Aug 24 20:13:12 2012
@@ -245,12 +245,6 @@ public class ComponentFactoryImpl extend
return props;
}
-
- protected Object getService()
- {
- return this;
- }
-
State getSatisfiedState()
{
return Factory.getInstance();
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java?rev=1377083&r1=1377082&r2=1377083&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java Fri Aug 24 20:13:12 2012
@@ -295,20 +295,6 @@ public class ImmediateComponentManager e
// nothing to do, we keep no references on per-Bundle services
}
-
- /**
- * Returns the service object to be registered if the service element is
- * specified.
- * <p/>
- * Extensions of this class may overwrite this method to return a
- * ServiceFactory to register in the case of a delayed or a service
- * factory component.
- */
- protected Object getService()
- {
- return this;
- }
-
State getSatisfiedState()
{
return Registered.getInstance();