svn commit: r1390023 - in /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe: InfoHeaderReader.java RgbeInfo.java

[damjan]

Author: damjan
Date: Tue Sep 25 17:55:57 2012
New Revision: 1390023

URL: http://svn.apache.org/viewvc?rev=1390023&view=rev
Log:
Shut Findbugs's NP_IMMEDIATE_DEREFERENCE_OF_READLINE lie up.


Modified:
    
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/InfoHeaderReader.java
    
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java

Modified: 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/InfoHeaderReader.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/InfoHeaderReader.java?rev=1390023&r1=1390022&r2=1390023&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/InfoHeaderReader.java
 (original)
+++ 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/InfoHeaderReader.java
 Tue Sep 25 17:55:57 2012
@@ -34,7 +34,7 @@ class InfoHeaderReader {
         return (char) result;
     }
 
-    public String readLine() throws IOException {
+    public String readNextLine() throws IOException {
         StringBuilder buffer = new StringBuilder();
         char c;
 

Modified: 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java?rev=1390023&r1=1390022&r2=1390023&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
 (original)
+++ 
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
 Tue Sep 25 17:55:57 2012
@@ -81,7 +81,7 @@ class RgbeInfo extends BinaryFileFunctio
         getMetadata(); // Ensure we've read past this
 
         InfoHeaderReader reader = new InfoHeaderReader(in);
-        String resolution = reader.readLine();
+        String resolution = reader.readNextLine();
         Matcher matcher = RESOLUTION_STRING.matcher(resolution);
 
         if (!matcher.matches()) {
@@ -100,13 +100,13 @@ class RgbeInfo extends BinaryFileFunctio
 
         InfoHeaderReader reader = new InfoHeaderReader(in);
 
-        if (reader.readLine().length() != 0) {
+        if (reader.readNextLine().length() != 0) {
             throw new ImageReadException("Not a valid HDR: Incorrect Header");
         }
 
         metadata = new ImageMetadata();
 
-        String info = reader.readLine();
+        String info = reader.readNextLine();
 
         while (info.length() != 0) {
             int equals = info.indexOf("=");
@@ -128,7 +128,7 @@ class RgbeInfo extends BinaryFileFunctio
                 metadata.add("<command>", info);
             }
 
-            info = reader.readLine();
+            info = reader.readNextLine();
         }
     }