Changeset 30737 in osm for applications/editors/josm/plugins/sds

Timestamp:

2014-10-18T23:07:52+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds

Files:

• DetermineSdsModificationsUploadHook.java (modified) (4 diffs)
• ReadPostprocessor.java (modified) (1 diff)
• SdsApi.java (modified) (1 diff)
• SdsCredentialAgent.java (modified) (1 diff)
• SdsLoadAction.java (modified) (1 diff)
• SdsOsmWriter.java (modified) (1 diff)
• SeparateDataStorePlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/DetermineSdsModificationsUploadHook.java

@@ -40 +40 @@
     public boolean checkUpload(APIDataSet apiDataSet) {
         
-        ArrayList<OsmPrimitive> droplist = new ArrayList<OsmPrimitive>();
+        ArrayList<OsmPrimitive> droplist = new ArrayList<>();
         
         // check deleted primitives for special tags.
@@ -54 +54 @@
         for (OsmPrimitive upd : apiDataSet.getPrimitivesToUpdate()) {
                 
-                HashSet<String> allKeys = new HashSet<String>();
+                HashSet<String> allKeys = new HashSet<>();
                 boolean specialTags = false;
                 
@@ -87 +87 @@
                 
                 // 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 +151 @@
         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));

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/ReadPostprocessor.java

@@ -38 +38 @@
     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() {

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsApi.java

@@ -41 +41 @@
 
     /** the collection of instantiated OSM APIs */
-    private static HashMap<String, SdsApi> instances = new HashMap<String, SdsApi>();
+    private static HashMap<String, SdsApi> instances = new HashMap<>();
     
     /**

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialAgent.java

@@ -27 +27 @@
 public class SdsCredentialAgent extends AbstractCredentialsAgent {
 
-    Map<RequestorType, PasswordAuthentication> sdsMemoryCredentialsCache = new HashMap<RequestorType, PasswordAuthentication>();
+    Map<RequestorType, PasswordAuthentication> sdsMemoryCredentialsCache = new HashMap<>();
 
     /**

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsLoadAction.java

@@ -54 +54 @@
         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;
         }

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsOsmWriter.java

@@ -40 +40 @@
                 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) {

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SeparateDataStorePlugin.java

@@ -29 +29 @@
 {
 
-        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 +113 @@
          */
         protected void clearQueue() {
-                ArrayList<QueueItem> newQueue = new ArrayList<QueueItem>();
+                ArrayList<QueueItem> newQueue = new ArrayList<>();
                 for (QueueItem q : uploadQueue) {
                         if (!q.processed) newQueue.add(q);