Completed some modest tweaks to new Data Matrix code based on IntelliJ suggestions

[zxing.git] / core / src / com / google / zxing / datamatrix / decoder / BitMatrixParser.java

diff --git a/core/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java b/core/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
index 3bc61cd..a14eb95 100644 (file)
--- a/core/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
+++ b/core/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
@@ -40,7 +40,7 @@ final class BitMatrixParser {
     }\r
     \r
     version = readVersion(bitMatrix);\r
-    this.mappingBitMatrix = ExtractDataRegion(bitMatrix, version);\r
+    this.mappingBitMatrix = extractDataRegion(bitMatrix, version);\r
     // TODO(bbrown): Make this work for rectangular symbols\r
     this.readMappingMatrix = new BitMatrix(this.mappingBitMatrix.getDimension());\r
   }\r
@@ -81,8 +81,6 @@ final class BitMatrixParser {
 \r
     byte[] result = new byte[version.getTotalCodewords()];\r
     int resultOffset = 0;\r
-    int currentByte = 0;\r
-    int bitsRead = 0;\r
     \r
     int row = 4;\r
     int column = 0;\r
@@ -144,10 +142,10 @@ final class BitMatrixParser {
   /**\r
    * <p>Reads a bit of the mapping matrix accounting for boundry wrapping.</p>\r
    * \r
-   * @param Row to read in the mapping matrix\r
-   * @param Column to read in the mapping matrix\r
-   * @param Number of rows in the mapping matrix\r
-   * @param Number of columns in the mapping matrix\r
+   * @param row Row to read in the mapping matrix\r
+   * @param column Column to read in the mapping matrix\r
+   * @param numRows Number of rows in the mapping matrix\r
+   * @param numColumns Number of columns in the mapping matrix\r
    * @return value of the given bit in the mapping matrix\r
    */\r
   boolean readModule(int row, int column, int numRows, int numColumns) {\r
@@ -169,10 +167,10 @@ final class BitMatrixParser {
    * \r
    * <p>See ISO 16022:2006, 5.8.1 Figure 6</p>\r
    * \r
-   * @param Current row in the mapping matrix, anchored at the 8th bit (LSB) of the pattern\r
-   * @param Current column in the mapping matrix, anchored at the 8th bit (LSB) of the pattern\r
-   * @param Number of rows in the mapping matrix\r
-   * @param Number of columns in the mapping matrix\r
+   * @param row Current row in the mapping matrix, anchored at the 8th bit (LSB) of the pattern\r
+   * @param column Current column in the mapping matrix, anchored at the 8th bit (LSB) of the pattern\r
+   * @param numRows Number of rows in the mapping matrix\r
+   * @param numColumns Number of columns in the mapping matrix\r
    * @return byte from the utah shape\r
    */\r
   int readUtah(int row, int column, int numRows, int numColumns) {\r
@@ -216,8 +214,8 @@ final class BitMatrixParser {
    * \r
    * <p>See ISO 16022:2006, Figure F.3</p>\r
    * \r
-   * @param Number of rows in the mapping matrix\r
-   * @param Number of columns in the mapping matrix\r
+   * @param numRows Number of rows in the mapping matrix\r
+   * @param numColumns Number of columns in the mapping matrix\r
    * @return byte from the Corner condition 1\r
    */\r
   int readCorner1(int numRows, int numColumns) {\r
@@ -261,8 +259,8 @@ final class BitMatrixParser {
    * \r
    * <p>See ISO 16022:2006, Figure F.4</p>\r
    * \r
-   * @param Number of rows in the mapping matrix\r
-   * @param Number of columns in the mapping matrix\r
+   * @param numRows Number of rows in the mapping matrix\r
+   * @param numColumns Number of columns in the mapping matrix\r
    * @return byte from the Corner condition 2\r
    */\r
   int readCorner2(int numRows, int numColumns) {\r
@@ -306,8 +304,8 @@ final class BitMatrixParser {
    * \r
    * <p>See ISO 16022:2006, Figure F.5</p>\r
    * \r
-   * @param Number of rows in the mapping matrix\r
-   * @param Number of columns in the mapping matrix\r
+   * @param numRows Number of rows in the mapping matrix\r
+   * @param numColumns Number of columns in the mapping matrix\r
    * @return byte from the Corner condition 3\r
    */\r
   int readCorner3(int numRows, int numColumns) {\r
@@ -351,8 +349,8 @@ final class BitMatrixParser {
    * \r
    * <p>See ISO 16022:2006, Figure F.6</p>\r
    * \r
-   * @param Number of rows in the mapping matrix\r
-   * @param Number of columns in the mapping matrix\r
+   * @param numRows Number of rows in the mapping matrix\r
+   * @param numColumns Number of columns in the mapping matrix\r
    * @return byte from the Corner condition 4\r
    */\r
   int readCorner4(int numRows, int numColumns) {\r
@@ -395,11 +393,11 @@ final class BitMatrixParser {
    * <p>Extracts the data region from a {@link BitMatrix} that contains\r
    * alignment patterns.</p>\r
    * \r
-   * @param bitMarix Original {@link BitMatrix} with alignment patterns\r
+   * @param bitMatrix Original {@link BitMatrix} with alignment patterns\r
    * @param version {@link Version} information corresponding with the bitMatrix\r
    * @return BitMatrix that has the alignment patterns removed\r
    */\r
-  BitMatrix ExtractDataRegion(BitMatrix bitMatrix, Version version) {\r
+  BitMatrix extractDataRegion(BitMatrix bitMatrix, Version version) {\r
     int symbolSizeRows = version.getSymbolSizeRows();\r
     int symbolSizeColumns = version.getSymbolSizeColumns();\r
     \r