Changeset 6883 in josm for trunk/src/org/openstreetmap/josm/gui/download

Timestamp:

2014-02-25T01:31:24+01:00 (10 years ago)

Author:

Don-vip

Message:

fix some Sonar issues

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• BookmarkSelection.java (modified) (1 diff)
• DownloadDialog.java (modified) (2 diffs)
• PlaceSelection.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

@@ -47 +47 @@
     /** displays information about the current download area */
     private JMultilineLabel lblCurrentDownloadArea;
-    final private JosmTextArea bboxDisplay = new JosmTextArea();
+    private final JosmTextArea bboxDisplay = new JosmTextArea();
     /** the add action */
     private AddAction actAdd;

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -48 +48 @@
 
 /**
- *
+ * Dialog displayed to download OSM and/or GPS data from OSM server.
  */
 public class DownloadDialog extends JDialog  {
     /** the unique instance of the download dialog */
-    static private DownloadDialog instance;
+    private static DownloadDialog instance;
 
     /**
@@ -59 +59 @@
      * @return the unique instance of the download dialog
      */
-    static public DownloadDialog getInstance() {
+    public static DownloadDialog getInstance() {
         if (instance == null) {
             instance = new DownloadDialog(Main.parent);

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -70 +70 @@
     private JTable tblSearchResults;
     private DownloadDialog parent;
-    private final static Server[] servers = new Server[]{
-        new Server("Nominatim","http://nominatim.openstreetmap.org/search?format=xml&q=",tr("Class Type"),tr("Bounds")),
-        //new Server("Namefinder","http://gazetteer.openstreetmap.org/namefinder/search.xml?find=",tr("Near"),trc("placeselection", "Zoom"))
+    private static final Server[] SERVERS = new Server[] {
+        new Server("Nominatim","http://nominatim.openstreetmap.org/search?format=xml&q=",tr("Class Type"),tr("Bounds"))
     };
-    private final JosmComboBox server = new JosmComboBox(servers);
+    private final JosmComboBox server = new JosmComboBox(SERVERS);
 
     private static class Server {
@@ -101 +100 @@
         lpanel.add(new JLabel(tr("Choose the server for searching:")));
         lpanel.add(server);
-        String s = Main.pref.get("namefinder.server", servers[0].name);
-        for (int i = 0; i < servers.length; ++i) {
-            if (servers[i].name.equals(s)) {
+        String s = Main.pref.get("namefinder.server", SERVERS[0].name);
+        for (int i = 0; i < SERVERS.length; ++i) {
+            if (SERVERS[i].name.equals(s)) {
                 server.setSelectedIndex(i);
             }
@@ -172 +171 @@
      * Data storage for search results.
      */
-    static private class SearchResult {
+    private static class SearchResult {
         public String name;
         public String info;
@@ -450 +449 @@
             // column 2 - Near
             col3 = new TableColumn(2);
-            col3.setHeaderValue(servers[0].thirdcol);
+            col3.setHeaderValue(SERVERS[0].thirdcol);
             col3.setResizable(true);
             col3.setPreferredWidth(100);
@@ -458 +457 @@
             // column 3 - Zoom
             col4 = new TableColumn(3);
-            col4.setHeaderValue(servers[0].fourthcol);
+            col4.setHeaderValue(SERVERS[0].fourthcol);
             col4.setResizable(true);
             col4.setPreferredWidth(50);