summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-10-24 06:26:01 (EDT)
committerEike Stepper2006-10-24 06:26:01 (EDT)
commit96f26e8e3ce41e19f45994ec87a6a9cdcf744812 (patch)
treee6943961f77fc859002833f2d8bf640770d47871
parent73ab230d762acbe084c562c88ee5b699e860958b (diff)
downloadcdo-96f26e8e3ce41e19f45994ec87a6a9cdcf744812.zip
cdo-96f26e8e3ce41e19f45994ec87a6a9cdcf744812.tar.gz
cdo-96f26e8e3ce41e19f45994ec87a6a9cdcf744812.tar.bz2
String externalization
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java24
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactoryImpl.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferImpl.java26
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPoolImpl.java10
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferProviderImpl.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferUtil.java10
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ChannelImpl.java12
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/embedded/AbstractEmbeddedConnector.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/AbstractTCPConnector.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ClientTCPConnectorImpl.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ControlChannelImpl.java6
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ServerTCPConnectorImpl.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPAcceptorImpl.java8
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPSelectorImpl.java18
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPUtil.java14
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/AbstractCachingMap.java12
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java10
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java18
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPAcceptor.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferInputStream.java8
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java12
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelInputStream.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/HexUtil.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java14
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.java6
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/AbstractLifecycle.java6
33 files changed, 132 insertions, 132 deletions
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java
index 99fc973..5fdcf22 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java
@@ -43,7 +43,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
@Override
public String toString()
{
- return "NullChannel";
+ return "NullChannel"; //$NON-NLS-1$
}
};
@@ -189,8 +189,8 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
State oldState = getState();
if (newState != oldState)
{
- System.out.println(toString() + ": Setting state " + newState + " (was "
- + oldState.toString().toLowerCase() + ")");
+ System.out.println(toString() + ": Setting state " + newState + " (was " //$NON-NLS-1$ //$NON-NLS-2$
+ + oldState.toString().toLowerCase() + ")"); //$NON-NLS-1$
state = newState;
fireStateChanged(newState, oldState);
@@ -264,7 +264,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
try
{
- System.out.println(toString() + ": Waiting for connection...");
+ System.out.println(toString() + ": Waiting for connection..."); //$NON-NLS-1$
return finishedNegotiating.await(timeout, TimeUnit.MILLISECONDS);
}
catch (InterruptedException ex)
@@ -343,8 +343,8 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
{
ChannelImpl channel = new ChannelImpl(receiveExecutor);
Protocol protocol = createProtocol(protocolID, channel);
- System.out.println(toString() + ": Opening channel " + channelID
- + (protocol == null ? " without protocol" : " with protocol " + protocolID));
+ System.out.println(toString() + ": Opening channel " + channelID //$NON-NLS-1$
+ + (protocol == null ? " without protocol" : " with protocol " + protocolID)); //$NON-NLS-1$ //$NON-NLS-2$
channel.setChannelID(channelID);
channel.setConnector(this);
@@ -368,7 +368,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
}
catch (IndexOutOfBoundsException ex)
{
- System.out.println(toString() + ": Invalid channelID " + channelID);
+ System.out.println(toString() + ": Invalid channelID " + channelID); //$NON-NLS-1$
return null;
}
}
@@ -424,7 +424,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
channel.removeLifecycleListener(channelLifecycleListener);
int channelID = channel.getChannelID();
- System.out.println(toString() + ": Removing channel " + channelID);
+ System.out.println(toString() + ": Removing channel " + channelID); //$NON-NLS-1$
channels.set(channelID, NULL_CHANNEL);
}
@@ -444,7 +444,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
ProtocolFactory factory = registry.lookup(protocolID);
if (factory == null)
{
- System.out.println(toString() + ": Unknown protocol " + protocolID);
+ System.out.println(toString() + ": Unknown protocol " + protocolID); //$NON-NLS-1$
return null;
}
@@ -516,17 +516,17 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
super.onAboutToActivate();
if (bufferProvider == null)
{
- throw new IllegalStateException("bufferProvider == null");
+ throw new IllegalStateException("bufferProvider == null"); //$NON-NLS-1$
}
if (protocolFactoryRegistry == null)
{
- System.out.println(toString() + ": (INFO) protocolFactoryRegistry == null");
+ System.out.println(toString() + ": (INFO) protocolFactoryRegistry == null"); //$NON-NLS-1$
}
if (receiveExecutor == null)
{
- System.out.println(toString() + ": (INFO) receiveExecutor == null");
+ System.out.println(toString() + ": (INFO) receiveExecutor == null"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactoryImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactoryImpl.java
index e270ec7..2fbd2da 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactoryImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactoryImpl.java
@@ -26,7 +26,7 @@ public class BufferFactoryImpl extends BufferProviderImpl
protected Buffer doProvideBuffer()
{
BufferImpl buffer = new BufferImpl(this, getBufferCapacity());
- System.out.println(toString() + ": Created " + buffer);
+ System.out.println(toString() + ": Created " + buffer); //$NON-NLS-1$
return buffer;
}
@@ -44,6 +44,6 @@ public class BufferFactoryImpl extends BufferProviderImpl
@Override
public String toString()
{
- return "BufferFactory[capacity=" + getBufferCapacity() + "]";
+ return "BufferFactory[capacity=" + getBufferCapacity() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferImpl.java
index bf43de3..765d8db 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferImpl.java
@@ -73,7 +73,7 @@ public class BufferImpl implements Buffer
{
if (state == State.INITIAL || state == State.READING_HEADER)
{
- throw new IllegalStateException("state == " + state);
+ throw new IllegalStateException("state == " + state); //$NON-NLS-1$
}
return channelID;
@@ -88,7 +88,7 @@ public class BufferImpl implements Buffer
{
if (state != State.GETTING && state != State.PUTTING)
{
- throw new IllegalStateException("state == " + state);
+ throw new IllegalStateException("state == " + state); //$NON-NLS-1$
}
return byteBuffer;
@@ -128,7 +128,7 @@ public class BufferImpl implements Buffer
{
if (state != State.INITIAL && state != State.READING_HEADER && state != State.READING_BODY)
{
- throw new IllegalStateException("state == " + state);
+ throw new IllegalStateException("state == " + state); //$NON-NLS-1$
}
if (state == State.INITIAL)
@@ -179,8 +179,8 @@ public class BufferImpl implements Buffer
if (TRACE)
{
- System.out.println(toString() + ": Read " + byteBuffer.limit() + " bytes"
- + (eos ? " (EOS)" : ""));
+ System.out.println(toString() + ": Read " + byteBuffer.limit() + " bytes" //$NON-NLS-1$ //$NON-NLS-2$
+ + (eos ? " (EOS)" : "")); //$NON-NLS-1$ //$NON-NLS-2$
System.out.println(formatContent());
}
@@ -195,12 +195,12 @@ public class BufferImpl implements Buffer
{
if (channelID != this.channelID)
{
- throw new IllegalArgumentException("channelID != this.channelID");
+ throw new IllegalArgumentException("channelID != this.channelID"); //$NON-NLS-1$
}
}
else if (state != State.INITIAL)
{
- throw new IllegalStateException("state == " + state);
+ throw new IllegalStateException("state == " + state); //$NON-NLS-1$
}
else
{
@@ -218,14 +218,14 @@ public class BufferImpl implements Buffer
{
if (state != State.PUTTING && state != State.WRITING)
{
- throw new IllegalStateException("state == " + state);
+ throw new IllegalStateException("state == " + state); //$NON-NLS-1$
}
if (state == State.PUTTING)
{
if (channelID == NO_CHANNEL)
{
- throw new IllegalStateException("channelID == NO_CHANNEL");
+ throw new IllegalStateException("channelID == NO_CHANNEL"); //$NON-NLS-1$
}
int payloadSize = byteBuffer.position() - BufferImpl.HEADER_SIZE + EOS_OFFSET;
@@ -236,8 +236,8 @@ public class BufferImpl implements Buffer
if (TRACE)
{
- System.out.println(toString() + ": Writing " + (payloadSize - 1) + " bytes"
- + (eos ? " (EOS)" : ""));
+ System.out.println(toString() + ": Writing " + (payloadSize - 1) + " bytes" //$NON-NLS-1$ //$NON-NLS-2$
+ + (eos ? " (EOS)" : "")); //$NON-NLS-1$ //$NON-NLS-2$
System.out.println(formatContent());
}
@@ -251,7 +251,7 @@ public class BufferImpl implements Buffer
int numBytes = socketChannel.write(byteBuffer);
if (numBytes == -1)
{
- throw new IOException("Channel closed");
+ throw new IOException("Channel closed"); //$NON-NLS-1$
}
if (byteBuffer.hasRemaining())
@@ -266,7 +266,7 @@ public class BufferImpl implements Buffer
@Override
public String toString()
{
- return "Buffer@" + ReflectUtil.getID(this);
+ return "Buffer@" + ReflectUtil.getID(this); //$NON-NLS-1$
}
public String formatContent()
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPoolImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPoolImpl.java
index c2147e0..07d4a79 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPoolImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPoolImpl.java
@@ -48,7 +48,7 @@ public class BufferPoolImpl extends BufferProviderImpl implements BufferPool,
return false;
}
- System.out.println(toString() + ": Evicting " + buffer);
+ System.out.println(toString() + ": Evicting " + buffer); //$NON-NLS-1$
factory.retainBuffer(buffer);
--pooledBuffers;
return true;
@@ -83,7 +83,7 @@ public class BufferPoolImpl extends BufferProviderImpl implements BufferPool,
}
buffer.clear();
- System.out.println(toString() + ": Obtained " + buffer);
+ System.out.println(toString() + ": Obtained " + buffer); //$NON-NLS-1$
return buffer;
}
@@ -92,16 +92,16 @@ public class BufferPoolImpl extends BufferProviderImpl implements BufferPool,
{
if (buffer.getCapacity() != getBufferCapacity())
{
- throw new IllegalArgumentException("buffer.getCapacity() != getBufferCapacity()");
+ throw new IllegalArgumentException("buffer.getCapacity() != getBufferCapacity()"); //$NON-NLS-1$
}
- System.out.println(toString() + ": Retaining " + buffer);
+ System.out.println(toString() + ": Retaining " + buffer); //$NON-NLS-1$
queue.add(buffer);
}
@Override
public String toString()
{
- return "BufferPool[size=" + pooledBuffers + ", " + factory + "]";
+ return "BufferPool[size=" + pooledBuffers + ", " + factory + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferProviderImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferProviderImpl.java
index d6ba2d9..cafaa08 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferProviderImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferProviderImpl.java
@@ -59,7 +59,7 @@ public abstract class BufferProviderImpl implements BufferProvider, BufferProvid
@Override
public String toString()
{
- return "BufferProvider[capacity=" + bufferCapacity + "]";
+ return "BufferProvider[capacity=" + bufferCapacity + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
protected abstract Buffer doProvideBuffer();
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferUtil.java
index 143b47d..0cbb842 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferUtil.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferUtil.java
@@ -22,7 +22,7 @@ public final class BufferUtil
{
public static final short DEFAULT_BUFFER_CAPACITY = 4096;
- public static final String UTF8_CHAR_SET_NAME = "UTF-8";
+ public static final String UTF8_CHAR_SET_NAME = "UTF-8"; //$NON-NLS-1$
private BufferUtil()
{
@@ -37,10 +37,10 @@ public final class BufferUtil
if (object == null)
{
- throw new IllegalArgumentException("object == null");
+ throw new IllegalArgumentException("object == null"); //$NON-NLS-1$
}
- throw new IllegalArgumentException("Unable to provide buffers: " + object);
+ throw new IllegalArgumentException("Unable to provide buffers: " + object); //$NON-NLS-1$
}
public static byte[] toUTF8(String str)
@@ -56,7 +56,7 @@ public final class BufferUtil
String test = new String(bytes, UTF8_CHAR_SET_NAME);
if (!str.equals(test))
{
- throw new IllegalArgumentException("String not encodable: " + str);
+ throw new IllegalArgumentException("String not encodable: " + str); //$NON-NLS-1$
}
return bytes;
@@ -107,7 +107,7 @@ public final class BufferUtil
byte[] bytes = BufferUtil.toUTF8(str);
if (bytes.length > byteBuffer.remaining())
{
- throw new IllegalArgumentException("String too long: " + str);
+ throw new IllegalArgumentException("String too long: " + str); //$NON-NLS-1$
}
putByteArray(byteBuffer, bytes);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ChannelImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ChannelImpl.java
index 6547bab..c820c00 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ChannelImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ChannelImpl.java
@@ -61,7 +61,7 @@ public class ChannelImpl extends AbstractLifecycle implements Channel, BufferPro
{
if (channelID == BufferImpl.NO_CHANNEL)
{
- throw new IllegalArgumentException("channelID == INVALID_CHANNEL_ID");
+ throw new IllegalArgumentException("channelID == INVALID_CHANNEL_ID"); //$NON-NLS-1$
}
this.channelID = channelID;
@@ -127,7 +127,7 @@ public class ChannelImpl extends AbstractLifecycle implements Channel, BufferPro
State state = ((BufferImpl)buffer).getState();
if (state != State.PUTTING)
{
- System.out.println(toString() + ": Ignoring buffer in state == " + state);
+ System.out.println(toString() + ": Ignoring buffer in state == " + state); //$NON-NLS-1$
return;
}
@@ -139,7 +139,7 @@ public class ChannelImpl extends AbstractLifecycle implements Channel, BufferPro
{
if (receiveHandler == null)
{
- System.out.println(toString() + ": Ignoring buffer because receiveHandler == null");
+ System.out.println(toString() + ": Ignoring buffer because receiveHandler == null"); //$NON-NLS-1$
buffer.release();
return;
}
@@ -156,7 +156,7 @@ public class ChannelImpl extends AbstractLifecycle implements Channel, BufferPro
@Override
public String toString()
{
- return "Channel[" + connector + ", channelID=" + channelID + "]";
+ return "Channel[" + connector + ", channelID=" + channelID + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
@Override
@@ -165,12 +165,12 @@ public class ChannelImpl extends AbstractLifecycle implements Channel, BufferPro
super.onAboutToActivate();
if (channelID == BufferImpl.NO_CHANNEL)
{
- throw new IllegalStateException("channelID == INVALID_CHANNEL_ID");
+ throw new IllegalStateException("channelID == INVALID_CHANNEL_ID"); //$NON-NLS-1$
}
if (connector == null)
{
- throw new IllegalStateException("connector == null");
+ throw new IllegalStateException("connector == null"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/embedded/AbstractEmbeddedConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/embedded/AbstractEmbeddedConnector.java
index 644dde6..dbd0a48 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/embedded/AbstractEmbeddedConnector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/embedded/AbstractEmbeddedConnector.java
@@ -52,7 +52,7 @@ public abstract class AbstractEmbeddedConnector extends AbstractConnector
ChannelImpl channel = getPeer().createChannel(channelID, protocolID);
if (channel == null)
{
- throw new ConnectorException("Failed to register channel with peer");
+ throw new ConnectorException("Failed to register channel with peer"); //$NON-NLS-1$
}
channel.activate();
@@ -73,7 +73,7 @@ public abstract class AbstractEmbeddedConnector extends AbstractConnector
ChannelImpl peerChannel = peer.getChannel(channelID);
if (peerChannel == null)
{
- throw new IllegalStateException("peerChannel == null");
+ throw new IllegalStateException("peerChannel == null"); //$NON-NLS-1$
}
Queue<Buffer> localQueue = ((ChannelImpl)localChannel).getSendQueue();
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/AbstractTCPConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/AbstractTCPConnector.java
index 3974062..c37308b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/AbstractTCPConnector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/AbstractTCPConnector.java
@@ -152,7 +152,7 @@ public abstract class AbstractTCPConnector extends AbstractConnector implements
}
else
{
- System.out.println(toString() + ": Discarding buffer from unknown channel");
+ System.out.println(toString() + ": Discarding buffer from unknown channel"); //$NON-NLS-1$
inputBuffer.release();
}
@@ -240,7 +240,7 @@ public abstract class AbstractTCPConnector extends AbstractConnector implements
{
if (!controlChannel.registerChannel(channelID, protocolID))
{
- throw new ConnectorException("Failed to register channel with peer");
+ throw new ConnectorException("Failed to register channel with peer"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ClientTCPConnectorImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ClientTCPConnectorImpl.java
index fd814b3..7057293 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ClientTCPConnectorImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ClientTCPConnectorImpl.java
@@ -55,7 +55,7 @@ public class ClientTCPConnectorImpl extends AbstractTCPConnector
@Override
public String toString()
{
- return "ClientTCPConnector[" + host + ":" + port + "]";
+ return "ClientTCPConnector[" + host + ":" + port + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
@Override
@@ -64,7 +64,7 @@ public class ClientTCPConnectorImpl extends AbstractTCPConnector
super.onAboutToActivate();
if (host == null || host.length() == 0)
{
- throw new IllegalArgumentException("host == null || host.length() == 0");
+ throw new IllegalArgumentException("host == null || host.length() == 0"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ControlChannelImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ControlChannelImpl.java
index 9a9e920..d0e298c 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ControlChannelImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ControlChannelImpl.java
@@ -67,7 +67,7 @@ public final class ControlChannelImpl extends ChannelImpl
{
if (channelID <= CONTROL_CHANNEL_ID)
{
- throw new IllegalArgumentException("channelID <= CONTROL_CHANNEL_ID");
+ throw new IllegalArgumentException("channelID <= CONTROL_CHANNEL_ID"); //$NON-NLS-1$
}
}
@@ -77,7 +77,7 @@ public final class ControlChannelImpl extends ChannelImpl
{
ByteBuffer byteBuffer = buffer.getByteBuffer();
byte opcode = byteBuffer.get();
- System.out.println("CONTROL: " + opcode);
+ System.out.println("CONTROL: " + opcode); //$NON-NLS-1$
switch (opcode)
{
case OPCODE_REGISTRATION:
@@ -123,7 +123,7 @@ public final class ControlChannelImpl extends ChannelImpl
throw new UnsupportedOperationException();
default:
- System.out.println("Invalid opcode: " + opcode);
+ System.out.println("Invalid opcode: " + opcode); //$NON-NLS-1$
((AbstractTCPConnector)getConnector()).deactivate();
break;
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ServerTCPConnectorImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ServerTCPConnectorImpl.java
index f79e8ae..8043e0b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ServerTCPConnectorImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ServerTCPConnectorImpl.java
@@ -56,11 +56,11 @@ public class ServerTCPConnectorImpl extends AbstractTCPConnector
try
{
SocketAddress address = getSocketChannel().socket().getRemoteSocketAddress();
- return "ServerTCPConnector[" + address + "]";
+ return "ServerTCPConnector[" + address + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
catch (Exception ex)
{
- return "ServerTCPConnector";
+ return "ServerTCPConnector"; //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPAcceptorImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPAcceptorImpl.java
index 5ab5a44..fe0f4f0 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPAcceptorImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPAcceptorImpl.java
@@ -226,7 +226,7 @@ public class TCPAcceptorImpl extends AbstractLifecycle implements TCPAcceptor, B
@Override
public String toString()
{
- return "TCPAcceptor[" + "/" + listenAddr + ":" + listenPort + "]";
+ return "TCPAcceptor[" + "/" + listenAddr + ":" + listenPort + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
protected void addConnector(SocketChannel socketChannel)
@@ -286,17 +286,17 @@ public class TCPAcceptorImpl extends AbstractLifecycle implements TCPAcceptor, B
super.onAboutToActivate();
if (bufferProvider == null)
{
- throw new IllegalStateException("bufferProvider == null");
+ throw new IllegalStateException("bufferProvider == null"); //$NON-NLS-1$
}
if (protocolFactoryRegistry == null)
{
- System.out.println(toString() + ": (INFO) protocolFactoryRegistry == null");
+ System.out.println(toString() + ": (INFO) protocolFactoryRegistry == null"); //$NON-NLS-1$
}
if (receiveExecutor == null)
{
- System.out.println(toString() + ": (INFO) receiveExecutor == null");
+ System.out.println(toString() + ": (INFO) receiveExecutor == null"); //$NON-NLS-1$
}
if (selector == null)
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPSelectorImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPSelectorImpl.java
index ec1d1c6..c1d5237 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPSelectorImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPSelectorImpl.java
@@ -45,10 +45,10 @@ public class TCPSelectorImpl extends AbstractLifecycle implements TCPSelector, R
{
if (listener == null)
{
- throw new IllegalArgumentException("listener == null");
+ throw new IllegalArgumentException("listener == null"); //$NON-NLS-1$
}
- System.out.println(toString() + ": Registering " + TCPUtil.toString(channel));
+ System.out.println(toString() + ": Registering " + TCPUtil.toString(channel)); //$NON-NLS-1$
return channel.register(selector, SelectionKey.OP_ACCEPT, listener);
}
@@ -57,10 +57,10 @@ public class TCPSelectorImpl extends AbstractLifecycle implements TCPSelector, R
{
if (listener == null)
{
- throw new IllegalArgumentException("listener == null");
+ throw new IllegalArgumentException("listener == null"); //$NON-NLS-1$
}
- System.out.println(toString() + ": Registering " + TCPUtil.toString(channel));
+ System.out.println(toString() + ": Registering " + TCPUtil.toString(channel)); //$NON-NLS-1$
return channel.register(selector, SelectionKey.OP_CONNECT | SelectionKey.OP_READ, listener);
}
@@ -116,7 +116,7 @@ public class TCPSelectorImpl extends AbstractLifecycle implements TCPSelector, R
@Override
public String toString()
{
- return "TCPSelector";
+ return "TCPSelector"; //$NON-NLS-1$
}
protected void handleSelection(SelectionKey selKey) throws IOException
@@ -129,7 +129,7 @@ public class TCPSelectorImpl extends AbstractLifecycle implements TCPSelector, R
if (selKey.isAcceptable())
{
- System.out.println(toString() + ": Accepting " + TCPUtil.toString(ssChannel));
+ System.out.println(toString() + ": Accepting " + TCPUtil.toString(ssChannel)); //$NON-NLS-1$
listener.handleAccept(this, ssChannel);
}
}
@@ -140,19 +140,19 @@ public class TCPSelectorImpl extends AbstractLifecycle implements TCPSelector, R
if (selKey.isConnectable())
{
- System.out.println(toString() + ": Connecting " + TCPUtil.toString(sChannel));
+ System.out.println(toString() + ": Connecting " + TCPUtil.toString(sChannel)); //$NON-NLS-1$
listener.handleConnect(this, sChannel);
}
if (selKey.isReadable())
{
- System.out.println(toString() + ": Reading " + TCPUtil.toString(sChannel));
+ System.out.println(toString() + ": Reading " + TCPUtil.toString(sChannel)); //$NON-NLS-1$
listener.handleRead(this, sChannel);
}
if (selKey.isWritable())
{
- System.out.println(toString() + ": Writing " + TCPUtil.toString(sChannel));
+ System.out.println(toString() + ": Writing " + TCPUtil.toString(sChannel)); //$NON-NLS-1$
listener.handleWrite(this, sChannel);
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPUtil.java
index 8cad688..38f918b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPUtil.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPUtil.java
@@ -38,22 +38,22 @@ public final class TCPUtil
StringBuilder builder = new StringBuilder();
if ((newOps & SelectionKey.OP_ACCEPT) != 0)
{
- addInterestOp(builder, "ACCEPT");
+ addInterestOp(builder, "ACCEPT"); //$NON-NLS-1$
}
if ((newOps & SelectionKey.OP_CONNECT) != 0)
{
- addInterestOp(builder, "CONNECT");
+ addInterestOp(builder, "CONNECT"); //$NON-NLS-1$
}
if ((newOps & SelectionKey.OP_READ) != 0)
{
- addInterestOp(builder, "READ");
+ addInterestOp(builder, "READ"); //$NON-NLS-1$
}
if ((newOps & SelectionKey.OP_WRITE) != 0)
{
- addInterestOp(builder, "WRITE");
+ addInterestOp(builder, "WRITE"); //$NON-NLS-1$
}
return builder.toString();
@@ -74,8 +74,8 @@ public final class TCPUtil
if (oldOps != newOps)
{
- System.out.println(selectionKey.channel().toString() + ": Setting interest "
- + formatInterestOps(newOps) + " (was " + formatInterestOps(oldOps).toLowerCase() + ")");
+ System.out.println(selectionKey.channel().toString() + ": Setting interest " //$NON-NLS-1$
+ + formatInterestOps(newOps) + " (was " + formatInterestOps(oldOps).toLowerCase() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
selectionKey.interestOps(newOps);
}
}
@@ -104,7 +104,7 @@ public final class TCPUtil
{
if (builder.length() != 0)
{
- builder.append("|");
+ builder.append("|"); //$NON-NLS-1$
}
builder.append(op);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/AbstractCachingMap.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/AbstractCachingMap.java
index d3429ac..bb69be2 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/AbstractCachingMap.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/AbstractCachingMap.java
@@ -292,7 +292,7 @@ public abstract class AbstractCachingMap<K, V> extends AbstractDelegatingMap<K,
protected String mergedToString()
{
StringBuffer buf = new StringBuffer();
- buf.append("{");
+ buf.append("{"); //$NON-NLS-1$
Iterator<Entry<K, V>> i = entrySet().iterator();
boolean hasNext = i.hasNext();
@@ -302,20 +302,20 @@ public abstract class AbstractCachingMap<K, V> extends AbstractDelegatingMap<K,
K key = e.getKey();
V value = e.getValue();
if (key == this)
- buf.append("(this Map)");
+ buf.append("(this Map)"); //$NON-NLS-1$
else
buf.append(key);
- buf.append("=");
+ buf.append("="); //$NON-NLS-1$
if (value == this)
- buf.append("(this Map)");
+ buf.append("(this Map)"); //$NON-NLS-1$
else
buf.append(value);
hasNext = i.hasNext();
if (hasNext)
- buf.append(", ");
+ buf.append(", "); //$NON-NLS-1$
}
- buf.append("}");
+ buf.append("}"); //$NON-NLS-1$
return buf.toString();
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
index 9a16237..0675320 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
@@ -28,7 +28,7 @@ public abstract class Indication extends SignalReactor
@Override
protected final void execute(BufferInputStream in, BufferOutputStream out) throws Exception
{
- System.out.println("================ Indicating " + this);
+ System.out.println("================ Indicating " + this); //$NON-NLS-1$
indicating(new ExtendedDataInputStream(in));
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
index 531c76f..fc2db11 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
@@ -29,10 +29,10 @@ public abstract class IndicationWithResponse extends SignalReactor
@Override
protected final void execute(BufferInputStream in, BufferOutputStream out) throws Exception
{
- System.out.println("================ Indicating " + this);
+ System.out.println("================ Indicating " + this); //$NON-NLS-1$
indicating(new ExtendedDataInputStream(in));
- System.out.println("================ Responding " + this);
+ System.out.println("================ Responding " + this); //$NON-NLS-1$
responding(new ExtendedDataOutputStream(out));
out.flush();
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java
index 1c55435..66335f9 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java
@@ -30,7 +30,7 @@ public abstract class Request<RESULT> extends SignalActor<RESULT>
@Override
protected final void execute(BufferInputStream in, BufferOutputStream out) throws Exception
{
- System.out.println("================ Requesting " + this);
+ System.out.println("================ Requesting " + this); //$NON-NLS-1$
requesting(new ExtendedDataOutputStream(out));
out.flush();
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java
index 7259fd8..40d8544 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java
@@ -31,11 +31,11 @@ public abstract class RequestWithConfirmation<RESULT> extends SignalActor<RESULT
@Override
protected final void execute(BufferInputStream in, BufferOutputStream out) throws Exception
{
- System.out.println("================ Requesting " + this);
+ System.out.println("================ Requesting " + this); //$NON-NLS-1$
requesting(new ExtendedDataOutputStream(out));
out.flush();
- System.out.println("================ Confirming " + this);
+ System.out.println("================ Confirming " + this); //$NON-NLS-1$
setResult(confirming(new ExtendedDataInputStream(in)));
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
index 8c08a87..951bff6 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
@@ -41,7 +41,7 @@ public abstract class SignalActor<RESULT> extends Signal
{
if (terminated)
{
- throw new IllegalStateException("Terminated");
+ throw new IllegalStateException("Terminated"); //$NON-NLS-1$
}
getProtocol().startSignal(this, timeout);
@@ -52,8 +52,8 @@ public abstract class SignalActor<RESULT> extends Signal
@Override
public String toString()
{
- return "SignalActor[" + getSignalID() + ", " + getProtocol() + ", correlation="
- + getCorrelationID() + (terminated ? ", SENT" : "") + "]";
+ return "SignalActor[" + getSignalID() + ", " + getProtocol() + ", correlation=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + getCorrelationID() + (terminated ? ", SENT" : "") + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
protected void setResult(RESULT result)
@@ -66,12 +66,12 @@ public abstract class SignalActor<RESULT> extends Signal
BufferHandler receiveHandler = channel.getReceiveHandler();
if (receiveHandler == null)
{
- throw new IllegalArgumentException("Channel has no protocol");
+ throw new IllegalArgumentException("Channel has no protocol"); //$NON-NLS-1$
}
if (!(receiveHandler instanceof SignalProtocol))
{
- throw new IllegalArgumentException("Channel has no signal protocol");
+ throw new IllegalArgumentException("Channel has no signal protocol"); //$NON-NLS-1$
}
return (SignalProtocol)receiveHandler;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
index 905f8cb..2397768 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
@@ -48,7 +48,7 @@ public abstract class SignalProtocol extends AbstractProtocol
if (executorService == null)
{
- throw new IllegalArgumentException("executorService == null");
+ throw new IllegalArgumentException("executorService == null"); //$NON-NLS-1$
}
this.executorService = executorService;
@@ -63,7 +63,7 @@ public abstract class SignalProtocol extends AbstractProtocol
{
ByteBuffer byteBuffer = buffer.getByteBuffer();
int correlationID = byteBuffer.getInt();
- System.out.println(toString() + ": Received buffer for correlation " + correlationID);
+ System.out.println(toString() + ": Received buffer for correlation " + correlationID); //$NON-NLS-1$
Signal signal;
if (correlationID > 0)
@@ -73,7 +73,7 @@ public abstract class SignalProtocol extends AbstractProtocol
if (signal == null)
{
short signalID = byteBuffer.getShort();
- System.out.println(toString() + ": Got signal id " + signalID);
+ System.out.println(toString() + ": Got signal id " + signalID); //$NON-NLS-1$
signal = createSignalReactor(signalID);
signal.setProtocol(this);
@@ -90,7 +90,7 @@ public abstract class SignalProtocol extends AbstractProtocol
signal = signals.get(-correlationID);
if (signal == null)
{
- System.out.println(toString() + ": Discarding buffer");
+ System.out.println(toString() + ": Discarding buffer"); //$NON-NLS-1$
buffer.release();
}
}
@@ -106,7 +106,7 @@ public abstract class SignalProtocol extends AbstractProtocol
@Override
public String toString()
{
- return "SignalProtocol[" + getProtocolID() + ", " + getChannel() + "]";
+ return "SignalProtocol[" + getProtocolID() + ", " + getChannel() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
protected abstract SignalReactor createSignalReactor(short signalID);
@@ -115,7 +115,7 @@ public abstract class SignalProtocol extends AbstractProtocol
{
if (signalActor.getProtocol() != this)
{
- throw new IllegalArgumentException("signalActor.getProtocol() != this");
+ throw new IllegalArgumentException("signalActor.getProtocol() != this"); //$NON-NLS-1$
}
short signalID = signalActor.getSignalID();
@@ -138,7 +138,7 @@ public abstract class SignalProtocol extends AbstractProtocol
int correlationID = nextCorrelationID;
if (nextCorrelationID == MAX_CORRELATION_ID)
{
- System.out.println(toString() + ": Correlation wrap around");
+ System.out.println(toString() + ": Correlation wrap around"); //$NON-NLS-1$
nextCorrelationID = MIN_CORRELATION_ID;
}
else
@@ -186,11 +186,11 @@ public abstract class SignalProtocol extends AbstractProtocol
Buffer buffer = delegate.provideBuffer();
ByteBuffer byteBuffer = buffer.startPutting(getChannel().getChannelID());
- System.out.println("Providing buffer for correlation " + correlationID);
+ System.out.println("Providing buffer for correlation " + correlationID); //$NON-NLS-1$
byteBuffer.putInt(correlationID);
if (firstBuffer)
{
- System.out.println(SignalProtocol.this.toString() + ": Put signal id " + signalID);
+ System.out.println(SignalProtocol.this.toString() + ": Put signal id " + signalID); //$NON-NLS-1$
byteBuffer.putShort(signalID);
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java
index 9d48ae0..55d43b7 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java
@@ -22,7 +22,7 @@ public abstract class SignalReactor extends Signal
@Override
public String toString()
{
- return "SignalReactor[" + getSignalID() + ", " + getProtocol() + ", correlation="
- + getCorrelationID() + "]";
+ return "SignalReactor[" + getSignalID() + ", " + getProtocol() + ", correlation=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + getCorrelationID() + "]"; //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPAcceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPAcceptor.java
index bf4117d..fb9cb79 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPAcceptor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPAcceptor.java
@@ -20,7 +20,7 @@ import java.util.concurrent.ExecutorService;
*/
public interface TCPAcceptor
{
- public static final String DEFAULT_ADDRESS = "0.0.0.0";
+ public static final String DEFAULT_ADDRESS = "0.0.0.0"; //$NON-NLS-1$
public static final int DEFAULT_PORT = 2036;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferInputStream.java
index 41f49f3..d1d5b44 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferInputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferInputStream.java
@@ -67,8 +67,8 @@ public class BufferInputStream extends InputStream implements BufferHandler
final int result = b < 0 ? ~b : b;
if (TRACE)
{
- System.out.println("<-- " + HexUtil.toHex(result)
- + (result >= 32 ? " " + Character.toString((char)result) : ""));
+ System.out.println("<-- " + HexUtil.toHex(result) //$NON-NLS-1$
+ + (result >= 32 ? " " + Character.toString((char)result) : "")); //$NON-NLS-1$ //$NON-NLS-2$
}
if (!currentBuffer.getByteBuffer().hasRemaining())
@@ -91,7 +91,7 @@ public class BufferInputStream extends InputStream implements BufferHandler
@Override
public String toString()
{
- return "BufferInputStream";
+ return "BufferInputStream"; //$NON-NLS-1$
}
protected boolean ensureBuffer() throws IOException
@@ -137,7 +137,7 @@ public class BufferInputStream extends InputStream implements BufferHandler
}
catch (InterruptedException ex)
{
- throw new IOException("Interrupted");
+ throw new IOException("Interrupted"); //$NON-NLS-1$
}
eos = currentBuffer.isEOS();
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java
index e6ea348..1065931 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java
@@ -42,12 +42,12 @@ public class BufferOutputStream extends OutputStream
{
if (bufferHandler == null)
{
- throw new IllegalArgumentException("bufferHandler == null");
+ throw new IllegalArgumentException("bufferHandler == null"); //$NON-NLS-1$
}
if (bufferProvider == null)
{
- throw new IllegalArgumentException("bufferProvider == null");
+ throw new IllegalArgumentException("bufferProvider == null"); //$NON-NLS-1$
}
this.bufferHandler = bufferHandler;
@@ -66,8 +66,8 @@ public class BufferOutputStream extends OutputStream
ensureBuffer();
if (TRACE)
{
- System.out.println("--> " + HexUtil.toHex(b)
- + (b >= 32 ? " " + Character.toString((char)b) : ""));
+ System.out.println("--> " + HexUtil.toHex(b) //$NON-NLS-1$
+ + (b >= 32 ? " " + Character.toString((char)b) : "")); //$NON-NLS-1$ //$NON-NLS-2$
}
ByteBuffer buffer = currentBuffer.getByteBuffer();
@@ -118,7 +118,7 @@ public class BufferOutputStream extends OutputStream
@Override
public String toString()
{
- return "BufferOutputStream";
+ return "BufferOutputStream"; //$NON-NLS-1$
}
protected void ensureBuffer()
@@ -142,6 +142,6 @@ public class BufferOutputStream extends OutputStream
return (BufferProvider)bufferHandler;
}
- throw new IllegalArgumentException("Buffer handler unable to provide buffers");
+ throw new IllegalArgumentException("Buffer handler unable to provide buffers"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelInputStream.java
index 5c6eacd..b0b491f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelInputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelInputStream.java
@@ -64,6 +64,6 @@ public class ChannelInputStream extends BufferInputStream
@Override
public String toString()
{
- return "ChannelInputStream[" + channel + "]";
+ return "ChannelInputStream[" + channel + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/HexUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/HexUtil.java
index b18e8fb..b800113 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/HexUtil.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/HexUtil.java
@@ -25,7 +25,7 @@ public final class HexUtil
public static String toHex(int b)
{
assertByte(b);
- return "" + DIGITS[b >> 4] + DIGITS[b & 0xf];
+ return "" + DIGITS[b >> 4] + DIGITS[b & 0xf]; //$NON-NLS-1$
}
public static void appendHex(StringBuilder builder, int b)
@@ -39,7 +39,7 @@ public final class HexUtil
{
if (b < 0 || b > 255)
{
- throw new IllegalArgumentException("b < 0 || b > 255");
+ throw new IllegalArgumentException("b < 0 || b > 255"); //$NON-NLS-1$
}
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java
index 9d2e064..56085ba 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java
@@ -28,7 +28,7 @@ public final class ReflectUtil
public static final Object[] NO_ARGUMENTS = null;
- private static final String NL = System.getProperty("line.separator");
+ private static final String NL = System.getProperty("line.separator"); //$NON-NLS-1$
private static final Method hashCodeMethod = getHashCodeMethod();
@@ -87,12 +87,12 @@ public final class ReflectUtil
public static String getLabel(Object object)
{
- return getSimpleClassName(object) + "@" + getID(object);
+ return getSimpleClassName(object) + "@" + getID(object); //$NON-NLS-1$
}
public static void dump(Object object)
{
- dump(object, "");
+ dump(object, ""); //$NON-NLS-1$
}
public static void dump(Object object, String prefix)
@@ -106,7 +106,7 @@ public final class ReflectUtil
builder.append(prefix);
builder.append(getLabel(object));
builder.append(NL);
- dumpSegment(object.getClass(), object, prefix + " ", builder);
+ dumpSegment(object.getClass(), object, prefix + " ", builder); //$NON-NLS-1$
out.print(builder.toString());
}
@@ -118,7 +118,7 @@ public final class ReflectUtil
dumpSegment(segment.getSuperclass(), object, prefix, builder);
}
- String segmentPrefix = segment == object.getClass() ? "" : getSimpleName(segment) + ".";
+ String segmentPrefix = segment == object.getClass() ? "" : getSimpleName(segment) + "."; //$NON-NLS-1$ //$NON-NLS-2$
Field[] fields = segment.getDeclaredFields();
for (Field field : fields)
{
@@ -135,7 +135,7 @@ public final class ReflectUtil
builder.append(prefix);
builder.append(segmentPrefix);
builder.append(field.getName());
- builder.append(" = ");
+ builder.append(" = "); //$NON-NLS-1$
builder.append(getValue(object, field));
builder.append(NL);
}
@@ -167,7 +167,7 @@ public final class ReflectUtil
try
{
- method = ROOT_CLASS.getMethod("hashCode", NO_PARAMETERS);
+ method = ROOT_CLASS.getMethod("hashCode", NO_PARAMETERS); //$NON-NLS-1$
}
catch (Exception ex)
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.java
index 479b58a..62ca646 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.java
@@ -29,7 +29,7 @@ public class AsynchronousWorkSerializer implements WorkSerializer, Runnable
{
if (executorService == null)
{
- throw new IllegalArgumentException("executorService == null");
+ throw new IllegalArgumentException("executorService == null"); //$NON-NLS-1$
}
this.executorService = executorService;
@@ -58,7 +58,7 @@ public class AsynchronousWorkSerializer implements WorkSerializer, Runnable
occupation.setOccupied(true);
}
- System.out.println(toString() + ": Notifying executor service");
+ System.out.println(toString() + ": Notifying executor service"); //$NON-NLS-1$
executorService.execute(this);
}
}
@@ -104,7 +104,7 @@ public class AsynchronousWorkSerializer implements WorkSerializer, Runnable
@Override
public String toString()
{
- return "AsynchronousWorkSerializer[" + executorService + "]";
+ return "AsynchronousWorkSerializer[" + executorService + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java
index 58f132f..d43f462 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java
@@ -43,7 +43,7 @@ public class SynchronizingCorrelator<CORRELATION, RESULT> implements
Synchronizer<RESULT> synchronizer = createSynchronizer(correlation);
if (map.putIfAbsent(correlation, synchronizer) != null)
{
- throw new IllegalStateException("Already correlated: " + correlation);
+ throw new IllegalStateException("Already correlated: " + correlation); //$NON-NLS-1$
}
return synchronizer;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.java
index d727aaf..8296524 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.java
@@ -31,6 +31,6 @@ public class SynchronousWorkSerializer implements WorkSerializer
@Override
public String toString()
{
- return "SynchronousWorkSerializer";
+ return "SynchronousWorkSerializer"; //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/AbstractLifecycle.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/AbstractLifecycle.java
index a7597d0..51d3464 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/AbstractLifecycle.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/AbstractLifecycle.java
@@ -39,7 +39,7 @@ public abstract class AbstractLifecycle implements Lifecycle, LifecycleNotifier
{
if (!active)
{
- System.out.println(toString() + ": Activating");
+ System.out.println(toString() + ": Activating"); //$NON-NLS-1$
onAboutToActivate();
fireLifecycleAboutToActivate();
@@ -49,7 +49,7 @@ public abstract class AbstractLifecycle implements Lifecycle, LifecycleNotifier
if (DUMP_ON_ACTIVATE)
{
- ReflectUtil.dump(this, toString() + ": DUMP ");
+ ReflectUtil.dump(this, toString() + ": DUMP "); //$NON-NLS-1$
}
}
}
@@ -58,7 +58,7 @@ public abstract class AbstractLifecycle implements Lifecycle, LifecycleNotifier
{
if (active)
{
- System.out.println(toString() + ": Deactivating");
+ System.out.println(toString() + ": Deactivating"); //$NON-NLS-1$
fireLifecycleDeactivating();
try