Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.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/BoundingBoxSelection.java (modified) (11 diffs)

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

@@ -57 +57 @@
     protected void buildDownloadAreaInputFields() {
         latlon = new JosmTextField[4];
-        for(int i=0; i< 4; i++) {
+        for (int i = 0; i < 4; i++) {
             latlon[i] = new JosmTextField(11);
-            latlon[i].setMinimumSize(new Dimension(100,new JosmTextField().getMinimumSize().height));
+            latlon[i].setMinimumSize(new Dimension(100, new JosmTextField().getMinimumSize().height));
             latlon[i].addFocusListener(new SelectAllOnFocusHandler(latlon[i]));
         }
@@ -95 +95 @@
         tfOsmUrl.setBorder(latlon[0].getBorder());
 
-        dlg.add(new JLabel(tr("min lat")), GBC.std().insets(10,20,5,0));
-        dlg.add(latlon[0], GBC.std().insets(0,20,0,0));
-        dlg.add(new JLabel(tr("min lon")), GBC.std().insets(10,20,5,0));
-        dlg.add(latlon[1], GBC.eol().insets(0,20,0,0));
-        dlg.add(new JLabel(tr("max lat")), GBC.std().insets(10,0,5,0));
+        dlg.add(new JLabel(tr("min lat")), GBC.std().insets(10, 20, 5, 0));
+        dlg.add(latlon[0], GBC.std().insets(0, 20, 0, 0));
+        dlg.add(new JLabel(tr("min lon")), GBC.std().insets(10, 20, 5, 0));
+        dlg.add(latlon[1], GBC.eol().insets(0, 20, 0, 0));
+        dlg.add(new JLabel(tr("max lat")), GBC.std().insets(10, 0, 5, 0));
         dlg.add(latlon[2], GBC.std());
-        dlg.add(new JLabel(tr("max lon")), GBC.std().insets(10,0,5,0));
+        dlg.add(new JLabel(tr("max lon")), GBC.std().insets(10, 0, 5, 0));
         dlg.add(latlon[3], GBC.eol());
 
@@ -111 +111 @@
             }
         });
-        dlg.add(btnClear, GBC.eol().insets(10,20,0,0));
-
-        dlg.add(new JLabel(tr("URL from www.openstreetmap.org (you can paste an URL here to download the area)")), GBC.eol().insets(10,5,5,0));
-        dlg.add(tfOsmUrl, GBC.eop().insets(10,0,5,0).fill());
-        dlg.add(showUrl, GBC.eop().insets(10,0,5,5));
+        dlg.add(btnClear, GBC.eol().insets(10, 20, 0, 0));
+
+        dlg.add(new JLabel(tr("URL from www.openstreetmap.org (you can paste an URL here to download the area)")),
+                GBC.eol().insets(10, 5, 5, 0));
+        dlg.add(tfOsmUrl, GBC.eop().insets(10, 0, 5, 0).fill());
+        dlg.add(showUrl, GBC.eop().insets(10, 0, 5, 5));
         showUrl.setEditable(false);
         showUrl.setBackground(dlg.getBackground());
@@ -136 +137 @@
     public Bounds getDownloadArea() {
         double[] values = new double[4];
-        for (int i=0; i < 4; i++) {
+        for (int i = 0; i < 4; i++) {
             try {
                 values[i] = Double.parseDouble(latlon[i].getText());
-            } catch(NumberFormatException x) {
+            } catch (NumberFormatException x) {
                 return null;
             }
@@ -152 +153 @@
     private boolean parseURL(DownloadDialog gui) {
         Bounds b = OsmUrlToBounds.parse(tfOsmUrl.getText());
-        if(b == null) return false;
-        gui.boundingBoxChanged(b,BoundingBoxSelection.this);
+        if (b == null) return false;
+        gui.boundingBoxChanged(b, BoundingBoxSelection.this);
         updateBboxFields(b);
         updateUrl(b);
@@ -198 +199 @@
             try {
                 value = Double.parseDouble(tfLatValue.getText());
-            } catch(NumberFormatException ex) {
-                setErrorMessage(tfLatValue,tr("The string ''{0}'' is not a valid double value.", tfLatValue.getText()));
+            } catch (NumberFormatException ex) {
+                setErrorMessage(tfLatValue, tr("The string ''{0}'' is not a valid double value.", tfLatValue.getText()));
                 return;
             }
             if (!LatLon.isValidLat(value)) {
-                setErrorMessage(tfLatValue,tr("Value for latitude in range [-90,90] required.", tfLatValue.getText()));
+                setErrorMessage(tfLatValue, tr("Value for latitude in range [-90,90] required.", tfLatValue.getText()));
                 return;
             }
@@ -231 +232 @@
             try {
                 value = Double.parseDouble(tfLonValue.getText());
-            } catch(NumberFormatException ex) {
-                setErrorMessage(tfLonValue,tr("The string ''{0}'' is not a valid double value.", tfLonValue.getText()));
+            } catch (NumberFormatException ex) {
+                setErrorMessage(tfLonValue, tr("The string ''{0}'' is not a valid double value.", tfLonValue.getText()));
                 return;
             }
             if (!LatLon.isValidLon(value)) {
-                setErrorMessage(tfLonValue,tr("Value for longitude in range [-180,180] required.", tfLonValue.getText()));
+                setErrorMessage(tfLonValue, tr("Value for longitude in range [-180,180] required.", tfLonValue.getText()));
                 return;
             }
@@ -255 +256 @@
     static class SelectAllOnFocusHandler extends FocusAdapter {
         private JTextComponent tfTarget;
+
         public SelectAllOnFocusHandler(JTextComponent tfTarget) {
             this.tfTarget = tfTarget;
@@ -267 +269 @@
     class OsmUrlRefresher implements DocumentListener {
         @Override
-        public void changedUpdate(DocumentEvent e) { parseURL(parent); }
-        @Override
-        public void insertUpdate(DocumentEvent e) { parseURL(parent); }
-        @Override
-        public void removeUpdate(DocumentEvent e) { parseURL(parent); }
+        public void changedUpdate(DocumentEvent e) {
+            parseURL(parent);
+        }
+
+        @Override
+        public void insertUpdate(DocumentEvent e) {
+            parseURL(parent);
+        }
+
+        @Override
+        public void removeUpdate(DocumentEvent e) {
+            parseURL(parent);
+        }
     }
 
     class BoundingBoxBuilder extends FocusAdapter implements ActionListener {
         protected Bounds build() {
-            double minlon, minlat, maxlon,maxlat;
+            double minlon, minlat, maxlon, maxlat;
             try {
                 minlat = Double.parseDouble(latlon[0].getText().trim());
@@ -282 +292 @@
                 maxlat = Double.parseDouble(latlon[2].getText().trim());
                 maxlon = Double.parseDouble(latlon[3].getText().trim());
-            } catch(NumberFormatException e) {
+            } catch (NumberFormatException e) {
                 return null;
             }
@@ -292 +302 @@
             if (minlat > maxlat)
                 return null;
-            return new Bounds(minlat,minlon,maxlat,maxlon);
+            return new Bounds(minlat, minlon, maxlat, maxlon);
         }