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 2002/05/20 13:53:55 UTC
cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager AbstractSystemManager.java
donaldp 02/05/20 04:53:55
Modified: src/java/org/apache/avalon/phoenix/components/manager
AbstractSystemManager.java
Log:
Extracted inner class from AbstractSystemManager
Revision Changes Path
1.12 +10 -23 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractSystemManager.java
Index: AbstractSystemManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractSystemManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractSystemManager.java 20 May 2002 10:23:34 -0000 1.11
+++ AbstractSystemManager.java 20 May 2002 11:53:55 -0000 1.12
@@ -30,18 +30,6 @@
private static final Resources REZ =
ResourceManager.getPackageResources( AbstractSystemManager.class );
- protected static final class ManagedEntry
- {
- ///Object passed in for management
- protected Object m_object;
-
- ///Interfaces object wants to be managed through (can be null)
- protected Class[] m_interfaces;
-
- ///Object representation when exported (usually a proxy)
- protected Object m_exportedObject;
- }
-
private HashMap m_entrys = new HashMap();
/**
@@ -58,7 +46,9 @@
* classes, the name is already registered etc.
* @throws IllegalArgumentException if object or interfaces is null
*/
- public synchronized void register( final String name, final Object object, final Class[] interfaces )
+ public synchronized void register( final String name,
+ final Object object,
+ final Class[] interfaces )
throws ManagerException, IllegalArgumentException
{
checkRegister( name, object );
@@ -70,10 +60,9 @@
verifyInterfaces( object, interfaces );
- final ManagedEntry entry = new ManagedEntry();
- entry.m_object = object;
- entry.m_interfaces = interfaces;
- entry.m_exportedObject = export( name, entry.m_object, interfaces );
+ final ManagedEntry entry =
+ new ManagedEntry( object, interfaces );
+ entry.setExportedObject( export( name, entry.m_object, interfaces ) );
m_entrys.put( name, entry );
}
@@ -93,11 +82,9 @@
{
checkRegister( name, object );
- final ManagedEntry entry = new ManagedEntry();
- entry.m_object = object;
- entry.m_interfaces = null;
- entry.m_exportedObject = export( name, entry.m_object, null );
-
+ final ManagedEntry entry =
+ new ManagedEntry( object, null );
+ entry.setExportedObject( export( name, entry.m_object, null ) );
m_entrys.put( name, entry );
}
@@ -118,7 +105,7 @@
throw new ManagerException( message );
}
- unexport( name, entry.m_exportedObject );
+ unexport( name, entry.getExportedObject() );
}
/**
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>