donaldp 2002/11/07 07:52:11
Modified: src/java/org/apache/avalon/framework/component
WrapperComponentManager.java
WrapperComponentSelector.java
src/java/org/apache/avalon/framework/service
WrapperServiceManager.java
WrapperServiceSelector.java
Log:
Homogenize the names
Revision Changes Path
1.4 +2 -2
jakarta-avalon/src/java/org/apache/avalon/framework/component/WrapperComponentManager.java
Index: WrapperComponentManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/WrapperComponentManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WrapperComponentManager.java 7 Nov 2002 15:51:26 -0000 1.3
+++ WrapperComponentManager.java 7 Nov 2002 15:52:11 -0000 1.4
@@ -98,7 +98,7 @@
if( component instanceof WrapperServiceSelector )
{
m_manager.
- release( ( (WrapperComponentSelector)component
).getWrappedServiceSelector() );
+ release( ( (WrapperComponentSelector)component
).getWrappedSelector() );
}
else
{
1.3 +2 -2
jakarta-avalon/src/java/org/apache/avalon/framework/component/WrapperComponentSelector.java
Index: WrapperComponentSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/WrapperComponentSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WrapperComponentSelector.java 7 Nov 2002 15:50:06 -0000 1.2
+++ WrapperComponentSelector.java 7 Nov 2002 15:52:11 -0000 1.3
@@ -165,7 +165,7 @@
*
* @return The {@link ServiceSelector} being wrapped.
*/
- ServiceSelector getWrappedServiceSelector()
+ ServiceSelector getWrappedSelector()
{
return m_selector;
}
1.4 +2 -2
jakarta-avalon/src/java/org/apache/avalon/framework/service/WrapperServiceManager.java
Index: WrapperServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/service/WrapperServiceManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WrapperServiceManager.java 7 Nov 2002 12:43:19 -0000 1.3
+++ WrapperServiceManager.java 7 Nov 2002 15:52:11 -0000 1.4
@@ -141,7 +141,7 @@
if ( service instanceof WrapperServiceSelector )
{
m_componentManager.
- release(
((WrapperServiceSelector)service).getWrappedComponentSelector() );
+ release( ((WrapperServiceSelector)service).getWrappedSelector() );
}
else
{
1.4 +3 -3
jakarta-avalon/src/java/org/apache/avalon/framework/service/WrapperServiceSelector.java
Index: WrapperServiceSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/service/WrapperServiceSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WrapperServiceSelector.java 7 Nov 2002 12:43:19 -0000 1.3
+++ WrapperServiceSelector.java 7 Nov 2002 15:52:11 -0000 1.4
@@ -150,7 +150,7 @@
{
m_selector.release( (Component)object );
}
-
+
/**
* The {@link WrapperServiceManager} wraps ComponentSelectors in
* WrapperServiceSelectors when they are looked up. This method
@@ -158,7 +158,7 @@
*
* @return The {@link ComponentSelector} being wrapped.
*/
- ComponentSelector getWrappedComponentSelector()
+ ComponentSelector getWrappedSelector()
{
return m_selector;
}
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
