Index: src/org/openstreetmap/josm/actions/ZoomToAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/ZoomToAction.java	(revision 6084)
+++ src/org/openstreetmap/josm/actions/ZoomToAction.java	(working copy)
@@ -64,7 +64,7 @@
     public void actionPerformed(ActionEvent e) {
         if (! isEnabled())
             return;
-        int rows[] = this.table.getSelectedRows();
+        int[] rows = this.table.getSelectedRows();
         if (rows == null || rows.length == 0)
             return;
         int row = rows[0];
Index: src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
===================================================================
--- src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java	(revision 6084)
+++ src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java	(working copy)
@@ -52,7 +52,7 @@
         StringBuilder buf = new StringBuilder("<tr><td>");
         buf.append(getTitle());
         buf.append(":</td><td>");
-        String patterns[] = getPatterns();
+        String[] patterns = getPatterns();
         if (patterns.length>0) {
             buf.append("<ul>");
             for (String pattern: patterns) {
Index: src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 6084)
+++ src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(working copy)
@@ -1332,7 +1332,7 @@
         private EastNorth segmentPoint2; // remembered second point of base segment
         private EastNorth projectionSource; // point that we are projecting to the line
 
-        double snapAngles[];
+        double[] snapAngles;
         double snapAngleTolerance;
 
         double pe,pn; // (pe,pn) - direction of snapping line
Index: src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java	(revision 6084)
+++ src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java	(working copy)
@@ -81,7 +81,7 @@
         composition of some (not necessarily all) name:* labels.
         Check if this is the case. */
 
-        String split_names[] = name.split(" - ");
+        String[] split_names = name.split(" - ");
         if (split_names.length == 1) {
             /* The name is not composed of multiple parts. Complain. */
             missingTranslation(p);
Index: src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(revision 6084)
+++ src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(working copy)
@@ -98,7 +98,7 @@
      * @return The distance between words
      */
     public int getLevenshteinDistance(String s, String t) {
-        int d[][]; // matrix
+        int[][] d; // matrix
         int n; // length of s
         int m; // length of t
         int i; // iterates through s
Index: src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
===================================================================
--- src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 6084)
+++ src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(working copy)
@@ -281,7 +281,7 @@
 
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            int rows[] = mineTable.getSelectedRows();
+            int[] rows = mineTable.getSelectedRows();
             if (rows == null || rows.length == 0)
                 return;
             model.decide(rows, MergeDecisionType.KEEP_MINE);
@@ -313,7 +313,7 @@
 
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            int rows[] = theirTable.getSelectedRows();
+            int[] rows = theirTable.getSelectedRows();
             if (rows == null || rows.length == 0)
                 return;
             model.decide(rows, MergeDecisionType.KEEP_THEIR);
@@ -411,7 +411,7 @@
 
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            int rows[] = mergedTable.getSelectedRows();
+            int[] rows = mergedTable.getSelectedRows();
             if (rows == null || rows.length == 0)
                 return;
             model.decide(rows, MergeDecisionType.UNDECIDED);
Index: src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 6084)
+++ src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(working copy)
@@ -389,7 +389,7 @@
      * @param visible true, if the components should be visible; false otherwise
      */
     protected void setContentVisible(boolean visible) {
-        Component comps[] = getComponents();
+        Component[] comps = getComponents();
         for(int i=0; i<comps.length; i++) {
             if (comps[i] != titleBar && (!visible || comps[i] != buttonsPanel || buttonHiding != ButtonHiddingType.ALWAYS_HIDDEN)) {
                 comps[i].setVisible(visible);
Index: src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 6084)
+++ src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(working copy)
@@ -162,7 +162,7 @@
         }
 
         public void select() {
-            int indexes[] = userTable.getSelectedRows();
+            int[] indexes = userTable.getSelectedRows();
             if (indexes == null || indexes.length == 0) return;
             model.selectPrimitivesOwnedBy(userTable.getSelectedRows());
         }
@@ -197,7 +197,7 @@
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            int rows[] = userTable.getSelectedRows();
+            int[] rows = userTable.getSelectedRows();
             if (rows == null || rows.length == 0) return;
             List<User> users = model.getSelectedUsers(rows);
             if (users.isEmpty()) return;
@@ -363,7 +363,7 @@
             Main.main.getCurrentDataSet().setSelected(byUser);
         }
 
-        public List<User> getSelectedUsers(int rows[]) {
+        public List<User> getSelectedUsers(int[] rows) {
             LinkedList<User> ret = new LinkedList<User>();
             if (rows == null || rows.length == 0) return ret;
             for (int row: rows) {
Index: src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 6084)
+++ src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(working copy)
@@ -1135,7 +1135,7 @@
 
         @Override
         public void actionPerformed(ActionEvent ae) {
-            int rows[] = propertyTable.getSelectedRows();
+            int[] rows = propertyTable.getSelectedRows();
             Set<String> values = new TreeSet<String>();
             Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
             if (rows.length == 0 || sel.isEmpty()) return;
Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java	(revision 6084)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java	(working copy)
@@ -129,8 +129,8 @@
             setDotted(g);
             y1 = 7;
 
-            int xValues [] = {xoff - xowloop + 1, xoff - xowloop + 1, xoff};
-            int yValues [] = {ymax, y1+1, 1};
+            int[] xValues  = {xoff - xowloop + 1, xoff - xowloop + 1, xoff};
+            int[] yValues  = {ymax, y1+1, 1};
             g.drawPolyline(xValues, yValues, 3);
             unsetDotted(g);
             g.drawLine(xoff + xowloop, y1+1, xoff, 1);
@@ -140,8 +140,8 @@
             setDotted(g);
             y2 = ymax - 7;
 
-            int xValues [] = {xoff+1, xoff - xowloop + 1, xoff - xowloop + 1};
-            int yValues [] = {ymax-1, y2, y1};
+            int[] xValues  = {xoff+1, xoff - xowloop + 1, xoff - xowloop + 1};
+            int[] yValues  = {ymax-1, y2, y1};
             g.drawPolyline(xValues, yValues, 3);
             unsetDotted(g);
             g.drawLine(xoff + xowloop, y2, xoff, ymax-1);
Index: src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 6084)
+++ src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(working copy)
@@ -534,7 +534,7 @@
             }
             double now = new Date().getTime()/1000.0;
             if (colored == colorModes.time) {
-                Date bounds[] = getMinMaxTimeForAllTracks();
+                Date[] bounds = getMinMaxTimeForAllTracks();
                 if (bounds!=null) {
                     minval = bounds[0].getTime()/1000.0;
                     maxval = bounds[1].getTime()/1000.0;
Index: src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 6084)
+++ src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(working copy)
@@ -1361,7 +1361,7 @@
         g.setColor(Color.DARK_GRAY);
 
         List<Tile> missedTiles = this.paintTileImages(g, ts, displayZoomLevel, null);
-        int otherZooms[] = { -1, 1, -2, 2, -3, -4, -5};
+        int[] otherZooms = { -1, 1, -2, 2, -3, -4, -5};
         for (int zoomOffset : otherZooms) {
             if (!autoZoom) {
                 break;
Index: src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java	(revision 6084)
+++ src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java	(working copy)
@@ -37,8 +37,8 @@
     private final JCheckBox cbDownloadGpxData;
 
     // Legacy list of values
-    private static final Integer dist[] = { 5000, 500, 50 };
-    private static final Integer area[] = { 20, 10, 5, 1 };
+    private static final Integer[] dist = { 5000, 500, 50 };
+    private static final Integer[] area = { 20, 10, 5, 1 };
     
     private final JList buffer;
     private final JList maxRect;
@@ -69,7 +69,7 @@
         add(cbDownloadGpxData,  GBC.eol().insets(5,5,1,5));
         
         add(new JLabel(tr("Download everything within:")), GBC.eol());
-        String s[] = new String[dist.length];
+        String[] s = new String[dist.length];
         for (int i = 0; i < dist.length; ++i) {
             s[i] = tr("{0} meters", dist[i]);
         }
Index: src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java
===================================================================
--- src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java	(revision 6084)
+++ src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java	(working copy)
@@ -293,7 +293,7 @@
         }
     }
 
-    @Override public void characters(char ch[], int start, int length)
+    @Override public void characters(char[] ch, int start, int length)
     {
         if (inScaleMax == true) {
             rule.scaleMax = Long.parseLong(new String(ch, start, length));
Index: src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 6084)
+++ src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(working copy)
@@ -191,7 +191,7 @@
         };
         JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(!saveFileFlag, !saveFileFlag, title, filter, JFileChooser.FILES_ONLY, "customsettings.lastDirectory");
         if (fc != null) {
-            File sel[] = fc.isMultiSelectionEnabled() ? fc.getSelectedFiles() : (new File[]{fc.getSelectedFile()});
+            File[] sel = fc.isMultiSelectionEnabled() ? fc.getSelectedFiles() : (new File[]{fc.getSelectedFile()});
             if (sel.length==1 && !sel[0].getName().contains(".")) sel[0]=new File(sel[0].getAbsolutePath()+".xml");
             return sel;
         }
@@ -407,7 +407,7 @@
             Setting valueSetting = e.getValue();
             String prefValue = valueSetting.getValue() == null ? "" : valueSetting.getValue().toString();
 
-            String input[] = txtFilter.getText().split("\\s+");
+            String[] input = txtFilter.getText().split("\\s+");
             boolean canHas = true;
 
             // Make 'wmsplugin cache' search for e.g. 'cache.wmsplugin'
Index: src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 6084)
+++ src/org/openstreetmap/josm/gui/util/GuiHelper.java	(working copy)
@@ -187,7 +187,7 @@
             w = 1.0f;
         }
         if (s.length>1) {
-            float dash[]= new float[s.length-1];
+            float[] dash= new float[s.length-1];
             boolean error = false;
             float sumAbs = 0;
             try {
Index: src/org/openstreetmap/josm/io/UTFInputStreamReader.java
===================================================================
--- src/org/openstreetmap/josm/io/UTFInputStreamReader.java	(revision 6084)
+++ src/org/openstreetmap/josm/io/UTFInputStreamReader.java	(working copy)
@@ -17,7 +17,7 @@
      * @return A reader with the correct encoding. Starts to read after the BOM.
      */
     public static UTFInputStreamReader create(InputStream input, String defaultEncoding) throws IOException {
-        byte bom[] = new byte[4];
+        byte[] bom = new byte[4];
         String encoding = defaultEncoding;
         int unread;
         PushbackInputStream pushbackStream = new PushbackInputStream(input, 4);
Index: src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
===================================================================
--- src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java	(revision 6084)
+++ src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java	(working copy)
@@ -132,7 +132,7 @@
 
 
         final DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")}, tags.length) {
-            final Class<?> types[] = {Boolean.class, String.class, Object.class, ExistingValues.class};
+            final Class<?>[] types = {Boolean.class, String.class, Object.class, ExistingValues.class};
             @Override
             public Class getColumnClass(int c) {
                 return types[c];
Index: src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
===================================================================
--- src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 6084)
+++ src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(working copy)
@@ -173,7 +173,7 @@
                 get=in.readLine();
                 if (get==null) break;
                 k++;
-                String h[] = get.split(": ", 2);
+                String[] h = get.split(": ", 2);
                 if (h.length==2) {
                     headers.put(h[0], h[1]);
                 } else break;
Index: src/org/openstreetmap/josm/plugins/PluginInformation.java
===================================================================
--- src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 6084)
+++ src/org/openstreetmap/josm/plugins/PluginInformation.java	(working copy)
@@ -441,7 +441,7 @@
      */
     public boolean matches(String filter) {
         if (filter == null) return true;
-        String words[] = filter.split("\\s+");
+        String[] words = filter.split("\\s+");
         for (String word: words) {
             if (matches(word, name)
                     || matches(word, description)
Index: src/org/openstreetmap/josm/plugins/PluginListParser.java
===================================================================
--- src/org/openstreetmap/josm/plugins/PluginListParser.java	(revision 6084)
+++ src/org/openstreetmap/josm/plugins/PluginListParser.java	(working copy)
@@ -84,7 +84,7 @@
                     continue;
                 }
                 addPluginInformation(ret, name, url, manifest.toString());
-                String x[] = line.split(";");
+                String[] x = line.split(";");
                 if(x.length != 2)
                     throw new IOException(tr("Illegal entry in plugin list."));
                 name = x[0];
Index: src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
===================================================================
--- src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 6084)
+++ src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(working copy)
@@ -40,7 +40,7 @@
 
         try {
             if (map.containsKey("bbox")) {
-                String bbox[] = map.get("bbox").split(",");
+                String[] bbox = map.get("bbox").split(",");
                 b = new Bounds(
                         new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[0])),
                         new LatLon(Double.parseDouble(bbox[3]), Double.parseDouble(bbox[2])));
Index: src/org/openstreetmap/josm/tools/TextTagParser.java
===================================================================
--- src/org/openstreetmap/josm/tools/TextTagParser.java	(revision 6084)
+++ src/org/openstreetmap/josm/tools/TextTagParser.java	(working copy)
@@ -70,7 +70,7 @@
         }
         
         private String parseString(String stopChars) {
-            char stop[] = stopChars.toCharArray();
+            char[] stop = stopChars.toCharArray();
             Arrays.sort(stop);
             char c;
             while (pos < n) {
@@ -158,7 +158,7 @@
      * @param unescapeTextInQuotes - if true, matched tag and value will be analyzed more thoroughly
      */
     public static Map<String, String> readTagsByRegexp(String text, String splitRegex, String tagRegex, boolean unescapeTextInQuotes) {
-         String lines[] = text.split(splitRegex);
+         String[] lines = text.split(splitRegex);
          Pattern p = Pattern.compile(tagRegex);
          Map<String, String> tags = new HashMap<String,String>();
          String k=null, v=null;