Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.2
diff -u -b -B -r1.2 configure.ac
--- configure.ac	27 Jan 2004 22:00:42 -0000	1.2
+++ configure.ac	30 Jan 2004 21:35:54 -0000
@@ -286,7 +286,7 @@
               [])
 dnl -----------------------------------------------------------
 
-AC_CONFIG_FILES(Makefile
+AC_CONFIG_FILES([Makefile
 doc/Makefile
 doc/api/Makefile
 external/Makefile
@@ -443,7 +443,6 @@
 vm/reference/java/lang/reflect/Makefile
 vm/reference/java/io/Makefile
 lib/Makefile
-lib/gen-classlist.sh
-lib/gen_nio.sh)
+lib/gen-classlist.sh])
 AC_OUTPUT_COMMANDS([chmod 755 lib/gen-classlist.sh])
 AC_OUTPUT
Index: java/nio/GenericBuffer.cpp
===================================================================
RCS file: java/nio/GenericBuffer.cpp
diff -N java/nio/GenericBuffer.cpp
--- java/nio/GenericBuffer.cpp	8 Apr 2002 10:14:49 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,210 +0,0 @@
-package java.nio;
-
-#include "temp.h"
-
-    /*
-     *    Watch it though, this thing is generated from GenericBuffer.cpp
-     *    with "C"'s preprocessor !
-     *
-     *    The C preprocessor needs to define:
-     *
-     *            TYPE, SIZE, ELT
-     *          
-     */
-
-
-public abstract class BUFFER extends Buffer
-{ 
-    private ByteOrder endian = ByteOrder.BIG_ENDIAN;
-
-   protected ELT [] backing_buffer;
-    
-    public static BUFFER allocateDirect(int capacity)
-    {
-	BUFFER b = new gnu.java.nio. BUFFERImpl(capacity, 0, capacity);
-	return b;
-    }
-
-    public static BUFFER allocate(int capacity)
-    {
-	BUFFER b = new gnu.java.nio. BUFFERImpl(capacity, 0, capacity);
-	return b;
-    }
-
-   final public static BUFFER wrap(ELT[] array,
-			      int offset,
-			      int length)
-    {
-        gnu.java.nio.BUFFERImpl b = new gnu.java.nio. BUFFERImpl(array, offset, length);
-	return b;
-    }
-
-  final  public static BUFFER wrap(String a)
-    {
-#if SIZE == 1
-	return wrap(a.getBytes(), 0, a.length());
-#else
-	int len = a.length();
-	ELT[] buffer = new ELT[len];
-	for (int i=0;i<len;i++)
-	    {
-		buffer[i] = (ELT) a.charAt(i);
-	    }
-	return wrap(buffer, 0, len);
-#endif
-    }
-
-   final public static BUFFER wrap(ELT[] array)
-    {
-	return wrap(array, 0, array.length);
-    }
-    
-    final public BUFFER get(ELT[] dst,
-			    int offset,
-			    int length)
-    {
-
-	  for (int i = offset; i < offset + length; i++)
-	      {
-		  dst[i] = get(); 
-	      }
-	  return this;
-    }
-
-  final  public BUFFER get(ELT[] dst)
-    {
-	return get(dst, 0, dst.length);
-    }
-
-  final  public BUFFER put(BUFFER src)
-    {
-	while (src.hasRemaining())
-	    put(src.get());
-	return this;
-    }
-
-  final public BUFFER put(ELT[] src,
-			  int offset,
-			  int length)
-    {
-	  for (int i = offset; i < offset + length; i++)
-	      put(src[i]); 
-	  return this;
-    }
-
-public final BUFFER put(ELT[] src)
-    {
-	return put(src, 0, src.length);
-    }
-
-public final boolean hasArray()
-    {
-      return (backing_buffer != null);
-    }
-
-public final ELT[] array()
-    {
-      return backing_buffer;
-    }
-
-    public final int arrayOffset()
-    {
-      return 0;
-    }
-
-    public int hashCode()
-    {
-	return super.hashCode();
-    }
-
-    public boolean equals(Object obj)
-    {
-	if (obj instanceof BUFFER)
-	    {
-		return compareTo(obj) == 0;
-	    }	
-	return false;
-    }
-
-    public int compareTo(Object ob)
-    {
-	BUFFER a = (BUFFER) ob;
-	if (a.remaining() != remaining())
-	    return 1;
-
-	if (! hasArray() ||
-	    ! a.hasArray())
-	  {
-	    return 1;
-	  }
-	
-	int r = remaining();
-	int i1 = pos;
-	int i2 = a.pos;
-	for (int i=0;i<r;i++)
-	    {
-		int t = (int) (get(i1)- a.get(i2));
-		if (t != 0)
-		    {
-			return (int) t;
-		    }
-	    }
-	return 0;
-    }
-
-    public final ByteOrder order()
-    {
-	return endian;
-    }
-
-    public final BUFFER order(ByteOrder bo)
-    {
-	endian = bo;
-	return this;
-    }
-
-
-    // abstract functions:
-  
-    public abstract  ELT get();    
-    public abstract  java.nio. BUFFER put(ELT  b);
-    public abstract  ELT get(int index);
-    public abstract  java.nio. BUFFER put(int index, ELT  b);
-    public abstract BUFFER compact();
-    public abstract boolean isDirect();
-    public abstract BUFFER slice();
-    public abstract BUFFER duplicate();
-    public abstract BUFFER asReadOnlyBuffer();
-    public abstract ShortBuffer asShortBuffer();
-    public abstract CharBuffer asCharBuffer();
-    public abstract IntBuffer asIntBuffer();
-    public abstract LongBuffer asLongBuffer();
-    public abstract FloatBuffer asFloatBuffer();
-    public abstract DoubleBuffer asDoubleBuffer();
-
-    public abstract char getChar();
-    public abstract BUFFER putChar(char value);
-    public abstract char getChar(int index);
-    public abstract BUFFER putChar(int index, char value);
-    public abstract short getShort();
-    public abstract BUFFER putShort(short value);
-    public abstract short getShort(int index);
-    public abstract BUFFER putShort(int index, short value);
-    public abstract int getInt();
-    public abstract BUFFER putInt(int value);
-    public abstract int getInt(int index);
-    public abstract BUFFER putInt(int index, int value);
-    public abstract long getLong();
-    public abstract BUFFER putLong(long value);
-    public abstract long getLong(int index);
-    public abstract BUFFER putLong(int index, long value);
-    public abstract float getFloat();
-    public abstract BUFFER putFloat(float value);
-    public abstract float getFloat(int index);
-    public abstract BUFFER putFloat(int index, float value);
-    public abstract double getDouble();
-    public abstract BUFFER putDouble(double value);
-    public abstract double getDouble(int index);
-    public abstract BUFFER putDouble(int index, double value);
-}
-    
Index: lib/gen_nio.sh.in
===================================================================
RCS file: lib/gen_nio.sh.in
diff -N lib/gen_nio.sh.in
--- lib/gen_nio.sh.in	13 Mar 2002 13:05:23 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,137 +0,0 @@
-#! /bin/sh
-
-export address@hidden@
-
-# generate java.nio.ByteBuffer etc
-
-echo "#define TYPE Byte"  > ${top_builddir}/include/temp.h
-echo "#define ELT  byte"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 1"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/ByteBuffer/g > $CLASSPATH_SRC/java/nio/ByteBuffer.java
-
-
-echo "#define TYPE Short"  > ${top_builddir}/include/temp.h
-echo "#define ELT  short"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 2"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/ShortBuffer/g > $CLASSPATH_SRC/java/nio/ShortBuffer.java
-
-
-echo "#define TYPE Char"  > ${top_builddir}/include/temp.h
-echo "#define ELT  char"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 2"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/CharBuffer/g > $CLASSPATH_SRC/java/nio/CharBuffer.java
-
-
-echo "#define TYPE Int"  > ${top_builddir}/include/temp.h
-echo "#define ELT  int"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 4"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/IntBuffer/g > $CLASSPATH_SRC/java/nio/IntBuffer.java
-
-
-echo "#define TYPE Long"  > ${top_builddir}/include/temp.h
-echo "#define ELT  long"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 8"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/LongBuffer/g > $CLASSPATH_SRC/java/nio/LongBuffer.java
-
-
-echo "#define TYPE Float"  > ${top_builddir}/include/temp.h
-echo "#define ELT  float"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 4"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/FloatBuffer/g > $CLASSPATH_SRC/java/nio/FloatBuffer.java
-
-
-echo "#define TYPE Double"  > ${top_builddir}/include/temp.h
-echo "#define ELT  double"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 8"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/DoubleBuffer/g > $CLASSPATH_SRC/java/nio/DoubleBuffer.java
-
-#generate the implementation classes of the above:
-
-echo "#define TYPE Byte"  > ${top_builddir}/include/temp.h
-echo "#define ELT  byte"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 1"     >> ${top_builddir}/include/temp.h
-echo "#define BYTE 1"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/ByteBuffer/g > $CLASSPATH_SRC/gnu/java/nio/ByteBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Byte/g > $CLASSPATH_SRC/gnu/java/nio/MappedByteFileBuffer.java
-
-
-echo "#define TYPE Short"  > ${top_builddir}/include/temp.h
-echo "#define ELT  short"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 2"     >> ${top_builddir}/include/temp.h
-echo "#define SHORT 2"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/ShortBuffer/g > $CLASSPATH_SRC/gnu/java/nio/ShortBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Short/g > $CLASSPATH_SRC/gnu/java/nio/MappedShortFileBuffer.java
-
-
-echo "#define TYPE Char"  > ${top_builddir}/include/temp.h
-echo "#define ELT  char"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 2"     >> ${top_builddir}/include/temp.h
-echo "#define CHAR 2"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/CharBuffer/g > $CLASSPATH_SRC/gnu/java/nio/CharBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Char/g > $CLASSPATH_SRC/gnu/java/nio/MappedCharFileBuffer.java
-
-
-
-echo "#define TYPE Int"  > ${top_builddir}/include/temp.h
-echo "#define ELT  int"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 4"     >> ${top_builddir}/include/temp.h
-echo "#define INT 2"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/IntBuffer/g > $CLASSPATH_SRC/gnu/java/nio/IntBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Int/g > $CLASSPATH_SRC/gnu/java/nio/MappedIntFileBuffer.java
-
-
-
-echo "#define TYPE Long"  > ${top_builddir}/include/temp.h
-echo "#define ELT  long"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 8"     >> ${top_builddir}/include/temp.h
-echo "#define LONG"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/LongBuffer/g > $CLASSPATH_SRC/gnu/java/nio/LongBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Long/g > $CLASSPATH_SRC/gnu/java/nio/MappedLongFileBuffer.java
-
-
-
-
-echo "#define TYPE Float"  > ${top_builddir}/include/temp.h
-echo "#define ELT  float"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 4"     >> ${top_builddir}/include/temp.h
-echo "#define FLOAT"     >> ${top_builddir}/include/temp.h
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/FloatBuffer/g > $CLASSPATH_SRC/gnu/java/nio/FloatBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Float/g > $CLASSPATH_SRC/gnu/java/nio/MappedFloatFileBuffer.java
-
-
-
-echo "#define TYPE Double"  > ${top_builddir}/include/temp.h
-echo "#define ELT  double"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 8"     >> ${top_builddir}/include/temp.h
-echo "#define DOUBLE 8"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/DoubleBuffer/g > $CLASSPATH_SRC/gnu/java/nio/DoubleBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Double/g > $CLASSPATH_SRC/gnu/java/nio/MappedDoubleFileBuffer.java
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.52
diff -u -b -B -r1.52 Makefile.am
--- lib/Makefile.am	24 Aug 2003 18:10:56 -0000	1.52
+++ lib/Makefile.am	30 Jan 2004 21:35:54 -0000
@@ -111,9 +111,6 @@
 genclasses: gen-classlist.sh standard.omit
 	top_builddir=$(top_builddir) $(SHELL) ./gen-classlist.sh standard
 
-gennio:
-	top_builddir=$(top_builddir) $(SHELL) ./gen_nio.sh
-
 $(JAVA_DEPEND): genclasses
 
 compile-classes: classes $(JAVA_SRCS) Makefile