svn commit: r1300540 - in /commons/proper/csv/trunk/src/main/java/org/apache/commons/csv: ExtendedBufferedReader.java UnicodeUnescapeReader.java

[se...@apache.org]

Author: sebb
Date: Wed Mar 14 13:38:43 2012
New Revision: 1300540

URL: http://svn.apache.org/viewvc?rev=1300540&view=rev
Log:
Rename local variables to make them easier to read
l (ell) looks rather like 1 (one)

Modified:
    commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java
    commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/UnicodeUnescapeReader.java

Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java
URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java?rev=1300540&r1=1300539&r2=1300540&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java (original)
+++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java Wed Mar 14 13:38:43 2012
@@ -77,27 +77,27 @@ class ExtendedBufferedReader extends Buf
     }
 
     @Override
-    public int read(char[] buf, int off, int len) throws IOException {
-        if (len == 0) {
+    public int read(char[] buf, int offset, int length) throws IOException {
+        if (length == 0) {
             return 0;
         }
         
-        int l = super.read(buf, off, len);
+        int len = super.read(buf, offset, length);
         
-        if (l > 0) {
-            lastChar = buf[off + l - 1];
+        if (len > 0) {
+            lastChar = buf[offset + len - 1];
             
-            for (int i = off; i < off + l; i++) {
+            for (int i = offset; i < offset + len; i++) {
                 if (buf[i] == '\n') {
                     lineCounter++;
                 }
             }
             
-        } else if (l == -1) {
+        } else if (len == -1) {
             lastChar = END_OF_STREAM;
         }
         
-        return l;
+        return len;
     }
 
     @Override

Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/UnicodeUnescapeReader.java
URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/UnicodeUnescapeReader.java?rev=1300540&r1=1300539&r2=1300540&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/UnicodeUnescapeReader.java (original)
+++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/UnicodeUnescapeReader.java Wed Mar 14 13:38:43 2012
@@ -39,9 +39,9 @@ class UnicodeUnescapeReader extends Read
     }
 
     @Override
-    public int read(char[] cbuf, int off, int len) throws IOException {
+    public int read(char[] cbuf, int offset, int length) throws IOException {
         int count = 0;
-        for (int i = 0; i < len; i++) {
+        for (int i = 0; i < length; i++) {
             int c = reader.read();
             
             if (c == -1) {
@@ -49,18 +49,18 @@ class UnicodeUnescapeReader extends Read
             }
             
             if (c == '\\') {
-                int l = reader.read(sequence);
-                if (l == sequence.length && isUnicodeSequence(sequence)) {
+                int len = reader.read(sequence);
+                if (len == sequence.length && isUnicodeSequence(sequence)) {
                     // unicode escape found
                     c = Integer.parseInt(new String(sequence, 1, 4), 16);
                     
-                } else if (l > 0) {
+                } else if (len > 0) {
                     // put the characters back in the stream
-                    reader.unread(sequence, 0, l);
+                    reader.unread(sequence, 0, len);
                 }
             }
 
-            cbuf[off + i] = (char) c;
+            cbuf[offset + i] = (char) c;
             count++;
         }