Changeset 6316 in josm for trunk/src/org/openstreetmap/josm/tools

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/tools

Files:

• Geometry.java (modified) (3 diffs)
• I18n.java (modified) (3 diffs)
• ImageResource.java (modified) (2 diffs)
• Shortcut.java (modified) (1 diff)
• XmlObjectParser.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -51 +51 @@
         int n = ways.size();
         @SuppressWarnings("unchecked")
-        ArrayList<Node>[] newNodes = new ArrayList[n];
+        List<Node>[] newNodes = new ArrayList[n];
         BBox[] wayBounds = new BBox[n];
         boolean[] changedWays = new boolean[n];
@@ -74 +74 @@
                 }
 
-                ArrayList<Node> way1Nodes = newNodes[seg1Way];
-                ArrayList<Node> way2Nodes = newNodes[seg2Way];
+                List<Node> way1Nodes = newNodes[seg1Way];
+                List<Node> way2Nodes = newNodes[seg2Way];
 
                 //iterate over primary segmemt
@@ -195 +195 @@
     }
 
-    private static BBox getNodesBounds(ArrayList<Node> nodes) {
+    private static BBox getNodesBounds(List<Node> nodes) {
 
         BBox bounds = new BBox(nodes.get(0));
-        for(Node n: nodes) {
+        for (Node n: nodes) {
             bounds.add(n.getCoor());
         }

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -15 +15 @@
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.jar.JarInputStream;
 import java.util.zip.ZipEntry;
@@ -121 +122 @@
         "OptionPane.cancelButtonText"
     };
-    private static HashMap<String, String> strings = null;
-    private static HashMap<String, String[]> pstrings = null;
-    private static HashMap<String, PluralMode> languages = new HashMap<String, PluralMode>();
+    private static Map<String, String> strings = null;
+    private static Map<String, String[]> pstrings = null;
+    private static Map<String, PluralMode> languages = new HashMap<String, PluralMode>();
 
     /**
@@ -476 +477 @@
     }
 
-    private static boolean load(InputStream en, InputStream tr, boolean add)
-    {
-        HashMap<String, String> s;
-        HashMap<String, String[]> p;
-        if(add)
-        {
+    private static boolean load(InputStream en, InputStream tr, boolean add) {
+        Map<String, String> s;
+        Map<String, String[]> p;
+        if (add) {
             s = strings;
             p = pstrings;
-        }
-        else
-        {
+        } else {
             s = new HashMap<String, String>();
             p = new HashMap<String, String[]>();

trunk/src/org/openstreetmap/josm/tools/ImageResource.java

@@ -6 +6 @@
 import java.awt.image.BufferedImage;
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.swing.ImageIcon;
@@ -24 +25 @@
      * Caches the image data for resized versions of the same image.
      */
-    private HashMap<Dimension, Image> imgCache = new HashMap<Dimension, Image>();
+    private Map<Dimension, Image> imgCache = new HashMap<Dimension, Image>();
     private SVGDiagram svg;
     public static final Dimension DEFAULT_DIMENSION = new Dimension(-1, -1);

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -156 +156 @@
     // create a shortcut object from an string as saved in the preferences
     private Shortcut(String prefString) {
-        ArrayList<String> s = (new ArrayList<String>(Main.pref.getCollection(prefString)));
+        List<String> s = (new ArrayList<String>(Main.pref.getCollection(prefString)));
         this.shortText = prefString.substring(15);
         this.longText = s.get(0);

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -12 +12 @@
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -46 +47 @@
         private int lineNumber;
 
+        /**
+         * Constructs a new {@code PresetParsingException}.
+         */
         public PresetParsingException() {
             super();
@@ -274 +278 @@
      * The queue of already parsed items from the parsing thread.
      */
-    private LinkedList<Object> queue = new LinkedList<Object>();
+    private List<Object> queue = new LinkedList<Object>();
     private Iterator<Object> queueIterator = null;