From 712c8cacf75be81b9d893914d11d48d36d277cb9 Mon Sep 17 00:00:00 2001
From: Simon Legner <Simon.Legner@gmail.com>
Date: Sun, 3 Jan 2021 23:39:46 +0100
Subject: [PATCH] Use Java array syntax

---
 src.java/crosby/binary/BinaryParser.java           | 2 +-
 src.java/crosby/binary/StringTable.java            | 2 +-
 src.java/crosby/binary/file/FileBlock.java         | 2 +-
 src.java/crosby/binary/file/FileBlockHead.java     | 4 ++--
 src.java/crosby/binary/file/FileBlockPosition.java | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src.java/crosby/binary/BinaryParser.java b/src.java/crosby/binary/BinaryParser.java
index f32d41e..7a1d9c1 100644
--- a/src.java/crosby/binary/BinaryParser.java
+++ b/src.java/crosby/binary/BinaryParser.java
@@ -33,7 +33,7 @@ public abstract class BinaryParser implements BlockReaderAdapter {
     private long lat_offset;
     private long lon_offset;
     protected int date_granularity;
-    private String strings[];
+    private String[] strings;
 
     /** Take a Info protocol buffer containing a date and convert it into a java Date object */
     protected Date getDate(Osmformat.Info info) {
diff --git a/src.java/crosby/binary/StringTable.java b/src.java/crosby/binary/StringTable.java
index e2c1d2d..7f704b0 100644
--- a/src.java/crosby/binary/StringTable.java
+++ b/src.java/crosby/binary/StringTable.java
@@ -34,7 +34,7 @@ public class StringTable {
 
     private HashMap<String, Integer> counts;
     private HashMap<String, Integer> stringmap;
-    private String set[];
+    private String[] set;
 
     public void incr(String s) {
         counts.merge(s, 1, Integer::sum);
diff --git a/src.java/crosby/binary/file/FileBlock.java b/src.java/crosby/binary/file/FileBlock.java
index 4b4e146..23eb94a 100644
--- a/src.java/crosby/binary/file/FileBlock.java
+++ b/src.java/crosby/binary/file/FileBlock.java
@@ -65,7 +65,7 @@ public class FileBlock extends FileBlockBase {
         Deflater deflater = new Deflater();
         deflater.setInput(data.toByteArray());
         deflater.finish();
-        byte out[] = new byte[size];
+        byte[] out = new byte[size];
         deflater.deflate(out);
         
         if (!deflater.finished()) {
diff --git a/src.java/crosby/binary/file/FileBlockHead.java b/src.java/crosby/binary/file/FileBlockHead.java
index bf7259a..53113c6 100644
--- a/src.java/crosby/binary/file/FileBlockHead.java
+++ b/src.java/crosby/binary/file/FileBlockHead.java
@@ -50,7 +50,7 @@ public class FileBlockHead extends FileBlockReference {
           throw new FileFormatException("Unexpectedly long header "+MAX_HEADER_SIZE+ " bytes. Possibly corrupt file.");
         }
         
-        byte buf[] = new byte[headersize];
+        byte[] buf = new byte[headersize];
         datinput.readFully(buf);
         // System.out.format("Read buffer for header of %d bytes\n",buf.length);
         Fileformat.BlobHeader header = Fileformat.BlobHeader
@@ -90,7 +90,7 @@ public class FileBlockHead extends FileBlockReference {
      */
     FileBlock readContents(InputStream input) throws IOException {
         DataInputStream datinput = new DataInputStream(input);
-        byte buf[] = new byte[getDatasize()];
+        byte[] buf = new byte[getDatasize()];
         datinput.readFully(buf);
         return parseData(buf);
     }
diff --git a/src.java/crosby/binary/file/FileBlockPosition.java b/src.java/crosby/binary/file/FileBlockPosition.java
index 044de55..5f1d3c4 100644
--- a/src.java/crosby/binary/file/FileBlockPosition.java
+++ b/src.java/crosby/binary/file/FileBlockPosition.java
@@ -43,13 +43,13 @@ public class FileBlockPosition extends FileBlockBase {
     }
 
     /** Parse out and decompress the data part of a fileblock helper function. */
-    FileBlock parseData(byte buf[]) throws InvalidProtocolBufferException {
+    FileBlock parseData(byte[] buf) throws InvalidProtocolBufferException {
         FileBlock out = FileBlock.newInstance(type, null, indexdata);
         Fileformat.Blob blob = Fileformat.Blob.parseFrom(buf);
         if (blob.hasRaw()) {
             out.data = blob.getRaw();
         } else if (blob.hasZlibData()) {
-            byte buf2[] = new byte[blob.getRawSize()];
+            byte[] buf2 = new byte[blob.getRawSize()];
             Inflater decompresser = new Inflater();
             decompresser.setInput(blob.getZlibData().toByteArray());
             // decompresser.getRemaining();
@@ -85,7 +85,7 @@ public class FileBlockPosition extends FileBlockBase {
     public FileBlock read(InputStream input) throws IOException {
         if (input instanceof FileInputStream) {
             ((FileInputStream) input).getChannel().position(data_offset);
-            byte buf[] = new byte[getDatasize()];
+            byte[] buf = new byte[getDatasize()];
             (new DataInputStream(input)).readFully(buf);
             return parseData(buf);
         } else {