diff options
author | Eike Stepper | 2006-10-23 19:29:34 +0000 |
---|---|---|
committer | Eike Stepper | 2006-10-23 19:29:34 +0000 |
commit | 23c06b895f9b472914055e7ad751163203d7a272 (patch) | |
tree | 68b27a6166727406707801bdd2deedd559597d11 /plugins/org.eclipse.net4j.tests/src | |
parent | bb8c3765a13a93cb90777b8a59d660bb75d0372e (diff) | |
download | cdo-23c06b895f9b472914055e7ad751163203d7a272.tar.gz cdo-23c06b895f9b472914055e7ad751163203d7a272.tar.xz cdo-23c06b895f9b472914055e7ad751163203d7a272.zip |
Net4jFactory
Diffstat (limited to 'plugins/org.eclipse.net4j.tests/src')
3 files changed, 10 insertions, 13 deletions
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java index 8ff9db4ed5..ab10ecd4dd 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java @@ -10,6 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tests; +import org.eclipse.net4j.Net4jFactory; import org.eclipse.net4j.tests.signal.Request1; import org.eclipse.net4j.tests.signal.Request2; import org.eclipse.net4j.tests.signal.TestSignalProtocol; @@ -24,11 +25,9 @@ import org.eclipse.net4j.util.stream.BufferInputStream; import org.eclipse.net4j.util.stream.BufferOutputStream; import org.eclipse.internal.net4j.transport.BufferImpl; -import org.eclipse.internal.net4j.transport.BufferUtil; import org.eclipse.internal.net4j.transport.tcp.AbstractTCPConnector; import org.eclipse.internal.net4j.transport.tcp.TCPAcceptorImpl; import org.eclipse.internal.net4j.transport.tcp.TCPSelectorImpl; -import org.eclipse.internal.net4j.transport.tcp.TCPUtil; import java.util.Arrays; import java.util.concurrent.ExecutorService; @@ -62,16 +61,16 @@ public class SignalTest extends TestCase System.out.print(getName()); System.out.println(" ================================="); - bufferPool = BufferUtil.createBufferPool((short)64); + bufferPool = Net4jFactory.createBufferPool((short)64); LifecycleUtil.activate(bufferPool); assertTrue(LifecycleUtil.isActive(bufferPool)); - selector = (TCPSelectorImpl)TCPUtil.createTCPSelector(); + selector = (TCPSelectorImpl)Net4jFactory.createTCPSelector(); selector.activate(); assertTrue(selector.isActive()); - acceptor = (TCPAcceptorImpl)TCPUtil.createTCPAcceptor(bufferPool, selector); - connector = (AbstractTCPConnector)TCPUtil.createTCPConnector(bufferPool, selector, "localhost"); + acceptor = (TCPAcceptorImpl)Net4jFactory.createTCPAcceptor(bufferPool, selector); + connector = (AbstractTCPConnector)Net4jFactory.createTCPConnector(bufferPool, selector, "localhost"); } @Override diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java index 905a547488..0a2c4a4cf5 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java @@ -13,7 +13,6 @@ package org.eclipse.net4j.tests; import org.eclipse.net4j.util.concurrent.Synchronizer; import org.eclipse.net4j.util.concurrent.SynchronizingCorrelator; - import junit.framework.TestCase; /** diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java index 0d34b3c83b..a7f62b3ecf 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java @@ -10,6 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tests; +import org.eclipse.net4j.Net4jFactory; import org.eclipse.net4j.transport.Buffer; import org.eclipse.net4j.transport.BufferProvider; import org.eclipse.net4j.transport.Channel; @@ -25,11 +26,9 @@ import org.eclipse.net4j.util.registry.IRegistry; import org.eclipse.net4j.util.stream.ChannelInputStream; import org.eclipse.net4j.util.stream.ChannelOutputStream; -import org.eclipse.internal.net4j.transport.BufferUtil; import org.eclipse.internal.net4j.transport.tcp.AbstractTCPConnector; import org.eclipse.internal.net4j.transport.tcp.TCPAcceptorImpl; import org.eclipse.internal.net4j.transport.tcp.TCPSelectorImpl; -import org.eclipse.internal.net4j.transport.tcp.TCPUtil; import java.io.BufferedReader; import java.io.DataInputStream; @@ -66,16 +65,16 @@ public class TCPTransportTest extends TestCase System.out.print(getName()); System.out.println(" ================================="); - bufferPool = BufferUtil.createBufferPool(); + bufferPool = Net4jFactory.createBufferPool(); LifecycleUtil.activate(bufferPool); assertTrue(LifecycleUtil.isActive(bufferPool)); - selector = (TCPSelectorImpl)TCPUtil.createTCPSelector(); + selector = (TCPSelectorImpl)Net4jFactory.createTCPSelector(); selector.activate(); assertTrue(selector.isActive()); - acceptor = (TCPAcceptorImpl)TCPUtil.createTCPAcceptor(bufferPool, selector); - connector = (AbstractTCPConnector)TCPUtil.createTCPConnector(bufferPool, selector, "localhost"); + acceptor = (TCPAcceptorImpl)Net4jFactory.createTCPAcceptor(bufferPool, selector); + connector = (AbstractTCPConnector)Net4jFactory.createTCPConnector(bufferPool, selector, "localhost"); } @Override |