Changeset 8509 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2015-06-20T14:36:00+02:00 (9 years ago)

Author:

Don-vip

Message:

fix many checkstyle violations

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• ChangePropertyCommand.java (modified) (1 diff)
• PurgeCommand.java (modified) (1 diff)
• conflict/TagConflictResolveCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -166 +166 @@
             } else {
                 /* I18n: plural form for objects, but value < 2 not possible! */
-                text = trn("Set {0}={1} for {2} object", "Set {0}={1} for {2} objects", objects.size(), entry.getKey(), entry.getValue(), objects.size());
+                text = trn("Set {0}={1} for {2} object", "Set {0}={1} for {2} objects",
+                        objects.size(), entry.getKey(), entry.getValue(), objects.size());
             }
         } else {

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -124 +124 @@
             if (data != null) {
                 if (ds.getPrimitiveById(osm) != osm)
-                    throw new AssertionError(String.format("Primitive %s has been made incomplete when purging, but it cannot be found on undo.", osm));
+                    throw new AssertionError(
+                            String.format("Primitive %s has been made incomplete when purging, but it cannot be found on undo.", osm));
                 osm.load(data);
             } else {

trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java

@@ -58 +58 @@
             case NODE:
                 /* for correct i18n of plural forms - see #9110 */
-                return trn("Resolve {0} tag conflict in node {1}", "Resolve {0} tag conflicts in node {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
+                return trn("Resolve {0} tag conflict in node {1}", "Resolve {0} tag conflicts in node {1}",
+                        getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
             case WAY:
                 /* for correct i18n of plural forms - see #9110 */
-                return trn("Resolve {0} tag conflict in way {1}", "Resolve {0} tag conflicts in way {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
+                return trn("Resolve {0} tag conflict in way {1}", "Resolve {0} tag conflicts in way {1}",
+                        getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
             case RELATION:
                 /* for correct i18n of plural forms - see #9110 */
-                return trn("Resolve {0} tag conflict in relation {1}", "Resolve {0} tag conflicts in relation {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
+                return trn("Resolve {0} tag conflict in relation {1}", "Resolve {0} tag conflicts in relation {1}",
+                        getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
         }
         return "";