[Releng] Change Entry to Map.Entry

14 files changed, 43 insertions, 49 deletions

diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
index 0ede73a97b..8b66b9cc6b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.Properties;
 import java.util.jar.JarEntry;
@@ -184,7 +184,7 @@ public class LegacyBundle extends AbstractBundle
       inputStream = new BufferedInputStream(getInputStream(LegacyPlatform.OPTIONS));
       properties.load(inputStream);
 
-      for (Entry<Object, Object> entry : properties.entrySet())
+      for (Map.Entry<Object, Object> entry : properties.entrySet())
       {
         try
         {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
index 9f8b736ee8..885ec05d30 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
@@ -29,7 +29,6 @@ import java.io.InputStream;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
@@ -82,7 +81,7 @@ public class LegacyPlatform extends AbstractPlatform
       inputStream = new BufferedInputStream(new FileInputStream(debugOptionsPath));
       properties.load(inputStream);
 
-      for (Entry<Object, Object> entry : properties.entrySet())
+      for (Map.Entry<Object, Object> entry : properties.entrySet())
       {
         try
         {
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 0c89342be7..4e089827f6 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
@@ -33,7 +33,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.WeakHashMap;
 
 /**
@@ -512,7 +511,7 @@ public final class ReflectUtil
 
     String className = null;
     Map<String, Object> values = new HashMap<>();
-    for (Entry<Object, Object> entry : properties.entrySet())
+    for (Map.Entry<Object, Object> entry : properties.entrySet())
     {
       if (entry.getKey() instanceof String)
       {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MultiMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MultiMap.java
index 1b4a4b5e90..fe09584fdc 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MultiMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MultiMap.java
@@ -292,7 +292,7 @@ public abstract class MultiMap<K, V> implements Map<K, V>
   /**
    * @author Eike Stepper
    */
-  private final class Entries extends AbstractSet<Entry<K, V>>
+  private final class Entries extends AbstractSet<Map.Entry<K, V>>
   {
     public Entries()
     {
@@ -302,7 +302,7 @@ public abstract class MultiMap<K, V> implements Map<K, V>
      * @category WRITE
      */
     @Override
-    public boolean add(Entry<K, V> o)
+    public boolean add(Map.Entry<K, V> o)
     {
       throw new UnsupportedOperationException();
     }
@@ -311,7 +311,7 @@ public abstract class MultiMap<K, V> implements Map<K, V>
      * @category WRITE
      */
     @Override
-    public boolean addAll(Collection<? extends Entry<K, V>> c)
+    public boolean addAll(Collection<? extends Map.Entry<K, V>> c)
     {
       throw new UnsupportedOperationException();
     }
@@ -402,15 +402,15 @@ public abstract class MultiMap<K, V> implements Map<K, V>
     }
 
     @Override
-    public Iterator<Entry<K, V>> iterator()
+    public Iterator<Map.Entry<K, V>> iterator()
     {
-      return new Iterator<Entry<K, V>>()
+      return new Iterator<Map.Entry<K, V>>()
       {
-        private Entry<K, V> next;
+        private Map.Entry<K, V> next;
 
         private int delegateIndex = -1;
 
-        private Iterator<Entry<K, V>> delegateIt;
+        private Iterator<Map.Entry<K, V>> delegateIt;
 
         /**
          * @category WRITE
@@ -762,7 +762,7 @@ public abstract class MultiMap<K, V> implements Map<K, V>
     {
       return new Iterator<V>()
       {
-        private Iterator<Entry<K, V>> delegateIt = entrySet().iterator();
+        private Iterator<Map.Entry<K, V>> delegateIt = entrySet().iterator();
 
         /**
          * @category WRITE
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
index f7569e7970..a452a4d363 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
@@ -165,7 +165,7 @@ public class RWLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWLock
       List<LockEntry<OBJECT, CONTEXT>> lockEntrysToRemove = new ArrayList<>();
       List<LockEntry<OBJECT, CONTEXT>> lockEntrysToAdd = new ArrayList<>();
 
-      for (Entry<OBJECT, LockEntry<OBJECT, CONTEXT>> entry : lockEntries.entrySet())
+      for (Map.Entry<OBJECT, LockEntry<OBJECT, CONTEXT>> entry : lockEntries.entrySet())
       {
         LockEntry<OBJECT, CONTEXT> lockedContext = entry.getValue();
         LockEntry<OBJECT, CONTEXT> newEntry = lockedContext.clearLock(context);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
index 2f2aea8793..4945882ba2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
@@ -43,7 +43,6 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -72,7 +71,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
     @Override
     protected void onDeactivated(ILifecycle lifecycle)
     {
-      for (Entry<ElementKey, Object> entry : getElementRegistryEntries())
+      for (Map.Entry<ElementKey, Object> entry : getElementRegistryEntries())
       {
         Object value = entry.getValue();
         if (lifecycle == value)
@@ -167,7 +166,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
     if (processExistingElements)
     {
       ContainerEvent<Object> event = new ContainerEvent<>(this);
-      for (Entry<ElementKey, Object> entry : getElementRegistryEntries())
+      for (Map.Entry<ElementKey, Object> entry : getElementRegistryEntries())
       {
         ElementKey key = entry.getKey();
         Object element = entry.getValue();
@@ -275,7 +274,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
   public String[] getElementKey(Object element)
   {
     checkActive();
-    for (Entry<ElementKey, Object> entry : getElementRegistryEntries())
+    for (Map.Entry<ElementKey, Object> entry : getElementRegistryEntries())
     {
       if (entry.getValue() == element)
       {
@@ -300,7 +299,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
   {
     checkActive();
     List<Object> result = new ArrayList<>();
-    for (Entry<ElementKey, Object> entry : getElementRegistryEntries())
+    for (Map.Entry<ElementKey, Object> entry : getElementRegistryEntries())
     {
       ElementKey key = entry.getKey();
       if (ObjectUtil.equals(key.getProductGroup(), productGroup))
@@ -317,7 +316,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
   {
     checkActive();
     List<Object> result = new ArrayList<>();
-    for (Entry<ElementKey, Object> entry : getElementRegistryEntries())
+    for (Map.Entry<ElementKey, Object> entry : getElementRegistryEntries())
     {
       ElementKey key = entry.getKey();
       if (ObjectUtil.equals(key.getProductGroup(), productGroup) && ObjectUtil.equals(key.getFactoryType(), factoryType))
@@ -597,11 +596,11 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
     synchronized (elementRegistry)
     {
       ObjectOutputStream oos = new ObjectOutputStream(stream);
-      List<Entry<ElementKey, Object>> entries = new ArrayList<>(elementRegistry.entrySet());
+      List<Map.Entry<ElementKey, Object>> entries = new ArrayList<>(elementRegistry.entrySet());
       Collections.sort(entries, new EntryComparator());
 
       oos.writeInt(entries.size());
-      for (Entry<ElementKey, Object> entry : entries)
+      for (Map.Entry<ElementKey, Object> entry : entries)
       {
         oos.writeObject(entry.getKey());
         oos.writeBoolean(LifecycleUtil.isActive(entry.getValue()));
@@ -680,11 +679,11 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
    * @since 2.0
    */
   @SuppressWarnings("unchecked")
-  protected Entry<ElementKey, Object>[] getElementRegistryEntries()
+  protected Map.Entry<ElementKey, Object>[] getElementRegistryEntries()
   {
     synchronized (elementRegistry)
     {
-      return elementRegistry.entrySet().toArray(new Entry[elementRegistry.size()]);
+      return elementRegistry.entrySet().toArray(new Map.Entry[elementRegistry.size()]);
     }
   }
 
@@ -844,10 +843,10 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
   /**
    * @author Eike Stepper
    */
-  private static final class EntryComparator implements Comparator<Entry<ElementKey, Object>>
+  private static final class EntryComparator implements Comparator<Map.Entry<ElementKey, Object>>
   {
     @Override
-    public int compare(Entry<ElementKey, Object> entry1, Entry<ElementKey, Object> entry2)
+    public int compare(Map.Entry<ElementKey, Object> entry1, Map.Entry<ElementKey, Object> entry2)
     {
       return entry1.getKey().compareTo(entry2.getKey());
     }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java
index 6e3a4fce64..c7bca305b2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java
@@ -89,10 +89,10 @@ public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> imple
   public void putAll(Map<? extends K, ? extends V> t)
   {
     ContainerEvent<Map.Entry<K, V>> event = new ContainerEvent<>(this);
-    Iterator<? extends Entry<? extends K, ? extends V>> i = t.entrySet().iterator();
+    Iterator<? extends Map.Entry<? extends K, ? extends V>> i = t.entrySet().iterator();
     while (i.hasNext())
     {
-      Entry<? extends K, ? extends V> entry = i.next();
+      Map.Entry<? extends K, ? extends V> entry = i.next();
       K key = entry.getKey();
       V value = entry.getValue();
       V removed = getDelegate().put(key, value);
@@ -165,7 +165,7 @@ public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> imple
   @SuppressWarnings("unchecked")
   public Map.Entry<K, V>[] getElements()
   {
-    return (Entry<K, V>[])getDelegate().entrySet().toArray();
+    return (Map.Entry<K, V>[])getDelegate().entrySet().toArray();
   }
 
   /**
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap2.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap2.java
index b13df4db4b..5f48e6bf1e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap2.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap2.java
@@ -406,7 +406,7 @@ public abstract class ReferenceValueMap2<K, V> extends AbstractMap<K, V>
    */
   private class EntrySetIterator implements Iterator<Map.Entry<K, V>>
   {
-    private Iterator<Entry<K, KeyedReference<K, V>>> it = map.entrySet().iterator();
+    private Iterator<Map.Entry<K, KeyedReference<K, V>>> it = map.entrySet().iterator();
 
     private MapEntry<K, V> nextEntry;
 
@@ -424,7 +424,7 @@ public abstract class ReferenceValueMap2<K, V> extends AbstractMap<K, V>
 
       while (it.hasNext())
       {
-        Entry<K, KeyedReference<K, V>> entry = it.next();
+        Map.Entry<K, KeyedReference<K, V>> entry = it.next();
         V value = dereference(entry.getValue());
         if (value != null)
         {
@@ -437,7 +437,7 @@ public abstract class ReferenceValueMap2<K, V> extends AbstractMap<K, V>
     }
 
     @Override
-    public Entry<K, V> next()
+    public Map.Entry<K, V> next()
     {
       if (nextEntry == null)
       {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java
index 47a67e3bff..e11d750ce4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java
@@ -54,7 +54,7 @@ public abstract class DelegatingRegistry<K, V> extends Registry<K, V>
   }
 
   @Override
-  public Set<Entry<K, V>> entrySet()
+  public Set<Map.Entry<K, V>> entrySet()
   {
     return mergedEntrySet();
   }
@@ -112,7 +112,7 @@ public abstract class DelegatingRegistry<K, V> extends Registry<K, V>
     return old;
   }
 
-  protected Set<Entry<K, V>> mergedEntrySet()
+  protected Set<Map.Entry<K, V>> mergedEntrySet()
   {
     final Map<K, V> merged = new HashMap<>();
     if (delegate != null)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java
index 28e3d6cd0a..2ffe7197de 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java
@@ -53,7 +53,7 @@ public abstract class Registry<K, V> extends Container<Map.Entry<K, V>> implemen
   }
 
   @Override
-  public Set<Entry<K, V>> entrySet()
+  public Set<Map.Entry<K, V>> entrySet()
   {
     return getMap().entrySet();
   }
@@ -107,10 +107,10 @@ public abstract class Registry<K, V> extends Container<Map.Entry<K, V>> implemen
   {
     if (!t.isEmpty())
     {
-      Iterator<? extends Entry<? extends K, ? extends V>> i = t.entrySet().iterator();
+      Iterator<? extends Map.Entry<? extends K, ? extends V>> i = t.entrySet().iterator();
       while (i.hasNext())
       {
-        Entry<? extends K, ? extends V> e = i.next();
+        Map.Entry<? extends K, ? extends V> e = i.next();
         register(e.getKey(), e.getValue());
       }
 
@@ -148,9 +148,9 @@ public abstract class Registry<K, V> extends Container<Map.Entry<K, V>> implemen
 
   @Override
   @SuppressWarnings("unchecked")
-  public Entry<K, V>[] getElements()
+  public Map.Entry<K, V>[] getElements()
   {
-    return entrySet().toArray(new Entry[size()]);
+    return entrySet().toArray(new Map.Entry[size()]);
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/UnmodifiableRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/UnmodifiableRegistry.java
index 703237710d..4b195e718a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/UnmodifiableRegistry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/UnmodifiableRegistry.java
@@ -116,7 +116,7 @@ public class UnmodifiableRegistry<K, V> implements IRegistry<K, V>
   }
 
   @Override
-  public Entry<K, V>[] getElements()
+  public Map.Entry<K, V>[] getElements()
   {
     return delegate.getElements();
   }
@@ -140,7 +140,7 @@ public class UnmodifiableRegistry<K, V> implements IRegistry<K, V>
   }
 
   @Override
-  public Set<Entry<K, V>> entrySet()
+  public Set<Map.Entry<K, V>> entrySet()
   {
     return delegate.entrySet();
   }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManager.java
index 32c2883c7a..1568826a2f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManager.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.text.MessageFormat;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
 
 /**
@@ -156,7 +155,7 @@ public class FileUserManager extends UserManager
     Properties properties = new Properties();
     properties.load(stream);
 
-    for (Entry<Object, Object> entry : properties.entrySet())
+    for (Map.Entry<Object, Object> entry : properties.entrySet())
     {
       String userID = (String)entry.getKey();
       char[] password = SecurityUtil.toCharArray((String)entry.getValue());
@@ -191,7 +190,7 @@ public class FileUserManager extends UserManager
   {
     Properties properties = new Properties();
 
-    for (Entry<String, char[]> entry : users.entrySet())
+    for (Map.Entry<String, char[]> entry : users.entrySet())
     {
       properties.put(entry.getKey(), SecurityUtil.toString(entry.getValue()));
     }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/operations/AuthorizableOperation.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/operations/AuthorizableOperation.java
index 82dd5d9a04..a0762bc41e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/operations/AuthorizableOperation.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/operations/AuthorizableOperation.java
@@ -20,7 +20,6 @@ import java.lang.ref.WeakReference;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Objects;
 
 /**
@@ -95,7 +94,7 @@ public final class AuthorizableOperation
     out.writeString(id);
     out.writeVarInt(parameters.size());
 
-    for (Entry<String, Object> entry : parameters.entrySet())
+    for (Map.Entry<String, Object> entry : parameters.entrySet())
     {
       out.writeString(entry.getKey());
       out.writeObject(entry.getValue());
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/operations/AuthorizableOperationImpl.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/operations/AuthorizableOperationImpl.java
index 9821b3cf18..004dbd5450 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/operations/AuthorizableOperationImpl.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/operations/AuthorizableOperationImpl.java
@@ -19,7 +19,6 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Objects;
 
 /**
@@ -83,7 +82,7 @@ public final class AuthorizableOperationImpl
     out.writeString(id);
     out.writeVarInt(parameters.size());
 
-    for (Entry<String, Object> entry : parameters.entrySet())
+    for (Map.Entry<String, Object> entry : parameters.entrySet())
     {
       out.writeString(entry.getKey());
       out.writeObject(entry.getValue());