Index: trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java	(revision 6085)
@@ -65,5 +65,5 @@
         if (! isEnabled())
             return;
-        int rows[] = this.table.getSelectedRows();
+        int[] rows = this.table.getSelectedRows();
         if (rows == null || rows.length == 0)
             return;
Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java	(revision 6085)
@@ -53,5 +53,5 @@
         buf.append(getTitle());
         buf.append(":</td><td>");
-        String patterns[] = getPatterns();
+        String[] patterns = getPatterns();
         if (patterns.length>0) {
             buf.append("<ul>");
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 6085)
@@ -1333,5 +1333,5 @@
         private EastNorth projectionSource; // point that we are projecting to the line
 
-        double snapAngles[];
+        double[] snapAngles;
         double snapAngleTolerance;
 
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java	(revision 6085)
@@ -82,5 +82,5 @@
         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. */
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(revision 6085)
@@ -99,5 +99,5 @@
      */
     public int getLevenshteinDistance(String s, String t) {
-        int d[][]; // matrix
+        int[][] d; // matrix
         int n; // length of s
         int m; // length of t
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 6085)
@@ -282,5 +282,5 @@
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            int rows[] = mineTable.getSelectedRows();
+            int[] rows = mineTable.getSelectedRows();
             if (rows == null || rows.length == 0)
                 return;
@@ -314,5 +314,5 @@
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            int rows[] = theirTable.getSelectedRows();
+            int[] rows = theirTable.getSelectedRows();
             if (rows == null || rows.length == 0)
                 return;
@@ -412,5 +412,5 @@
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            int rows[] = mergedTable.getSelectedRows();
+            int[] rows = mergedTable.getSelectedRows();
             if (rows == null || rows.length == 0)
                 return;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 6085)
@@ -390,5 +390,5 @@
      */
     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)) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 6085)
@@ -163,5 +163,5 @@
 
         public void select() {
-            int indexes[] = userTable.getSelectedRows();
+            int[] indexes = userTable.getSelectedRows();
             if (indexes == null || indexes.length == 0) return;
             model.selectPrimitivesOwnedBy(userTable.getSelectedRows());
@@ -198,5 +198,5 @@
         @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);
@@ -364,5 +364,5 @@
         }
 
-        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;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 6085)
@@ -1136,5 +1136,5 @@
         @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();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java	(revision 6085)
@@ -130,6 +130,6 @@
             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);
@@ -141,6 +141,6 @@
             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);
Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 6085)
@@ -535,5 +535,5 @@
             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;
Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 6085)
@@ -1362,5 +1362,5 @@
 
         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) {
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java	(revision 6085)
@@ -38,6 +38,6 @@
 
     // 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;
@@ -70,5 +70,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: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java	(revision 6085)
@@ -294,5 +294,5 @@
     }
 
-    @Override public void characters(char ch[], int start, int length)
+    @Override public void characters(char[] ch, int start, int length)
     {
         if (inScaleMax == true) {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 6085)
@@ -192,5 +192,5 @@
         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;
@@ -408,5 +408,5 @@
             String prefValue = valueSetting.getValue() == null ? "" : valueSetting.getValue().toString();
 
-            String input[] = txtFilter.getText().split("\\s+");
+            String[] input = txtFilter.getText().split("\\s+");
             boolean canHas = true;
 
Index: trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 6085)
@@ -188,5 +188,5 @@
         }
         if (s.length>1) {
-            float dash[]= new float[s.length-1];
+            float[] dash= new float[s.length-1];
             boolean error = false;
             float sumAbs = 0;
Index: trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java	(revision 6085)
@@ -18,5 +18,5 @@
      */
     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;
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java	(revision 6085)
@@ -133,5 +133,5 @@
 
         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) {
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 6085)
@@ -174,5 +174,5 @@
                 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]);
Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 6085)
@@ -442,5 +442,5 @@
     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)
Index: trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java	(revision 6085)
@@ -85,5 +85,5 @@
                 }
                 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."));
Index: trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 6085)
@@ -41,5 +41,5 @@
         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])),
Index: trunk/src/org/openstreetmap/josm/tools/TextTagParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/TextTagParser.java	(revision 6084)
+++ trunk/src/org/openstreetmap/josm/tools/TextTagParser.java	(revision 6085)
@@ -71,5 +71,5 @@
         
         private String parseString(String stopChars) {
-            char stop[] = stopChars.toCharArray();
+            char[] stop = stopChars.toCharArray();
             Arrays.sort(stop);
             char c;
@@ -159,5 +159,5 @@
      */
     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>();