diff options
Diffstat (limited to 'plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java')
| -rw-r--r-- | plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java | 24 |
1 files changed, 12 insertions, 12 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 f2873f4a64..1f041040c8 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 @@ -22,7 +22,7 @@ import org.eclipse.net4j.util.lifecycle.AbstractLifecycle; import org.eclipse.net4j.util.lifecycle.LifecycleListener; import org.eclipse.net4j.util.lifecycle.LifecycleNotifier; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; -import org.eclipse.net4j.util.om.ContextTracer; +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.registry.IRegistry; import org.eclipse.internal.net4j.bundle.Net4j; @@ -210,9 +210,9 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con { if (TRACER.isEnabled()) { - TRACER.trace(toString() - + ": Setting state " + newState + " (was " + oldState.toString().toLowerCase() //$NON-NLS-1$ //$NON-NLS-2$ - + ")"); //$NON-NLS-1$ + TRACER.trace(this, + "Setting state " + newState + " (was " + oldState.toString().toLowerCase() //$NON-NLS-1$ //$NON-NLS-2$ + + ")"); //$NON-NLS-1$ } state = newState; @@ -291,7 +291,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con { if (TRACER.isEnabled()) { - TRACER.trace(toString() + ": Waiting for connection..."); //$NON-NLS-1$ + TRACER.trace(this, "Waiting for connection..."); //$NON-NLS-1$ } return finishedNegotiating.await(timeout, TimeUnit.MILLISECONDS); @@ -374,7 +374,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con Protocol protocol = createProtocol(protocolID, channel); if (TRACER.isEnabled()) { - TRACER.trace(toString() + ": Opening channel " + channelIndex //$NON-NLS-1$ + TRACER.trace(this, "Opening channel " + channelIndex //$NON-NLS-1$ + (protocol == null ? " without protocol" : " with protocol " + protocolID)); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -402,7 +402,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con { if (TRACER.isEnabled()) { - TRACER.trace(toString() + ": Invalid channelIndex " + channelIndex); //$NON-NLS-1$ + TRACER.trace(this, "Invalid channelIndex " + channelIndex); //$NON-NLS-1$ } return null; @@ -461,7 +461,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con int channelIndex = channel.getChannelIndex(); if (TRACER.isEnabled()) { - TRACER.trace(toString() + ": Removing channel " + channelIndex); //$NON-NLS-1$ + TRACER.trace(this, "Removing channel " + channelIndex); //$NON-NLS-1$ } channels.set(channelIndex, NULL_CHANNEL); @@ -485,7 +485,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con { if (TRACER.isEnabled()) { - TRACER.trace(toString() + ": Unknown protocol " + protocolID); //$NON-NLS-1$ + TRACER.trace(this, "Unknown protocol " + protocolID); //$NON-NLS-1$ } return null; @@ -565,12 +565,12 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con if (protocolFactoryRegistry == null && TRACER.isEnabled()) { - TRACER.trace(toString() + ": No protocol factory registry!"); //$NON-NLS-1$ + TRACER.trace(this, "No protocol factory registry!"); //$NON-NLS-1$ } if (receiveExecutor == null && TRACER.isEnabled()) { - TRACER.trace(toString() + ": No receive executor!"); //$NON-NLS-1$ + TRACER.trace(this, "No receive executor!"); //$NON-NLS-1$ } } @@ -608,7 +608,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con { if (TRACER.isEnabled()) { - TRACER.trace(toString() + ": ID wrap around"); //$NON-NLS-1$ + TRACER.trace(this, "ID wrap around"); //$NON-NLS-1$ } nextConnectorID = MIN_CONNECTOR_ID; |