Changeset 6316 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2013-10-07T20:18:17+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - Loose coupling

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• CloseChangesetDialog.java (modified) (2 diffs)
• CloseChangesetTask.java (modified) (2 diffs)
• UploadLayerTask.java (modified) (2 diffs)
• UploadPrimitivesTask.java (modified) (2 diffs)
• UploadSelectionDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java

@@ -13 +13 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import javax.swing.AbstractAction;
@@ -214 +215 @@
     public Collection<Changeset> getSelectedChangesets() {
         Object [] sel = lstOpenChangesets.getSelectedValues();
-        ArrayList<Changeset> ret = new ArrayList<Changeset>(sel.length);
+        List<Changeset> ret = new ArrayList<Changeset>(sel.length);
         for (Object o: sel) {
             ret.add((Changeset)o);

trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import javax.swing.SwingUtilities;
@@ -26 +27 @@
     private Exception lastException;
     private Collection<Changeset> changesets;
-    private ArrayList<Changeset> closedChangesets;
+    private List<Changeset> closedChangesets;
 
     /**

trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Set;
 
 import org.openstreetmap.josm.Main;
@@ -45 +46 @@
     private Changeset changeset;
     private Collection<OsmPrimitive> toUpload;
-    private HashSet<IPrimitive> processedPrimitives;
+    private Set<IPrimitive> processedPrimitives;
     private UploadStrategySpecification strategy;
 

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -10 +10 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashSet;
+import java.util.Set;
 
 import javax.swing.JOptionPane;
@@ -50 +51 @@
     private OsmDataLayer layer;
     private Changeset changeset;
-    private HashSet<IPrimitive> processedPrimitives;
+    private Set<IPrimitive> processedPrimitives;
     private UploadStrategySpecification strategy;
 

trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java

@@ -150 +150 @@
 
     public List<OsmPrimitive> getSelectedPrimitives() {
-        ArrayList<OsmPrimitive> ret  = new ArrayList<OsmPrimitive>();
+        List<OsmPrimitive> ret  = new ArrayList<OsmPrimitive>();
         ret.addAll(lstSelectedPrimitives.getOsmPrimitiveListModel().getPrimitives(lstSelectedPrimitives.getSelectedIndices()));
         ret.addAll(lstDeletedPrimitives.getOsmPrimitiveListModel().getPrimitives(lstDeletedPrimitives.getSelectedIndices()));
@@ -247 +247 @@
             if (indices == null || indices.length == 0)
                 return Collections.emptyList();
-            ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>(indices.length);
+            List<OsmPrimitive> ret = new ArrayList<OsmPrimitive>(indices.length);
             for (int i: indices) {
                 if (i < 0) {