Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java	(revision 11747)
@@ -247,5 +247,5 @@
      * @param angles The angles
      */
-    public void saveAngles(String ... angles) {
+    public void saveAngles(String... angles) {
         Main.pref.putCollection(DRAW_ANGLESNAP_ANGLES, Arrays.asList(angles));
     }
Index: /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java	(revision 11747)
@@ -117,5 +117,5 @@
     }
 
-    protected final void setSequence(Command ... sequence) {
+    protected final void setSequence(Command... sequence) {
         this.sequence = Utils.copyArray(sequence);
     }
Index: /trunk/src/org/openstreetmap/josm/data/Bounds.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Bounds.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/Bounds.java	(revision 11747)
@@ -186,5 +186,5 @@
      * @throws IllegalArgumentException if coords does not contain 4 double values
      */
-    public Bounds(double ... coords) {
+    public Bounds(double... coords) {
         this(coords, true);
     }
Index: /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java	(revision 11747)
@@ -344,5 +344,5 @@
      * over all routes
      */
-    public Iterable<Collection<WayPoint>> getLinesIterable(final boolean ... trackVisibility) {
+    public Iterable<Collection<WayPoint>> getLinesIterable(final boolean... trackVisibility) {
         return () -> new LinesIterator(this, trackVisibility);
     }
@@ -397,5 +397,5 @@
          * included in the iteration. Can be null, then all tracks are included.
          */
-        public LinesIterator(GpxData data, boolean ... trackVisibility) {
+        public LinesIterator(GpxData data, boolean... trackVisibility) {
             itTracks = data.tracks.iterator();
             idxTracks = -1;
Index: /trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java	(revision 11747)
@@ -118,5 +118,5 @@
      * @throws XMLStreamException See {@link XMLStreamReader}
      */
-    public static boolean moveReaderToTag(XMLStreamReader reader, QName ... tags) throws XMLStreamException {
+    public static boolean moveReaderToTag(XMLStreamReader reader, QName... tags) throws XMLStreamException {
         QName stopTag = reader.getName();
         int currentLevel = 0;
Index: /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 11747)
@@ -731,5 +731,5 @@
      * @since 11587
      */
-    public boolean hasKey(String ... keys) {
+    public boolean hasKey(String... keys) {
         return keys != null && Arrays.stream(keys).anyMatch(this::hasKey);
     }
Index: /trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java	(revision 11747)
@@ -50,5 +50,5 @@
      * @since 6305
      */
-    public boolean hasRole(String ... roles) {
+    public boolean hasRole(String... roles) {
         return Arrays.asList(roles).contains(role);
     }
Index: /trunk/src/org/openstreetmap/josm/data/osm/TagMap.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/TagMap.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/osm/TagMap.java	(revision 11747)
@@ -50,5 +50,5 @@
          * @param tags The tags array. It is never changed but should also not be changed by you.
          */
-        TagEntryInterator(String ... tags) {
+        TagEntryInterator(String... tags) {
             super();
             this.tags = tags;
@@ -89,5 +89,5 @@
          * @param tags The tags array. It is never changed but should also not be changed by you.
          */
-        TagEntrySet(String ... tags) {
+        TagEntrySet(String... tags) {
             super();
             this.tags = tags;
@@ -142,5 +142,5 @@
      * @param tags The tags array. It is not modified by this map.
      */
-    public TagMap(String ... tags) {
+    public TagMap(String... tags) {
         if (tags == null || tags.length == 0) {
             this.tags = EMPTY_TAGS;
Index: /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java	(revision 11747)
@@ -322,5 +322,5 @@
      * @return The corresponding latitude and longitude in degrees
      */
-    public LatLon cart2LatLon(double ... xyz) {
+    public LatLon cart2LatLon(double... xyz) {
         return cart2LatLon(xyz, 1e-11);
     }
Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java	(revision 11747)
@@ -167,5 +167,5 @@
      * @return an array of top level Sub Grids with lower level Sub Grids set.
      */
-    private static NTV2SubGrid[] createSubGridTree(NTV2SubGrid ... subGrid) {
+    private static NTV2SubGrid[] createSubGridTree(NTV2SubGrid... subGrid) {
         int topLevelCount = 0;
         Map<String, List<NTV2SubGrid>> subGridMap = new HashMap<>();
Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java	(revision 11747)
@@ -281,5 +281,5 @@
      * @param subGrid subgrids
      */
-    public void setSubGridArray(NTV2SubGrid ... subGrid) {
+    public void setSubGridArray(NTV2SubGrid... subGrid) {
         this.subGrid = Utils.copyArray(subGrid);
     }
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 11747)
@@ -1925,5 +1925,5 @@
      * @since 1.5.0
      */
-    public static synchronized void updateTLDOverride(ArrayType table, String ... tlds) {
+    public static synchronized void updateTLDOverride(ArrayType table, String... tlds) {
         if (inUse) {
             throw new IllegalStateException("Can only invoke this method before calling getInstance");
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java	(revision 11747)
@@ -102,5 +102,5 @@
      * validate against
      */
-    public RegexValidator(String ... regexs) {
+    public RegexValidator(String... regexs) {
         this(regexs, true);
     }
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java	(revision 11747)
@@ -218,5 +218,5 @@
      *        ignore the contents of schemes.
      */
-    public UrlValidator(String ... schemes) {
+    public UrlValidator(String... schemes) {
         this(schemes, 0L);
     }
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/package.html
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/package.html	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/package.html	(revision 11747)
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java	(revision 11747)
@@ -78,14 +78,14 @@
     }
 
-    private static boolean isKeyValid3Parts(String ... parts) {
+    private static boolean isKeyValid3Parts(String... parts) {
         return parts.length == 3 && isRestrictionType(parts[0]) && isTransportationMode(parts[1]) && isDirection(parts[2]);
     }
 
-    private static boolean isKeyValid2Parts(String ... parts) {
+    private static boolean isKeyValid2Parts(String... parts) {
         return parts.length == 2 && ((isRestrictionType(parts[0]) && (isTransportationMode(parts[1]) || isDirection(parts[1])))
                                   || (isTransportationMode(parts[0]) && isDirection(parts[1])));
     }
 
-    private static boolean isKeyValid1Part(String ... parts) {
+    private static boolean isKeyValid1Part(String... parts) {
         return parts.length == 1 && (isRestrictionType(parts[0]) || isTransportationMode(parts[0]));
     }
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(revision 11747)
@@ -253,5 +253,5 @@
         private final String replacement;
 
-        public SynonymRule(String replacement, String ... words) {
+        public SynonymRule(String replacement, String... words) {
             this.replacement = replacement.toLowerCase(Locale.ENGLISH);
             this.words = words;
Index: /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 11747)
@@ -131,5 +131,5 @@
      * @param buttonTexts  String Array of the text that will appear on the buttons. The first button is the default one.
      */
-    public ExtendedDialog(Component parent, String title, String ... buttonTexts) {
+    public ExtendedDialog(Component parent, String title, String... buttonTexts) {
         this(parent, title, buttonTexts, true, true);
     }
@@ -178,5 +178,5 @@
      * @return {@code this}
      */
-    public ExtendedDialog setButtonIcons(Icon ... buttonIcons) {
+    public ExtendedDialog setButtonIcons(Icon... buttonIcons) {
         this.bIcons = Utils.copyArray(buttonIcons);
         return this;
@@ -188,5 +188,5 @@
      * @return {@code this}
      */
-    public ExtendedDialog setButtonIcons(String ... buttonIcons) {
+    public ExtendedDialog setButtonIcons(String... buttonIcons) {
         bIcons = new Icon[buttonIcons.length];
         for (int i = 0; i < buttonIcons.length; ++i) {
@@ -203,5 +203,5 @@
      * @return {@code this}
      */
-    public ExtendedDialog setToolTipTexts(String ... toolTipTexts) {
+    public ExtendedDialog setToolTipTexts(String... toolTipTexts) {
         this.bToolTipTexts = Utils.copyArray(toolTipTexts);
         return this;
Index: /trunk/src/org/openstreetmap/josm/gui/ProgramArguments.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/ProgramArguments.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/ProgramArguments.java	(revision 11747)
@@ -103,5 +103,5 @@
      * @since 10936
      */
-    public ProgramArguments(String ... args) {
+    public ProgramArguments(String... args) {
         Stream.of(Option.values()).forEach(o -> argMap.put(o, new ArrayList<>()));
         buildCommandLineArgumentMap(args);
@@ -112,5 +112,5 @@
      * @param args command-line arguments array
      */
-    private void buildCommandLineArgumentMap(String ... args) {
+    private void buildCommandLineArgumentMap(String... args) {
         LongOpt[] los = Stream.of(Option.values()).map(Option::toLongOpt).toArray(i -> new LongOpt[i]);
 
@@ -215,5 +215,5 @@
     }
 
-    private static String getValue(String ... kv) {
+    private static String getValue(String... kv) {
         if (kv.length < 2) {
             return "";
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java	(revision 11747)
@@ -274,5 +274,5 @@
     }
 
-    protected void copyToTop(ListRole role, int ... rows) {
+    protected void copyToTop(ListRole role, int... rows) {
         copy(role, rows, 0);
         mergedEntriesSelectionModel.setSelectionInterval(0, rows.length -1);
@@ -286,5 +286,5 @@
      * @param rows the indices
      */
-    public void copyMyToTop(int ... rows) {
+    public void copyMyToTop(int... rows) {
         copyToTop(MY_ENTRIES, rows);
     }
@@ -297,5 +297,5 @@
      * @param rows the indices
      */
-    public void copyTheirToTop(int ... rows) {
+    public void copyTheirToTop(int... rows) {
         copyToTop(THEIR_ENTRIES, rows);
     }
@@ -310,5 +310,5 @@
      */
 
-    public void copyToEnd(ListRole source, int ... rows) {
+    public void copyToEnd(ListRole source, int... rows) {
         copy(source, rows, getMergedEntriesSize());
         mergedEntriesSelectionModel.setSelectionInterval(getMergedEntriesSize()-rows.length, getMergedEntriesSize() -1);
@@ -323,5 +323,5 @@
      * @param rows the indices
      */
-    public void copyMyToEnd(int ... rows) {
+    public void copyMyToEnd(int... rows) {
         copyToEnd(MY_ENTRIES, rows);
     }
@@ -334,5 +334,5 @@
      * @param rows the indices
      */
-    public void copyTheirToEnd(int ... rows) {
+    public void copyTheirToEnd(int... rows) {
         copyToEnd(THEIR_ENTRIES, rows);
     }
@@ -492,5 +492,5 @@
      *
      */
-    public void moveUpMerged(int ... rows) {
+    public void moveUpMerged(int... rows) {
         if (rows == null || rows.length == 0)
             return;
@@ -519,5 +519,5 @@
      * @param rows the indices
      */
-    public void moveDownMerged(int ... rows) {
+    public void moveDownMerged(int... rows) {
         if (rows == null || rows.length == 0)
             return;
@@ -547,5 +547,5 @@
      * @param rows the indices
      */
-    public void removeMerged(int ... rows) {
+    public void removeMerged(int... rows) {
         if (rows == null || rows.length == 0)
             return;
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java	(revision 11747)
@@ -33,5 +33,5 @@
     private final ListRole[] participatingRoles;
 
-    ComparePairType(String displayName, ListRole ... participatingRoles) {
+    ComparePairType(String displayName, ListRole... participatingRoles) {
         this.displayName = displayName;
         this.participatingRoles = Utils.copyArray(participatingRoles);
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 11747)
@@ -238,5 +238,5 @@
     }
 
-    private void selectNextConflict(int ... rows) {
+    private void selectNextConflict(int... rows) {
         int max = rows[0];
         for (int row: rows) {
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 11747)
@@ -548,5 +548,5 @@
 
     class ChangesetDialogPopup extends ListPopupMenu {
-        ChangesetDialogPopup(JList<?> ... lists) {
+        ChangesetDialogPopup(JList<?>... lists) {
             super(lists);
             add(selectObjectsAction);
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java	(revision 11747)
@@ -52,5 +52,5 @@
     protected final transient GroupLayout layout = new GroupLayout(panel);
 
-    public OsmIdSelectionDialog(Component parent, String title, String ... buttonTexts) {
+    public OsmIdSelectionDialog(Component parent, String title, String... buttonTexts) {
         super(parent, title, buttonTexts);
     }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 11747)
@@ -342,5 +342,5 @@
         }
 
-        public void selectPrimitivesOwnedBy(int ... rows) {
+        public void selectPrimitivesOwnedBy(int... rows) {
             Set<User> users = new HashSet<>();
             for (int index: rows) {
@@ -357,5 +357,5 @@
         }
 
-        public List<User> getSelectedUsers(int ... rows) {
+        public List<User> getSelectedUsers(int... rows) {
             List<User> ret = new LinkedList<>();
             if (rows == null || rows.length == 0)
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 11747)
@@ -967,5 +967,5 @@
         }
 
-        protected void deleteTags(int ... rows) {
+        protected void deleteTags(int... rows) {
             // convert list of rows to HashMap (and find gap for nextKey)
             Map<String, String> tags = new HashMap<>(rows.length);
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 11747)
@@ -545,5 +545,5 @@
         protected AutoCompletingComboBox values;
 
-        AbstractTagsDialog(Component parent, String title, String ... buttonTexts) {
+        AbstractTagsDialog(Component parent, String title, String... buttonTexts) {
             super(parent, title, buttonTexts);
             addMouseListener(new PopupMenuLauncher(popupMenu));
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 11747)
@@ -257,5 +257,5 @@
     }
 
-    public void moveUp(int ... selectedRows) {
+    public void moveUp(int... selectedRows) {
         if (!canMoveUp(selectedRows))
             return;
@@ -280,5 +280,5 @@
     }
 
-    public void moveDown(int ... selectedRows) {
+    public void moveDown(int... selectedRows) {
         if (!canMoveDown(selectedRows))
             return;
@@ -305,5 +305,5 @@
     }
 
-    public void remove(int ... selectedRows) {
+    public void remove(int... selectedRows) {
         if (!canRemove(selectedRows))
             return;
@@ -319,5 +319,5 @@
     }
 
-    public boolean canMoveUp(int ... rows) {
+    public boolean canMoveUp(int... rows) {
         if (rows == null || rows.length == 0)
             return false;
@@ -326,5 +326,5 @@
     }
 
-    public boolean canMoveDown(int ... rows) {
+    public boolean canMoveDown(int... rows) {
         if (rows == null || rows.length == 0)
             return false;
@@ -333,5 +333,5 @@
     }
 
-    public boolean canRemove(int ... rows) {
+    public boolean canRemove(int... rows) {
         if (rows == null || rows.length == 0)
             return false;
Index: /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java	(revision 11747)
@@ -64,5 +64,5 @@
     boolean referenceReversed;
 
-    TwoColumnDiff(Object[] reference, Object ... current) {
+    TwoColumnDiff(Object[] reference, Object... current) {
         this.reference = Utils.copyArray(reference);
         this.current = Utils.copyArray(current);
Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java	(revision 11747)
@@ -239,5 +239,5 @@
         }
 
-        public List<OsmPrimitive> getPrimitives(int ... indices) {
+        public List<OsmPrimitive> getPrimitives(int... indices) {
             if (indices == null || indices.length == 0)
                 return Collections.emptyList();
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 11747)
@@ -756,5 +756,5 @@
     }
 
-    private static void addIntegerIfPresent(WayPoint wpt, OsmPrimitive p, String gpxKey, String ... osmKeys) {
+    private static void addIntegerIfPresent(WayPoint wpt, OsmPrimitive p, String gpxKey, String... osmKeys) {
         List<String> possibleKeys = new ArrayList<>(Arrays.asList(osmKeys));
         possibleKeys.add(0, gpxKey);
@@ -777,5 +777,5 @@
     }
 
-    private static void addDoubleIfPresent(WayPoint wpt, OsmPrimitive p, String gpxKey, String ... osmKeys) {
+    private static void addDoubleIfPresent(WayPoint wpt, OsmPrimitive p, String gpxKey, String... osmKeys) {
         List<String> possibleKeys = new ArrayList<>(Arrays.asList(osmKeys));
         possibleKeys.add(0, gpxKey);
@@ -797,5 +797,5 @@
     }
 
-    private static void addStringIfPresent(WayPoint wpt, OsmPrimitive p, String gpxKey, String ... osmKeys) {
+    private static void addStringIfPresent(WayPoint wpt, OsmPrimitive p, String gpxKey, String... osmKeys) {
         List<String> possibleKeys = new ArrayList<>(Arrays.asList(osmKeys));
         possibleKeys.add(0, gpxKey);
Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java	(revision 11747)
@@ -41,5 +41,5 @@
     }
 
-    private static void addRecursiveFiles(List<File> files, File ... sel) {
+    private static void addRecursiveFiles(List<File> files, File... sel) {
         if (sel == null) { // listFiles might return null
             return;
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java	(revision 11747)
@@ -143,5 +143,5 @@
      * @return The icon or <code>null</code> if no icon is defined
      */
-    public static MapImage createIcon(final Environment env, final String ... keys) {
+    public static MapImage createIcon(final Environment env, final String... keys) {
         CheckParameterUtil.ensureParameterNotNull(env, "env");
         CheckParameterUtil.ensureParameterNotNull(keys, "keys");
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 11747)
@@ -272,5 +272,5 @@
      * @param tagIndices a list of tag indices
      */
-    public void deleteTagNames(int ... tagIndices) {
+    public void deleteTagNames(int... tagIndices) {
         if (tags == null)
             return;
@@ -291,5 +291,5 @@
      * @param tagIndices the lit of tag indices
      */
-    public void deleteTagValues(int ... tagIndices) {
+    public void deleteTagValues(int... tagIndices) {
         if (tags == null)
             return;
@@ -334,5 +334,5 @@
      * @param tagIndices the list of tag indices
      */
-    public void deleteTags(int ... tagIndices) {
+    public void deleteTags(int... tagIndices) {
         if (tags == null)
             return;
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagTableColumnModelBuilder.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TagTableColumnModelBuilder.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagTableColumnModelBuilder.java	(revision 11747)
@@ -26,5 +26,5 @@
      * @see TableColumn#setCellRenderer
      */
-    public TagTableColumnModelBuilder(TableCellRenderer renderer, String ... headerValues) {
+    public TagTableColumnModelBuilder(TableCellRenderer renderer, String... headerValues) {
         CheckParameterUtil.ensureParameterNotNull(headerValues, "headerValues");
         for (int i = 0; i < headerValues.length; i++) {
@@ -44,5 +44,5 @@
      * @see TableColumn#setWidth
      */
-    public TagTableColumnModelBuilder setWidth(int width, int ... indexes) {
+    public TagTableColumnModelBuilder setWidth(int width, int... indexes) {
         for (int i : indexes) {
             model.getColumn(i).setWidth(width);
@@ -58,5 +58,5 @@
      * @see TableColumn#setPreferredWidth
      */
-    public TagTableColumnModelBuilder setPreferredWidth(int width, int ... indexes) {
+    public TagTableColumnModelBuilder setPreferredWidth(int width, int... indexes) {
         for (int i : indexes) {
             model.getColumn(i).setPreferredWidth(width);
@@ -72,5 +72,5 @@
      * @see TableColumn#setMaxWidth
      */
-    public TagTableColumnModelBuilder setMaxWidth(int width, int ... indexes) {
+    public TagTableColumnModelBuilder setMaxWidth(int width, int... indexes) {
         for (int i : indexes) {
             model.getColumn(i).setMaxWidth(width);
@@ -86,5 +86,5 @@
      * @see TableColumn#setCellEditor
      */
-    public TagTableColumnModelBuilder setCellEditor(TableCellEditor editor, int ... indexes) {
+    public TagTableColumnModelBuilder setCellEditor(TableCellEditor editor, int... indexes) {
         for (int i : indexes) {
             model.getColumn(i).setCellEditor(editor);
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java	(revision 11747)
@@ -125,5 +125,5 @@
         }
 
-        private static int isMatching(Collection<String> values, String ... searchString) {
+        private static int isMatching(Collection<String> values, String... searchString) {
             int sum = 0;
             for (String word: searchString) {
@@ -149,13 +149,13 @@
         }
 
-        int isMatchingGroup(String ... words) {
+        int isMatchingGroup(String... words) {
             return isMatching(groups, words);
         }
 
-        int isMatchingName(String ... words) {
+        int isMatchingName(String... words) {
             return isMatching(names, words);
         }
 
-        int isMatchingTags(String ... words) {
+        int isMatchingTags(String... words) {
             return isMatching(tags, words);
         }
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 11747)
@@ -158,5 +158,5 @@
         private final String delimiter;
 
-        protected ConcatenatingJList(String del, PresetListEntry ... o) {
+        protected ConcatenatingJList(String del, PresetListEntry... o) {
             super(o);
             delimiter = del;
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java	(revision 11747)
@@ -16,5 +16,5 @@
     private final JList<?>[] lists;
 
-    public ListPopupMenu(JList<?> ... lists) {
+    public ListPopupMenu(JList<?>... lists) {
         this.lists = lists;
     }
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 11747)
@@ -53,5 +53,5 @@
      * @param allowed The allowed states
      */
-    public QuadStateCheckBox(String text, Icon icon, State initial, State ... allowed) {
+    public QuadStateCheckBox(String text, Icon icon, State initial, State... allowed) {
         super(text, icon);
         this.allowed = Utils.copyArray(allowed);
@@ -86,5 +86,5 @@
      * @param allowed The allowed states
      */
-    public QuadStateCheckBox(String text, State initial, State ... allowed) {
+    public QuadStateCheckBox(String text, State initial, State... allowed) {
         this(text, null, initial, allowed);
     }
Index: /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java	(revision 11747)
@@ -274,5 +274,5 @@
     }
 
-    static boolean isImageFormatSupported(String format, String ... mimeFormats) {
+    static boolean isImageFormatSupported(String format, String... mimeFormats) {
         for (String mime : mimeFormats) {
             if (format.startsWith("image/" + mime)) {
Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 11747)
@@ -1795,5 +1795,5 @@
     }
 
-    private static Color parseRGB(String ... s) {
+    private static Color parseRGB(String... s) {
         int[] rgb = new int[3];
         try {
Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 11747)
@@ -116,5 +116,5 @@
      * @since 7314
      */
-    public static String getPackageDetails(String ... packageNames) {
+    public static String getPackageDetails(String... packageNames) {
         try {
             // CHECKSTYLE.OFF: SingleSpaceSeparator
Index: /trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 11746)
+++ /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 11747)
@@ -349,5 +349,5 @@
      * @since 7436
      */
-    public static int[] copyArray(int ... array) {
+    public static int[] copyArray(int... array) {
         if (array != null) {
             return Arrays.copyOf(array, array.length);
Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java	(revision 11746)
+++ /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java	(revision 11747)
@@ -31,5 +31,5 @@
     private static final DuplicateNode TEST = new DuplicateNode();
 
-    private static void doTest(int code, Tag ... tags) {
+    private static void doTest(int code, Tag... tags) {
         performTest(code, buildDataSet(tags), true);
     }
Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java	(revision 11746)
+++ /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java	(revision 11747)
@@ -34,5 +34,5 @@
     static <T extends OsmPrimitive> void testSampleFile(String sampleFile,
             Function<DataSet, Iterable<T>> provider, Predicate<String> namePredicate,
-            Test ... tests) throws Exception {
+            Test... tests) throws Exception {
         try (InputStream is = new FileInputStream(sampleFile)) {
             for (T t: provider.apply(OsmReader.parseDataSet(is, null))) {
Index: /trunk/tools/checkstyle/josm_checks.xml
===================================================================
--- /trunk/tools/checkstyle/josm_checks.xml	(revision 11746)
+++ /trunk/tools/checkstyle/josm_checks.xml	(revision 11747)
@@ -63,7 +63,5 @@
     <module name="EmptyForIteratorPad"/>
     <module name="NoWhitespaceAfter"/>
-    <module name="NoWhitespaceBefore">
-    	<property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC"/>
-    </module>
+    <module name="NoWhitespaceBefore"/>
     <module name="SingleSpaceSeparator"/>
     <module name="MethodParamPad"/>