Ignore:
Timestamp:
2016-06-15T10:30:37+02:00 (8 years ago)
Author:
Don-vip
Message:

Checkstyle 6.19: enable SingleSpaceSeparator and fix violations

Location:
trunk/src/org/openstreetmap/josm/gui/io
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r10217 r10378  
    115115        String lbl;
    116116        switch(primitiveType) {
    117         case NODE: lbl =  tr("Synchronize node {0} only", id); break;
    118         case WAY: lbl =  tr("Synchronize way {0} only", id); break;
    119         case RELATION: lbl =  tr("Synchronize relation {0} only", id); break;
     117        // CHECKSTYLE.OFF: SingleSpaceSeparator
     118        case NODE:     lbl = tr("Synchronize node {0} only", id); break;
     119        case WAY:      lbl = tr("Synchronize way {0} only", id); break;
     120        case RELATION: lbl = tr("Synchronize relation {0} only", id); break;
     121        // CHECKSTYLE.ON: SingleSpaceSeparator
    120122        default: throw new AssertionError();
    121123        }
    … …  
    140142                )
    141143        };
    142         String msg =  tr("<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>"
     144        String msg = tr("<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>"
    143145                + "of your nodes, ways, or relations.<br>"
    144146                + "The conflict is caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>"
    … …  
    188190                )
    189191        };
    190         String msg =  tr("<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>"
     192        String msg = tr("<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>"
    191193                + "of your nodes, ways, or relations.<br>"
    192194                + "<br>"
    … …  
    217219     */
    218220    protected void handleUploadConflictForClosedChangeset(long changesetId, Date d) {
    219         String msg =  tr("<html>Uploading <strong>failed</strong> because you have been using<br>"
     221        String msg = tr("<html>Uploading <strong>failed</strong> because you have been using<br>"
    220222                + "changeset {0} which was already closed at {1}.<br>"
    221223                + "Please upload again with a new or an existing open changeset.</html>",

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

    r10217 r10378  
    184184     */
    185185    public void setSelectedChangesetForNextUpload(Changeset cs) {
    186         int idx  = model.getIndexOf(cs);
     186        int idx = model.getIndexOf(cs);
    187187        if (idx >= 0) {
    188188            rbExisting.setSelected(true);

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

    r10212 r10378  
    4141            monitor = NullProgressMonitor.INSTANCE;
    4242        }
    43         this.layerInfo =  layerInfo;
     43        this.layerInfo = layerInfo;
    4444        this.parentMonitor = monitor;
    4545    }

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

    r10212 r10378  
    324324    }
    325325
    326     class DiscardAndProceedAction extends AbstractAction  implements PropertyChangeListener {
     326    class DiscardAndProceedAction extends AbstractAction implements PropertyChangeListener {
    327327        DiscardAndProceedAction() {
    328328            initForDiscardAndExit();
    … …  
    414414            BufferedImage newIco = new BufferedImage(ICON_SIZE*3, ICON_SIZE, BufferedImage.TYPE_4BYTE_ABGR);
    415415            Graphics2D g = newIco.createGraphics();
     416            // CHECKSTYLE.OFF: SingleSpaceSeparator
    416417            g.drawImage(model.getLayersToUpload().isEmpty() ? upldDis : upld, ICON_SIZE*0, 0, ICON_SIZE, ICON_SIZE, null);
    417418            g.drawImage(model.getLayersToSave().isEmpty()   ? saveDis : save, ICON_SIZE*1, 0, ICON_SIZE, ICON_SIZE, null);
    418419            g.drawImage(base,                                                 ICON_SIZE*2, 0, ICON_SIZE, ICON_SIZE, null);
     420            // CHECKSTYLE.ON: SingleSpaceSeparator
    419421            putValue(SMALL_ICON, new ImageIcon(newIco));
    420422        }

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

    r9986 r10378  
    220220        // partially uploaded. Better run on EDT.
    221221        //
    222         Runnable r  = new Runnable() {
     222        Runnable r = new Runnable() {
    223223            @Override
    224224            public void run() {

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

    r10369 r10378  
    154154
    155155    public List<OsmPrimitive> getSelectedPrimitives() {
    156         List<OsmPrimitive> ret  = new ArrayList<>();
     156        List<OsmPrimitive> ret = new ArrayList<>();
    157157        ret.addAll(lstSelectedPrimitives.getOsmPrimitiveListModel().getPrimitives(lstSelectedPrimitives.getSelectedIndices()));
    158158        ret.addAll(lstDeletedPrimitives.getOsmPrimitiveListModel().getPrimitives(lstDeletedPrimitives.getSelectedIndices()));

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

    r9841 r10378  
    1515 * </ul>
    1616 */
    17 public class UploadStrategySpecification  {
     17public class UploadStrategySpecification {
    1818    /** indicates that the chunk size isn't specified */
    1919    public static final int UNSPECIFIED_CHUNK_SIZE = -1;

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

    r8836 r10378  
    134134     * @return the number of objects to upload
    135135     */
    136     public int  getNumObjectsToUpload() {
     136    public int getNumObjectsToUpload() {
    137137        return lstAdd.getModel().getSize()
    138138        + lstUpdate.getModel().getSize()
Note: See TracChangeset for help on using the changeset viewer.