[Releng] Change Entry to Map.Entry

6 files changed, 6 insertions, 11 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
index 6d2af1faaf..af6a6a2618 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
@@ -71,7 +71,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;
 import java.util.Timer;
 
@@ -399,7 +398,7 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
 
     try
     {
-      for (Entry<String, String> entry : properties.entrySet())
+      for (Map.Entry<String, String> entry : properties.entrySet())
       {
         String name = entry.getKey();
         String value = entry.getValue();
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java
index 6d836be7b2..22ebaf5414 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java
@@ -48,7 +48,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Map;
-import java.util.Map.Entry;
 
 /**
  * @author Eike Stepper
@@ -174,7 +173,7 @@ public class DurableLockingManager extends Lifecycle implements IBranchDeletionS
     {
       stmt.setString(1, durableLockingID);
 
-      for (Entry<CDOID, LockGrade> entry : locks.entrySet())
+      for (Map.Entry<CDOID, LockGrade> entry : locks.entrySet())
       {
         CDOID id = entry.getKey();
         int grade = entry.getValue().getValue();
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java
index 85fc67217d..d7e9e16024 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java
@@ -58,7 +58,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 
 /**
  * @author Eike Stepper
@@ -423,7 +422,7 @@ public class MetaDataManager extends Lifecycle implements IMetaDataManager
       monitor.done();
     }
 
-    for (Entry<String, InternalCDOPackageUnit> entry : packageUnits.entrySet())
+    for (Map.Entry<String, InternalCDOPackageUnit> entry : packageUnits.entrySet())
     {
       String id = entry.getKey();
       InternalCDOPackageUnit packageUnit = entry.getValue();
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
index de882f304e..db2115a0f8 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
@@ -52,7 +52,6 @@ import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 /**
@@ -525,7 +524,7 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
       if (event instanceof ContainerEvent<?>)
       {
         @SuppressWarnings("unchecked")
-        ContainerEvent<Map.Entry<IFactoryKey, IFactory>> ev = (ContainerEvent<Entry<IFactoryKey, IFactory>>)event;
+        ContainerEvent<Map.Entry<IFactoryKey, IFactory>> ev = (ContainerEvent<Map.Entry<IFactoryKey, IFactory>>)event;
 
         for (IContainerDelta<Map.Entry<IFactoryKey, IFactory>> delta : ev.getDeltas())
         {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/ObjectTypeCache.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/ObjectTypeCache.java
index d848dde919..9747a62b3f 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/ObjectTypeCache.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/ObjectTypeCache.java
@@ -99,7 +99,7 @@ public class ObjectTypeCache extends DelegatingObjectTypeMapper implements IBran
     }
 
     @Override
-    protected boolean removeEldestEntry(java.util.Map.Entry<CDOID, CDOID> eldest)
+    protected boolean removeEldestEntry(Map.Entry<CDOID, CDOID> eldest)
     {
       return size() > capacity;
     }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/UnitMappingTable.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/UnitMappingTable.java
index d18becf35b..ab4875f724 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/UnitMappingTable.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/UnitMappingTable.java
@@ -51,7 +51,6 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 /**
@@ -261,7 +260,7 @@ public class UnitMappingTable extends Lifecycle implements IMappingConstants
 
     try
     {
-      for (Entry<CDOID, CDOID> entry : unitMappings.entrySet())
+      for (Map.Entry<CDOID, CDOID> entry : unitMappings.entrySet())
       {
         CDOID id = entry.getKey();
         CDOID rootID = entry.getValue();