Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2019-12-14 06:01:26 +0000
committerEike Stepper2019-12-14 08:26:37 +0000
commitfb21060053c5e2d335aedde561619bf46bff7368 (patch)
tree608e92d6da36db65475fd3c04ee4002ab949f987 /plugins/org.eclipse.emf.cdo.transfer/src
parent3057ec447b4764b8a6a9cc535e5bcc37c3e01479 (diff)
downloadcdo-fb21060053c5e2d335aedde561619bf46bff7368.tar.gz
cdo-fb21060053c5e2d335aedde561619bf46bff7368.tar.xz
cdo-fb21060053c5e2d335aedde561619bf46bff7368.zip
[Releng] Use Java 8 diamond operator where possible
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.transfer/src')
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferType.java2
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
index f40dbea968..cb1bf2f58d 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
@@ -72,7 +72,7 @@ public class CDOTransfer implements INotifier
private final CDOTransferMapping rootMapping = new CDOTransferMappingImpl(this);
- private final Map<CDOTransferElement, CDOTransferMapping> mappings = new HashMap<CDOTransferElement, CDOTransferMapping>();
+ private final Map<CDOTransferElement, CDOTransferMapping> mappings = new HashMap<>();
private CDOTransferType defaultTransferType = CDOTransferType.BINARY;
@@ -158,7 +158,7 @@ public class CDOTransfer implements INotifier
public Set<CDOTransferType> getUsedTransferTypes()
{
- final Set<CDOTransferType> result = new HashSet<CDOTransferType>();
+ final Set<CDOTransferType> result = new HashSet<>();
rootMapping.accept(new CDOTransferMapping.Visitor()
{
@Override
@@ -641,13 +641,13 @@ public class CDOTransfer implements INotifier
private ResourceSet targetResourceSet;
- private Map<CDOTransferElement, Resource> elementResources = new HashMap<CDOTransferElement, Resource>();
+ private Map<CDOTransferElement, Resource> elementResources = new HashMap<>();
- private Map<Resource, CDOTransferElement> resourceElements = new HashMap<Resource, CDOTransferElement>();
+ private Map<Resource, CDOTransferElement> resourceElements = new HashMap<>();
private Set<Resource> unmappedModels;
- private Map<URI, ModelTransferResolution> resolutions = new HashMap<URI, ModelTransferResolution>();
+ private Map<URI, ModelTransferResolution> resolutions = new HashMap<>();
private ResolveProxyAdapter resolveProxyAdapter;
@@ -765,7 +765,7 @@ public class CDOTransfer implements INotifier
ResourceSet resourceSet = getSourceResourceSet();
EList<Resource> resources = resourceSet.getResources();
- Set<Resource> unmappedModels = new HashSet<Resource>(resources);
+ Set<Resource> unmappedModels = new HashSet<>(resources);
unmappedModels.removeAll(mappedModels);
return unmappedModels;
}
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java
index b3de129b38..251bb67108 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java
@@ -236,7 +236,7 @@ class CDOTransferMappingImpl implements CDOTransferMapping
{
if (children == null)
{
- children = new ArrayList<CDOTransferMapping>();
+ children = new ArrayList<>();
}
}
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferType.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferType.java
index aba1f44e54..51b6375a77 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferType.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferType.java
@@ -31,7 +31,7 @@ public class CDOTransferType implements Comparable<CDOTransferType>
/**
* Must be declared/initialized <b>before</b> any transfer types!
*/
- private static final Map<String, CDOTransferType> MAP = new HashMap<String, CDOTransferType>();
+ private static final Map<String, CDOTransferType> MAP = new HashMap<>();
public static final CDOTransferType FOLDER = new CDOTransferType()
{

Back to the top