Use Pair.create()

4 files changed, 9 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
index d679abdec8..c0d2dfc22c 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
@@ -858,7 +858,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
 
       DBUtil.update(stmt, true);
       getConnection().commit();
-      return new Pair<Integer, Long>(branchID, branchInfo.getBaseTimeStamp());
+      return Pair.create(branchID, branchInfo.getBaseTimeStamp());
     }
     catch (SQLException ex)
     {
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 e828a11f1e..3c8f26227e 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
@@ -202,7 +202,7 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
 
     EClassifier eClassifier = descriptor.getEClassifier();
     DBType dbType = descriptor.getDBType();
-    Pair<EClassifier, DBType> sourceTargetPair = new Pair<EClassifier, DBType>(eClassifier, dbType);
+    Pair<EClassifier, DBType> sourceTargetPair = Pair.create(eClassifier, dbType);
 
     // currently we do not support more than one typeMapping per source-target type pair
     if (typeMappingByTypes.containsKey(sourceTargetPair))
@@ -345,13 +345,12 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
   private ITypeMapping.Descriptor getMappingByType(EStructuralFeature feature, DBType dbType)
   {
     // First try: lookup specific mapping for the immediate type.
-    ITypeMapping.Descriptor descriptor = typeMappingByTypes.get(new Pair<EClassifier, DBType>(feature.getEType(),
-        dbType));
+    ITypeMapping.Descriptor descriptor = typeMappingByTypes.get(Pair.create(feature.getEType(), dbType));
 
     if (descriptor == null)
     {
       // Second try: lookup general mapping
-      descriptor = typeMappingByTypes.get(new Pair<EClassifier, DBType>(getEType(feature), dbType));
+      descriptor = typeMappingByTypes.get(Pair.create(getEType(feature), dbType));
       if (descriptor == null)
       {
         // Lookup failed. Give up
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
index eee03722d8..3e7f4a3ec6 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
@@ -348,7 +348,7 @@ public class BranchingListTableMappingWithRanges extends BasicAbstractListTableM
           {
             toReadFromBase = new ArrayList<Pair<Integer, Integer>>();
           }
-          toReadFromBase.add(new Pair<Integer, Integer>(currentIndex, index));
+          toReadFromBase.add(Pair.create(currentIndex, index));
 
           if (TRACER.isEnabled())
           {
@@ -375,7 +375,7 @@ public class BranchingListTableMappingWithRanges extends BasicAbstractListTableM
         {
           toReadFromBase = new ArrayList<Pair<Integer, Integer>>();
         }
-        toReadFromBase.add(new Pair<Integer, Integer>(currentIndex, currentIndex + valuesToRead));
+        toReadFromBase.add(Pair.create(currentIndex, currentIndex + valuesToRead));
       }
     }
     catch (SQLException ex)
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
index add4fcd5f8..4222481aa3 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
@@ -590,7 +590,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
         throw new IllegalArgumentException("AttributeMapping for " + delta.getFeature() + " is null!"); //$NON-NLS-1$ //$NON-NLS-2$
       }
 
-      attributeChanges.add(new Pair<ITypeMapping, Object>(am, delta.getValue()));
+      attributeChanges.add(Pair.create(am, delta.getValue()));
     }
 
     public void visit(CDOUnsetFeatureDelta delta)
@@ -598,7 +598,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
       // TODO: correct this when DBStore implements unsettable features
       // see Bugs 259868 and 263010
       ITypeMapping tm = getValueMapping(delta.getFeature());
-      attributeChanges.add(new Pair<ITypeMapping, Object>(tm, null));
+      attributeChanges.add(Pair.create(tm, null));
     }
 
     public void visit(CDOListFeatureDelta delta)
@@ -614,7 +614,7 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
 
       if (oldSize != newSize)
       {
-        listSizeChanges.add(new Pair<EStructuralFeature, Integer>(feature, newSize));
+        listSizeChanges.add(Pair.create(feature, newSize));
       }
     }