| commit | f715e867be1134b7af1f7cdeedb796cd57320ac3 | [log] [tgz] |
|---|---|---|
| author | David Jencks <djencks@apache.org> | Fri Aug 24 20:13:12 2012 +0000 |
| committer | David Jencks <djencks@apache.org> | Fri Aug 24 20:13:12 2012 +0000 |
| tree | 9625fcfbe917420d7b22085bd522f308ebfee1a9 | |
| parent | 0395d30de34719d8539387ea72cee57dff539e10 [diff] |
FELIX-3456 minor code cleanup git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1377083 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java index 40171e2..acacd39 100644 --- a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java +++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
@@ -643,17 +643,14 @@ 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();
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java index 86713b8..f146dc7 100644 --- a/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java +++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
@@ -245,12 +245,6 @@ return props; } - - protected Object getService() - { - return this; - } - State getSatisfiedState() { return Factory.getInstance();
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java index 1987346..00c019a 100644 --- a/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java +++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
@@ -295,20 +295,6 @@ // 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();