Remove some warnings

7 files changed, 5 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NotificationManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NotificationManager.java
index 0cfefd95c2..f9bc8d7354 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NotificationManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NotificationManager.java
@@ -10,7 +10,6 @@
  **************************************************************************/
 package org.eclipse.emf.cdo.internal.server;
 
-import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.id.CDOIDAndVersion;
 import org.eclipse.emf.cdo.common.id.CDOIDUtil;
 import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
index 69d7e19437..5b8da872c8 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
@@ -12,11 +12,9 @@
 package org.eclipse.emf.cdo.internal.server;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.id.CDOIDAndVersion;
 import org.eclipse.emf.cdo.common.id.CDOIDMetaRange;
 import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory;
 import org.eclipse.emf.cdo.common.id.CDOIDTemp;
-import org.eclipse.emf.cdo.common.id.CDOIDUtil;
 import org.eclipse.emf.cdo.common.model.CDOPackage;
 import org.eclipse.emf.cdo.common.model.CDOPackageManager;
 import org.eclipse.emf.cdo.common.model.core.CDOCorePackage;
@@ -199,7 +197,6 @@ public class Transaction extends View implements ITransaction, IStoreWriter.Comm
   {
     try
     {
-      int modifications = dirtyObjectDeltas.length;
       repository.getNotificationManager().notifyCommit( getSession(), this);
     }
     finally
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ChangeSubscriptionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ChangeSubscriptionIndication.java
index ca554f086b..66f8b8bd81 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ChangeSubscriptionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ChangeSubscriptionIndication.java
@@ -60,6 +60,7 @@ public class ChangeSubscriptionIndication extends CDOReadIndication
     
     if (clear)
     {
+      if (PROTOCOL.isEnabled())  PROTOCOL.trace("Clear subscription");
       view.clearChangeSubscription();
     }
     
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java
index ab8f30a951..8678c8b088 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java
@@ -117,7 +117,7 @@ public class QueryTest extends AbstractCDOTest
     queryResult.close();
 
     assertEquals(false, ((Repository)getRepository()).getQueryManager().isRunning(
-        ((CDOQueryResultIteratorImpl)queryResult).getQueryID()));
+        ((CDOQueryResultIteratorImpl<?>)queryResult).getQueryID()));
 
     transaction.close();
     transaction.getSession().close();
@@ -134,7 +134,7 @@ public class QueryTest extends AbstractCDOTest
     // queryResult.cancel();
     transaction.close();
     assertEquals(false, ((Repository)getRepository()).getQueryManager().isRunning(
-        ((CDOQueryResultIteratorImpl)queryResult).getQueryID()));
+        ((CDOQueryResultIteratorImpl<?>)queryResult).getQueryID()));
     transaction.getSession().close();
   }
 
@@ -150,7 +150,7 @@ public class QueryTest extends AbstractCDOTest
     transaction.getSession().close();
 
     assertEquals(false, ((Repository)getRepository()).getQueryManager().isRunning(
-        ((CDOQueryResultIteratorImpl)queryResult).getQueryID()));
+        ((CDOQueryResultIteratorImpl<?>)queryResult).getQueryID()));
 
   }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
index 61a2abdf2a..c72c80f56f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
@@ -12,7 +12,6 @@
 package org.eclipse.emf.cdo;
 
 import org.eclipse.emf.cdo.common.CDOProtocolSession;
-import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.id.CDOIDAndVersion;
 import org.eclipse.emf.cdo.util.CDOPackageRegistry;
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/PassiveUpdateRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/PassiveUpdateRequest.java
index adb9c04df1..9e4e21c61f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/PassiveUpdateRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/PassiveUpdateRequest.java
@@ -23,7 +23,6 @@ import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
 import org.eclipse.net4j.util.om.trace.ContextTracer;
 
 import java.io.IOException;
-import java.util.Collection;
 import java.util.Map;
 
 /**
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/ECDOIDList.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/ECDOIDList.java
index 531c271f05..f3d89758c2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/ECDOIDList.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/ECDOIDList.java
@@ -169,7 +169,7 @@ public class ECDOIDList<T> implements EList<T>
   {
     throw new UnsupportedOperationException();
   }
-
+  
   public <T> T[] toArray(T[] arg0)
   {
     throw new UnsupportedOperationException();