NativeBuffer/PointerBuffer API/Impl Change (remove explicit backup array, alloc referenced data map if used only)

This patch doesn't impact GlueGen's code generation,
but enhance and fix PointerBuffer usage only.

remove explicit backup array
  As suggested by Michael Bien with a proposed patch,
  PointerBuffer's backup array is not only redundant in case it's not used,
  but also erroneous - due to possible sliced buffers.

  Removes the explicit backup array implementation
  leaving it up to the user, ie how PointerBuffer is created (alloc/allocDirect)
  and use the underlying nio's buffer backup array, if available.

  This also fixes the (never tested) case of indirect w/ backup array usage
  on 32bit platform size. In this case the array shall be of type int[],
  holding 32bit pointer - on 64bit long[].
  Previous to this patch, it was always long[].

  Added more thorough tests of PointerBuffer, notably indirect w/ backup array
  and native deep copy and filling of a pointer array.

alloc referenced data map if used only
  As suggested by Michael Bien with a proposed patch,
  the allocation of the dataMap hash map is redundant in case it's not used.

  The hash map will be initialized lazy, if needed only.

1 files changed, 0 insertions, 142 deletions

diff --git a/src/java/com/jogamp/common/nio/AbstractLongBuffer.java b/src/java/com/jogamp/common/nio/AbstractLongBuffer.java
deleted file mode 100644
index c097e2e..0000000
--- a/src/java/com/jogamp/common/nio/AbstractLongBuffer.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- * 
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- * 
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-
-/*
- * Created on Saturday, March 27 2010 11:55
- */
-package com.jogamp.common.nio;
-
-import com.jogamp.common.os.*;
-import java.nio.ByteBuffer;
-
-/**
- * Hardware independent container for native pointer arrays.
- *
- * The native values (NIO direct ByteBuffer) might be 32bit or 64bit wide,
- * depending of the CPU pointer width.
- *
- * @author Michael Bien
- * @author Sven Gothel
- */
-public abstract class AbstractLongBuffer<B extends AbstractLongBuffer> extends AbstractBuffer<B> {
-
-    protected long[] backup;
-
-    static {
-        NativeLibrary.ensureNativeLibLoaded();
-    }
-
-    protected AbstractLongBuffer(ByteBuffer bb, int elementSize) {
-        super(bb, elementSize);
-
-        backup = new long[capacity];
-    }
-
-    final void updateBackup() {
-        for (int i = 0; i < capacity; i++) {
-            backup[i] = get(i);
-        }
-    }
-
-    @Override
-    public final boolean hasArray() {
-        return true;
-    }
-
-    public final long[] array() {
-        return backup;
-    }
-
-    /** Absolute get method. Get the pointer value at the given index */
-    public abstract long get(int idx);
-
-    /** Relative get method. Get the pointer value at the current position and increment the position by one. */
-    public final long get() {
-        long r = get(position);
-        position++;
-        return r;
-    }
-
-    /** 
-     * Relative bulk get method. Copy the pointer values <code> [ position .. position+length [</code> 
-     * to the destination array <code> [ dest[offset] .. dest[offset+length] [ </code>
-     * and increment the position by <code>length</code>. */
-    public final AbstractLongBuffer get(long[] dest, int offset, int length) {
-        if (dest.length<offset+length) {
-            throw new IndexOutOfBoundsException();
-        }
-        if (remaining() < length) {
-            throw new IndexOutOfBoundsException();
-        }
-        while(length>0) {
-            dest[offset++] = get(position++);
-            length--;
-        }
-        return this;
-    }
-
-    /** Absolute put method. Put the pointer value at the given index */
-    public abstract B put(int index, long value);
-
-    /** Relative put method. Put the pointer value at the current position and increment the position by one. */
-    public final B put(long value) {
-        put(position, value);
-        position++;
-        return (B) this;
-    }
-
-    /** 
-     * Relative bulk put method. Put the pointer values <code> [ src[offset] .. src[offset+length] [</code> 
-     * at the current position and increment the position by <code>length</code>. */
-    public final AbstractLongBuffer put(long[] src, int offset, int length) {
-        if (src.length<offset+length) {
-            throw new IndexOutOfBoundsException();
-        }
-        if (remaining() < length) {
-            throw new IndexOutOfBoundsException();
-        }
-        while(length>0) {
-            put(position++, src[offset++]);
-            length--;
-        }
-        return this;
-    }
-
-    /** 
-     * Relative bulk get method. Copy the source values <code> src[position .. capacity] [</code> 
-     * to this buffer and increment the position by <code>capacity-position</code>. */
-    public B put(B src) {
-        if (remaining() < src.remaining()) {
-            throw new IndexOutOfBoundsException();
-        }
-        while (src.hasRemaining()) {
-                 put(src.get()); 
-        }
-        return (B) this;
-    }
-}