Removed InstanceTracer

15 files changed, 91 insertions, 95 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
index d50ef47b60..3b73159ceb 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
@@ -365,7 +365,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, SELECT_PACKAGES);
+      TRACER.trace(SELECT_PACKAGES);
     }
 
     jdbcTemplate.query(SELECT_PACKAGES, new RowCallbackHandler()
@@ -377,7 +377,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
 
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Initializing package: pid=" + pid + ", name=" + name);
+          TRACER.trace("Initializing package: pid=" + pid + ", name=" + name);
         }
         PackageInfo packageInfo = packageManager.addPackage(pid, name);
         initClasses(packageInfo);
@@ -394,7 +394,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = { new Integer(packageInfo.getPid())};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(SELECT_CLASSES, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(SELECT_CLASSES, "?", args));
     }
 
     nestedTemplate.query(SELECT_CLASSES, args, new RowCallbackHandler()
@@ -413,7 +413,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
 
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Initializing class: cid=" + cid + ", name=" + name + ", parentName="
+          TRACER.trace("Initializing class: cid=" + cid + ", name=" + name + ", parentName="
               + parentName + ", tableName=" + tableName);
         }
         ClassInfo classInfo = packageInfo.addClass(cid, name, parentName, tableName);
@@ -437,7 +437,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = { new Integer(classInfo.getCID())};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(SELECT_ATTRIBUTES, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(SELECT_ATTRIBUTES, "?", args));
     }
 
     nestedTemplate.query(SELECT_ATTRIBUTES, args, new RowCallbackHandler()
@@ -452,7 +452,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
 
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Initializing attribute: name=" + name + ", featureId=" + featureId
+          TRACER.trace("Initializing attribute: name=" + name + ", featureId=" + featureId
               + ", dataType=" + dataType + ", columnName=" + columnName + ", columnType="
               + columnType);
         }
@@ -485,7 +485,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = { path};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(SELECT_RID_OF_RESOURCE, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(SELECT_RID_OF_RESOURCE, "?", args));
     }
 
     final int[] rows = new int[1];
@@ -511,7 +511,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
 
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Selected " + result);
+      TRACER.trace("Selected " + result);
     }
     return result;
   }
@@ -521,7 +521,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = { new Integer(rid)};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(SELECT_PATH_OF_RESOURCE, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(SELECT_PATH_OF_RESOURCE, "?", args));
     }
 
     final int[] rows = new int[1];
@@ -547,7 +547,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
 
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Selected " + result);
+      TRACER.trace("Selected " + result);
     }
     return result;
   }
@@ -557,7 +557,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = ridBounds(rid);
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(SELECT_MAX_OID_FRAGMENT, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(SELECT_MAX_OID_FRAGMENT, "?", args));
     }
     long oid = jdbcTemplate.queryForLong(SELECT_MAX_OID_FRAGMENT, args);
     return oidEncoder.getOIDFragment(oid);
@@ -574,7 +574,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, SELECT_MAX_PID);
+      TRACER.trace(SELECT_MAX_PID);
     }
     return jdbcTemplate.queryForInt(SELECT_MAX_PID);
   }
@@ -583,7 +583,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, SELECT_MAX_CID);
+      TRACER.trace(SELECT_MAX_CID);
     }
     return jdbcTemplate.queryForInt(SELECT_MAX_CID);
   }
@@ -592,7 +592,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, SELECT_MAX_RID);
+      TRACER.trace(SELECT_MAX_RID);
     }
     return jdbcTemplate.queryForInt(SELECT_MAX_RID);
   }
@@ -609,7 +609,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = { new Long(oid), new Integer(feature)};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(SELECT_COLLECTION_COUNT, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(SELECT_COLLECTION_COUNT, "?", args));
     }
 
     return jdbcTemplate.queryForInt(SELECT_COLLECTION_COUNT, args);
@@ -620,7 +620,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = { new Long(oid), new Integer(oca)};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(DO_OPTIMISTIC_CONTROL, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(DO_OPTIMISTIC_CONTROL, "?", args));
     }
 
     int changed = jdbcTemplate.update(DO_OPTIMISTIC_CONTROL, args);
@@ -653,7 +653,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
         new Integer(startIndex), new Integer(endIndex)};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(MOVE_REFERENCES_RELATIVE, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(MOVE_REFERENCES_RELATIVE, "?", args));
     }
 
     // ignore number of affected rows
@@ -670,7 +670,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = { oid};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(REMOVE_REFERENCES, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(REMOVE_REFERENCES, "?", args));
     }
 
     jdbcTemplate.update(REMOVE_REFERENCES, args);
@@ -700,7 +700,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = { new Long(oid)};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(SELECT_CID_OF_OBJECT, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(SELECT_CID_OF_OBJECT, "?", args));
     }
 
     try
@@ -751,7 +751,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, sql);
+      TRACER.trace(sql);
     }
 
     int rows = jdbcTemplate.update(sql);
@@ -766,7 +766,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(sql, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(sql, "?", args));
     }
 
     int rows = jdbcTemplate.update(sql, args);
@@ -781,7 +781,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(sql, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(sql, "?", args));
     }
 
     int rows = jdbcTemplate.update(sql, args, types);
@@ -799,7 +799,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
       Object[] args = ridBounds(resourceInfo.getRID());
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, StringHelper.replaceWildcards(TRANSMIT_CONTENT, "?", args));
+        TRACER.trace(StringHelper.replaceWildcards(TRANSMIT_CONTENT, "?", args));
       }
 
       try
@@ -816,8 +816,8 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
 
               if (TRACER.isEnabled())
               {
-                TRACER.trace(this, "Object: oid=" + oidEncoder.toString(oid) + ", oca=" + oca
-                    + ", cid=" + cid);
+                TRACER.trace("Object: oid=" + oidEncoder.toString(oid) + ", oca=" + oca + ", cid="
+                    + cid);
               }
 
               out.writeLong(oid);
@@ -854,7 +854,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = { new Long(oid)};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(TRANSMIT_OBJECT, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(TRANSMIT_OBJECT, "?", args));
     }
 
     try
@@ -870,8 +870,8 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
 
             if (TRACER.isEnabled())
             {
-              TRACER.trace(this, "Object: oid=" + oidEncoder.toString(oid) + ", oca=" + oca
-                  + ", cid=" + cid);
+              TRACER.trace("Object: oid=" + oidEncoder.toString(oid) + ", oca=" + oca + ", cid="
+                  + cid);
             }
 
             out.writeLong(oid);
@@ -925,7 +925,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
       Object[] args = { new Long(child[0]), Boolean.TRUE};
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, StringHelper.replaceWildcards(SELECT_CONTAINER_OF_OBJECT, "?", args));
+        TRACER.trace(StringHelper.replaceWildcards(SELECT_CONTAINER_OF_OBJECT, "?", args));
       }
 
       child[0] = 0;
@@ -947,7 +947,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
       Container container = (Container) it.next();
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Container: oid=" + oidEncoder.toString(container.oid) + ", cid="
+        TRACER.trace("Container: oid=" + oidEncoder.toString(container.oid) + ", cid="
             + container.cid);
       }
 
@@ -961,7 +961,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = { new Long(oid)};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(TRANSMIT_REFERENCES, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(TRANSMIT_REFERENCES, "?", args));
     }
 
     try
@@ -977,7 +977,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
             int cid = resultSet.getInt(3);
             if (TRACER.isEnabled())
             {
-              TRACER.trace(this, "Reference: feature=" + feature + ", target="
+              TRACER.trace("Reference: feature=" + feature + ", target="
                   + oidEncoder.toString(target) + ", cid=" + cid);
             }
 
@@ -1015,7 +1015,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
         Object[] args = { new Long(oid)};
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, StringHelper.replaceWildcards(sql, "?", args));
+          TRACER.trace(StringHelper.replaceWildcards(sql, "?", args));
         }
 
         try
@@ -1056,8 +1056,8 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Querying all resources");
-      TRACER.trace(this, SELECT_ALL_RESOURCES);
+      TRACER.trace("Querying all resources");
+      TRACER.trace(SELECT_ALL_RESOURCES);
     }
 
     try
@@ -1092,7 +1092,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Deleting resource: rid=" + rid);
+      TRACER.trace("Deleting resource: rid=" + rid);
     }
 
     sql(DELETE_RESOURCE, new Object[] { rid});
@@ -1100,7 +1100,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = ridBounds(rid);
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(SELECT_ALL_OBJECTS_OF_RESOURCE, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(SELECT_ALL_OBJECTS_OF_RESOURCE, "?", args));
     }
 
     jdbcTemplate.query(SELECT_ALL_OBJECTS_OF_RESOURCE, args, new RowCallbackHandler()
@@ -1112,7 +1112,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
 
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Deleting object: oid=" + oidEncoder.toString(oid) + ", cid=" + cid);
+          TRACER.trace("Deleting object: oid=" + oidEncoder.toString(oid) + ", cid=" + cid);
         }
 
         removeObject(oid, cid);
@@ -1124,7 +1124,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Removing stale references");
+      TRACER.trace("Removing stale references");
     }
 
     final Set<Long> modifiedOIDs = new HashSet<Long>();
@@ -1138,7 +1138,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
 
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Reference: oid=" + oidEncoder.toString(oid) + ", feature=" + feature
+          TRACER.trace("Reference: oid=" + oidEncoder.toString(oid) + ", feature=" + feature
               + ", ordinal=" + ordinal);
         }
 
@@ -1191,7 +1191,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     String sql = buffer.toString();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, sql);
+      TRACER.trace(sql);
     }
 
     try
@@ -1206,7 +1206,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
             int cid = exactMatch ? context : resultSet.getInt(2);
             if (TRACER.isEnabled())
             {
-              TRACER.trace(this, "Extent: oid=" + oidEncoder.toString(oid)
+              TRACER.trace("Extent: oid=" + oidEncoder.toString(oid)
                   + (exactMatch ? "" : ", cid=" + cid));
             }
 
@@ -1237,7 +1237,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
     Object[] args = { new Long(oid)};
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, StringHelper.replaceWildcards(SELECT_XREFS_OF_OBJECT, "?", args));
+      TRACER.trace(StringHelper.replaceWildcards(SELECT_XREFS_OF_OBJECT, "?", args));
     }
 
     try
@@ -1253,8 +1253,8 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
             int cid = resultSet.getInt(3);
             if (TRACER.isEnabled())
             {
-              TRACER.trace(this, "XRef: referer=" + oidEncoder.toString(referer) + ", feature="
-                  + feature + ", cid=" + cid);
+              TRACER.trace("XRef: referer=" + oidEncoder.toString(referer) + ", feature=" + feature
+                  + ", cid=" + cid);
             }
 
             out.writeLong(referer);
@@ -1280,7 +1280,7 @@ public class MapperImpl extends AbstractLifecycle implements Mapper, SQLConstant
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Creating attribute tables");
+      TRACER.trace("Creating attribute tables");
     }
 
     Database database = DBGenFactory.eINSTANCE.createDatabase();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/ResourceManagerImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/ResourceManagerImpl.java
index aba729d0a1..4f965c1d30 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/ResourceManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/ResourceManagerImpl.java
@@ -39,7 +39,7 @@ public class ResourceManagerImpl extends AbstractLifecycle implements ResourceMa
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Registering " + resourceInfo);
+      TRACER.trace("Registering " + resourceInfo);
     }
 
     ridToResourceMap.put(resourceInfo.getRID(), resourceInfo);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/AnnouncePackageIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/AnnouncePackageIndication.java
index a5584b4a93..e4335cac39 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/AnnouncePackageIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/AnnouncePackageIndication.java
@@ -54,7 +54,7 @@ public class AnnouncePackageIndication extends IndicationWithResponse
     packageName = in.readString();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Announced package " + packageName);
+      TRACER.trace("Announced package " + packageName);
     }
   }
 
@@ -66,7 +66,7 @@ public class AnnouncePackageIndication extends IndicationWithResponse
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Unknown package " + packageName);
+        TRACER.trace("Unknown package " + packageName);
       }
 
       out.writeInt(-1);
@@ -80,8 +80,7 @@ public class AnnouncePackageIndication extends IndicationWithResponse
         ClassInfo classInfo = classInfos[i];
         if (TRACER.isEnabled())
         {
-          TRACER
-              .trace(this, "Responding class " + classInfo.getName() + " = " + classInfo.getCID());
+          TRACER.trace("Responding class " + classInfo.getName() + " = " + classInfo.getCID());
         }
 
         out.writeInt(classInfo.getCID());
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CommitTransactionIndication.java
index 68d74eaa79..7e45064b9b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CommitTransactionIndication.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.cdo.server.ColumnConverter;
 import org.eclipse.emf.cdo.server.Mapper;
 import org.eclipse.emf.cdo.server.ResourceInfo;
 import org.eclipse.emf.cdo.server.ServerCDOProtocol;
-import org.eclipse.emf.cdo.server.ServerCDOResProtocol;
 import org.eclipse.emf.cdo.server.impl.SQLConstants;
 import org.eclipse.emf.cdo.server.internal.CDOServer;
 
@@ -173,7 +172,7 @@ public class CommitTransactionIndication extends IndicationWithResponse
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "receiveObjectsToDetach()");
+      TRACER.trace("receiveObjectsToDetach()");
     }
 
     for (;;)
@@ -192,7 +191,7 @@ public class CommitTransactionIndication extends IndicationWithResponse
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "receiveObjectsToAttach()");
+      TRACER.trace("receiveObjectsToAttach()");
     }
 
     int count = in.readInt();
@@ -222,7 +221,7 @@ public class CommitTransactionIndication extends IndicationWithResponse
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "receiveObjectsToAttachReferences()");
+      TRACER.trace("receiveObjectsToAttachReferences()");
     }
 
     int count = in.readInt();
@@ -283,8 +282,7 @@ public class CommitTransactionIndication extends IndicationWithResponse
     oidList.add(val);
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Mapping oid " + oidEncoder.toString(key) + " --> "
-          + oidEncoder.toString(val));
+      TRACER.trace("Mapping oid " + oidEncoder.toString(key) + " --> " + oidEncoder.toString(val));
     }
 
     return oid;
@@ -310,7 +308,7 @@ public class CommitTransactionIndication extends IndicationWithResponse
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "receiveObjectChanges()");
+      TRACER.trace("receiveObjectChanges()");
     }
 
     for (;;)
@@ -383,7 +381,7 @@ public class CommitTransactionIndication extends IndicationWithResponse
     if (TRACER.isEnabled())
     {
       OIDEncoder oidEncoder = mapper.getOidEncoder();
-      TRACER.trace(this, "received reference set: oid=" + oidEncoder.toString(oid) + ", feature="
+      TRACER.trace("received reference set: oid=" + oidEncoder.toString(oid) + ", feature="
           + feature + ", target=" + oidEncoder.toString(target) + ", containment=" + containment);
     }
 
@@ -403,7 +401,7 @@ public class CommitTransactionIndication extends IndicationWithResponse
     if (TRACER.isEnabled())
     {
       OIDEncoder oidEncoder = mapper.getOidEncoder();
-      TRACER.trace(this, "received reference unset: oid=" + oidEncoder.toString(oid) + ", feature="
+      TRACER.trace("received reference unset: oid=" + oidEncoder.toString(oid) + ", feature="
           + feature);
     }
 
@@ -431,7 +429,7 @@ public class CommitTransactionIndication extends IndicationWithResponse
     if (TRACER.isEnabled())
     {
       OIDEncoder oidEncoder = mapper.getOidEncoder();
-      TRACER.trace(this, "received reference add: oid=" + oidEncoder.toString(oid) + ", feature="
+      TRACER.trace("received reference add: oid=" + oidEncoder.toString(oid) + ", feature="
           + feature + ", ordinal=" + ordinal + ", target=" + oidEncoder.toString(target)
           + ", containment=" + containment);
     }
@@ -459,9 +457,8 @@ public class CommitTransactionIndication extends IndicationWithResponse
     if (TRACER.isEnabled())
     {
       OIDEncoder oidEncoder = mapper.getOidEncoder();
-      TRACER.trace(this, "receiveObjectChangesReferences(REMOVE, sourceId="
-          + oidEncoder.toString(oid) + ", featureId=" + feature + ", sourceOrdinal=" + ordinal
-          + ")");
+      TRACER.trace("receiveObjectChangesReferences(REMOVE, sourceId=" + oidEncoder.toString(oid)
+          + ", featureId=" + feature + ", sourceOrdinal=" + ordinal + ")");
     }
 
     mapper.removeReference(oid, feature, ordinal);
@@ -483,7 +480,7 @@ public class CommitTransactionIndication extends IndicationWithResponse
     if (TRACER.isEnabled())
     {
       OIDEncoder oidEncoder = mapper.getOidEncoder();
-      TRACER.trace(this, "received reference move: oid=" + oidEncoder.toString(oid) + ", feature="
+      TRACER.trace("received reference move: oid=" + oidEncoder.toString(oid) + ", feature="
           + feature + ", ordinal=" + ordinal + ", moveToIndex=" + moveToIndex);
     }
 
@@ -515,11 +512,11 @@ public class CommitTransactionIndication extends IndicationWithResponse
       optimisticControlException = true;
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "");
-        TRACER.trace(this, "============================");
-        TRACER.trace(this, "OPTIMISTIC CONTROL EXCEPTION");
-        TRACER.trace(this, "============================");
-        TRACER.trace(this, "");
+        TRACER.trace("");
+        TRACER.trace("============================");
+        TRACER.trace("OPTIMISTIC CONTROL EXCEPTION");
+        TRACER.trace("============================");
+        TRACER.trace("");
       }
 
       return oca;
@@ -608,7 +605,7 @@ public class CommitTransactionIndication extends IndicationWithResponse
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "receiveObjectsToAttachAttributes()");
+      TRACER.trace("receiveObjectsToAttachAttributes()");
     }
 
     while (classInfo != null)
@@ -628,7 +625,7 @@ public class CommitTransactionIndication extends IndicationWithResponse
         AttributeInfo attributeInfo = attributeInfos[i];
         if (TRACER.isEnabled())
         {
-          TRACER.trace(this, "Receiving attribute " + attributeInfo.getName());
+          TRACER.trace("Receiving attribute " + attributeInfo.getName());
         }
 
         ColumnConverter converter = mapper.getColumnConverter();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DeleteResourcesIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DeleteResourcesIndication.java
index d32a0524fb..daddd1ab03 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DeleteResourcesIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DeleteResourcesIndication.java
@@ -77,7 +77,7 @@ public class DeleteResourcesIndication extends IndicationWithResponse implements
 
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Deleting rid " + rid);
+        TRACER.trace("Deleting rid " + rid);
       }
 
       rids.add(rid);
@@ -102,7 +102,7 @@ public class DeleteResourcesIndication extends IndicationWithResponse implements
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Deleted resources: " + ok);
+      TRACER.trace("Deleted resources: " + ok);
     }
 
     out.writeBoolean(ok);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DescribePackageIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DescribePackageIndication.java
index 3da7379129..d5005a70ec 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DescribePackageIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DescribePackageIndication.java
@@ -60,7 +60,7 @@ public class DescribePackageIndication extends IndicationWithResponse
     String packageName = in.readString();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Described package " + packageName);
+      TRACER.trace("Described package " + packageName);
     }
 
     PackageInfo packageInfo = mapper.getPackageManager().addPackage(pid, packageName);
@@ -79,7 +79,7 @@ public class DescribePackageIndication extends IndicationWithResponse
       ClassInfo classInfo = iter.next();
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Responding class " + classInfo.getName() + " = " + classInfo.getCID());
+        TRACER.trace("Responding class " + classInfo.getName() + " = " + classInfo.getCID());
       }
 
       out.writeInt(classInfo.getCID());
@@ -100,7 +100,7 @@ public class DescribePackageIndication extends IndicationWithResponse
       String tableName = in.readString();
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Described class " + name);
+        TRACER.trace("Described class " + name);
       }
 
       ClassInfo classInfo = packageInfo.addClass(cid, name, parentName, tableName);
@@ -126,7 +126,7 @@ public class DescribePackageIndication extends IndicationWithResponse
       int columnType = in.readInt();
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Described attribute " + name);
+        TRACER.trace("Described attribute " + name);
       }
 
       AttributeInfo attributeInfo = classInfo.addAttribute(name, featureId, dataType, columnName,
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/InvalidationNotificationRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/InvalidationNotificationRequest.java
index 618b7c6fd9..fb82a66ef5 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/InvalidationNotificationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/InvalidationNotificationRequest.java
@@ -52,7 +52,7 @@ public class InvalidationNotificationRequest extends Request
     int size = changedObjectIds.size();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Transmitting " + size + " invalidations");
+      TRACER.trace("Transmitting " + size + " invalidations");
     }
 
     out.writeInt(size);
@@ -60,7 +60,7 @@ public class InvalidationNotificationRequest extends Request
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Transmitting oid " + oid);
+        TRACER.trace("Transmitting oid " + oid);
       }
 
       out.writeLong(oid);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadObjectIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadObjectIndication.java
index e31a9acadd..9abe732a4b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadObjectIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadObjectIndication.java
@@ -52,7 +52,7 @@ public class LoadObjectIndication extends IndicationWithResponse
     oid = in.readLong();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Loading object " + mapper.getOidEncoder().toString(oid));
+      TRACER.trace("Loading object " + mapper.getOidEncoder().toString(oid));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadResourceIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadResourceIndication.java
index 2dde316483..301a57b1b5 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadResourceIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadResourceIndication.java
@@ -54,7 +54,7 @@ public class LoadResourceIndication extends IndicationWithResponse
     rid = in.readInt();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Loading rid " + rid);
+      TRACER.trace("Loading rid " + rid);
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryExtentIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryExtentIndication.java
index 69655795c1..d748d8d2fd 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryExtentIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryExtentIndication.java
@@ -59,7 +59,7 @@ public class QueryExtentIndication extends IndicationWithResponse
 
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Received cid=" + cid + ", exactMatch=" + exactMatch + ", rid=" + rid);
+      TRACER.trace("Received cid=" + cid + ", exactMatch=" + exactMatch + ", rid=" + rid);
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryXRefsIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryXRefsIndication.java
index 384811e99c..56edc33995 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryXRefsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryXRefsIndication.java
@@ -56,7 +56,7 @@ public class QueryXRefsIndication extends IndicationWithResponse
 
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Received oid=" + oid + ", rid=" + rid);
+      TRACER.trace("Received oid=" + oid + ", rid=" + rid);
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/RemovalNotificationRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/RemovalNotificationRequest.java
index 7e759e7d1e..8fdd08f8f5 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/RemovalNotificationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/RemovalNotificationRequest.java
@@ -52,7 +52,7 @@ public class RemovalNotificationRequest extends Request
     int size = rids.size();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Transmitting " + size + " removals");
+      TRACER.trace("Transmitting " + size + " removals");
     }
 
     out.writeInt(size);
@@ -60,7 +60,7 @@ public class RemovalNotificationRequest extends Request
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Transmitting rid " + rid);
+        TRACER.trace("Transmitting rid " + rid);
       }
 
       out.writeInt(rid);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcePathIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcePathIndication.java
index c82871c5e2..59bd948ece 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcePathIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcePathIndication.java
@@ -54,7 +54,7 @@ public class ResourcePathIndication extends IndicationWithResponse
     path = in.readString();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Requested path " + path);
+      TRACER.trace("Requested path " + path);
     }
   }
 
@@ -69,7 +69,7 @@ public class ResourcePathIndication extends IndicationWithResponse
       resourceManager.registerResourceInfo(path, rid, 1);
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "No resource with path " + path + " - reserving rid " + rid);
+        TRACER.trace("No resource with path " + path + " - reserving rid " + rid);
       }
 
       out.writeInt(-rid);
@@ -78,7 +78,7 @@ public class ResourcePathIndication extends IndicationWithResponse
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Responding rid " + info.getRID());
+        TRACER.trace("Responding rid " + info.getRID());
       }
 
       out.writeInt(info.getRID());
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourceRIDIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourceRIDIndication.java
index 6b7f504753..6ac4ff3064 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourceRIDIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourceRIDIndication.java
@@ -54,7 +54,7 @@ public class ResourceRIDIndication extends IndicationWithResponse
     rid = in.readInt();
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Requested rid " + rid);
+      TRACER.trace("Requested rid " + rid);
     }
   }
 
@@ -67,7 +67,7 @@ public class ResourceRIDIndication extends IndicationWithResponse
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "No resource with rid " + rid);
+        TRACER.trace("No resource with rid " + rid);
       }
 
       out.writeString(null);
@@ -76,7 +76,7 @@ public class ResourceRIDIndication extends IndicationWithResponse
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Responding path " + info.getPath());
+        TRACER.trace("Responding path " + info.getPath());
       }
 
       out.writeString(info.getPath());
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcesChangedRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcesChangedRequest.java
index f72c3e8a39..5e821b77c6 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcesChangedRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcesChangedRequest.java
@@ -52,15 +52,15 @@ public class ResourcesChangedRequest extends Request
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace(this, "Transmitting " + infos.size() + " resource changes");
+      TRACER.trace("Transmitting " + infos.size() + " resource changes");
     }
 
     for (ResourceChangeInfo info : infos)
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace(this, "Transmitting changeKind=" + info.getChangeKind() + ", rid="
-            + info.getRID() + ". path=" + info.getPath());
+        TRACER.trace("Transmitting changeKind=" + info.getChangeKind() + ", rid=" + info.getRID()
+            + ". path=" + info.getPath());
       }
 
       info.transmit(out);