Index: applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/DetermineSdsModificationsUploadHook.java
===================================================================
--- applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/DetermineSdsModificationsUploadHook.java	(revision 30666)
+++ applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/DetermineSdsModificationsUploadHook.java	(revision 30737)
@@ -40,5 +40,5 @@
     public boolean checkUpload(APIDataSet apiDataSet) {
     	
-    	ArrayList<OsmPrimitive> droplist = new ArrayList<OsmPrimitive>();
+    	ArrayList<OsmPrimitive> droplist = new ArrayList<>();
     	
     	// check deleted primitives for special tags.
@@ -54,5 +54,5 @@
        	for (OsmPrimitive upd : apiDataSet.getPrimitivesToUpdate()) {
        		
-       		HashSet<String> allKeys = new HashSet<String>();
+       		HashSet<String> allKeys = new HashSet<>();
        		boolean specialTags = false;
        		
@@ -87,5 +87,5 @@
        		
        		// assemble new set of special tags. might turn out to be empty.
-       		HashMap<String, String> newSpecialTags = new HashMap<String, String>();
+       		HashMap<String, String> newSpecialTags = new HashMap<>();
        		for (String key : upd.keySet()) {
        			if (isSpecialKey(key)) newSpecialTags.put(key, upd.get(key));
@@ -151,5 +151,5 @@
        	for (OsmPrimitive add : apiDataSet.getPrimitivesToAdd()) {
        		// assemble new set of special tags. might turn out to be empty.
-       		HashMap<String, String> newSpecialTags = new HashMap<String, String>();
+       		HashMap<String, String> newSpecialTags = new HashMap<>();
        		for (String key : add.keySet()) {
        			if (isSpecialKey(key)) newSpecialTags.put(key, add.get(key));
Index: applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/ReadPostprocessor.java
===================================================================
--- applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/ReadPostprocessor.java	(revision 30666)
+++ applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/ReadPostprocessor.java	(revision 30737)
@@ -38,7 +38,7 @@
     public void postprocessDataSet(DataSet ds, ProgressMonitor progress) {
         
-		nodeList = new ArrayList<Long>();
-		wayList = new ArrayList<Long>();
-		relationList = new ArrayList<Long>();
+		nodeList = new ArrayList<>();
+		wayList = new ArrayList<>();
+		relationList = new ArrayList<>();
 
 		Visitor adder = new Visitor() {
Index: applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsApi.java
===================================================================
--- applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsApi.java	(revision 30666)
+++ applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsApi.java	(revision 30737)
@@ -41,5 +41,5 @@
 
     /** the collection of instantiated OSM APIs */
-    private static HashMap<String, SdsApi> instances = new HashMap<String, SdsApi>();
+    private static HashMap<String, SdsApi> instances = new HashMap<>();
     
     /**
Index: applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialAgent.java
===================================================================
--- applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialAgent.java	(revision 30666)
+++ applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialAgent.java	(revision 30737)
@@ -27,5 +27,5 @@
 public class SdsCredentialAgent extends AbstractCredentialsAgent {
 
-    Map<RequestorType, PasswordAuthentication> sdsMemoryCredentialsCache = new HashMap<RequestorType, PasswordAuthentication>();
+    Map<RequestorType, PasswordAuthentication> sdsMemoryCredentialsCache = new HashMap<>();
 
     /**
Index: applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsLoadAction.java
===================================================================
--- applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsLoadAction.java	(revision 30666)
+++ applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsLoadAction.java	(revision 30737)
@@ -54,5 +54,5 @@
         public OpenFileTask(List<File> files, SeparateDataStorePlugin p) {
             super(tr("Loading files"), false /* don't ignore exception */);
-            this.files = new ArrayList<File>(files);
+            this.files = new ArrayList<>(files);
             plugin = p;
         }
Index: applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsOsmWriter.java
===================================================================
--- applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsOsmWriter.java	(revision 30666)
+++ applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsOsmWriter.java	(revision 30737)
@@ -40,5 +40,5 @@
                 out.println(">");
             }
-            List<Entry<String, String>> entries = new ArrayList<Entry<String,String>>(osm.getKeys().entrySet());
+            List<Entry<String, String>> entries = new ArrayList<>(osm.getKeys().entrySet());
             Collections.sort(entries, byKeyComparator);
             for (Entry<String, String> e : entries) {
Index: applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SeparateDataStorePlugin.java
===================================================================
--- applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SeparateDataStorePlugin.java	(revision 30666)
+++ applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SeparateDataStorePlugin.java	(revision 30737)
@@ -29,9 +29,9 @@
 {
 
-	public HashMap<Long, IPrimitive> originalNodes = new HashMap<Long, IPrimitive>();
-	public HashMap<Long, IPrimitive> originalWays = new HashMap<Long, IPrimitive>();
-	public HashMap<Long, IPrimitive> originalRelations = new HashMap<Long, IPrimitive>();
+	public HashMap<Long, IPrimitive> originalNodes = new HashMap<>();
+	public HashMap<Long, IPrimitive> originalWays = new HashMap<>();
+	public HashMap<Long, IPrimitive> originalRelations = new HashMap<>();
 	
-	public ArrayList<QueueItem> uploadQueue = new ArrayList<QueueItem>();
+	public ArrayList<QueueItem> uploadQueue = new ArrayList<>();
 	
 	private PrimitiveVisitor learnVisitor = new PrimitiveVisitor() {
@@ -113,5 +113,5 @@
 	 */
 	protected void clearQueue() {
-		ArrayList<QueueItem> newQueue = new ArrayList<QueueItem>();
+		ArrayList<QueueItem> newQueue = new ArrayList<>();
 		for (QueueItem q : uploadQueue) {
 			if (!q.processed) newQueue.add(q);