Ignore:
Timestamp:
2015-06-02T16:41:37+02:00 (5 years ago)
Author:
Don-vip
Message:

remove extra whitespaces

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

Legend:

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

    r6887 r8444  
    6161    @Override
    6262    public void undoCommand() {
    63         if (! Main.map.mapView.hasLayer(getLayer())) {
     63        if (!Main.map.mapView.hasLayer(getLayer())) {
    6464            Main.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
    6565                    getLayer().getName(),
  • trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

    r6887 r8444  
    4545     */
    4646    protected void rememberConflict(Conflict<?> c) {
    47         if (! resolvedConflicts.hasConflictForMy(c.getMy())) {
     47        if (!resolvedConflicts.hasConflictForMy(c.getMy())) {
    4848            resolvedConflicts.add(c);
    4949        }
     
    6868        super.undoCommand();
    6969
    70         if (! Main.map.mapView.hasLayer(getLayer())) {
     70        if (!Main.map.mapView.hasLayer(getLayer())) {
    7171            Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
    7272                    this.toString(),
  • trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java

    r6887 r8444  
    7474    public void undoCommand() {
    7575        OsmDataLayer layer = getLayer();
    76         if (! Main.map.mapView.hasLayer(layer)) {
     76        if (!Main.map.mapView.hasLayer(layer)) {
    7777            Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
    7878                    this.toString(),
  • trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java

    r6887 r8444  
    8484        //
    8585        for (TagMergeItem item: mergeItems) {
    86             if (! item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
     86            if (!item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
    8787                item.applyToMyPrimitive(conflict.getMy());
    8888            }
  • trunk/src/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommand.java

    r6887 r8444  
    5858        //
    5959        for (Node n:mergedNodeList) {
    60             if (! getLayer().data.getNodes().contains(n)) {
     60            if (!getLayer().data.getNodes().contains(n)) {
    6161                Main.warn(tr("Main dataset does not include node {0}", n.toString()));
    6262            }
Note: See TracChangeset for help on using the changeset viewer.