[CVS spice] Decrease access specifiers

Commit in spice/sandbox/packet/src/test/org/codehaus/spice/packet on MAIN

EchoHandler.java +3 -3 1.1 -> 1.2

NetRuntime.java +99 -125 1.1 -> 1.2

+102 -128

2 modified files

Decrease access specifiers

----------

spice/sandbox/packet/src/test/org/codehaus/spice/packet

EchoHandler.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- EchoHandler.java 22 Mar 2004 01:17:51 -0000 1.1
+++ EchoHandler.java 17 May 2004 06:25:47 -0000 1.2
@@ -5,15 +5,15 @@

/**
* @author Peter Donald

- * @version $Revision: 1.1 $ $Date: 2004/03/22 01:17:51 $

+ * @version $Revision: 1.2 $ $Date: 2004/05/17 06:25:47 $

*/

-public class EchoHandler

+class EchoHandler

extends AbstractEventHandler
{
private final EventHandler _eventHandler;
private final String _header;

- public EchoHandler( final String header, final EventHandler eventHandler )

+ EchoHandler( final String header, final EventHandler eventHandler )

{
_header = header;
_eventHandler = eventHandler;

----------

spice/sandbox/packet/src/test/org/codehaus/spice/packet

NetRuntime.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- NetRuntime.java 26 Mar 2004 02:23:01 -0000 1.1
+++ NetRuntime.java 17 May 2004 06:25:47 -0000 1.2
@@ -20,132 +20,106 @@

/**
* @author Peter Donald

- * @version $Revision: 1.1 $ $Date: 2004/03/26 02:23:01 $

+ * @version $Revision: 1.2 $ $Date: 2004/05/17 06:25:47 $

*/

-public class NetRuntime

+class NetRuntime

{

- private final SelectableChannelEventSource _source;

+ private final SelectableChannelEventSource _source;

- /**
- * Manager for all the data chunks used in system.
- */
- private final BufferManager _bufferManager;
-
- /**
- * Session manager associated with runtime.
- */
- private final SessionManager _sessionManager;
-
- /**
- * EventSource use to register sockets and so forth.
- */
- private final EventSink _sessionSink;
-
- private final EventPump[] _pumps;
-
- public NetRuntime( final SelectableChannelEventSource source,
- final BufferManager bufferManager,
- final SessionManager sessionManager,
- final EventSink sessionSink,
- final EventPump[] pumps )
- {
- _source = source;
- _bufferManager = bufferManager;
- _sessionManager = sessionManager;
- _sessionSink = sessionSink;
- _pumps = pumps;
- }
-
- public SelectableChannelEventSource getSource()
- {
- return _source;
- }
-
- public BufferManager getBufferManager()
- {
- return _bufferManager;
- }
-
- public SessionManager getSessionManager()
- {
- return _sessionManager;
- }
-
- public EventSink getSessionSink()
- {
- return _sessionSink;
- }
-
- public EventPump[] getPumps()
- {
- return _pumps;
- }
-
- static NetRuntime createRuntime( final String type )
- throws IOException
- {
- final DefaultEventQueue queue1 =
- new DefaultEventQueue( new BoundedFifoBuffer( 15 ) );
- final DefaultEventQueue queue2 =
- new DefaultEventQueue( new UnboundedFifoBuffer( 15 ) );
- final DefaultEventQueue queue3 =
- new DefaultEventQueue( new UnboundedFifoBuffer( 15 ) );
- final DefaultEventQueue queue4 =
- new DefaultEventQueue( new UnboundedFifoBuffer( 15 ) );
- final DefaultEventQueue queue5 =
- new DefaultEventQueue( new UnboundedFifoBuffer( 15 ) );
-
- final SelectableChannelEventSource source1 =
- new SelectableChannelEventSource( queue1 );
- source1.setSelectTimeout( 0 );
- final TimeEventSource source2 = new TimeEventSource( queue4 );
- final TimeEventSource source3 = new TimeEventSource( queue5 );
-
- final DefaultBufferManager bufferManager = new DefaultBufferManager();
- final EventHandler handler1 =
- new EchoHandler( "CHAN " + type,
- new ChannelEventHandler( source1,
- queue1,
- queue2,
- bufferManager ) );
-
- final DefaultSessionManager sessionManager = new DefaultSessionManager();
- final EventHandler handler2 =
- new EchoHandler( "PACK " + type,
- new PacketIOEventHandler( source2,
- source1,
- queue2,
- queue3,
- bufferManager,
- sessionManager ) );
-
- final EventHandler handler3 =
- new EchoHandler( "TEST " + type,
- new TestEventHandler( queue1,
- bufferManager,
- "TEST " + type ) );
-
- final EventPump pump1 = newPump( "CHAN " + type, source1, handler1 );
- final EventPump pump2 = newPump( "PACK " + type, queue2, handler2 );
- final EventPump pump3 = newPump( "TEST " + type, queue3, handler3 );
- final EventPump pump4 = newPump( "PACK TIME " + type, source2, handler2 );
- final EventPump pump5 = newPump( "TEST TIME " + type, source3, handler3 );
-
- final EventPump[] pumps =
- new EventPump[]{pump1, pump2, pump3, pump4, pump5};
- return new NetRuntime( source1,
- bufferManager,
- sessionManager,
- queue2,
- pumps );
- }
-
- private static EventPump newPump( final String name,
- final EventSource source,
- final EventHandler handler )
- {
- return new EventPump( name,
- new BlockingEventSource( source ),
- handler );
- }

+ /**
+ * Manager for all the data chunks used in system.
+ */
+ private final BufferManager _bufferManager;
+
+ /**
+ * Session manager associated with runtime.
+ */
+ private final SessionManager _sessionManager;
+
+ /**
+ * EventSource use to register sockets and so forth.
+ */
+ private final EventSink _sessionSink;
+
+ private final EventPump[] _pumps;
+
+ NetRuntime( final SelectableChannelEventSource source,
+ final BufferManager bufferManager,
+ final SessionManager sessionManager,
+ final EventSink sessionSink,
+ final EventPump[] pumps )
+ {
+ _source = source;
+ _bufferManager = bufferManager;
+ _sessionManager = sessionManager;
+ _sessionSink = sessionSink;
+ _pumps = pumps;
+ }
+
+ SelectableChannelEventSource getSource()
+ {
+ return _source;
+ }
+
+ BufferManager getBufferManager()
+ {
+ return _bufferManager;
+ }
+
+ SessionManager getSessionManager()
+ {
+ return _sessionManager;
+ }
+
+ EventSink getSessionSink()
+ {
+ return _sessionSink;
+ }
+
+ EventPump[] getPumps()
+ {
+ return _pumps;
+ }
+
+ static NetRuntime createRuntime( final String type )
+ throws IOException
+ {
+ final DefaultEventQueue queue1 = new DefaultEventQueue( new BoundedFifoBuffer( 15 ) );
+ final DefaultEventQueue queue2 = new DefaultEventQueue( new UnboundedFifoBuffer( 15 ) );
+ final DefaultEventQueue queue3 = new DefaultEventQueue( new UnboundedFifoBuffer( 15 ) );
+ final DefaultEventQueue queue4 = new DefaultEventQueue( new UnboundedFifoBuffer( 15 ) );
+ final DefaultEventQueue queue5 = new DefaultEventQueue( new UnboundedFifoBuffer( 15 ) );
+
+ final SelectableChannelEventSource source1 = new SelectableChannelEventSource( queue1 );
+ source1.setSelectTimeout( 0 );
+ final TimeEventSource source2 = new TimeEventSource( queue4 );
+ final TimeEventSource source3 = new TimeEventSource( queue5 );
+
+ final DefaultBufferManager bufferManager = new DefaultBufferManager();
+ final EventHandler handler1 = new EchoHandler( "CHAN " + type, new ChannelEventHandler(
+ source1, queue1, queue2, bufferManager ) );
+
+ final DefaultSessionManager sessionManager = new DefaultSessionManager();
+ final EventHandler handler2 = new EchoHandler( "PACK " + type, new PacketIOEventHandler(
+ source2, source1, queue2, queue3, bufferManager, sessionManager ) );
+
+ final EventHandler handler3 = new EchoHandler( "TEST " + type, new TestEventHandler(
+ queue1, bufferManager, "TEST " + type ) );
+
+ final EventPump pump1 = newPump( "CHAN " + type, source1, handler1 );
+ final EventPump pump2 = newPump( "PACK " + type, queue2, handler2 );
+ final EventPump pump3 = newPump( "TEST " + type, queue3, handler3 );
+ final EventPump pump4 = newPump( "PACK TIME " + type, source2, handler2 );
+ final EventPump pump5 = newPump( "TEST TIME " + type, source3, handler3 );
+
+ final EventPump[] pumps = new EventPump[]{pump1, pump2, pump3, pump4, pump5};
+ return new NetRuntime( source1, bufferManager, sessionManager, queue2, pumps );
+ }
+
+ private static EventPump newPump( final String name,
+ final EventSource source,
+ final EventHandler handler )
+ {
+ return new EventPump( name, new BlockingEventSource( source ), handler );
+ }

}

CVSspam 0.2.8