[Releng] Change Entry to Map.Entry

8 files changed, 10 insertions, 15 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java
index cd1f016af8..877502d5c5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.java
@@ -15,7 +15,7 @@ import org.eclipse.net4j.util.concurrent.Worker;
 import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EPackage;
 
-import java.util.Map.Entry;
+import java.util.Map;
 
 /**
  * Populates a {@link #getTarget() target} package registry by asynchronously polling a {@link #getSource() source}
@@ -108,7 +108,7 @@ public class CDOPackageRegistryPopulator extends Worker
 
   private static boolean populateFirstMatch(EPackage.Registry source, CDOPackageRegistry target)
   {
-    for (Entry<String, Object> entry : source.entrySet())
+    for (Map.Entry<String, Object> entry : source.entrySet())
     {
       String nsURI = entry.getKey();
       if (!target.containsKey(nsURI))
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
index 8ebfe2a4e9..9f00f067ee 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
@@ -53,7 +53,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.function.Consumer;
 
@@ -271,7 +270,7 @@ public final class EMFUtil
   {
     Set<Map.Entry<String, Object>> entries = packageRegistry.entrySet();
     @SuppressWarnings("unchecked")
-    Map.Entry<String, Object>[] array = entries.toArray(new Entry[entries.size()]);
+    Map.Entry<String, Object>[] array = entries.toArray(new Map.Entry[entries.size()]);
     Arrays.sort(array, new Comparator<Map.Entry<String, Object>>()
     {
       @Override
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/CDOQueryInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/CDOQueryInfoImpl.java
index ddc7caa91c..d43fcb65db 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/CDOQueryInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/CDOQueryInfoImpl.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 
 /**
  * @author Simon McDuff
@@ -112,7 +111,7 @@ public class CDOQueryInfoImpl implements CDOQueryInfo
     }
 
     out.writeXInt(parameters.size());
-    for (Entry<String, Object> entry : parameters.entrySet())
+    for (Map.Entry<String, Object> entry : parameters.entrySet())
     {
       out.writeString(entry.getKey());
       out.writeCDORevisionOrPrimitiveOrClassifier(entry.getValue());
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
index 6ce753b190..f8112c8103 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
@@ -19,7 +19,6 @@ import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
 
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.WeakHashMap;
 
 /**
@@ -60,7 +59,7 @@ public abstract class CDOCommitHistoryProviderImpl<KEY, HISTORY extends CDOCommi
   {
     synchronized (histories)
     {
-      for (Entry<CDOCommitHistory, KEY> entry : histories.entrySet())
+      for (Map.Entry<CDOCommitHistory, KEY> entry : histories.entrySet())
       {
         KEY currentKey = entry.getValue();
         if (currentKey == key)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
index 9c8db801bb..082372a66e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOClassInfoImpl.java
@@ -484,7 +484,7 @@ public final class CDOClassInfoImpl implements InternalCDOClassInfo, Adapter.Int
   public static boolean isMap(EStructuralFeature eStructuralFeature)
   {
     // Java ensures that string constants are interned, so == is actually more efficient than equals().
-    return eStructuralFeature.getEType().getInstanceClassName() == "java.util.Map$Entry"; //$NON-NLS-1$
+    return eStructuralFeature.getEType().getInstanceClassName() == "java.util.Map$Map.Entry"; //$NON-NLS-1$
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java
index a403abaf34..49f8edffba 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOTypeImpl.java
@@ -52,7 +52,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 /**
@@ -863,7 +862,7 @@ public abstract class CDOTypeImpl implements CDOType
       Map<Object, Object> map = (Map<Object, Object>)value;
       out.writeXInt(map.size());
 
-      for (Entry<Object, Object> entry : map.entrySet())
+      for (Map.Entry<Object, Object> entry : map.entrySet())
       {
         writeTypeAndValue(out, entry.getKey());
         writeTypeAndValue(out, entry.getValue());
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/util/URIHandlerRegistryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/util/URIHandlerRegistryImpl.java
index 82dde732ac..b706e1f3f5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/util/URIHandlerRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/util/URIHandlerRegistryImpl.java
@@ -28,7 +28,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 
 /**
  * @author Eike Stepper
@@ -67,7 +66,7 @@ public final class URIHandlerRegistryImpl implements URIHandlerRegistry, URIHand
       IPluginContainer.INSTANCE.getFactoryRegistry().addListener(new ContainerEventAdapter<Map.Entry<IFactoryKey, IFactory>>()
       {
         @Override
-        protected void onAdded(IContainer<Entry<IFactoryKey, IFactory>> container, Map.Entry<IFactoryKey, IFactory> element)
+        protected void onAdded(IContainer<Map.Entry<IFactoryKey, IFactory>> container, Map.Entry<IFactoryKey, IFactory> element)
         {
           String scheme = getScheme(element);
           if (scheme != null)
@@ -78,7 +77,7 @@ public final class URIHandlerRegistryImpl implements URIHandlerRegistry, URIHand
         }
 
         @Override
-        protected void onRemoved(IContainer<Entry<IFactoryKey, IFactory>> container, Map.Entry<IFactoryKey, IFactory> element)
+        protected void onRemoved(IContainer<Map.Entry<IFactoryKey, IFactory>> container, Map.Entry<IFactoryKey, IFactory> element)
         {
           String scheme = getScheme(element);
           if (scheme != null)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java
index 9fbcababb0..228bb89d8e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/DelegatingCDOPackageRegistry.java
@@ -59,7 +59,7 @@ public abstract class DelegatingCDOPackageRegistry extends Lifecycle implements
   }
 
   @Override
-  public Set<java.util.Map.Entry<String, Object>> entrySet()
+  public Set<Map.Entry<String, Object>> entrySet()
   {
     return getDelegate().entrySet();
   }