fix some new raw type warnings

19 files changed, 49 insertions, 45 deletions

diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
index c6c347af56..17566dc3d2 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
@@ -199,7 +199,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class) || ((Class<?>)type).isInstance(adapter))
+      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
       {
         return adapter;
       }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java
index 8a0b5f182d..4c7cbd17de 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java
@@ -173,7 +173,7 @@ public class QueryManager extends Lifecycle implements IRepositoryElement
     {
       public void notifyEvent(IEvent event)
       {
-        if (event instanceof SingleDeltaContainerEvent)
+        if (event instanceof SingleDeltaContainerEvent<?>)
         {
           IView view = getQueryResult().getView();
           SingleDeltaContainerEvent<?> deltaEvent = (SingleDeltaContainerEvent<?>)event;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java
index a97ad4936e..c113ca6a70 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java
@@ -44,11 +44,11 @@ public class EMFTest extends AbstractOMTest
 
     IOUtil.OUT().println();
 
-    if (false)
-    {
-      model2.eResource().getResourceSet().getResources().get(1).unload();
-    }
-    else
+    // if (false)
+    // {
+    // model2.eResource().getResourceSet().getResources().get(1).unload();
+    // }
+    // else
     {
       ((InternalEObject)type).eSetProxyURI(URI.createURI("model1.ecore#//Company"));
     }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
index af33e51471..11e14349dc 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
@@ -49,7 +49,7 @@ public class CDOEventHandler
   {
     public void notifyEvent(IEvent event)
     {
-      if (event instanceof IContainerEvent)
+      if (event instanceof IContainerEvent<?>)
       {
         IContainerEvent<?> e = (IContainerEvent<?>)event;
         if (e.getDeltaElement() == view && e.getDeltaKind() == IContainerDelta.Kind.REMOVED)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index 10cf9ecaa9..2f0387acb0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.cdo.common.model.CDOClass;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
 import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
-import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
 import org.eclipse.emf.cdo.common.util.TransportException;
 import org.eclipse.emf.cdo.spi.common.InternalCDORevision;
 import org.eclipse.emf.cdo.util.InvalidObjectException;
@@ -30,7 +29,6 @@ import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol;
 import org.eclipse.emf.internal.cdo.protocol.CommitTransactionResult;
 import org.eclipse.emf.internal.cdo.protocol.VerifyRevisionRequest;
 import org.eclipse.emf.internal.cdo.util.FSMUtil;
-import org.eclipse.emf.internal.cdo.util.RevisionAdjuster;
 
 import org.eclipse.net4j.util.collection.Pair;
 import org.eclipse.net4j.util.fsm.FiniteStateMachine;
@@ -562,15 +560,15 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
       revision.setUntransactional();
       revision.setCreated(data.getTimeStamp());
 
-      if (useDeltas && false)
-      {
-        // Cannot use that yet, since we need to change adjust index for list.
-        // TODO Simon Implement a way to adjust indexes as fast as possible.
-        RevisionAdjuster revisionAdjuster = new RevisionAdjuster(data.getReferenceAdjuster());
-        CDORevisionDelta delta = data.getCommitContext().getRevisionDeltas().get(oldID);
-        revisionAdjuster.adjustRevision(revision, delta);
-      }
-      else
+      // if (useDeltas)
+      // {
+      // // Cannot use that yet, since we need to change adjust index for list.
+      // // TODO Simon Implement a way to adjust indexes as fast as possible.
+      // RevisionAdjuster revisionAdjuster = new RevisionAdjuster(data.getReferenceAdjuster());
+      // CDORevisionDelta delta = data.getCommitContext().getRevisionDeltas().get(oldID);
+      // revisionAdjuster.adjustRevision(revision, delta);
+      // }
+      // else
       {
         revision.adjustReferences(data.getReferenceAdjuster());
       }
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
index 4eb77b4202..a032a762cc 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
@@ -152,7 +152,7 @@ public class Net4jTransportServlet extends HttpServlet implements INet4jTranspor
         writer.write(String.valueOf(channel.getID()));
         writer.write(": ");
         IBufferHandler receiveHandler = channel.getReceiveHandler();
-        if (receiveHandler instanceof IProtocol)
+        if (receiveHandler instanceof IProtocol<?>)
         {
           writer.write(((IProtocol<?>)receiveHandler).getType());
         }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
index fc2c2f9ffd..3d6022b58c 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
@@ -349,11 +349,11 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
     classLabel.getParent().layout();
     backAction.setEnabled(elements.size() >= 2);
 
-    if (object instanceof Map)
+    if (object instanceof Map<?, ?>)
     {
       setCurrentViewer(mapViewer);
     }
-    else if (object instanceof Iterable)
+    else if (object instanceof Iterable<?>)
     {
       setCurrentViewer(iterableViewer);
     }
@@ -576,7 +576,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
       if (!elements.isEmpty())
       {
         Object element = elements.peek();
-        if (element instanceof Iterable)
+        if (element instanceof Iterable<?>)
         {
           List<Object> result = new ArrayList<Object>();
           for (Object object : (Iterable<?>)element)
@@ -683,7 +683,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
       if (!elements.isEmpty())
       {
         Object element = elements.peek();
-        if (element instanceof Map)
+        if (element instanceof Map<?, ?>)
         {
           return ((Map<?, ?>)element).entrySet().toArray();
         }
@@ -700,7 +700,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
   {
     public String getColumnText(Object obj, int index)
     {
-      if (obj instanceof Map.Entry)
+      if (obj instanceof Map.Entry<?, ?>)
       {
         Map.Entry<?, ?> entry = (Map.Entry<?, ?>)obj;
         Object key = entry.getKey();
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java
index 7024bb23f0..24432e95b6 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java
@@ -37,7 +37,7 @@ public class OMPreferenceStore implements IPreferenceStore
   {
     public void notifyEvent(IEvent event)
     {
-      if (event instanceof OMPreferencesChangeEvent)
+      if (event instanceof OMPreferencesChangeEvent<?>)
       {
         OMPreferencesChangeEvent<?> e = (OMPreferencesChangeEvent<?>)event;
         firePropertyChangeEvent(e.getPreference().getName(), e.getOldValue(), e.getNewValue());
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
index 929405ca50..506d4510d4 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
@@ -189,7 +189,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
 
   protected Node createNode(Node parent, Object element)
   {
-    if (element instanceof IContainer)
+    if (element instanceof IContainer<?>)
     {
       return createContaineNode(parent, element);
     }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
index b96c81049e..f4868ea965 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
@@ -540,12 +540,12 @@ public final class ReflectUtil
       builder.append(" = "); //$NON-NLS-1$
 
       Object value = getValue(field, object);
-      if (value instanceof Map)
+      if (value instanceof Map<?, ?>)
       {
         value = ((Map<?, ?>)value).entrySet();
       }
 
-      if (value instanceof Collection)
+      if (value instanceof Collection<?>)
       {
         builder.append(StringUtil.NL);
         for (Object element : (Collection<?>)value)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Pair.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Pair.java
index a1a4239780..c91d67a629 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Pair.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Pair.java
@@ -62,7 +62,7 @@ public class Pair<T1, T2>
       return true;
     }
 
-    if (obj instanceof Pair)
+    if (obj instanceof Pair<?, ?>)
     {
       Pair<?, ?> that = (Pair<?, ?>)obj;
       return ObjectUtil.equals(element1, that.getElement1()) && ObjectUtil.equals(element2, that.getElement2());
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/Container.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/Container.java
index 0aeae79b54..982ff84629 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/Container.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/Container.java
@@ -99,7 +99,7 @@ public abstract class Container<E> extends Lifecycle implements IContainer<E>
   @Override
   public void fireEvent(IEvent event)
   {
-    if (event instanceof IContainerEvent)
+    if (event instanceof IContainerEvent<?>)
     {
       if (((IContainerEvent<?>)event).isEmpty())
       {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java
index 8439af05c3..e1208610b8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java
@@ -92,7 +92,7 @@ public class ContainerEvent<E> extends Event implements IContainerEvent<E>
       E element = delta.getElement();
 
       boolean filtered = true;
-      if (visitor instanceof Filtered)
+      if (visitor instanceof Filtered<?>)
       {
         filtered = ((Filtered<E>)visitor).filter(element);
       }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
index 2a4d55231f..419f0d5419 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
@@ -62,7 +62,7 @@ public final class ContainerUtil
 
   public static boolean isEmpty(Object container)
   {
-    if (container instanceof IContainer)
+    if (container instanceof IContainer<?>)
     {
       return ((IContainer<?>)container).isEmpty();
     }
@@ -72,7 +72,7 @@ public final class ContainerUtil
 
   public static Object[] getElements(Object container)
   {
-    if (container instanceof IContainer)
+    if (container instanceof IContainer<?>)
     {
       return ((IContainer<?>)container).getElements();
     }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java
index 2d77d6bfd0..7ca208a9e5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java
@@ -67,7 +67,7 @@ public class SingleDeltaContainerEvent<E> extends Event implements IContainerEve
     E element = deltas[0].getElement();
 
     boolean filtered = true;
-    if (visitor instanceof Filtered)
+    if (visitor instanceof Filtered<?>)
     {
       filtered = ((Filtered<E>)visitor).filter(element);
     }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
index 1fd846bb65..b3515a6e1e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
@@ -68,9 +68,12 @@ public class Lifecycle extends Notifier implements ILifecycle.Introspection
       }
       else
       {
-        if (TRACE_IGNORING && TRACER.isEnabled())
+        if (TRACE_IGNORING)
         {
-          TRACER.format("Ignoring activation in state {0} for {1}", lifecycleState, this);
+          if (TRACER.isEnabled())
+          {
+            TRACER.format("Ignoring activation in state {0} for {1}", lifecycleState, this);
+          }
         }
       }
     }
@@ -109,9 +112,12 @@ public class Lifecycle extends Notifier implements ILifecycle.Introspection
         return null;
       }
 
-      if (TRACE_IGNORING && TRACER.isEnabled())
+      if (TRACE_IGNORING)
       {
-        TRACER.format("Ignoring deactivation in state {0} for {1}", lifecycleState, this);
+        if (TRACER.isEnabled())
+        {
+          TRACER.format("Ignoring deactivation in state {0} for {1}", lifecycleState, this);
+        }
       }
 
       return null;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java
index f9fbb9fa6d..bc323180dd 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java
@@ -21,7 +21,7 @@ public final class RegistryUtil
 
   public <K, V> IRegistry<K, V> unmodifiableRegistry(IRegistry<K, V> registry)
   {
-    if (registry instanceof UnmodifiableRegistry)
+    if (registry instanceof UnmodifiableRegistry<?, ?>)
     {
       return registry;
     }
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 62753b9d14..5a4e628881 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
@@ -386,7 +386,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
     short signalID = signalActor.getID();
     int correlationID = signalActor.getCorrelationID();
     signalActor.setBufferOutputStream(new SignalOutputStream(correlationID, signalID, true));
-    if (signalActor instanceof RequestWithConfirmation)
+    if (signalActor instanceof RequestWithConfirmation<?>)
     {
       signalActor.setBufferInputStream(new SignalInputStream(timeout));
     }
@@ -429,7 +429,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
           signalActor.setBufferOutputStream(new SignalOutputStream(correlationID, signalID, true));
 
           // Set new InputStream
-          if (signalActor instanceof RequestWithConfirmation)
+          if (signalActor instanceof RequestWithConfirmation<?>)
           {
             long timeout = signalActor.getBufferInputStream().getMillisBeforeTimeout();
             signalActor.setBufferInputStream(new SignalInputStream(timeout));
@@ -460,7 +460,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
     synchronized (signals)
     {
       Signal signal = signals.remove(correlationID);
-      if (signal instanceof RequestWithConfirmation)
+      if (signal instanceof RequestWithConfirmation<?>)
       {
         RequestWithConfirmation<?> request = (RequestWithConfirmation<?>)signal;
         request.setRemoteException(t, responding);
@@ -475,7 +475,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
     synchronized (signals)
     {
       Signal signal = signals.get(correlationID);
-      if (signal instanceof RequestWithMonitoring)
+      if (signal instanceof RequestWithMonitoring<?>)
       {
         RequestWithMonitoring<?> request = (RequestWithMonitoring<?>)signal;
         request.setMonitorProgress(totalWork, work);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/StreamWrapperInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/StreamWrapperInjector.java
index 858362132a..376a81b738 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/StreamWrapperInjector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/StreamWrapperInjector.java
@@ -44,7 +44,7 @@ public class StreamWrapperInjector implements IElementProcessor
   public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
       Object element)
   {
-    if (element instanceof SignalProtocol)
+    if (element instanceof SignalProtocol<?>)
     {
       SignalProtocol<?> signalProtocol = (SignalProtocol<?>)element;
       if (shouldInject(container, productGroup, factoryType, description, signalProtocol))