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

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

Files:

• AbstractUploadTask.java (modified) (4 diffs)
• ActionFlagsTableCell.java (modified) (3 diffs)
• BasicUploadSettingsPanel.java (modified) (4 diffs)
• ChangesetCommentModel.java (modified) (1 diff)
• ChangesetManagementPanel.java (modified) (9 diffs)
• CloseChangesetDialog.java (modified) (3 diffs)
• CloseChangesetTask.java (modified) (1 diff)
• ConfigurationParameterRequestHandler.java (modified) (1 diff)
• CredentialDialog.java (modified) (9 diffs)
• DownloadFileTask.java (modified) (6 diffs)
• DownloadOpenChangesetsTask.java (modified) (6 diffs)
• DownloadPrimitivesTask.java (modified) (7 diffs)
• DownloadPrimitivesWithReferrersTask.java (modified) (6 diffs)
• LayerNameAndFilePathTableCell.java (modified) (4 diffs)
• OpenChangesetComboBoxModel.java (modified) (1 diff)
• SaveLayerTask.java (modified) (2 diffs)
• SaveLayersDialog.java (modified) (8 diffs)
• SaveLayersModel.java (modified) (4 diffs)
• SaveLayersTable.java (modified) (1 diff)
• SaveLayersTableColumnModel.java (modified) (1 diff)
• TagSettingsPanel.java (modified) (3 diffs)
• UpdatePrimitivesTask.java (modified) (6 diffs)
• UploadAndSaveProgressRenderer.java (modified) (4 diffs)
• UploadDialog.java (modified) (8 diffs)
• UploadLayerTask.java (modified) (5 diffs)
• UploadParameterSummaryPanel.java (modified) (4 diffs)
• UploadPrimitivesTask.java (modified) (8 diffs)
• UploadSelectionDialog.java (modified) (6 diffs)
• UploadStrategySelectionPanel.java (modified) (16 diffs)
• UploadStrategySpecification.java (modified) (2 diffs)
• UploadedObjectsSummaryPanel.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java

@@ -78 +78 @@
     protected void synchronizeDataSet() {
         UpdateDataAction act = new UpdateDataAction();
-        act.actionPerformed(new ActionEvent(this,0,""));
+        act.actionPerformed(new ActionEvent(this, 0, ""));
     }
 
@@ -256 +256 @@
             Matcher m = p.matcher(errorHeader);
             if (m.matches()) {
-                handleUploadConflictForKnownConflict(OsmPrimitiveType.from(m.group(3)), Long.parseLong(m.group(4)), m.group(2),m.group(1));
+                handleUploadConflictForKnownConflict(OsmPrimitiveType.from(m.group(3)), Long.parseLong(m.group(4)), m.group(2), m.group(1));
                 return;
             }
@@ -296 +296 @@
     protected void handleGone(OsmApiPrimitiveGoneException e) {
         if (e.isKnownPrimitive()) {
-            UpdateSelectionAction.handlePrimitiveGoneException(e.getPrimitiveId(),e.getPrimitiveType());
+            UpdateSelectionAction.handlePrimitiveGoneException(e.getPrimitiveId(), e.getPrimitiveType());
         } else {
             ExceptionDialogUtil.explainGoneForUnknownPrimitive(e);
@@ -311 +311 @@
         //
         if (e instanceof OsmApiInitializationException) {
-            ExceptionDialogUtil.explainOsmApiInitializationException((OsmApiInitializationException)e);
+            ExceptionDialogUtil.explainOsmApiInitializationException((OsmApiInitializationException) e);
             return;
         }
 
         if (e instanceof OsmApiPrimitiveGoneException) {
-            handleGone((OsmApiPrimitiveGoneException)e);
+            handleGone((OsmApiPrimitiveGoneException) e);
             return;
         }
         if (e instanceof OsmApiException) {
-            OsmApiException ex = (OsmApiException)e;
-            if(ex.getResponseCode() == HttpURLConnection.HTTP_CONFLICT) {
+            OsmApiException ex = (OsmApiException) e;
+            if (ex.getResponseCode() == HttpURLConnection.HTTP_CONFLICT) {
                 // There was an upload conflict. Let the user decide whether and how to resolve it
                 handleUploadConflict(ex);

trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java

@@ -47 +47 @@
     };
 
+    /**
+     * Constructs a new {@code ActionFlagsTableCell}.
+     */
     public ActionFlagsTableCell() {
         checkBoxes[0] = new JCheckBox(tr("Upload"));
@@ -66 +69 @@
         }
 
-        setToolTipText(tr("<html>Select which actions to perform for this layer, if you click the leftmost button.<br/>Check \"upload\" to upload the changes to the OSM server.<br/>Check \"Save\" to save the layer to the file specified on the left.</html>"));
+        setToolTipText(tr("<html>"+
+            "Select which actions to perform for this layer, if you click the leftmost button.<br/>"+
+            "Check \"upload\" to upload the changes to the OSM server.<br/>"+
+            "Check \"Save\" to save the layer to the file specified on the left."+
+            "</html>"));
     }
 
@@ -72 +79 @@
         if (v != null && checkBoxes[0] != null && checkBoxes[1] != null) {
             boolean[] values;
-            if(v instanceof SaveLayerInfo) {
+            if (v instanceof SaveLayerInfo) {
                 values = new boolean[2];
                 values[0] = ((SaveLayerInfo) v).isDoUploadToServer();

trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java

@@ -99 +99 @@
     protected void build() {
         setLayout(new BorderLayout());
-        setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
+        setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
         add(buildUploadCommentPanel(), BorderLayout.NORTH);
         add(pnlUploadParameterSummary, BorderLayout.CENTER);
@@ -136 +136 @@
                         }
                     }
+
                     @Override
                     public void keyReleased(KeyEvent e) {}
@@ -192 +193 @@
             destination.setComment(source.getText());
         }
+
         @Override
         public void focusLost(FocusEvent e) {
@@ -213 +215 @@
         public void update(Observable o, Object arg) {
             if (!(o instanceof ChangesetCommentModel)) return;
-            String newComment = (String)arg;
+            String newComment = (String) arg;
             if (!destination.getText().equals(newComment)) {
                 destination.setText(newComment);

trunk/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java

@@ -33 +33 @@
      */
     public String getComment() {
-        return comment == null ? "": comment;
+        return comment == null ? "" : comment;
     }
 }

trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java

@@ -64 +64 @@
         setLayout(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
-        setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
+        setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
 
         ButtonGroup bgUseNewOrExisting = new ButtonGroup();
@@ -83 +83 @@
         gc.weightx = 1.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(0,0,0,0);
+        gc.insets = new Insets(0, 0, 0, 0);
         gc.anchor = GridBagConstraints.FIRST_LINE_START;
         rbUseNew = new JRadioButton(tr("Upload to a new changeset"));
@@ -124 +124 @@
         gc.weightx = 0.0;
         JButton btnRefresh = new JButton(new RefreshAction());
-        btnRefresh.setMargin(new Insets(0,0,0,0));
+        btnRefresh.setMargin(new Insets(0, 0, 0, 0));
         add(btnRefresh, gc);
 
@@ -132 +132 @@
         CloseChangesetAction closeChangesetAction = new CloseChangesetAction();
         JButton btnClose = new JButton(closeChangesetAction);
-        btnClose.setMargin(new Insets(0,0,0,0));
+        btnClose.setMargin(new Insets(0, 0, 0, 0));
         cbOpenChangesets.addItemListener(closeChangesetAction);
         rbExisting.addItemListener(closeChangesetAction);
@@ -189 +189 @@
     public void setSelectedChangesetForNextUpload(Changeset cs) {
         int idx  = model.getIndexOf(cs);
-        if (idx >=0) {
+        if (idx >= 0) {
             rbExisting.setSelected(true);
             model.setSelectedItem(cs);
@@ -205 +205 @@
         if (rbUseNew.isSelected())
             return null;
-        return (Changeset)cbOpenChangesets.getSelectedItem();
+        return (Changeset) cbOpenChangesets.getSelectedItem();
     }
 
@@ -242 +242 @@
         @Override
         public void itemStateChanged(ItemEvent e) {
-            Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
+            Changeset cs = (Changeset) cbOpenChangesets.getSelectedItem();
             if (cs == null) return;
             if (rbExisting.isSelected()) {
@@ -288 +288 @@
                     model.selectFirstChangeset();
                 }
-                Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
+                Changeset cs = (Changeset) cbOpenChangesets.getSelectedItem();
                 if (cs == null) return;
                 changesetCommentModel.setComment(cs.get("comment"));
@@ -326 +326 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
+            Changeset cs = (Changeset) cbOpenChangesets.getSelectedItem();
             if (cs == null) return;
             CloseChangesetTask task = new CloseChangesetTask(Collections.singletonList(cs));

trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java

@@ -53 +53 @@
     protected JPanel buildTopPanel() {
         JPanel pnl = new JPanel();
-        pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         pnl.setLayout(new BorderLayout());
         pnl.add(new JLabel(tr("<html>Please select the changesets you want to close</html>")), BorderLayout.CENTER);
@@ -92 +92 @@
         getContentPane().add(buildSouthPanel(), BorderLayout.SOUTH);
 
-        getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0), "escape");
+        getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "escape");
         getRootPane().getActionMap().put("escape", new CancelAction());
         addWindowListener(new WindowEventHandler());
@@ -102 +102 @@
             new WindowGeometry(
                     getClass().getName() + ".geometry",
-                    WindowGeometry.centerInWindow(Main.parent, new Dimension(300,300))
+                    WindowGeometry.centerInWindow(Main.parent, new Dimension(300, 300))
             ).applySafe(this);
         } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775

trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java

@@ -80 +80 @@
                 closedChangesets.add(cs);
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             if (canceled)
                 return;

trunk/src/org/openstreetmap/josm/gui/io/ConfigurationParameterRequestHandler.java

@@ -4 +4 @@
 public interface ConfigurationParameterRequestHandler {
     void handleChangesetConfigurationRequest();
+
     void handleUploadStrategyConfigurationRequest();
 }

trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

@@ -79 +79 @@
     public void setVisible(boolean visible) {
         if (visible) {
-            WindowGeometry.centerInWindow(Main.parent, new Dimension(350,300)).applySafe(this);
+            WindowGeometry.centerInWindow(Main.parent, new Dimension(350, 300)).applySafe(this);
         }
         super.setVisible(visible);
@@ -97 +97 @@
 
         addWindowListener(new WindowEventHander());
-        getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "escape");
+        getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
+                KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "escape");
         getRootPane().getActionMap().put("escape", new CancelAction());
 
-        getRootPane().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        getRootPane().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
     }
 
@@ -108 +109 @@
         try {
             setAlwaysOnTop(true);
-        } catch(SecurityException e) {
+        } catch (SecurityException e) {
             Main.warn(tr("Failed to put Credential Dialog always on top. Caught security exception."));
         }
@@ -136 +137 @@
 
     public String getUsername() {
-        if (pnlCredentials== null) return null;
+        if (pnlCredentials == null) return null;
         return pnlCredentials.getUserName();
     }
 
     public char[] getPassword() {
-        if (pnlCredentials== null) return null;
+        if (pnlCredentials == null) return null;
         return pnlCredentials.getPassword();
     }
 
     public boolean isSaveCredentials() {
-        if (pnlCredentials== null) return false;
+        if (pnlCredentials == null) return false;
         return pnlCredentials.isSaveCredentials();
     }
@@ -174 +175 @@
             gc.weightx = 1.0;
             gc.weighty = 0.0;
-            gc.insets = new Insets(0,0,10,0);
+            gc.insets = new Insets(0, 0, 10, 0);
             add(lblHeading = new JMultilineLabel(""), gc);
 
@@ -184 +185 @@
             gc.weightx = 0.0;
             gc.weighty = 0.0;
-            gc.insets = new Insets(0,0,10,10);
+            gc.insets = new Insets(0, 0, 10, 10);
             add(new JLabel(tr("Username")), gc);
             gc.gridx = 1;
@@ -220 +221 @@
             gc.gridy = 5;
             gc.weighty = 1.0;
-            add(new JPanel(),gc);
+            add(new JPanel(), gc);
 
         }
@@ -330 +331 @@
         public void focusGained(FocusEvent e) {
             if (e.getSource() instanceof JTextField) {
-                JTextField tf = (JTextField)e.getSource();
+                JTextField tf = (JTextField) e.getSource();
                 tf.selectAll();
             }
@@ -356 +357 @@
         @Override
         public void keyPressed(KeyEvent e) {
-            if(e.getKeyChar() == KeyEvent.VK_ENTER) {
+            if (e.getKeyChar() == KeyEvent.VK_ENTER) {
                 if (currentTF.getText().trim().isEmpty()) {
                     currentTF.selectAll();

trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

@@ -77 +77 @@
     }
 
-
     @Override
     protected void cancel() {
@@ -102 +101 @@
             URL url = new URL(address);
             int size;
-            synchronized(this) {
+            synchronized (this) {
                 downloadConnection = Utils.openHttpConnection(url);
                 downloadConnection.setRequestProperty("Cache-Control", "no-cache");
@@ -110 +109 @@
 
             progressMonitor.setTicksCount(100);
-            progressMonitor.subTask(tr("Downloading File {0}: {1} bytes...", file.getName(),size));
+            progressMonitor.subTask(tr("Downloading File {0}: {1} bytes...", file.getName(), size));
 
             try (
@@ -117 +116 @@
             ) {
                 byte[] buffer = new byte[32768];
-                int count=0;
-                int p1=0, p2=0;
+                int count = 0;
+                int p1 = 0, p2 = 0;
                 for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
                     out.write(buffer, 0, read);
-                    count+=read;
+                    count += read;
                     if (canceled) break;
                     p2 = 100 * count / size;
-                    if (p2!=p1) {
+                    if (p2 != p1) {
                         progressMonitor.setTicks(p2);
-                        p1=p2;
+                        p1 = p2;
                     }
                 }
@@ -138 +137 @@
                 }
             }
-        } catch(MalformedURLException e) {
+        } catch (MalformedURLException e) {
             String msg = tr("Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. Skipping download.",
                     file.getName(), address);
@@ -157 +156 @@
         try {
             download();
-        } catch(DownloadException e) {
+        } catch (DownloadException e) {
             Main.error(e);
         }

trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java

@@ -48 +48 @@
     protected void cancel() {
         this.canceled = true;
-        synchronized(this) {
+        synchronized (this) {
             if (reader != null) {
                 reader.cancel();
@@ -70 +70 @@
             return;
         }
-        if (canceled)return;
+        if (canceled) return;
         if (lastException != null) {
             ExceptionDialogUtil.explainException(lastException);
@@ -98 +98 @@
      *
      */
-    protected void refreshUserIdentity(){
+    protected void refreshUserIdentity() {
         JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
         try {
@@ -104 +104 @@
             UserInfo info = infoReader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false));
             im.setFullyIdentified(info.getDisplayName(), info);
-        } catch(OsmTransferException e) {
+        } catch (OsmTransferException e) {
             // retrieving the user info can fail if the current user is not authorised to
             // retrieve it, i.e. if he is working with an OAuth Access Token which doesn't
@@ -127 +127 @@
             if (im.isAnonymous()) {
                 refreshUserIdentity();
-            } else if (im.isFullyIdentified()){
+            } else if (im.isFullyIdentified()) {
                 // do nothing
             } else if (im.isPartiallyIdentified()) {
                 refreshUserIdentity();
             }
-            if (canceled)return;
-            synchronized(this) {
+            if (canceled) return;
+            synchronized (this) {
                 reader = new OsmServerChangesetReader();
             }
@@ -153 +153 @@
                     getProgressMonitor().createSubTaskMonitor(1, false /* not internal */)
             );
-        } catch(Exception e) {
+        } catch (Exception e) {
             if (canceled)
                 return;

trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java

@@ -83 +83 @@
     protected void cancel() {
         canceled = true;
-        synchronized(this) {
+        synchronized (this) {
             if (multiObjectReader != null) {
                 multiObjectReader.cancel();
@@ -105 +105 @@
             public void run() {
                 layer.mergeFrom(ds);
-                if(Main.map != null)
+                if (Main.map != null)
                     AutoScaleAction.zoomTo(ds.allPrimitives());
                 layer.onPostDownloadFromServer();
@@ -139 +139 @@
         DataSet theirDataSet;
         try {
-            synchronized(this) {
+            synchronized (this) {
                 if (canceled) return;
                 multiObjectReader = new MultiFetchServerObjectReader();
@@ -146 +146 @@
             theirDataSet = multiObjectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
             missingPrimitives = multiObjectReader.getMissingPrimitives();
-            synchronized(this) {
+            synchronized (this) {
                 multiObjectReader = null;
             }
@@ -158 +158 @@
                 // (it may happen because "relations" has no deterministic sort order, see #10388)
                 if (r.isIncomplete() || r.hasIncompleteMembers()) {
-                    synchronized(this) {
+                    synchronized (this) {
                         if (canceled) return;
                         objectReader = new OsmServerObjectReader(r.getId(), OsmPrimitiveType.RELATION, fullRelation);
@@ -178 +178 @@
                 if (canceled) return;
                 if (w.hasIncompleteNodes()) {
-                    synchronized(this) {
+                    synchronized (this) {
                         if (canceled) return;
                         objectReader = new OsmServerObjectReader(w.getId(), OsmPrimitiveType.WAY, true /* full */);
@@ -191 +191 @@
             }
 
-        } catch(Exception e) {
+        } catch (Exception e) {
             if (canceled) return;
             lastException = e;

trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java

@@ -85 +85 @@
     @Override
     protected void cancel() {
-        synchronized(this) {
+        synchronized (this) {
             canceled = true;
-            if(currentTask != null)
+            if (currentTask != null)
                 currentTask.operationCanceled();
         }
@@ -97 +97 @@
         // First, download primitives
         mainTask = new DownloadPrimitivesTask(tmpLayer, ids, full, getProgressMonitor().createSubTaskMonitor(1, false));
-        synchronized(this) {
+        synchronized (this) {
             currentTask = mainTask;
-            if(canceled) {
+            if (canceled) {
                 currentTask = null;
                 return;
@@ -106 +106 @@
         currentTask.run();
         // Then, download referrers for each primitive
-        if(downloadReferrers)
-            for(PrimitiveId id : ids) {
-                synchronized(this) {
-                    if(canceled) {
+        if (downloadReferrers)
+            for (PrimitiveId id : ids) {
+                synchronized (this) {
+                    if (canceled) {
                         currentTask = null;
                         return;
@@ -123 +123 @@
     @Override
     protected void finish() {
-        synchronized(this) {
-            if(canceled)
+        synchronized (this) {
+            if (canceled)
                 return;
         }
@@ -130 +130 @@
         // Append downloaded data to JOSM
         OsmDataLayer layer = Main.main.getEditLayer();
-        if(layer == null || this.newLayer)
+        if (layer == null || this.newLayer)
             Main.main.addLayer(tmpLayer);
         else
@@ -187 +187 @@
      */
     public List<PrimitiveId> getDownloadedId() {
-        synchronized(this) {
-            if(canceled)
+        synchronized (this) {
+            if (canceled)
                 return null;
         }

trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java

@@ -31 +31 @@
 
 class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer, TableCellEditor {
-    private static final Color colorError = new Color(255,197,197);
+    private static final Color colorError = new Color(255, 197, 197);
     private static final String separator = System.getProperty("file.separator");
     private static final String ellipsis = "…" + separator;
@@ -78 +78 @@
             boolean hasFocus, int row, int column) {
         removeAll();
-        SaveLayerInfo info = (SaveLayerInfo)value;
+        SaveLayerInfo info = (SaveLayerInfo) value;
         StringBuilder sb = new StringBuilder();
         sb.append("<html>")
@@ -93 +93 @@
     public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
         removeAll();
-        SaveLayerInfo info = (SaveLayerInfo)value;
+        SaveLayerInfo info = (SaveLayerInfo) value;
         value = info.getFile();
         tfFilename.setText(value == null ? "" : value.toString());
@@ -161 +161 @@
     private String makePathFit(String t) {
         boolean hasEllipsis = false;
-        while(t != null && !t.isEmpty()) {
+        while (t != null && !t.isEmpty()) {
             int txtwidth = lblFilename.getFontMetrics(lblFilename.getFont()).stringWidth(t);
-            if(txtwidth < lblFilename.getWidth() || t.lastIndexOf(separator) < ellipsis.length()) {
+            if (txtwidth < lblFilename.getWidth() || t.lastIndexOf(separator) < ellipsis.length()) {
                 break;
             }

trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java

@@ -101 +101 @@
         }
         if (!(anObject instanceof Changeset)) return;
-        Changeset cs = (Changeset)anObject;
+        Changeset cs = (Changeset) anObject;
         if (cs.getId() == 0 || !cs.isOpen()) return;
         Changeset candidate = getChangesetById(cs.getId());

trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java

@@ -21 +21 @@
  *        // wait for the task to complete
  *        taskFuture.get();
- *     } catch(Exception e) {
+ *     } catch (Exception e) {
  *        e.printStackTracek();
  *     }
@@ -56 +56 @@
                 layerInfo.getLayer().onPostSaveToFile();
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             Main.error(e);
             setLastException(e);

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -74 +74 @@
      */
     protected void build() {
-        WindowGeometry geometry = WindowGeometry.centerOnScreen(new Dimension(650,300));
+        WindowGeometry geometry = WindowGeometry.centerOnScreen(new Dimension(650, 300));
         geometry.applySafe(this);
         getContentPane().setLayout(new BorderLayout());
@@ -192 +192 @@
             gc.weightx = 1.0;
             gc.weighty = 1.0;
-            add(lstLayers,gc);
+            add(lstLayers, gc);
         }
 
@@ -353 +353 @@
             closeDialog();
         }
+
         @Override
         public void propertyChange(PropertyChangeEvent evt) {
             if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) {
-                Mode mode = (Mode)evt.getNewValue();
+                Mode mode = (Mode) evt.getNewValue();
                 switch(mode) {
                 case EDITING_DATA: setEnabled(true); break;
@@ -403 +404 @@
                 g.drawImage(base,                                                 is*2, 0, is, is, null);
                 putValue(SMALL_ICON, new ImageIcon(newIco));
-            } catch(Exception e) {
+            } catch (Exception e) {
                 putValue(SMALL_ICON, getValue(BASE_ICON));
             }
@@ -418 +419 @@
         public void propertyChange(PropertyChangeEvent evt) {
             if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) {
-                SaveLayersModel.Mode mode = (SaveLayersModel.Mode)evt.getNewValue();
+                SaveLayersModel.Mode mode = (SaveLayersModel.Mode) evt.getNewValue();
                 switch(mode) {
                 case EDITING_DATA: setEnabled(true); break;
@@ -481 +482 @@
                     //
                     currentFuture.get();
-                } catch(CancellationException e) {
+                } catch (CancellationException e) {
                     model.setUploadState(layer, UploadOrSaveState.CANCELED);
-                } catch(Exception e) {
+                } catch (Exception e) {
                     Main.error(e);
                     model.setUploadState(layer, UploadOrSaveState.FAILED);
@@ -522 +523 @@
                     //
                     currentFuture.get();
-                } catch(CancellationException e) {
+                } catch (CancellationException e) {
                     model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
-                } catch(Exception e) {
+                } catch (Exception e) {
                     Main.error(e);
                     model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.FAILED);
@@ -608 +609 @@
     public void tableChanged(TableModelEvent arg0) {
         boolean dis = model.getLayersToSave().isEmpty() && model.getLayersToUpload().isEmpty();
-        if(saveAndProceedActionButton != null) {
+        if (saveAndProceedActionButton != null) {
             saveAndProceedActionButton.setEnabled(!dis);
         }

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java

@@ -17 +17 @@
 public class SaveLayersModel extends DefaultTableModel {
     public static final String MODE_PROP = SaveLayerInfo.class.getName() + ".mode";
+
     public enum Mode {
         EDITING_DATA,
@@ -104 +105 @@
         switch(column) {
         case columnFilename:
-            this.layerInfo.get(row).setFile((File)value);
+            this.layerInfo.get(row).setFile((File) value);
             this.layerInfo.get(row).setDoSaveToFile(true);
             break;
@@ -131 +132 @@
 
     public List<SaveLayerInfo> getLayersWithIllegalFilesAndSaveRequest() {
-        List<SaveLayerInfo> ret =new ArrayList<>();
+        List<SaveLayerInfo> ret = new ArrayList<>();
         for (SaveLayerInfo info: layerInfo) {
             if (info.isDoSaveToFile() && info.getFile() != null && info.getFile().exists() && !info.getFile().canWrite()) {
@@ -144 +145 @@
         for (SaveLayerInfo info: layerInfo) {
             AbstractModifiableLayer l = info.getLayer();
-            if (info.isDoUploadToServer() && l instanceof OsmDataLayer && !((OsmDataLayer)l).getConflicts().isEmpty()) {
+            if (info.isDoUploadToServer() && l instanceof OsmDataLayer && !((OsmDataLayer) l).getConflicts().isEmpty()) {
                 ret.add(info);
             }

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java

@@ -22 +22 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) {
-            Mode mode = (Mode)evt.getNewValue();
+            Mode mode = (Mode) evt.getNewValue();
             switch(mode) {
             case EDITING_DATA: setEnabled(true);

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java

@@ -38 +38 @@
                 boolean hasFocus, int row, int column) {
             JPanel panel = new JPanel(new GridBagLayout());
-            SaveLayerInfo info = (SaveLayerInfo)value;
+            SaveLayerInfo info = (SaveLayerInfo) value;
             StringBuilder sb = new StringBuilder(24);
             sb.append("<html>");

trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java

@@ -81 +81 @@
 
     public void initFromChangeset(Changeset cs) {
-        Map<String,String> tags = getDefaultTags();
+        Map<String, String> tags = getDefaultTags();
         if (cs != null) {
             tags.putAll(cs.getKeys());
@@ -106 +106 @@
      * @return the map with the current tags in the tag editor model.
      */
-    public Map<String,String> getTags(boolean keepEmpty) {
+    public Map<String, String> getTags(boolean keepEmpty) {
         return pnlTagEditor.getModel().getTags(keepEmpty);
     }
 
-    public Map<String,String> getDefaultTags() {
-        Map<String,String> tags = new HashMap<>();
+    public Map<String, String> getDefaultTags() {
+        Map<String, String> tags = new HashMap<>();
         tags.putAll(defaultTags);
         return tags;
@@ -151 +151 @@
         public void update(Observable o, Object arg) {
             if (!(o instanceof ChangesetCommentModel)) return;
-            String newValue = (String)arg;
+            String newValue = (String) arg;
             String oldValue = getTagEditorValue(key);
             if (oldValue == null) {

trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java

@@ -60 +60 @@
     protected void cancel() {
         canceled = true;
-        synchronized(this) {
+        synchronized (this) {
             if (multiObjectReader != null) {
                 multiObjectReader.cancel();
@@ -93 +93 @@
                 reader.append(primitive);
             } else if (primitive instanceof Way) {
-                Way way = (Way)primitive;
+                Way way = (Way) primitive;
                 for (Node node: way.getNodes()) {
                     if (!node.isNew()) {
@@ -126 +126 @@
         DataSet theirDataSet;
         try {
-            synchronized(this) {
+            synchronized (this) {
                 if (canceled) return;
                 multiObjectReader = new MultiFetchServerObjectReader();
@@ -134 +134 @@
             initMultiFetchReaderWithRelations(multiObjectReader);
             theirDataSet = multiObjectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-            synchronized(this) {
+            synchronized (this) {
                 multiObjectReader = null;
             }
@@ -146 +146 @@
                 if (canceled) return;
                 if (w.hasIncompleteNodes()) {
-                    synchronized(this) {
+                    synchronized (this) {
                         if (canceled) return;
                         objectReader = new OsmServerObjectReader(w.getId(), OsmPrimitiveType.WAY, true /* full */);
@@ -158 +158 @@
                 }
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             if (canceled)
                 return;

trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java

@@ -38 +38 @@
         gc.weightx = 1.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(5,0,0,5);
+        gc.insets = new Insets(5, 0, 0, 5);
         add(lblTaskTitle = new JLabel(""), gc);
 
@@ -46 +46 @@
         gc.weightx = 1.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(5,0,0,5);
+        gc.insets = new Insets(5, 0, 0, 5);
         add(lblCustomText = new JLabel(""), gc);
 
@@ -54 +54 @@
         gc.weightx = 1.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(5,0,0,5);
+        gc.insets = new Insets(5, 0, 0, 5);
         add(progressBar = new JProgressBar(JProgressBar.HORIZONTAL), gc);
     }
@@ -91 +91 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) {
-            Mode mode = (Mode)evt.getNewValue();
+            Mode mode = (Mode) evt.getNewValue();
             switch(mode) {
                 case EDITING_DATA: setVisible(false); break;

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -108 +108 @@
     protected JPanel buildContentPanel() {
         JPanel pnl = new JPanel(new GridBagLayout());
-        pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
         // the panel with the list of uploaded objects
@@ -158 +158 @@
         JPanel pnl = new JPanel();
         pnl.setLayout(new FlowLayout(FlowLayout.CENTER));
-        pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
         // -- upload button
@@ -171 +171 @@
         getRootPane().registerKeyboardAction(
                 cancelAction,
-                KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0),
+                KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
                 JComponent.WHEN_IN_FOCUSED_WINDOW
         );
         pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/Upload"))));
-        HelpUtil.setHelpContext(getRootPane(),ht("/Dialog/Upload"));
+        HelpUtil.setHelpContext(getRootPane(), ht("/Dialog/Upload"));
         return pnl;
     }
@@ -209 +209 @@
         // users can click on either of two links in the upload parameter
         // summary handler. This installs the handler for these two events.
-        // We simply select the appropriate tab in the tabbed pane with the
-        // configuration dialogs.
+        // We simply select the appropriate tab in the tabbed pane with the configuration dialogs.
         //
         pnlBasicUploadSettings.getUploadParameterSummaryPanel().setConfigurationParameterRequestListener(
@@ -218 +217 @@
                         tpConfigPanels.setSelectedIndex(3);
                     }
+
                     @Override
                     public void handleChangesetConfigurationRequest() {
@@ -352 +352 @@
                     WindowGeometry.centerInWindow(
                             Main.parent,
-                            new Dimension(400,600)
+                            new Dimension(400, 600)
                     )
             ).applySafe(this);
@@ -429 +429 @@
                     new ImageProvider("cancel").setMaxSize(ImageSizes.LARGEICON).get(),
                     new ImageProvider("upload").setMaxSize(ImageSizes.LARGEICON).addOverlay(
-                            new ImageOverlay(new ImageProvider("warning-small"), 0.5,0.5,1.0,1.0)).get()});
+                            new ImageOverlay(new ImageProvider("warning-small"), 0.5, 0.5, 1.0, 1.0)).get()});
             dlg.setToolTipTexts(new String[] {
                     tr("Return to the previous dialog to enter a more descriptive comment"),
@@ -542 +542 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) {
-            Changeset cs = (Changeset)evt.getNewValue();
+            Changeset cs = (Changeset) evt.getNewValue();
             if (cs == null) {
                 tpConfigPanels.setTitleAt(1, tr("Tags of new changeset"));

trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

@@ -35 +35 @@
  *        // wait for the task to complete
  *        taskFuture.get();
- *     } catch(Exception e) {
+ *     } catch (Exception e) {
  *        e.printStackTracek();
  *     }
@@ -88 +88 @@
      * @throws OsmTransferException if we can't recover from the exception
      */
-    protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e, ProgressMonitor monitor) throws OsmTransferException{
+    protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e, ProgressMonitor monitor) throws OsmTransferException {
         if (!e.isKnownPrimitive()) throw e;
         OsmPrimitive p = getPrimitive(e.getPrimitiveType(), e.getPrimitiveId());
@@ -112 +112 @@
         try {
             ds.adjustRelationUploadOrder();
-        } catch(CyclicUploadDependencyException e) {
+        } catch (CyclicUploadDependencyException e) {
             setLastException(e);
             return;
@@ -121 +121 @@
         writer = new OsmServerWriter();
         try {
-            while(true) {
+            while (true) {
                 try {
                     ProgressMonitor m = monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
@@ -128 +128 @@
                     processedPrimitives.addAll(writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
                     break;
-                } catch(OsmApiPrimitiveGoneException e) {
+                } catch (OsmApiPrimitiveGoneException e) {
                     recoverFromGoneOnServer(e, monitor);
                 }

trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java

@@ -88 +88 @@
                         numObjects, numObjects
                 );
-            } else if (numRequests > 1){
+            } else if (numRequests > 1) {
                 msg = tr("Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using <strong>{1} requests</strong>",
                         numObjects, numRequests);
@@ -96 +96 @@
             lblWarning.setVisible(true);
             if (numRequests == 0) {
-                msg = tr("{0} objects exceed the max. allowed {1} objects in a changeset on the server ''{2}''. Please <a href=\"urn:advanced-configuration\">configure</a> how to proceed with <strong>multiple changesets</strong>",
+                msg = tr("{0} objects exceed the max. allowed {1} objects in a changeset on the server ''{2}''. " +
+                        "Please <a href=\"urn:advanced-configuration\">configure</a> how to proceed with <strong>multiple changesets</strong>",
                         numObjects, maxChunkSize, OsmApi.getOsmApi().getBaseUrl());
-            } else if (numRequests > 1){
+            } else if (numRequests > 1) {
                 msg = tr("Uploading <strong>{0} objects</strong> to <strong>multiple changesets</strong> using <strong>{1} requests</strong>",
                         numObjects, numRequests);
@@ -116 +117 @@
         lblWarning.setVisible(false);
         lblWarning.setIcon(ImageProvider.get("warning-small"));
-        lblWarning.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        lblWarning.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         JPanel pnl = new JPanel(new BorderLayout());
         pnl.add(lblWarning, BorderLayout.NORTH);
@@ -174 +175 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) {
-            selectedChangeset = (Changeset)evt.getNewValue();
+            selectedChangeset = (Changeset) evt.getNewValue();
             updateSummary();
         } else if (evt.getPropertyName().equals(ChangesetManagementPanel.CLOSE_CHANGESET_AFTER_UPLOAD)) {
-            closeChangesetAfterNextUpload = (Boolean)evt.getNewValue();
+            closeChangesetAfterNextUpload = (Boolean) evt.getNewValue();
             updateSummary();
         } else if (evt.getPropertyName().equals(UploadedObjectsSummaryPanel.NUM_OBJECTS_TO_UPLOAD_PROP)) {
-            numObjects = (Integer)evt.getNewValue();
+            numObjects = (Integer) evt.getNewValue();
             updateSummary();
         } else if (evt.getPropertyName().equals(UploadStrategySelectionPanel.UPLOAD_STRATEGY_SPECIFICATION_PROP)) {
-            this.spec = (UploadStrategySpecification)evt.getNewValue();
+            this.spec = (UploadStrategySpecification) evt.getNewValue();
             updateSummary();
         }

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -66 +66 @@
      */
     public UploadPrimitivesTask(UploadStrategySpecification strategy, OsmDataLayer layer, APIDataSet toUpload, Changeset changeset) {
-        super(tr("Uploading data for layer ''{0}''", layer.getName()),false /* don't ignore exceptions */);
-        ensureParameterNotNull(layer,"layer");
+        super(tr("Uploading data for layer ''{0}''", layer.getName()), false /* don't ignore exceptions */);
+        ensureParameterNotNull(layer, "layer");
         ensureParameterNotNull(strategy, "strategy");
         ensureParameterNotNull(changeset, "changeset");
@@ -186 +186 @@
      * @throws OsmTransferException if we can't recover from the exception
      */
-    protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e, ProgressMonitor monitor) throws OsmTransferException{
+    protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e, ProgressMonitor monitor) throws OsmTransferException {
         if (!e.isKnownPrimitive()) throw e;
         OsmPrimitive p = layer.data.getPrimitiveById(e.getPrimitiveId(), e.getPrimitiveType());
@@ -231 +231 @@
         try {
             SwingUtilities.invokeAndWait(r);
-        } catch(InterruptedException e) {
+        } catch (InterruptedException e) {
             lastException = e;
-        } catch(InvocationTargetException e) {
+        } catch (InvocationTargetException e) {
             lastException = new OsmTransferException(e.getCause());
         }
@@ -240 +240 @@
     @Override protected void realRun() {
         try {
-            uploadloop:while(true) {
+            uploadloop: while (true) {
                 try {
                     getProgressMonitor().subTask(trn("Uploading {0} object...", "Uploading {0} objects...", toUpload.getSize(), toUpload.getSize()));
-                    synchronized(this) {
+                    synchronized (this) {
                         writer = new OsmServerWriter();
                     }
@@ -251 +251 @@
                     //
                     break;
-                } catch(OsmTransferCanceledException e) {
+                } catch (OsmTransferCanceledException e) {
                     Main.error(e);
                     uploadCanceled = true;
                     break uploadloop;
-                } catch(OsmApiPrimitiveGoneException e) {
+                } catch (OsmApiPrimitiveGoneException e) {
                     // try to recover from  410 Gone
                     //
                     recoverFromGoneOnServer(e, getProgressMonitor());
-                } catch(ChangesetClosedException e) {
+                } catch (ChangesetClosedException e) {
                     processedPrimitives.addAll(writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
                     changeset.setOpen(false);
@@ -287 +287 @@
                         processedPrimitives.addAll(writer.getProcessedPrimitives());
                     }
-                    synchronized(this) {
+                    synchronized (this) {
                         writer = null;
                     }
@@ -336 +336 @@
                 }
                 if (lastException instanceof ChangesetClosedException) {
-                    ChangesetClosedException e = (ChangesetClosedException)lastException;
+                    ChangesetClosedException e = (ChangesetClosedException) lastException;
                     if (e.getSource().equals(ChangesetClosedException.Source.UPDATE_CHANGESET)) {
                         handleFailedUpload(lastException);
@@ -370 +370 @@
     @Override protected void cancel() {
         uploadCanceled = true;
-        synchronized(this) {
+        synchronized (this) {
             if (writer != null) {
                 writer.cancel();

trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java

@@ -70 +70 @@
         JLabel lbl = new JLabel(
                 tr("<html>Mark modified objects <strong>from the current selection</strong> to be uploaded to the server.</html>"));
-        lbl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        lbl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         pnl.add(lbl, BorderLayout.NORTH);
         pnl.add(new JScrollPane(lstSelectedPrimitives = new OsmPrimitiveList()), BorderLayout.CENTER);
@@ -81 +81 @@
         pnl.setLayout(new BorderLayout());
         JLabel lbl = new JLabel(tr("<html>Mark <strong>locally deleted objects</strong> to be deleted on the server.</html>"));
-        lbl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        lbl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         pnl.add(lbl, BorderLayout.NORTH);
         pnl.add(new JScrollPane(lstDeletedPrimitives = new OsmPrimitiveList()), BorderLayout.CENTER);
@@ -169 +169 @@
                     WindowGeometry.centerInWindow(
                             Main.parent,
-                            new Dimension(200,400)
+                            new Dimension(200, 400)
                     )
             ).applySafe(this);
@@ -194 +194 @@
 
         public OsmPrimitiveListModel getOsmPrimitiveListModel() {
-            return (OsmPrimitiveListModel)getModel();
+            return (OsmPrimitiveListModel) getModel();
         }
     }
@@ -222 +222 @@
             sort();
             if (data != null) {
-                fireContentsChanged(this,0, data.size());
+                fireContentsChanged(this, 0, data.size());
             } else {
-                fireContentsChanged(this, 0,0);
+                fireContentsChanged(this, 0, 0);
             }
         }
@@ -289 +289 @@
 
         protected void updateEnabledState() {
-            setEnabled(lstSelectedPrimitives.getSelectedIndex() >=0
+            setEnabled(lstSelectedPrimitives.getSelectedIndex() >= 0
                     || lstDeletedPrimitives.getSelectedIndex() >= 0);
         }

trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

@@ -50 +50 @@
         UploadStrategySelectionPanel.class.getName() + ".uploadStrategySpecification";
 
-    private static final Color BG_COLOR_ERROR = new Color(255,224,224);
+    private static final Color BG_COLOR_ERROR = new Color(255, 224, 224);
 
     private transient Map<UploadStrategy, JRadioButton> rbStrategy;
@@ -92 +92 @@
         gc.gridwidth = 4;
         gc.fill = GridBagConstraints.HORIZONTAL;
-        gc.insets = new Insets(0,0,3,0);
+        gc.insets = new Insets(0, 0, 3, 0);
         gc.anchor = GridBagConstraints.FIRST_LINE_START;
         pnl.add(new JMultilineLabel(tr("Please select the upload strategy:")), gc);
@@ -173 +173 @@
         tfChunkSize.addFocusListener(strategyChangeListener);
         tfChunkSize.addActionListener(strategyChangeListener);
-        for(UploadStrategy strategy: UploadStrategy.values()) {
+        for (UploadStrategy strategy: UploadStrategy.values()) {
             rbStrategy.get(strategy).addItemListener(strategyChangeListener);
         }
@@ -190 +190 @@
         gc.weightx = 1.0;
         pnlMultiChangesetPolicyPanel.add(lblMultiChangesetPoliciesHeader = new JMultilineLabel(
-                tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. Which strategy do you want to use?</html>",
+                tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. " +
+                   "Which strategy do you want to use?</html>",
                         numUploadedObjects)), gc);
         gc.gridy = 1;
@@ -214 +215 @@
         gc.weighty = 0.0;
         gc.anchor = GridBagConstraints.NORTHWEST;
-        gc.insets = new Insets(3,3,3,3);
+        gc.insets = new Insets(3, 3, 3, 3);
 
         add(buildUploadStrategyPanel(), gc);
@@ -234 +235 @@
 
     public void setNumUploadedObjects(int numUploadedObjects) {
-        this.numUploadedObjects = Math.max(numUploadedObjects,0);
+        this.numUploadedObjects = Math.max(numUploadedObjects, 0);
         updateNumRequestsLabels();
     }
@@ -264 +265 @@
             break;
         }
-        if(pnlMultiChangesetPolicyPanel.isVisible()) {
+        if (pnlMultiChangesetPolicyPanel.isVisible()) {
             if (rbFillOneChangeset.isSelected()) {
                 spec.setPolicy(MaxChangesetSizeExceededPolicy.FILL_ONE_CHANGESET_AND_RETURN_TO_UPLOAD_DIALOG);
@@ -292 +293 @@
         try {
             return Integer.parseInt(tfChunkSize.getText().trim());
-        } catch(NumberFormatException e) {
+        } catch (NumberFormatException e) {
             return UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE;
         }
@@ -312 +313 @@
             chunkSize = Integer.parseInt(tfChunkSize.getText().trim());
             Main.pref.putInteger("osm-server.upload-strategy.chunk-size", chunkSize);
-        } catch(NumberFormatException e) {
+        } catch (NumberFormatException e) {
             // don't save invalid value to preferences
         }
@@ -325 +326 @@
             lbl.setToolTipText(tr("<html>Cannot upload {0} objects in one request because the<br>"
                     + "max. changeset size {1} on server ''{2}'' is exceeded.</html>",
-                    numUploadedObjects,
-                    maxChunkSize,
-                    OsmApi.getOsmApi().getBaseUrl()
+                    numUploadedObjects, maxChunkSize, OsmApi.getOsmApi().getBaseUrl()
             )
             );
@@ -334 +333 @@
 
             lblMultiChangesetPoliciesHeader.setText(
-                    tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. Which strategy do you want to use?</html>",
+                    tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. " +
+                       "Which strategy do you want to use?</html>",
                             numUploadedObjects));
             if (!rbFillOneChangeset.isSelected() && !rbUseMultipleChangesets.isSelected()) {
@@ -364 +364 @@
                 lblNumRequests.get(UploadStrategy.CHUNKED_DATASET_STRATEGY).setText(tr("(# requests unknown)"));
             } else {
-                int chunks = (int)Math.ceil((double)numUploadedObjects / (double)chunkSize);
+                int chunks = (int) Math.ceil((double) numUploadedObjects / (double) chunkSize);
                 lblNumRequests.get(UploadStrategy.CHUNKED_DATASET_STRATEGY).setText(
                         trn("({0} request)", "({0} requests)", chunks, chunks)
@@ -379 +379 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(UploadedObjectsSummaryPanel.NUM_OBJECTS_TO_UPLOAD_PROP)) {
-            setNumUploadedObjects((Integer)evt.getNewValue());
+            setNumUploadedObjects((Integer) evt.getNewValue());
         }
     }
@@ -388 +388 @@
             Component c = e.getComponent();
             if (c instanceof JosmTextField) {
-                JosmTextField tf = (JosmTextField)c;
+                JosmTextField tf = (JosmTextField) c;
                 tf.selectAll();
             }
         }
+
         @Override
         public void focusLost(FocusEvent e) {}
@@ -426 +427 @@
                             chunkSize, maxChunkSize, OsmApi.getOsmApi().getBaseUrl()));
                 }
-            } catch(NumberFormatException e) {
+            } catch (NumberFormatException e) {
                 setErrorFeedback(tfChunkSize, tr("Value ''{0}'' is not a number. Please enter an integer > 1",
                         tfChunkSize.getText().trim()));
@@ -453 +454 @@
             if (evt.getSource() == tfChunkSize
                     && "enabled".equals(evt.getPropertyName())
-                    && (Boolean)evt.getNewValue()
+                    && (Boolean) evt.getNewValue()
             ) {
                 validateChunkSize();

trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java

@@ -91 +91 @@
 
     public int getNumRequests(int numObjects) {
-        if (numObjects <=0) return 0;
+        if (numObjects <= 0) return 0;
         switch(strategy) {
         case INDIVIDUAL_OBJECTS_STRATEGY: return numObjects;
@@ -99 +99 @@
                 return 0;
             else
-                return (int)Math.ceil((double)numObjects / (double)chunkSize);
+                return (int) Math.ceil((double) numObjects / (double) chunkSize);
         }
         // should not happen

trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java

@@ -101 +101 @@
             y++;
             gcLabel.gridy = y;
-            lblAdd.setText(trn("{0} object to add:", "{0} objects to add:", add.size(),add.size()));
+            lblAdd.setText(trn("{0} object to add:", "{0} objects to add:", add.size(), add.size()));
             add(lblAdd, gcLabel);
             y++;
@@ -110 +110 @@
             y++;
             gcLabel.gridy = y;
-            lblUpdate.setText(trn("{0} object to modify:", "{0} objects to modify:", update.size(),update.size()));
+            lblUpdate.setText(trn("{0} object to modify:", "{0} objects to modify:", update.size(), update.size()));
             add(lblUpdate, gcLabel);
             y++;
@@ -119 +119 @@
             y++;
             gcLabel.gridy = y;
-            lblDelete.setText(trn("{0} object to delete:", "{0} objects to delete:", delete.size(),delete.size()));
+            lblDelete.setText(trn("{0} object to delete:", "{0} objects to delete:", delete.size(), delete.size()));
             add(lblDelete, gcLabel);
             y++;
@@ -126 +126 @@
         }
 
-        firePropertyChange(NUM_OBJECTS_TO_UPLOAD_PROP,0, getNumObjectsToUpload());
+        firePropertyChange(NUM_OBJECTS_TO_UPLOAD_PROP, 0, getNumObjectsToUpload());
     }
 
@@ -152 +152 @@
 
         public PrimitiveListModel getPrimitiveListModel() {
-            return (PrimitiveListModel)getModel();
+            return (PrimitiveListModel) getModel();
         }
     }
@@ -179 +179 @@
                 this.primitives = primitives;
             }
-            fireContentsChanged(this,0,getSize());
+            fireContentsChanged(this, 0, getSize());
         }