Merge pull request #968 from haileyajohnson/cast-bytebuffer

[5.x] address buffer method disparity among java versions

Author: haileyajohnson

cdm/core/src/main/java/ucar/nc2/util/IO.java

@@ -5,6 +5,7 @@
 
 package ucar.nc2.util;
 
+import java.nio.Buffer;
 import java.nio.charset.StandardCharsets;
 import ucar.nc2.constants.CDM;
 import java.io.*;
@@ -147,7 +148,7 @@ public static long copy2null(FileChannel in, int buffersize) throws IOException
       if (n == -1)
         break;
       totalBytesRead += n;
-      buffer.flip();
+      ((Buffer) buffer).flip();
     }
     return totalBytesRead;
   }
@@ -171,7 +172,7 @@ public static long touch(FileChannel in, int buffersize) throws IOException {
       for (int i = 0; i < buffersize; i++)
         touch += result[i];
 
-      buffer.flip();
+      ((Buffer) buffer).flip();
     }
     return touch;
   }
@@ -397,7 +398,7 @@ public static void copyFileWithChannels(File fileIn, WritableByteChannel out) th
    * // The read() call leaves the buffer in "fill mode". To prepare
    * // to write bytes from the bufferwe have to put it in "drain mode"
    * // by flipping it: setting limit to position and position to zero
-   * buffer.flip();
+   * ((Buffer) buffer).flip();
    * 
    * // Now write some or all of the bytes out to the output channel
    * out.write(buffer);

cdm/misc/src/main/java/ucar/nc2/geotiff/GeoTiff.java

@@ -10,6 +10,7 @@
 import java.io.PrintWriter;
 import java.io.RandomAccessFile;
 import java.io.StringWriter;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
@@ -203,7 +204,7 @@ int writeData(float[] data, int imageNumber) throws IOException {
     ByteBuffer direct = ByteBuffer.allocateDirect(4 * data.length);
     FloatBuffer buffer = direct.asFloatBuffer();
     buffer.put(data);
-    // buffer.flip();
+    // ((Buffer) buffer).flip();
     channel.write(direct);
 
     if (imageNumber == 1)
@@ -232,7 +233,7 @@ void writeMetadata(int imageNumber) throws IOException {
       if (debugRead)
         System.out.println("position before writing nextIFD= " + channel.position() + " IFD is " + firstIFD);
       buffer.putInt(firstIFD);
-      buffer.flip();
+      ((Buffer) buffer).flip();
       channel.write(buffer);
     }
     writeIFD(channel, firstIFD);
@@ -247,7 +248,7 @@ private int writeHeader(FileChannel channel) throws IOException {
     buffer.putShort((short) 42);
     buffer.putInt(firstIFD);
 
-    buffer.flip();
+    ((Buffer) buffer).flip();
     channel.write(buffer);
 
     return firstIFD;
@@ -272,7 +273,7 @@ private void writeIFD(FileChannel channel, int start) throws IOException {
     ByteBuffer buffer = ByteBuffer.allocate(2);
     int n = tags.size();
     buffer.putShort((short) n);
-    buffer.flip();
+    ((Buffer) buffer).flip();
     channel.write(buffer);
 
     start += 2;
@@ -291,7 +292,7 @@ private void writeIFD(FileChannel channel, int start) throws IOException {
       System.out.println("pos before writing nextIFD= " + channel.position());
     buffer = ByteBuffer.allocate(4);
     buffer.putInt(0);
-    buffer.flip();
+    ((Buffer) buffer).flip();
     channel.write(buffer);
   }
 
@@ -308,18 +309,18 @@ private void writeIFDEntry(FileChannel channel, IFDEntry ifd, int start) throws
       int done = writeValues(buffer, ifd);
       for (int k = 0; k < 4 - done; k++) // fill out to 4 bytes
         buffer.put((byte) 0);
-      buffer.flip();
+      ((Buffer) buffer).flip();
       channel.write(buffer);
 
     } else { // write offset
       buffer.putInt(nextOverflowData);
-      buffer.flip();
+      ((Buffer) buffer).flip();
       channel.write(buffer);
       // write data
       channel.position(nextOverflowData);
       ByteBuffer vbuffer = ByteBuffer.allocate(size);
       writeValues(vbuffer, ifd);
-      vbuffer.flip();
+      ((Buffer) vbuffer).flip();
       channel.write(vbuffer);
       nextOverflowData += size;
     }
@@ -417,7 +418,7 @@ private int readHeader(FileChannel channel) throws IOException {
     ByteBuffer buffer = ByteBuffer.allocate(8);
     int n = channel.read(buffer);
     assert n == 8;
-    buffer.flip();
+    ((Buffer) buffer).flip();
     if (showHeaderBytes) {
       printBytes(System.out, "header", buffer, 4);
       buffer.rewind();
@@ -443,7 +444,7 @@ private int readIFD(FileChannel channel, int start) throws IOException {
 
     int n = channel.read(buffer);
     assert n == 2;
-    buffer.flip();
+    ((Buffer) buffer).flip();
     if (showBytes) {
       printBytes(System.out, "IFD", buffer, 2);
       buffer.rewind();
@@ -468,7 +469,7 @@ private int readIFD(FileChannel channel, int start) throws IOException {
     buffer = ByteBuffer.allocate(4);
     buffer.order(byteOrder);
     assert 4 == channel.read(buffer);
-    buffer.flip();
+    ((Buffer) buffer).flip();
     int nextIFD = buffer.getInt();
     if (debugRead)
       System.out.println(" nextIFD == " + nextIFD);
@@ -484,7 +485,7 @@ private IFDEntry readIFDEntry(FileChannel channel, int start) throws IOException
     buffer.order(byteOrder);
     int n = channel.read(buffer);
     assert n == 12;
-    buffer.flip();
+    ((Buffer) buffer).flip();
     if (showBytes)
       printBytes(System.out, "IFDEntry bytes", buffer, 12);
 
@@ -509,7 +510,7 @@ private IFDEntry readIFDEntry(FileChannel channel, int start) throws IOException
       ByteBuffer vbuffer = ByteBuffer.allocate(ifd.count * ifd.type.size);
       vbuffer.order(byteOrder);
       assert ifd.count * ifd.type.size == channel.read(vbuffer);
-      vbuffer.flip();
+      ((Buffer) vbuffer).flip();
       readValues(vbuffer, ifd);
     }
 
@@ -670,7 +671,7 @@ ByteBuffer testReadData(int offset, int size) throws IOException {
     ByteBuffer buffer = ByteBuffer.allocate(size);
     buffer.order(byteOrder);
     assert size == channel.read(buffer);
-    buffer.flip();
+    ((Buffer) buffer).flip();
     return buffer;
   }
 }