Skip to content

R
riscv-gcc-1
Commit 628cacef by Tom Tromey Committed by Tom Tromey
Options

sources.am, [...]: Rebuilt. 

	* sources.am, Makefile.in: Rebuilt.
	* Makefile.am (nat_source_files): Mention natVMChannels.cc, not
	natChannels.cc.
	* java/nio/channels/natVMChannels.cc: Renamed from
	natChannels.cc.
	* java/nio/channels/Channels.java: Removed.
	* java/nio/channels/natChannels.cc: Removed.
	* java/nio/channels/VMChannels.java: New file.

From-SVN: r113745
parent becd11a1
Showing with 41 additions and 98 deletions
libjava/ChangeLog
2006-05-13 Tom Tromey <tromey@redhat.com>
* sources.am, Makefile.in: Rebuilt.
* Makefile.am (nat_source_files): Mention natVMChannels.cc, not
natChannels.cc.
* java/nio/channels/natVMChannels.cc: Renamed from
natChannels.cc.
* java/nio/channels/Channels.java: Removed.
* java/nio/channels/natChannels.cc: Removed.
* java/nio/channels/VMChannels.java: New file.
2006-05-13 Tom Tromey <tromey@redhat.com>
* sources.am, Makefile.in: Rebuilt.
* java/text/DateFormat.java: Removed.
2006-05-13 Tom Tromey <tromey@redhat.com>
......
libjava/Makefile.am
......@@ -821,7 +821,7 @@ java/lang/reflect/natField.cc \
java/lang/reflect/natMethod.cc \
java/net/natVMNetworkInterface.cc \
java/net/natInetAddress.cc \
java/nio/channels/natChannels.cc \
java/nio/channels/natVMChannels.cc \
java/nio/natDirectByteBufferImpl.cc \
java/text/natCollator.cc \
java/util/natResourceBundle.cc \
......
libjava/Makefile.in
......@@ -277,7 +277,7 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
java/lang/reflect/natConstructor.cc \
java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \
java/net/natVMNetworkInterface.cc java/net/natInetAddress.cc \
java/nio/channels/natChannels.cc \
java/nio/channels/natVMChannels.cc \
java/nio/natDirectByteBufferImpl.cc java/text/natCollator.cc \
java/util/natResourceBundle.cc java/util/natVMTimeZone.cc \
java/util/logging/natLogger.cc java/util/zip/natDeflater.cc \
......@@ -318,7 +318,7 @@ am__objects_2 = gnu/classpath/natSystemProperties.lo \
java/lang/reflect/natConstructor.lo \
java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \
java/net/natVMNetworkInterface.lo java/net/natInetAddress.lo \
java/nio/channels/natChannels.lo \
java/nio/channels/natVMChannels.lo \
java/nio/natDirectByteBufferImpl.lo java/text/natCollator.lo \
java/util/natResourceBundle.lo java/util/natVMTimeZone.lo \
java/util/logging/natLogger.lo java/util/zip/natDeflater.lo \
......@@ -3793,7 +3793,7 @@ classpath/java/nio/channels/AsynchronousCloseException.java \
classpath/java/nio/channels/ByteChannel.java \
classpath/java/nio/channels/CancelledKeyException.java \
classpath/java/nio/channels/Channel.java \
java/nio/channels/Channels.java \
classpath/java/nio/channels/Channels.java \
classpath/java/nio/channels/ClosedByInterruptException.java \
classpath/java/nio/channels/ClosedChannelException.java \
classpath/java/nio/channels/ClosedSelectorException.java \
......@@ -3822,6 +3822,7 @@ classpath/java/nio/channels/ServerSocketChannel.java \
classpath/java/nio/channels/SocketChannel.java \
classpath/java/nio/channels/UnresolvedAddressException.java \
classpath/java/nio/channels/UnsupportedAddressTypeException.java \
java/nio/channels/VMChannels.java \
classpath/java/nio/channels/WritableByteChannel.java
java_nio_channels_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_channels_source_files)))
......@@ -6789,7 +6790,7 @@ java/lang/reflect/natField.cc \
java/lang/reflect/natMethod.cc \
java/net/natVMNetworkInterface.cc \
java/net/natInetAddress.cc \
java/nio/channels/natChannels.cc \
java/nio/channels/natVMChannels.cc \
java/nio/natDirectByteBufferImpl.cc \
java/text/natCollator.cc \
java/util/natResourceBundle.cc \
......@@ -7234,7 +7235,7 @@ java/nio/channels/$(am__dirstamp):
java/nio/channels/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) java/nio/channels/$(DEPDIR)
@: > java/nio/channels/$(DEPDIR)/$(am__dirstamp)
java/nio/channels/natChannels.lo: java/nio/channels/$(am__dirstamp) \
java/nio/channels/natVMChannels.lo: java/nio/channels/$(am__dirstamp) \
java/nio/channels/$(DEPDIR)/$(am__dirstamp)
java/nio/$(am__dirstamp):
@$(mkdir_p) java/nio
......@@ -7541,8 +7542,8 @@ mostlyclean-compile:
-rm -f java/net/natInetAddress.lo
-rm -f java/net/natVMNetworkInterface.$(OBJEXT)
-rm -f java/net/natVMNetworkInterface.lo
-rm -f java/nio/channels/natChannels.$(OBJEXT)
-rm -f java/nio/channels/natChannels.lo
-rm -f java/nio/channels/natVMChannels.$(OBJEXT)
-rm -f java/nio/channels/natVMChannels.lo
-rm -f java/nio/natDirectByteBufferImpl.$(OBJEXT)
-rm -f java/nio/natDirectByteBufferImpl.lo
-rm -f java/text/natCollator.$(OBJEXT)
......@@ -7658,7 +7659,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natInetAddress.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMNetworkInterface.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/nio/$(DEPDIR)/natDirectByteBufferImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natChannels.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natVMChannels.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/text/$(DEPDIR)/natCollator.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natResourceBundle.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natVMTimeZone.Plo@am__quote@
......
libjava/java/nio/channels/Channels.java → libjava/java/nio/channels/VMChannels.java
/* Channels.java --
Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
/* VMChannels.java --
Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
......@@ -40,39 +40,33 @@ package java.nio.channels;
import gnu.java.nio.ChannelInputStream;
import gnu.java.nio.ChannelOutputStream;
import gnu.java.nio.ChannelReader;
import gnu.java.nio.InputStreamChannel;
import gnu.java.nio.OutputStreamChannel;
import gnu.java.nio.channels.FileChannelImpl;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
/**
* @since 1.4
*/
public final class Channels
final class VMChannels
{
/**
* This class isn't intended to be instantiated.
*/
private Channels()
private VMChannels()
{
// Do nothing here.
}
static native FileInputStream newInputStream(FileChannelImpl ch);
static native FileOutputStream newOutputStream(FileChannelImpl ch);
/**
* Constructs a stream that reads bytes from the given channel.
*/
public static InputStream newInputStream(ReadableByteChannel ch)
static InputStream newInputStream(ReadableByteChannel ch)
{
if (ch instanceof FileChannelImpl)
return newInputStream((FileChannelImpl) ch);
......@@ -82,75 +76,10 @@ public final class Channels
/**
* Constructs a stream that writes bytes to the given channel.
*/
public static OutputStream newOutputStream(WritableByteChannel ch)
static OutputStream newOutputStream(WritableByteChannel ch)
{
if (ch instanceof FileChannelImpl)
return newOutputStream((FileChannelImpl) ch);
return new ChannelOutputStream(ch);
}
static native FileInputStream newInputStream(FileChannelImpl ch);
static native FileOutputStream newOutputStream(FileChannelImpl ch);
/**
* Constructs a channel that reads bytes from the given stream.
*/
public static ReadableByteChannel newChannel(InputStream in)
{
return new InputStreamChannel(in);
}
/**
* Constructs a channel that writes bytes to the given stream.
*/
public static WritableByteChannel newChannel(OutputStream out)
{
return new OutputStreamChannel(out);
}
/**
* Constructs a reader that decodes bytes from the given channel using the
* given decoder.
*/
public static Reader newReader(ReadableByteChannel ch, CharsetDecoder dec,
int minBufferCap)
{
return new ChannelReader(ch, dec, minBufferCap);
}
/**
* Constructs a reader that decodes bytes from the given channel according to
* the named charset.
*
* @exception UnsupportedCharsetException If no support for the named charset
* is available in this instance of the Java virtual machine.
*/
public static Reader newReader(ReadableByteChannel ch, String csName)
{
return newReader(ch, Charset.forName(csName).newDecoder(), -1);
}
/**
* Constructs a writer that encodes characters using the given encoder and
* writes the resulting bytes to the given channel.
*/
public static Writer newWriter(WritableByteChannel ch, CharsetEncoder enc,
int minBufferCap)
{
// FIXME: implement java.nio.channels.Channel.newWriter(WritableByteChannel, CharsetEncoder, int)
throw new Error("not implemented");
}
/**
* Constructs a writer that encodes characters according to the named charset
* and writes the resulting bytes to the given channel.
*
* @exception UnsupportedCharsetException If no support for the named charset
* is available in this instance of the Java virtual machine.
*/
public static Writer newWriter(WritableByteChannel ch, String csName)
{
return newWriter(ch, Charset.forName(csName).newEncoder(), -1);
}
}
libjava/java/nio/channels/natChannels.cc → libjava/java/nio/channels/natVMChannels.cc
// natChannels.cc - Native part of Channels class.
// natVMChannels.cc - Native part of VMChannels class.
/* Copyright (C) 2004 Free Software Foundation
/* Copyright (C) 2004, 2006 Free Software Foundation
This file is part of libgcj.
......@@ -11,25 +11,26 @@ details. */
#include <config.h>
#include <gcj/cni.h>
#include <java/nio/channels/VMChannels.h>
#include <java/nio/channels/Channels.h>
#include <java/io/FileInputStream.h>
#include <java/io/FileOutputStream.h>
#include <gnu/java/nio/channels/FileChannelImpl.h>
using java::nio::channels::Channels;
using java::nio::channels::VMChannels;
using java::io::FileInputStream;
using java::io::FileOutputStream;
using gnu::java::nio::channels::FileChannelImpl;
FileInputStream*
Channels::newInputStream(FileChannelImpl* ch)
VMChannels::newInputStream(FileChannelImpl* ch)
{
// Needs to be native to bypass Java access protection.
return new FileInputStream (ch);
}
FileOutputStream*
Channels::newOutputStream(FileChannelImpl* ch)
VMChannels::newOutputStream(FileChannelImpl* ch)
{
// Needs to be native to bypass Java access protection.
return new FileOutputStream (ch);
......
libjava/sources.am
......@@ -4491,7 +4491,7 @@ classpath/java/nio/channels/AsynchronousCloseException.java \
classpath/java/nio/channels/ByteChannel.java \
classpath/java/nio/channels/CancelledKeyException.java \
classpath/java/nio/channels/Channel.java \
java/nio/channels/Channels.java \
classpath/java/nio/channels/Channels.java \
classpath/java/nio/channels/ClosedByInterruptException.java \
classpath/java/nio/channels/ClosedChannelException.java \
classpath/java/nio/channels/ClosedSelectorException.java \
......@@ -4520,6 +4520,7 @@ classpath/java/nio/channels/ServerSocketChannel.java \
classpath/java/nio/channels/SocketChannel.java \
classpath/java/nio/channels/UnresolvedAddressException.java \
classpath/java/nio/channels/UnsupportedAddressTypeException.java \
java/nio/channels/VMChannels.java \
classpath/java/nio/channels/WritableByteChannel.java
java_nio_channels_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_channels_source_files)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment