You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/03/19 13:48:49 UTC
cvs commit: avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/lookup FortressServiceManager.java
donaldp 2003/03/19 04:48:49
Modified: fortress/src/java/org/apache/avalon/fortress/impl/lookup
FortressServiceManager.java
Log:
naming and style
Revision Changes Path
1.8 +20 -21 avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/lookup/FortressServiceManager.java
Index: FortressServiceManager.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/lookup/FortressServiceManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FortressServiceManager.java 27 Feb 2003 20:04:53 -0000 1.7
+++ FortressServiceManager.java 19 Mar 2003 12:48:49 -0000 1.8
@@ -104,14 +104,14 @@
public Object lookup( final String role )
throws ServiceException
{
- Lookup lookup = parseRole(role);
+ Lookup lookup = parseRole( role );
- if( !m_container.has( lookup.role, lookup.hint ) )
+ if( !m_container.has( lookup.m_role, lookup.m_hint ) )
{
return m_parent.lookup( role );
}
- final Object result = m_container.get( lookup.role, lookup.hint );
+ final Object result = m_container.get( lookup.m_role, lookup.m_hint );
if( result instanceof ServiceSelector )
{
return result;
@@ -119,7 +119,7 @@
if( result instanceof ComponentSelector )
{
- return new WrapperServiceSelector( lookup.role, (ComponentSelector)result );
+ return new WrapperServiceSelector( lookup.m_role, (ComponentSelector)result );
}
if( !( result instanceof ComponentHandler ) )
@@ -132,8 +132,8 @@
{
final ComponentHandler handler = (ComponentHandler)result;
final Object component = handler.get();
-
- m_used.put( new ComponentKey(component), handler );
+
+ m_used.put( new ComponentKey( component ), handler );
return component;
}
catch( final ServiceException ce )
@@ -152,7 +152,7 @@
{
Lookup lookup = parseRole( role );
- if( m_container.has( lookup.role, lookup.hint ) )
+ if( m_container.has( lookup.m_role, lookup.m_hint ) )
{
return true;
}
@@ -164,7 +164,7 @@
public void release( final Object component )
{
- final ComponentHandler handler = (ComponentHandler)m_used.remove( new ComponentKey(component) );
+ final ComponentHandler handler = (ComponentHandler)m_used.remove( new ComponentKey( component ) );
if( null == handler )
{
if( null == m_parent )
@@ -193,22 +193,22 @@
private Lookup parseRole( String role )
{
Lookup lookup = new Lookup();
- lookup.role = role;
- lookup.hint = AbstractContainer.DEFAULT_ENTRY;
+ lookup.m_role = role;
+ lookup.m_hint = AbstractContainer.DEFAULT_ENTRY;
- if ( role.endsWith("Selector") )
+ if( role.endsWith( "Selector" ) )
{
- lookup.role = role.substring(0, role.length() - "Selector".length());
- lookup.hint = AbstractContainer.SELECTOR_ENTRY;
+ lookup.m_role = role.substring( 0, role.length() - "Selector".length() );
+ lookup.m_hint = AbstractContainer.SELECTOR_ENTRY;
}
- int index = role.lastIndexOf("/");
+ int index = role.lastIndexOf( "/" );
// needs to be further than the first character
- if ( index > 0 )
+ if( index > 0 )
{
- lookup.role = role.substring(0, index);
- lookup.hint = role.substring(index + 1);
+ lookup.m_role = role.substring( 0, index );
+ lookup.m_hint = role.substring( index + 1 );
}
return lookup;
@@ -216,8 +216,7 @@
private final static class Lookup
{
- public String role;
- public String hint;
+ String m_role;
+ String m_hint;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org