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

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

Files:

• SourceEditor.java (modified) (2 diffs)
• advanced/AdvancedPreference.java (modified) (1 diff)
• advanced/ExportProfileAction.java (modified) (2 diffs)
• display/ColorPreference.java (modified) (2 diffs)
• projection/UTMProjectionChoice.java (modified) (1 diff)
• shortcut/PrefJPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -465 +465 @@
 
         public List<ExtendedSourceEntry> getSelected() {
-            ArrayList<ExtendedSourceEntry> ret = new ArrayList<ExtendedSourceEntry>();
+            List<ExtendedSourceEntry> ret = new ArrayList<ExtendedSourceEntry>();
             for(int i=0; i<data.size();i++) {
                 if (selectionModel.isSelectedIndex(i)) {
@@ -998 +998 @@
 
     protected static class IconPathTableModel extends AbstractTableModel {
-        private ArrayList<String> data;
+        private List<String> data;
         private DefaultListSelectionModel selectionModel;
 

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -200 +200 @@
 
     private void exportSelectedToXML() {
-        ArrayList<String> keys = new ArrayList<String>();
+        List<String> keys = new ArrayList<String>();
         boolean hasLists = false;
 

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java

@@ -7 +7 @@
 import java.io.File;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
@@ -37 +38 @@
     @Override
     public void actionPerformed(ActionEvent ae) {
-        ArrayList<String> keys = new ArrayList<String>();
+        List<String> keys = new ArrayList<String>();
         Map<String, Setting> all = prefs.getAllSettings();
         for (String key: all.keySet()) {

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -12 +12 @@
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -60 +61 @@
     private DefaultTableModel tableModel;
     private JTable colors;
-    private ArrayList<String> del = new ArrayList<String>();
+    private List<String> del = new ArrayList<String>();
 
     JButton colorEdit;

trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java

@@ -110 +110 @@
     @Override
     public String[] allCodes() {
-        ArrayList<String> projections = new ArrayList<String>(60*4);
+        List<String> projections = new ArrayList<String>(60*4);
         for (int zone = 1;zone <= 60; zone++) {
             for (Hemisphere hemisphere : Hemisphere.values()) {

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -16 +16 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.PatternSyntaxException;
@@ -373 +374 @@
                     expr = expr.replace("+", "\\+");
                     // split search string on whitespace, do case-insensitive AND search
-                    ArrayList<RowFilter<Object, Object>> andFilters = new ArrayList<RowFilter<Object, Object>>();
+                    List<RowFilter<Object, Object>> andFilters = new ArrayList<RowFilter<Object, Object>>();
                     for (String word : expr.split("\\s+")) {
                         andFilters.add(RowFilter.regexFilter("(?i)" + word));