Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified) (14 diffs)

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

@@ -75 +75 @@
     private DownloadDialog parent;
     private static final Server[] SERVERS = new Server[] {
-        new Server("Nominatim","https://nominatim.openstreetmap.org/search?format=xml&q=",tr("Class Type"),tr("Bounds"))
+        new Server("Nominatim", "https://nominatim.openstreetmap.org/search?format=xml&q=", tr("Class Type"), tr("Bounds"))
     };
     private final JosmComboBox<Server> server = new JosmComboBox<>(SERVERS);
 
     private static class Server {
-        public String name;
-        public String url;
-        public String thirdcol;
-        public String fourthcol;
-        @Override
-        public String toString() {
-            return name;
-        }
+        public final String name;
+        public final String url;
+        public final String thirdcol;
+        public final String fourthcol;
+
         public Server(String n, String u, String t, String f) {
             name = n;
@@ -94 +91 @@
             fourthcol = f;
         }
+
+        @Override
+        public String toString() {
+            return name;
+        }
     }
 
     protected JPanel buildSearchPanel() {
         JPanel lpanel = new JPanel();
-        lpanel.setLayout(new GridLayout(2,2));
+        lpanel.setLayout(new GridLayout(2, 2));
         JPanel panel = new JPanel();
         panel.setLayout(new GridBagLayout());
@@ -122 +124 @@
         SearchAction searchAction = new SearchAction();
         JButton btnSearch = new JButton(searchAction);
-        ((JTextField)cbSearchExpression.getEditor().getEditorComponent()).getDocument().addDocumentListener(searchAction);
-        ((JTextField)cbSearchExpression.getEditor().getEditorComponent()).addActionListener(searchAction);
+        ((JTextField) cbSearchExpression.getEditor().getEditorComponent()).getDocument().addDocumentListener(searchAction);
+        ((JTextField) cbSearchExpression.getEditor().getEditorComponent()).addActionListener(searchAction);
 
         panel.add(btnSearch, GBC.eol().insets(5, 5, 0, 5));
@@ -147 +149 @@
         tblSearchResults.setSelectionModel(selectionModel);
         JScrollPane scrollPane = new JScrollPane(tblSearchResults);
-        scrollPane.setPreferredSize(new Dimension(200,200));
+        scrollPane.setPreferredSize(new Dimension(200, 200));
         panel.add(scrollPane, BorderLayout.CENTER);
 
@@ -216 +218 @@
                     currentResult.name = atts.getValue("name");
                     currentResult.info = atts.getValue("info");
-                    if(currentResult.info != null) {
+                    if (currentResult.info != null) {
                         currentResult.info = tr(currentResult.info);
                     }
@@ -288 +290 @@
         public SearchAction() {
             putValue(NAME, tr("Search ..."));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs","search"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
             putValue(SHORT_DESCRIPTION, tr("Click to start searching for places"));
             updateEnabledState();
@@ -333 +335 @@
 
         public NameQueryTask(String searchExpression) {
-            super(tr("Querying name server"),false /* don't ignore exceptions */);
+            super(tr("Querying name server"), false /* don't ignore exceptions */);
             this.searchExpression = searchExpression;
-            useserver = (Server)server.getSelectedItem();
+            useserver = (Server) server.getSelectedItem();
             Main.pref.put("namefinder.server", useserver.name);
         }
@@ -368 +370 @@
                 getProgressMonitor().indeterminateSubTask(tr("Querying name server ..."));
                 URL url = new URL(urlString);
-                synchronized(this) {
+                synchronized (this) {
                     connection = Utils.openHttpConnection(url);
                 }
-                connection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+                connection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect", 15)*1000);
                 try (
                     InputStream inputStream = connection.getInputStream();
@@ -415 +417 @@
             this.selectionModel = selectionModel;
         }
+
         @Override
         public int getRowCount() {
@@ -435 +438 @@
             fireTableDataChanged();
         }
+
         @Override
         public boolean isCellEditable(int row, int column) {
@@ -486 +490 @@
             addColumn(col4);
         }
+
         public void setHeadlines(String third, String fourth) {
             col3.setHeaderValue(third);
@@ -509 +514 @@
     static class NamedResultCellRenderer extends JLabel implements TableCellRenderer {
 
+        /**
+         * Constructs a new {@code NamedResultCellRenderer}.
+         */
         public NamedResultCellRenderer() {
             setOpaque(true);
-            setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+            setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
         }
 
@@ -533 +541 @@
             StringBuilder line = new StringBuilder();
             StringTokenizer tok = new StringTokenizer(description, " ");
-            while(tok.hasMoreElements()) {
+            while (tok.hasMoreElements()) {
                 String t = tok.nextToken();
                 if (line.length() == 0) {
@@ -570 +578 @@
                 break;
             case 3:
-                if(sr.bounds != null) {
+                if (sr.bounds != null) {
                     setText(sr.bounds.toShortString(new DecimalFormat("0.000")));
                 } else {