Ignore:
Timestamp:
2015-06-20T23:42:21+02:00 (7 years ago)
Author:
Don-vip
Message:

checkstyle: enable relevant whitespace checks and fix them

Location:
trunk/src/org/openstreetmap/josm/command/conflict
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

    r8456 r8510  
    5252        try {
    5353            getLayer().getConflicts().add(conflict);
    54         } catch(IllegalStateException e) {
     54        } catch (IllegalStateException e) {
    5555            Main.error(e);
    5656            warnBecauseOfDoubleConflict();
  • trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

    r8456 r8510  
    5757    protected void reconstituteConflicts() {
    5858        OsmDataLayer editLayer = getLayer();
    59         for(Conflict<?> c : resolvedConflicts) {
     59        for (Conflict<?> c : resolvedConflicts) {
    6060            if (!editLayer.getConflicts().hasConflictForMy(c.getMy())) {
    6161                editLayer.getConflicts().add(c);
  • trunk/src/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommand.java

    r8456 r8510  
    4949    @Override
    5050    public boolean executeCommand() {
    51         // remember the current state of modified primitives, i.e. of
    52         // OSM primitive 'my'
    53         //
     51        // remember the current state of modified primitives, i.e. of OSM primitive 'my'
    5452        super.executeCommand();
    5553
     
    5755            // do nothing
    5856        } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
    59             Node my = (Node)conflict.getMy();
    60             Node their = (Node)conflict.getTheir();
     57            Node my = (Node) conflict.getMy();
     58            Node their = (Node) conflict.getTheir();
    6159            my.setCoor(their.getCoor());
    6260        } else
     
    6563
    6664        // remember the layer this command was applied to
    67         //
    6865        rememberConflict(conflict);
    6966
  • trunk/src/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommand.java

    r8456 r8510  
    4040        case RELATION: msg = marktr("Set the ''modified'' flag for relation {0}"); break;
    4141        }
    42         return tr(msg,conflict.getMy().getId());
     42        return tr(msg, conflict.getMy().getId());
    4343    }
    4444
  • trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java

    r8456 r8510  
    9292        //
    9393        if (!editLayer.getConflicts().hasConflictForMy(my)) {
    94             editLayer.getConflicts().add(my,their);
     94            editLayer.getConflicts().add(my, their);
    9595        }
    9696    }
  • trunk/src/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommand.java

    r8456 r8510  
    5656            conflict.getMy().setOsmId(
    5757                    conflict.getMy().getId(),
    58                     (int)Math.max(myVersion, theirVersion)
     58                    (int) Math.max(myVersion, theirVersion)
    5959            );
    6060            // update visiblity state
Note: See TracChangeset for help on using the changeset viewer.