summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-11-11 04:51:44 (EST)
committerEike Stepper2006-11-11 04:51:44 (EST)
commit7a9efaeb7a6bbd8fbdbc2d14732329399c5f92f7 (patch)
tree17eb8854b81fad2b5f4ccdcd185c0390fc7542e6
parent1e38486f5ebfe111397f24befecef9a10d108d3c (diff)
downloadcdo-7a9efaeb7a6bbd8fbdbc2d14732329399c5f92f7.zip
cdo-7a9efaeb7a6bbd8fbdbc2d14732329399c5f92f7.tar.gz
cdo-7a9efaeb7a6bbd8fbdbc2d14732329399c5f92f7.tar.bz2
Removed InstanceTracer
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java92
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/ResourceManagerImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/AnnouncePackageIndication.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/CommitTransactionIndication.java39
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DeleteResourcesIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/DescribePackageIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/InvalidationNotificationRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadObjectIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/LoadResourceIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryExtentIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/QueryXRefsIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/RemovalNotificationRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcePathIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourceRIDIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/protocol/ResourcesChangedRequest.java6
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java8
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTraceHandlerEventImpl.java11
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTracerImpl.java39
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiBundle.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiPlatform.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java21
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferImpl.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPoolImpl.java6
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ChannelImpl.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/AbstractTCPConnector.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ControlChannelImpl.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPAcceptorImpl.java6
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPSelectorImpl.java12
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPUtil.java2
-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/Signal.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java12
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferInputStream.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/AbstractLifecycle.java14
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTraceHandler.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTracer.java12
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java3
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/ContextTracer.java25
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/InstanceTracer.java88
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java16
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractCachingRegistry.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractRegistry.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistry.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistryListener.java4
55 files changed, 171 insertions, 353 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 d50ef47..3b73159 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 aba729d..4f965c1 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 a5584b4..e4335ca 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 68d74ea..7e45064 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 d32a052..daddd1a 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 3da7379..d5005a7 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 618b7c6..fb82a66 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 e31a9ac..9abe732 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 2dde316..301a57b 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 6965579..d748d8d 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 384811e..56edc33 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 7e759e7..8fdd08f 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 c82871c..59bd948 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 6b7f504..6ac4ff3 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 f72c3e8..5e821b7 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);
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java
index 41f0c31..c55e2bb 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java
@@ -261,7 +261,7 @@ public class TCPTransportTest extends AbstractOMTest
final ChannelInputStream[] inputStream = new ChannelInputStream[1];
acceptor.setReceiveExecutor(Executors.newCachedThreadPool());
- acceptor.addListener(new TCPAcceptorListener()
+ acceptor.addAcceptorListener(new TCPAcceptorListener()
{
public void notifyConnectorAccepted(TCPAcceptor acceptor, TCPConnector connector)
{
@@ -322,7 +322,7 @@ public class TCPTransportTest extends AbstractOMTest
final ChannelInputStream[] inputStream = new ChannelInputStream[1];
acceptor.setReceiveExecutor(Executors.newCachedThreadPool());
- acceptor.addListener(new TCPAcceptorListener()
+ acceptor.addAcceptorListener(new TCPAcceptorListener()
{
public void notifyConnectorAccepted(TCPAcceptor acceptor, TCPConnector connector)
{
@@ -390,7 +390,7 @@ public class TCPTransportTest extends AbstractOMTest
final ChannelInputStream[] inputStream = new ChannelInputStream[1];
acceptor.setReceiveExecutor(Executors.newCachedThreadPool());
- acceptor.addListener(new TCPAcceptorListener()
+ acceptor.addAcceptorListener(new TCPAcceptorListener()
{
public void notifyConnectorAccepted(TCPAcceptor acceptor, TCPConnector connector)
{
@@ -472,7 +472,7 @@ public class TCPTransportTest extends AbstractOMTest
final ChannelInputStream[] inputStream = new ChannelInputStream[1];
acceptor.setReceiveExecutor(Executors.newCachedThreadPool());
- acceptor.addListener(new TCPAcceptorListener()
+ acceptor.addAcceptorListener(new TCPAcceptorListener()
{
public void notifyConnectorAccepted(TCPAcceptor acceptor, TCPConnector connector)
{
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 c32801d..9481196 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 5e40b6c..cde96bc 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 e4d45ff..e7eb1ce 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 ee92561..ce33622 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 b6c445e..8cf2b11 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 d80e5d7..479a18a 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 b5926f4..befd995 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 ea86cc4..7fc9a7e 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 b3f1352..81c428e 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 e98c08e..072009f 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 676eb9d..7313b40 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 03daf25..ebca313 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 a556b86..9668bfc 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 b102846..53f8977 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 af664c0..e095225 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 55c8505..6b2b14c 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 e217bb0..3d1ddfe 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 5e55493..dc26241 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 8f4e6e4..479b572 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 4146d66..c8c0e79 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 a3e7d0c..11c84a3 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 51a00bb..9bb94d2 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 ca61299..c7f0ce4 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 f37b208..f892982 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 d9b5660..2b1d5ee 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 d18a7e3..c5bca74 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 29f63e1..d472a80 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 a2c479f..01c8a6c 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 6cf0f94..0a8e9b8 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 d943a69..e39e9f3 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 e6323bb..0000000
--- 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 d8cae7b..c4dd14c 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 eef8d7a..eb51af0 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 66ee0fb..40410b9 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 b985886..ac4e070 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 c9715ab..70dad2a 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 5c66592..917704e 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 17051af..510c2f4 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 a268d93..49d18a6 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