Removed InstanceTracer

39 files changed, 76 insertions, 254 deletions

diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java
index c32801de1a..9481196e6b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java
@@ -105,7 +105,7 @@ public abstract class AbstractOMPlatform implements OMPlatform
       {
         if (TRACER().isEnabled())
         {
-          TRACER().trace(this, ex);
+          TRACER().trace(ex);
         }
       }
     }
@@ -123,7 +123,7 @@ public abstract class AbstractOMPlatform implements OMPlatform
       {
         if (TRACER().isEnabled())
         {
-          TRACER().trace(this, ex);
+          TRACER().trace(ex);
         }
       }
     }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTraceHandlerEventImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTraceHandlerEventImpl.java
index 5e40b6ca0b..cde96bc6fd 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTraceHandlerEventImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTraceHandlerEventImpl.java
@@ -28,14 +28,11 @@ public class OMTraceHandlerEventImpl implements OMTraceHandler.Event, Serializab
 
   protected Class context;
 
-  protected Object instance;
-
   protected String message;
 
   protected Throwable throwable;
 
-  public OMTraceHandlerEventImpl(OMTracer tracer, Class context, Object instance, String message,
-      Throwable throwable)
+  public OMTraceHandlerEventImpl(OMTracer tracer, Class context, String message, Throwable throwable)
   {
     if (tracer == null)
     {
@@ -50,7 +47,6 @@ public class OMTraceHandlerEventImpl implements OMTraceHandler.Event, Serializab
     timeStamp = System.currentTimeMillis();
     this.tracer = tracer;
     this.context = context;
-    this.instance = instance;
     this.message = message;
     this.throwable = throwable;
   }
@@ -70,11 +66,6 @@ public class OMTraceHandlerEventImpl implements OMTraceHandler.Event, Serializab
     return context;
   }
 
-  public Object getInstance()
-  {
-    return instance;
-  }
-
   public String getMessage()
   {
     return message;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTracerImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTracerImpl.java
index e4d45ff060..e7eb1ce775 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTracerImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTracerImpl.java
@@ -79,57 +79,32 @@ public class OMTracerImpl implements OMTracer
     ((AbstractOMPlatform)bundle.getPlatform()).trace(event);
   }
 
-  public Event trace(Class context, Object instance, String msg, Throwable t)
+  public Event trace(Class context, String msg, Throwable t)
   {
-    Event event = new OMTraceHandlerEventImpl(this, context, instance, msg, t);
+    Event event = new OMTraceHandlerEventImpl(this, context, msg, t);
     trace(event);
     return event;
   }
 
-  public Event trace(Class context, Object instance, String msg)
-  {
-    return trace(context, instance, msg, (Throwable)null);
-  }
-
-  public Event trace(Class context, Object instance, Throwable t)
-  {
-    return trace(context, instance, t.getLocalizedMessage(), t);
-  }
-
-  public Event format(Class context, Object instance, String pattern, Object... args)
-  {
-    return format(context, instance, pattern, (Throwable)null, args);
-  }
-
-  public Event format(Class context, Object instance, String pattern, Throwable t, Object... args)
+  public Event format(Class context, String pattern, Throwable t, Object... args)
   {
     String msg = MessageFormat.format(pattern, args);
-    return trace(context, instance, msg, t);
+    return trace(context, msg, t);
   }
 
   public Event format(Class context, String pattern, Object... args)
   {
-    return format(context, NO_INSTANCE, pattern, (Throwable)null, args);
-  }
-
-  public Event format(Class context, String pattern, Throwable t, Object... args)
-  {
-    return format(context, NO_INSTANCE, pattern, t, args);
-  }
-
-  public Event trace(Class context, String msg, Throwable t)
-  {
-    return trace(context, NO_INSTANCE, msg, t);
+    return format(context, pattern, (Throwable)null, args);
   }
 
   public Event trace(Class context, String msg)
   {
-    return trace(context, NO_INSTANCE, msg);
+    return trace(context, msg);
   }
 
   public Event trace(Class context, Throwable t)
   {
-    return trace(context, NO_INSTANCE, t);
+    return trace(context, t);
   }
 
   public OMTracer tracer(String name)
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiBundle.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiBundle.java
index ee92561fff..ce336222a8 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiBundle.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiBundle.java
@@ -13,6 +13,7 @@ package org.eclipse.internal.net4j.bundle;
 import org.eclipse.net4j.util.IOUtil;
 
 import org.eclipse.core.runtime.FileLocator;
+
 import org.osgi.framework.BundleContext;
 
 import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiPlatform.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiPlatform.java
index b6c445e805..8cf2b11341 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiPlatform.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiPlatform.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.util.om.OMBundle;
 
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.osgi.service.debug.DebugOptions;
+
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 
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 d80e5d7938..479a18a608 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
@@ -210,9 +210,8 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this,
-            "Setting state " + newState + " (was " + oldState.toString().toLowerCase() //$NON-NLS-1$ //$NON-NLS-2$
-                + ")"); //$NON-NLS-1$
+        TRACER.trace("Setting state " + newState + " (was " + oldState.toString().toLowerCase() //$NON-NLS-1$ //$NON-NLS-2$
+            + ")"); //$NON-NLS-1$
       }
 
       state = newState;
@@ -291,7 +290,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Waiting for connection..."); //$NON-NLS-1$
+        TRACER.trace("Waiting for connection..."); //$NON-NLS-1$
       }
 
       return finishedNegotiating.await(timeout, TimeUnit.MILLISECONDS);
@@ -379,7 +378,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
     Protocol protocol = createProtocol(protocolID, channel, protocolData);
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Opening channel " + channelIndex //$NON-NLS-1$
+      TRACER.trace("Opening channel " + channelIndex //$NON-NLS-1$
           + (protocol == null ? " without protocol" : " with protocol " + protocolID)); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
@@ -407,7 +406,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Invalid channelIndex " + channelIndex); //$NON-NLS-1$
+        TRACER.trace("Invalid channelIndex " + channelIndex); //$NON-NLS-1$
       }
 
       return null;
@@ -466,7 +465,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
     int channelIndex = channel.getChannelIndex();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Removing channel " + channelIndex); //$NON-NLS-1$
+      TRACER.trace("Removing channel " + channelIndex); //$NON-NLS-1$
     }
 
     channels.set(channelIndex, NULL_CHANNEL);
@@ -490,7 +489,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Unknown protocol " + protocolID); //$NON-NLS-1$
+        TRACER.trace("Unknown protocol " + protocolID); //$NON-NLS-1$
       }
 
       return null;
@@ -570,12 +569,12 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
 
     if (protocolFactoryRegistry == null && TRACER.isEnabled())
     {
-      TRACER.trace(this, "No protocol factory registry!"); //$NON-NLS-1$
+      TRACER.trace("No protocol factory registry!"); //$NON-NLS-1$
     }
 
     if (receiveExecutor == null && TRACER.isEnabled())
     {
-      TRACER.trace(this, "No receive executor!"); //$NON-NLS-1$
+      TRACER.trace("No receive executor!"); //$NON-NLS-1$
     }
   }
 
@@ -613,7 +612,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "ID wrap around"); //$NON-NLS-1$
+        TRACER.trace("ID wrap around"); //$NON-NLS-1$
       }
 
       nextConnectorID = MIN_CONNECTOR_ID;
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 b5926f43ee..befd995e1d 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
@@ -34,7 +34,7 @@ public class BufferFactoryImpl extends BufferProviderImpl
     BufferImpl buffer = new BufferImpl(this, getBufferCapacity());
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Created " + buffer); //$NON-NLS-1$
+      TRACER.trace("Created " + buffer); //$NON-NLS-1$
     }
 
     return buffer;
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 ea86cc4f1a..7fc9a7eae6 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
@@ -185,7 +185,7 @@ public class BufferImpl implements Buffer
 
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Read " + byteBuffer.limit() + " bytes" //$NON-NLS-1$ //$NON-NLS-2$
+      TRACER.trace("Read " + byteBuffer.limit() + " bytes" //$NON-NLS-1$ //$NON-NLS-2$
           + (eos ? " (EOS)" : "") + NL + formatContent()); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
@@ -241,7 +241,7 @@ public class BufferImpl implements Buffer
 
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Writing " + (payloadSize - 1) + " bytes" //$NON-NLS-1$ //$NON-NLS-2$
+        TRACER.trace("Writing " + (payloadSize - 1) + " bytes" //$NON-NLS-1$ //$NON-NLS-2$
             + (eos ? " (EOS)" : "") + NL + formatContent()); //$NON-NLS-1$ //$NON-NLS-2$
       }
 
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 b3f1352af3..81c428e3dc 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
@@ -56,7 +56,7 @@ public class BufferPoolImpl extends BufferProviderImpl implements BufferPool,
 
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Evicting " + buffer); //$NON-NLS-1$
+      TRACER.trace("Evicting " + buffer); //$NON-NLS-1$
     }
 
     factory.retainBuffer(buffer);
@@ -95,7 +95,7 @@ public class BufferPoolImpl extends BufferProviderImpl implements BufferPool,
     buffer.clear();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Obtained " + buffer); //$NON-NLS-1$
+      TRACER.trace("Obtained " + buffer); //$NON-NLS-1$
     }
 
     return buffer;
@@ -111,7 +111,7 @@ public class BufferPoolImpl extends BufferProviderImpl implements BufferPool,
 
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Retaining " + buffer); //$NON-NLS-1$
+      TRACER.trace("Retaining " + buffer); //$NON-NLS-1$
     }
 
     queue.add(buffer);
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 e98c08e04a..072009fa0e 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
@@ -146,7 +146,7 @@ public class ChannelImpl extends AbstractLifecycle implements Channel, BufferPro
 
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Handling buffer from client: " + buffer); //$NON-NLS-1$
+      TRACER.trace("Handling buffer from client: " + buffer); //$NON-NLS-1$
     }
 
     sendQueue.add(buffer);
@@ -164,7 +164,7 @@ public class ChannelImpl extends AbstractLifecycle implements Channel, BufferPro
 
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Handling buffer from multiplexer: " + buffer); //$NON-NLS-1$
+      TRACER.trace("Handling buffer from multiplexer: " + buffer); //$NON-NLS-1$
     }
 
     receiveSerializer.addWork(new Runnable()
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 676eb9dd3b..7313b40e14 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
@@ -149,7 +149,7 @@ public abstract class AbstractTCPConnector extends AbstractConnector implements
         {
           if (TRACER.isEnabled())
           {
-            TRACER.trace(this, "Discarding buffer from unknown channel"); //$NON-NLS-1$
+            TRACER.trace("Discarding buffer from unknown channel"); //$NON-NLS-1$
           }
 
           inputBuffer.release();
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 03daf2521b..ebca3138e5 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
@@ -149,7 +149,7 @@ public final class ControlChannelImpl extends ChannelImpl
           {
             if (TRACER.isEnabled())
             {
-              TRACER.trace(this, "Invalid channel id: " + channelIndex); //$NON-NLS-1$
+              TRACER.trace("Invalid channel id: " + channelIndex); //$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 a556b86cd7..9668bfc0e8 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
@@ -246,7 +246,7 @@ public class TCPAcceptorImpl extends AbstractLifecycle implements TCPAcceptor, B
 
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Accepted connector " + connector); //$NON-NLS-1$
+        TRACER.trace("Accepted connector " + connector); //$NON-NLS-1$
       }
 
       fireConnectorAccepted(connector);
@@ -298,12 +298,12 @@ public class TCPAcceptorImpl extends AbstractLifecycle implements TCPAcceptor, B
 
     if (protocolFactoryRegistry == null && TRACER.isEnabled())
     {
-      TRACER.trace(this, "No protocol factory registry!"); //$NON-NLS-1$
+      TRACER.trace("No protocol factory registry!"); //$NON-NLS-1$
     }
 
     if (receiveExecutor == null && TRACER.isEnabled())
     {
-      TRACER.trace(this, "No receive executor!"); //$NON-NLS-1$
+      TRACER.trace("No receive executor!"); //$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 b1028469f2..53f897766c 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
@@ -260,7 +260,7 @@ public class TCPSelectorImpl extends AbstractLifecycle implements TCPSelector, R
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Accepting " + TCPUtil.toString(ssChannel)); //$NON-NLS-1$
+          TRACER.trace("Accepting " + TCPUtil.toString(ssChannel)); //$NON-NLS-1$
         }
 
         listener.handleAccept(this, ssChannel);
@@ -275,7 +275,7 @@ public class TCPSelectorImpl extends AbstractLifecycle implements TCPSelector, R
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Connecting " + TCPUtil.toString(sChannel)); //$NON-NLS-1$
+          TRACER.trace("Connecting " + TCPUtil.toString(sChannel)); //$NON-NLS-1$
         }
 
         listener.handleConnect(this, sChannel);
@@ -285,7 +285,7 @@ public class TCPSelectorImpl extends AbstractLifecycle implements TCPSelector, R
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Reading " + TCPUtil.toString(sChannel)); //$NON-NLS-1$
+          TRACER.trace("Reading " + TCPUtil.toString(sChannel)); //$NON-NLS-1$
         }
 
         listener.handleRead(this, sChannel);
@@ -295,7 +295,7 @@ public class TCPSelectorImpl extends AbstractLifecycle implements TCPSelector, R
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Writing " + TCPUtil.toString(sChannel)); //$NON-NLS-1$
+          TRACER.trace("Writing " + TCPUtil.toString(sChannel)); //$NON-NLS-1$
         }
 
         listener.handleWrite(this, sChannel);
@@ -369,7 +369,7 @@ public class TCPSelectorImpl extends AbstractLifecycle implements TCPSelector, R
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Registering " + TCPUtil.toString(channel)); //$NON-NLS-1$
+      TRACER.trace("Registering " + TCPUtil.toString(channel)); //$NON-NLS-1$
     }
 
     try
@@ -386,7 +386,7 @@ public class TCPSelectorImpl extends AbstractLifecycle implements TCPSelector, R
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(TCPSelectorImpl.this, "Registering " + TCPUtil.toString(channel)); //$NON-NLS-1$
+      TRACER.trace("Registering " + TCPUtil.toString(channel)); //$NON-NLS-1$
     }
 
     try
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 af664c0263..e0952250ee 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
@@ -87,7 +87,7 @@ public final class TCPUtil
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(selectionKey, "Setting interest " //$NON-NLS-1$
+        TRACER.trace("Setting interest " //$NON-NLS-1$
             + formatInterestOps(newOps) + " (was " + formatInterestOps(oldOps).toLowerCase() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
       }
 
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 55c85052a9..6b2b14c69f 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
@@ -36,7 +36,7 @@ public abstract class Indication extends SignalReactor
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "================ Indicating"); //$NON-NLS-1$
+      TRACER.trace("================ Indicating"); //$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 e217bb0706..3d1ddfec04 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
@@ -37,13 +37,13 @@ public abstract class IndicationWithResponse extends SignalReactor
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "================ Indicating"); //$NON-NLS-1$
+      TRACER.trace("================ Indicating"); //$NON-NLS-1$
     }
 
     indicating(new ExtendedDataInputStream(in));
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "================ Responding"); //$NON-NLS-1$
+      TRACER.trace("================ Responding"); //$NON-NLS-1$
     }
 
     responding(new ExtendedDataOutputStream(out));
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 5e5549392c..dc26241755 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
@@ -37,7 +37,7 @@ public abstract class Request extends SignalActor
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "================ Requesting"); //$NON-NLS-1$
+      TRACER.trace("================ Requesting"); //$NON-NLS-1$
     }
 
     requesting(new ExtendedDataOutputStream(out));
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 8f4e6e4819..479b57210d 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
@@ -39,14 +39,14 @@ public abstract class RequestWithConfirmation<RESULT> extends SignalActor<RESULT
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "================ Requesting"); //$NON-NLS-1$
+      TRACER.trace("================ Requesting"); //$NON-NLS-1$
     }
 
     requesting(new ExtendedDataOutputStream(out));
     out.flush();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "================ Confirming"); //$NON-NLS-1$
+      TRACER.trace("================ Confirming"); //$NON-NLS-1$
     }
 
     setResult(confirming(new ExtendedDataInputStream(in)));
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
index 4146d66358..c8c0e791f5 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
@@ -65,7 +65,7 @@ public abstract class Signal implements Runnable
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, ex);
+        TRACER.trace(ex);
       }
     }
     finally
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 a3e7d0c04c..11c84a3496 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
@@ -93,7 +93,7 @@ public abstract class SignalProtocol extends AbstractProtocol
     int correlationID = byteBuffer.getInt();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Received buffer for correlation " + correlationID); //$NON-NLS-1$
+      TRACER.trace("Received buffer for correlation " + correlationID); //$NON-NLS-1$
     }
 
     Signal signal;
@@ -106,7 +106,7 @@ public abstract class SignalProtocol extends AbstractProtocol
         short signalID = byteBuffer.getShort();
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Got signal id " + signalID); //$NON-NLS-1$
+          TRACER.trace("Got signal id " + signalID); //$NON-NLS-1$
         }
 
         signal = createSignalReactor(signalID);
@@ -126,7 +126,7 @@ public abstract class SignalProtocol extends AbstractProtocol
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Discarding buffer"); //$NON-NLS-1$
+          TRACER.trace("Discarding buffer"); //$NON-NLS-1$
         }
 
         buffer.release();
@@ -183,7 +183,7 @@ public abstract class SignalProtocol extends AbstractProtocol
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Correlation wrap around"); //$NON-NLS-1$
+        TRACER.trace("Correlation wrap around"); //$NON-NLS-1$
       }
 
       nextCorrelationID = MIN_CORRELATION_ID;
@@ -240,7 +240,7 @@ public abstract class SignalProtocol extends AbstractProtocol
           ByteBuffer byteBuffer = buffer.startPutting(getChannel().getChannelIndex());
           if (STREAM_TRACER.isEnabled())
           {
-            STREAM_TRACER.trace(this, "Providing buffer for correlation " + correlationID); //$NON-NLS-1$
+            STREAM_TRACER.trace("Providing buffer for correlation " + correlationID); //$NON-NLS-1$
           }
 
           byteBuffer.putInt(correlationID);
@@ -248,7 +248,7 @@ public abstract class SignalProtocol extends AbstractProtocol
           {
             if (SignalProtocol.TRACER.isEnabled())
             {
-              STREAM_TRACER.trace(this, "Put signal id " + signalID); //$NON-NLS-1$
+              STREAM_TRACER.trace("Put signal id " + signalID); //$NON-NLS-1$
             }
 
             byteBuffer.putShort(signalID);
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 51a00bb00a..9bb94d2e4a 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
@@ -70,7 +70,7 @@ public class BufferInputStream extends InputStream implements BufferHandler
     final int result = currentBuffer.getByteBuffer().get() & 0xff;
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "<-- " + HexUtil.toHex(result) //$NON-NLS-1$
+      TRACER.trace("<-- " + HexUtil.toHex(result) //$NON-NLS-1$
           + (result >= 32 ? " " + Character.toString((char)result) : "")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
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 ca612991c1..c7f0ce4d22 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
@@ -70,7 +70,7 @@ public class BufferOutputStream extends OutputStream
     ensureBuffer();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "--> " + HexUtil.toHex(b) //$NON-NLS-1$
+      TRACER.trace("--> " + HexUtil.toHex(b) //$NON-NLS-1$
           + (b >= 32 ? " " + Character.toString((char)b) : "")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
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 f37b20864d..f8929821de 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
@@ -67,7 +67,7 @@ public class AsynchronousWorkSerializer implements WorkSerializer, Runnable
 
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Notifying executor service"); //$NON-NLS-1$
+        TRACER.trace("Notifying executor service"); //$NON-NLS-1$
       }
 
       executorService.execute(this);
@@ -94,7 +94,7 @@ public class AsynchronousWorkSerializer implements WorkSerializer, Runnable
         {
           if (TRACER.isEnabled())
           {
-            TRACER.trace(this, ex);
+            TRACER.trace(ex);
           }
         }
       }
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 d9b56607e1..2b1d5ee4cf 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
@@ -58,14 +58,14 @@ public abstract class AbstractLifecycle implements Lifecycle, LifecycleNotifier
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Activating");//$NON-NLS-1$
+        TRACER.trace("Activating");//$NON-NLS-1$
       }
 
       onAboutToActivate();
       fireLifecycleAboutToActivate();
       if (DUMPER.isEnabled())
       {
-        DUMPER.trace(this, "DUMP " + ReflectUtil.toString(this)); //$NON-NLS-1$
+        DUMPER.trace("DUMP " + ReflectUtil.toString(this)); //$NON-NLS-1$
       }
 
       onActivate();
@@ -81,7 +81,7 @@ public abstract class AbstractLifecycle implements Lifecycle, LifecycleNotifier
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Deactivating");//$NON-NLS-1$
+        TRACER.trace("Deactivating");//$NON-NLS-1$
       }
 
       fireLifecycleDeactivating();
@@ -94,7 +94,7 @@ public abstract class AbstractLifecycle implements Lifecycle, LifecycleNotifier
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, ex);
+          TRACER.trace(ex);
         }
 
         return ex;
@@ -138,7 +138,7 @@ public abstract class AbstractLifecycle implements Lifecycle, LifecycleNotifier
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, ex);
+          TRACER.trace(ex);
         }
       }
     }
@@ -156,7 +156,7 @@ public abstract class AbstractLifecycle implements Lifecycle, LifecycleNotifier
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, ex);
+          TRACER.trace(ex);
         }
       }
     }
@@ -174,7 +174,7 @@ public abstract class AbstractLifecycle implements Lifecycle, LifecycleNotifier
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, ex);
+          TRACER.trace(ex);
         }
       }
     }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTraceHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTraceHandler.java
index d18a7e359a..c5bca745fb 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTraceHandler.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTraceHandler.java
@@ -28,8 +28,6 @@ public interface OMTraceHandler
 
     public Class getContext();
 
-    public Object getInstance();
-
     public String getMessage();
 
     public Throwable getThrowable();
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTracer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTracer.java
index 29f63e1c57..d472a80c5f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTracer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTracer.java
@@ -17,8 +17,6 @@ import org.eclipse.net4j.util.om.OMTraceHandler.Event;
  */
 public interface OMTracer
 {
-  public static final Object NO_INSTANCE = null;
-
   public OMBundle getBundle();
 
   public OMTracer getParent();
@@ -33,16 +31,6 @@ public interface OMTracer
 
   public void trace(Event traceRecord);
 
-  public Event format(Class context, Object instance, String pattern, Object... args);
-
-  public Event format(Class context, Object instance, String pattern, Throwable t, Object... args);
-
-  public Event trace(Class context, Object instance, String msg, Throwable t);
-
-  public Event trace(Class context, Object instance, String msg);
-
-  public Event trace(Class context, Object instance, Throwable t);
-
   public Event format(Class context, String pattern, Object... args);
 
   public Event format(Class context, String pattern, Throwable t, Object... args);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java
index a2c479f8c9..01c8a6c297 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java
@@ -48,7 +48,7 @@ public class EclipseLoggingBridge implements OMLogHandler
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, ex);
+        TRACER.trace(ex);
       }
     }
   }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java
index 6cf0f94240..0a8e9b8a8f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java
@@ -17,6 +17,7 @@ import org.eclipse.net4j.util.om.trace.ContextTracer;
 
 import org.eclipse.internal.net4j.bundle.Net4j;
 import org.eclipse.internal.net4j.bundle.OSGiBundle;
+
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogService;
@@ -46,7 +47,7 @@ public class OSGiLoggingBridge implements OMLogHandler
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, ex);
+        TRACER.trace(ex);
       }
     }
   }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/ContextTracer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/ContextTracer.java
index d943a69768..e39e9f3eff 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/ContextTracer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/ContextTracer.java
@@ -58,31 +58,6 @@ public class ContextTracer
     delegate.setEnabled(enabled);
   }
 
-  public void format(Object instance, String pattern, Object... args)
-  {
-    delegate.format(context, instance, pattern, args);
-  }
-
-  public void format(Object instance, String pattern, Throwable t, Object... args)
-  {
-    delegate.format(context, instance, pattern, t, args);
-  }
-
-  public void trace(Object instance, String msg, Throwable t)
-  {
-    delegate.trace(context, instance, msg, t);
-  }
-
-  public void trace(Object instance, String msg)
-  {
-    delegate.trace(context, instance, msg);
-  }
-
-  public void trace(Object instance, Throwable t)
-  {
-    delegate.trace(context, instance, t);
-  }
-
   public void format(String pattern, Object... args)
   {
     delegate.format(context, pattern, args);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/InstanceTracer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/InstanceTracer.java
deleted file mode 100644
index e6323bb60f..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/InstanceTracer.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.net4j.util.om.trace;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMTracer;
-
-/**
- * @author Eike Stepper
- */
-public class InstanceTracer
-{
-  private OMTracer delegate;
-
-  private Class context;
-
-  private Object instance;
-
-  public InstanceTracer(OMTracer delegate, Class context, Object instance)
-  {
-    this.delegate = delegate;
-    this.context = context;
-    this.instance = instance;
-  }
-
-  public OMBundle getBundle()
-  {
-    return delegate.getBundle();
-  }
-
-  public String getFullName()
-  {
-    return delegate.getFullName();
-  }
-
-  public String getName()
-  {
-    return delegate.getName();
-  }
-
-  public OMTracer getParent()
-  {
-    return delegate.getParent();
-  }
-
-  public boolean isEnabled()
-  {
-    return delegate.isEnabled();
-  }
-
-  public void setEnabled(boolean enabled)
-  {
-    delegate.setEnabled(enabled);
-  }
-
-  public void format(String pattern, Object... args)
-  {
-    delegate.format(context, instance, pattern, args);
-  }
-
-  public void format(String pattern, Throwable t, Object... args)
-  {
-    delegate.format(context, instance, pattern, t, args);
-  }
-
-  public void trace(String msg, Throwable t)
-  {
-    delegate.trace(context, instance, msg, t);
-  }
-
-  public void trace(String msg)
-  {
-    delegate.trace(context, instance, msg);
-  }
-
-  public void trace(Throwable t)
-  {
-    delegate.trace(context, instance, t);
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java
index d8cae7b5f6..c4dd14c725 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java
@@ -36,7 +36,7 @@ public class PrintTraceHandler implements OMTraceHandler
 
   public void traced(Event event)
   {
-    stream.println("[" + event.getInstance() + "] " + event.getMessage()); //$NON-NLS-1$
+    stream.println("[" + event.getContext() + "] " + event.getMessage()); //$NON-NLS-1$
     if (event.getThrowable() != null)
     {
       IOUtil.print(event.getThrowable(), stream);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java
index eef8d7a7a0..eb51af074f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java
@@ -11,7 +11,6 @@
 package org.eclipse.net4j.util.om.trace;
 
 import org.eclipse.net4j.util.IOUtil;
-import org.eclipse.net4j.util.ReflectUtil;
 import org.eclipse.net4j.util.om.OMTraceHandler;
 
 import java.io.DataOutputStream;
@@ -88,7 +87,6 @@ public class RemoteTraceHandler implements OMTraceHandler
       writeUTF(out, event.getTracer().getBundle().getBundleID());
       writeUTF(out, event.getTracer().getFullName());
       writeUTF(out, event.getContext() == null ? "" : event.getContext().getName());
-      writeUTF(out, ReflectUtil.getLabel(event.getInstance()));
       writeUTF(out, event.getMessage());
       if (event.getThrowable() == null)
       {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java
index 66ee0fb1d3..40410b92f9 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java
@@ -151,7 +151,6 @@ public class RemoteTraceServer
     event.bundleID = in.readUTF();
     event.tracerName = in.readUTF();
     event.context = in.readUTF();
-    event.instance = in.readUTF();
     event.message = in.readUTF();
     if (in.readBoolean())
     {
@@ -205,8 +204,6 @@ public class RemoteTraceServer
 
     String context;
 
-    String instance;
-
     String message;
 
     String throwable;
@@ -249,11 +246,6 @@ public class RemoteTraceServer
       return context;
     }
 
-    public String getInstance()
-    {
-      return instance;
-    }
-
     public String getMessage()
     {
       return message;
@@ -290,9 +282,6 @@ public class RemoteTraceServer
       builder.append(", context=");
       builder.append(context);
 
-      builder.append(", instance=");
-      builder.append(instance);
-
       builder.append(", message=");
       builder.append(message);
 
@@ -323,10 +312,8 @@ public class RemoteTraceServer
       case 5:
         return context;
       case 6:
-        return instance;
-      case 7:
         return message;
-      case 8:
+      case 7:
         return throwable;
       }
 
@@ -371,7 +358,6 @@ public class RemoteTraceServer
       stream.println(event.getBundleID());
       stream.println(event.getTracerName());
       stream.println(event.getContext());
-      stream.println(event.getInstance());
       stream.println(event.getMessage());
 
       String throwable = event.getThrowable();
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractCachingRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractCachingRegistry.java
index b98588627f..ac4e070a36 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractCachingRegistry.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractCachingRegistry.java
@@ -18,8 +18,8 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * TODO Check if all methods of {@link DelegatingRegistry} still do what they should.
- * TODO Remove {@link DelegatingRegistry}?
+ * TODO Check if all methods of {@link DelegatingRegistry} still do what they
+ * should. TODO Remove {@link DelegatingRegistry}?
  * 
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractRegistry.java
index c9715ab8cc..70dad2a858 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractRegistry.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractRegistry.java
@@ -129,7 +129,7 @@ public abstract class AbstractRegistry<ID, E extends IRegistryElement<ID>> imple
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, ex);
+          TRACER.trace(ex);
         }
       }
     }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java
index 5c6659243d..917704ea6f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java
@@ -10,7 +10,6 @@
  **************************************************************************/
 package org.eclipse.net4j.util.registry;
 
-
 import org.eclipse.net4j.util.registry.IRegistryListener.EventType;
 
 import java.util.Set;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistry.java
index 17051afdf8..510c2f4eec 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistry.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistry.java
@@ -10,11 +10,9 @@
  **************************************************************************/
 package org.eclipse.net4j.util.registry;
 
-
 import java.util.Collection;
 import java.util.Set;
 
-
 /**
  * Implementation note: {@link Object#equals(Object)} and
  * {@link Object#hashCode()} are based on pointer equality.
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistryListener.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistryListener.java
index a268d93480..49d18a62e1 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistryListener.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistryListener.java
@@ -1,12 +1,12 @@
 package org.eclipse.net4j.util.registry;
 
-
 /**
  * @author Eike Stepper
  */
 public interface IRegistryListener<ID, E extends IRegistryElement<ID>>
 {
-  public void notifyRegistryEvent(IRegistry<ID, E> registry, IRegistryListener.EventType eventType, E element);
+  public void notifyRegistryEvent(IRegistry<ID, E> registry, IRegistryListener.EventType eventType,
+      E element);
 
   /**
    * @author Eike Stepper