Ignore:
Timestamp:
2015-06-20T14:36:00+02:00 (4 years ago)
Author:
Don-vip
Message:

fix many checkstyle violations

Location:
trunk/src/org/openstreetmap/josm/command
Files:
3 edited

Legend:

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

    r8456 r8509  
    166166            } else {
    167167                /* I18n: plural form for objects, but value < 2 not possible! */
    168                 text = trn("Set {0}={1} for {2} object", "Set {0}={1} for {2} objects", objects.size(), entry.getKey(), entry.getValue(), objects.size());
     168                text = trn("Set {0}={1} for {2} object", "Set {0}={1} for {2} objects",
     169                        objects.size(), entry.getKey(), entry.getValue(), objects.size());
    169170            }
    170171        } else {
  • trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

    r8456 r8509  
    124124            if (data != null) {
    125125                if (ds.getPrimitiveById(osm) != osm)
    126                     throw new AssertionError(String.format("Primitive %s has been made incomplete when purging, but it cannot be found on undo.", osm));
     126                    throw new AssertionError(
     127                            String.format("Primitive %s has been made incomplete when purging, but it cannot be found on undo.", osm));
    127128                osm.load(data);
    128129            } else {
  • trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java

    r8456 r8509  
    5858            case NODE:
    5959                /* for correct i18n of plural forms - see #9110 */
    60                 return trn("Resolve {0} tag conflict in node {1}", "Resolve {0} tag conflicts in node {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
     60                return trn("Resolve {0} tag conflict in node {1}", "Resolve {0} tag conflicts in node {1}",
     61                        getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
    6162            case WAY:
    6263                /* for correct i18n of plural forms - see #9110 */
    63                 return trn("Resolve {0} tag conflict in way {1}", "Resolve {0} tag conflicts in way {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
     64                return trn("Resolve {0} tag conflict in way {1}", "Resolve {0} tag conflicts in way {1}",
     65                        getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
    6466            case RELATION:
    6567                /* for correct i18n of plural forms - see #9110 */
    66                 return trn("Resolve {0} tag conflict in relation {1}", "Resolve {0} tag conflicts in relation {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
     68                return trn("Resolve {0} tag conflict in relation {1}", "Resolve {0} tag conflicts in relation {1}",
     69                        getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
    6770        }
    6871        return "";
Note: See TracChangeset for help on using the changeset viewer.