niclas 2004/02/10 02:13:55
Modified: merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultKernel.java
Log:
Ripped away some un-elegant if() structures.
Revision Changes Path
1.10 +17 -39
avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultKernel.java 7 Feb 2004 22:46:42 -0000 1.9
+++ DefaultKernel.java 10 Feb 2004 10:13:55 -0000 1.10
@@ -54,6 +54,20 @@
*/
public class DefaultKernel implements Kernel, Disposable
{
+ static private final String[] STATE_NAMES =
+ {
+ "state: initializing",
+ "state: initialized",
+ "state: starting",
+ "state: assembly",
+ "state: deployment",
+ "state: started",
+ "state: stopping",
+ "state: decommissioning",
+ "state: dissassembly",
+ "state: stopped"
+ };
+
//--------------------------------------------------------------
// immutable state
@@ -419,45 +433,9 @@
public String toString()
{
int s = m_state;
- if( s == 0 )
- {
- return "state: initializing";
- }
- else if( s == 1 )
- {
- return "state: initialized";
- }
- else if( s == 2 )
- {
- return "state: starting";
- }
- else if( s == 3 )
- {
- return "state: assembly";
- }
- else if( s == 4 )
- {
- return "state: deployment";
- }
- else if( s == 5 )
- {
- return "state: started";
- }
- else if( s == 6 )
- {
- return "state: stopping";
- }
- else if( s == 7 )
- {
- return "state: decommissioning";
- }
- else if( s == 8 )
- {
- return "state: dissassembly";
- }
- else if( s == 9 )
+ if( s < STATE_NAMES.length )
{
- return "state: stopped";
+ return STATE_NAMES[ s ];
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
