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

Timestamp:

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

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

Location:

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

Files:

• BookmarkList.java (modified) (3 diffs)
• BookmarkSelection.java (modified) (12 diffs)
• BoundingBoxSelection.java (modified) (11 diffs)
• DownloadDialog.java (modified) (9 diffs)
• PlaceSelection.java (modified) (14 diffs)
• SlippyMapChooser.java (modified) (1 diff)
• TileSelection.java (modified) (1 diff)

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

@@ -45 +45 @@
         public Bookmark(Collection<String> list) {
             List<String> array = new ArrayList<>(list);
-            if(array.size() < 5)
+            if (array.size() < 5)
                 throw new IllegalArgumentException(tr("Wrong number of arguments for bookmark"));
             name = array.get(0);
@@ -155 +155 @@
      */
     public final void load() {
-        DefaultListModel<Bookmark> model = (DefaultListModel<Bookmark>)getModel();
+        DefaultListModel<Bookmark> model = (DefaultListModel<Bookmark>) getModel();
         model.removeAllElements();
         Collection<Collection<String>> args = Main.pref.getArray("bookmarks", null);
-        if(args != null) {
+        if (args != null) {
             List<Bookmark> bookmarks = new LinkedList<>();
-            for(Collection<String> entry : args) {
+            for (Collection<String> entry : args) {
                 try {
                     bookmarks.add(new Bookmark(entry));
@@ -179 +179 @@
     public final void save() {
         List<Collection<String>> coll = new LinkedList<>();
-        for (Object o : ((DefaultListModel<Bookmark>)getModel()).toArray()) {
+        for (Object o : ((DefaultListModel<Bookmark>) getModel()).toArray()) {
             String[] array = new String[5];
             Bookmark b = (Bookmark) o;

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

@@ -85 +85 @@
         GridBagConstraints  gc = new GridBagConstraints();
         gc.anchor = GridBagConstraints.NORTHWEST;
-        gc.insets = new Insets(5,5,5,5);
+        gc.insets = new Insets(5, 5, 5, 5);
         pnl.add(lblCurrentDownloadArea = new JMultilineLabel(""), gc);
 
@@ -99 +99 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(5,5,5,5);
+        gc.insets = new Insets(5, 5, 5, 5);
         pnl.add(new JButton(actAdd = new AddAction()), gc);
         return pnl;
@@ -116 +116 @@
                 Bookmark b = bookmarks.getSelectedValue();
                 if (b != null) {
-                    gui.boundingBoxChanged(b.getArea(),BookmarkSelection.this);
+                    gui.boundingBoxChanged(b.getArea(), BookmarkSelection.this);
                 }
             }
@@ -126 +126 @@
         gc.weighty = 0.0;
         gc.gridwidth = 2;
-        dlg.add(buildDownloadAreaAddPanel(),gc);
+        dlg.add(buildDownloadAreaAddPanel(), gc);
 
         gc.gridwidth = 1;
@@ -134 +134 @@
         gc.weightx = 0.0;
         gc.weighty = 1.0;
-        dlg.add(buildButtonPanel(),gc);
+        dlg.add(buildButtonPanel(), gc);
 
         gc.gridwidth = 1;
@@ -196 +196 @@
             b.setName(
                     JOptionPane.showInputDialog(
-                            Main.parent,tr("Please enter a name for the bookmarked download area."),
+                            Main.parent, tr("Please enter a name for the bookmarked download area."),
                             tr("Name of location"),
                             JOptionPane.QUESTION_MESSAGE)
@@ -202 +202 @@
             b.setArea(currentArea);
             if (b.getName() != null && !b.getName().isEmpty()) {
-                ((DefaultListModel<BookmarkList.Bookmark>)bookmarks.getModel()).addElement(b);
+                ((DefaultListModel<BookmarkList.Bookmark>) bookmarks.getModel()).addElement(b);
                 bookmarks.save();
             }
@@ -209 +209 @@
 
     class RemoveAction extends AbstractAction implements ListSelectionListener{
+        /**
+         * Constructs a new {@code RemoveAction}.
+         */
         public RemoveAction() {
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
@@ -221 +224 @@
                 return;
             for (Object sel: sels) {
-                ((DefaultListModel<Bookmark>)bookmarks.getModel()).removeElement(sel);
+                ((DefaultListModel<Bookmark>) bookmarks.getModel()).removeElement(sel);
             }
             bookmarks.save();
@@ -229 +232 @@
             setEnabled(bookmarks.getSelectedIndices().length > 0);
         }
+
         @Override
         public void valueChanged(ListSelectionEvent e) {
@@ -235 +239 @@
     }
 
-    class RenameAction extends AbstractAction implements ListSelectionListener{
+    class RenameAction extends AbstractAction implements ListSelectionListener {
+        /**
+         * Constructs a new {@code RenameAction}.
+         */
         public RenameAction() {
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
@@ -250 +257 @@
             Object value =
                 JOptionPane.showInputDialog(
-                        Main.parent,tr("Please enter a name for the bookmarked download area."),
+                        Main.parent, tr("Please enter a name for the bookmarked download area."),
                         tr("Name of location"),
                         JOptionPane.QUESTION_MESSAGE,

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);
         }
 

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

@@ -86 +86 @@
 
     private void makeCheckBoxRespondToEnter(JCheckBox cb) {
-        cb.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), "doDownload");
+        cb.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "doDownload");
         cb.getActionMap().put("doDownload", actDownload);
     }
@@ -103 +103 @@
 
         // adding the download tasks
-        pnl.add(new JLabel(tr("Data Sources and Types:")), GBC.std().insets(5,5,1,5));
+        pnl.add(new JLabel(tr("Data Sources and Types:")), GBC.std().insets(5, 5, 1, 5));
         cbDownloadOsmData = new JCheckBox(tr("OpenStreetMap data"), true);
         cbDownloadOsmData.setToolTipText(tr("Select to download OSM data in the selected download area."));
@@ -156 +156 @@
         cbStartup = new JCheckBox(tr("Open this dialog on startup"));
         cbStartup.setToolTipText(
-                tr("<html>Autostart ''Download from OSM'' dialog every time JOSM is started.<br>You can open it manually from File menu or toolbar.</html>"));
+                tr("<html>Autostart ''Download from OSM'' dialog every time JOSM is started.<br>" +
+                        "You can open it manually from File menu or toolbar.</html>"));
         cbStartup.addActionListener(new ActionListener() {
             @Override
@@ -163 +164 @@
             }});
 
-        pnl.add(cbNewLayer, GBC.std().anchor(GBC.WEST).insets(5,5,5,5));
-        pnl.add(cbStartup, GBC.std().anchor(GBC.WEST).insets(15,5,5,5));
-
-        pnl.add(sizeCheck,  GBC.eol().anchor(GBC.EAST).insets(5,5,5,2));
+        pnl.add(cbNewLayer, GBC.std().anchor(GBC.WEST).insets(5, 5, 5, 5));
+        pnl.add(cbStartup, GBC.std().anchor(GBC.WEST).insets(15, 5, 5, 5));
+
+        pnl.add(sizeCheck,  GBC.eol().anchor(GBC.EAST).insets(5, 5, 5, 2));
 
         if (!ExpertToggleAction.isExpert()) {
             JLabel infoLabel  = new JLabel(
                     tr("Use left click&drag to select area, arrows or right mouse button to scroll map, wheel or +/- to zoom."));
-            pnl.add(infoLabel,GBC.eol().anchor(GBC.SOUTH).insets(0,0,0,0));
+            pnl.add(infoLabel, GBC.eol().anchor(GBC.SOUTH).insets(0, 0, 0, 0));
         }
         return pnl;
@@ -203 +204 @@
 
         // -- cancel on ESC
-        getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0), "cancel");
+        getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "cancel");
         getRootPane().getActionMap().put("cancel", actCancel);
 
@@ -219 +220 @@
      */
     public DownloadDialog(Component parent) {
-        super(JOptionPane.getFrameForComponent(parent),tr("Download"), ModalityType.DOCUMENT_MODAL);
+        super(JOptionPane.getFrameForComponent(parent), tr("Download"), ModalityType.DOCUMENT_MODAL);
         getContentPane().setLayout(new BorderLayout());
         getContentPane().add(buildMainPanel(), BorderLayout.CENTER);
@@ -382 +383 @@
                     mv.getLatLon(mv.getWidth(), 0)
             );
-            boundingBoxChanged(currentBounds,null);
+            boundingBoxChanged(currentBounds, null);
         } else {
             Bounds bounds = getSavedDownloadBounds();
@@ -414 +415 @@
      */
     public static boolean isAutorunEnabled() {
-        return Main.pref.getBoolean("download.autorun",false);
+        return Main.pref.getBoolean("download.autorun", false);
     }
 
@@ -438 +439 @@
                     WindowGeometry.centerInWindow(
                             getParent(),
-                            new Dimension(1000,600)
+                            new Dimension(1000, 600)
                     )
             ).applySafe(this);

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 {

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

@@ -52 +52 @@
         if (evt.getPropertyName().equals(BBoxChooser.BBOX_PROP)) {
             if (iGui != null) {
-                iGui.boundingBoxChanged((Bounds)evt.getNewValue(), this);
+                iGui.boundingBoxChanged((Bounds) evt.getNewValue(), this);
             }
-        } else if(evt.getPropertyName().equals(SlippyMapBBoxChooser.RESIZE_PROP)) {
+        } else if (evt.getPropertyName().equals(SlippyMapBBoxChooser.RESIZE_PROP)) {
             int w, h;
 

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

@@ -49 +49 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(BBoxChooser.BBOX_PROP)) {
-            Bounds bbox = (Bounds)evt.getNewValue();
+            Bounds bbox = (Bounds) evt.getNewValue();
             parent.boundingBoxChanged(bbox, this);
         }