aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2002-10-07 13:56:38 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2002-10-07 13:56:38 +0000
commit0c59cbfaf61bce02e64caf4237f1d536a34caa8f (patch)
treeb383fde3e5b3feb548026898e832dc35ce1a0ff3 /libjava
parent0f31d441683d083328152a31348bcf74e1c3903a (diff)
downloadgcc-0c59cbfaf61bce02e64caf4237f1d536a34caa8f.zip
gcc-0c59cbfaf61bce02e64caf4237f1d536a34caa8f.tar.gz
gcc-0c59cbfaf61bce02e64caf4237f1d536a34caa8f.tar.bz2
Buffer.java: New stub file.
2002-10-07 Michael Koch <konqueror@gmx.de> * java/nio/Buffer.java: New stub file. * java/nio/charset/spi/CharsetProvider.java: Commented out all usages of class Charset. * Makefile.am (java_native_source_files): Added java/nio/Buffer.java. * Makefile.in: Regenerated. From-SVN: r57901
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog8
-rw-r--r--libjava/Makefile.am1
-rw-r--r--libjava/Makefile.in5
-rw-r--r--libjava/java/nio/Buffer.java42
-rw-r--r--libjava/java/nio/charset/spi/CharsetProvider.java4
5 files changed, 56 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c147687..b7effb1 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,13 @@
2002-10-07 Michael Koch <konqueror@gmx.de>
+ * java/nio/Buffer.java: New stub file.
+ * java/nio/charset/spi/CharsetProvider.java: Commented out all usages
+ of class Charset.
+ * Makefile.am (java_native_source_files): Added java/nio/Buffer.java.
+ * Makefile.in: Regenerated.
+
+2002-10-07 Michael Koch <konqueror@gmx.de>
+
* java/nio/ByteBuffer.java:
removed import of not commited class.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 0543221..bbcd51d 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -1956,6 +1956,7 @@ java/net/URLStreamHandler.java \
java/net/URLStreamHandlerFactory.java \
java/net/UnknownHostException.java \
java/net/UnknownServiceException.java \
+java/nio/Buffer.java \
java/nio/ByteBuffer.java \
java/nio/MappedByteBuffer.java \
java/nio/channels/AlreadyConnectedException.java \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 98cb094..b459660 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1706,6 +1706,7 @@ java/net/URLStreamHandler.java \
java/net/URLStreamHandlerFactory.java \
java/net/UnknownHostException.java \
java/net/UnknownServiceException.java \
+java/nio/Buffer.java \
java/nio/ByteBuffer.java \
java/nio/MappedByteBuffer.java \
java/nio/channels/AlreadyConnectedException.java \
@@ -2957,8 +2958,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/net/UnknownServiceException.P \
.deps/java/net/natInetAddress.P .deps/java/net/natNetworkInterface.P \
.deps/java/net/natPlainDatagramSocketImpl.P \
-.deps/java/net/natPlainSocketImpl.P .deps/java/nio/ByteBuffer.P \
-.deps/java/nio/MappedByteBuffer.P \
+.deps/java/net/natPlainSocketImpl.P .deps/java/nio/Buffer.P \
+.deps/java/nio/ByteBuffer.P .deps/java/nio/MappedByteBuffer.P \
.deps/java/nio/channels/AlreadyConnectedException.P \
.deps/java/nio/channels/ByteChannel.P .deps/java/nio/channels/Channel.P \
.deps/java/nio/channels/ClosedChannelException.P \
diff --git a/libjava/java/nio/Buffer.java b/libjava/java/nio/Buffer.java
new file mode 100644
index 0000000..4e18cbd
--- /dev/null
+++ b/libjava/java/nio/Buffer.java
@@ -0,0 +1,42 @@
+/* Buffer.java --
+ Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.nio;
+
+public abstract class Buffer
+{
+}
diff --git a/libjava/java/nio/charset/spi/CharsetProvider.java b/libjava/java/nio/charset/spi/CharsetProvider.java
index 32346a0..2eddf61 100644
--- a/libjava/java/nio/charset/spi/CharsetProvider.java
+++ b/libjava/java/nio/charset/spi/CharsetProvider.java
@@ -37,7 +37,7 @@ exception statement from your version. */
package java.nio.charset.spi;
-import java.nio.charset.Charset;
+//import java.nio.charset.Charset;
import java.util.Iterator;
/**
@@ -84,5 +84,5 @@ public abstract class CharsetProvider
*
* @return the charset, or null if not supported
*/
- public abstract Charset charsetForName(String name);
+ //public abstract Charset charsetForName(String name);
} // class CharsetProvider