aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/nio/channels/spi/AbstractSelectableChannel.java
AgeCommit message (Collapse)AuthorFilesLines
2005-07-16Major merge with Classpath.Tom Tromey1-256/+0
Removed many duplicate files. * HACKING: Updated.x * classpath: Imported new directory. * standard.omit: New file. * Makefile.in, aclocal.m4, configure: Rebuilt. * sources.am: New file. * configure.ac: Run Classpath configure script. Moved code around to support. Disable xlib AWT peers (temporarily). * Makefile.am (SUBDIRS): Added 'classpath' (JAVAC): Removed. (AM_CPPFLAGS): Added more -I options. (BOOTCLASSPATH): Simplified. Completely redid how sources are built. Include sources.am. * include/Makefile.am (tool_include__HEADERS): Removed jni.h. * include/jni.h: Removed (in Classpath). * scripts/classes.pl: Updated to look at built classes. * scripts/makemake.tcl: New file. * testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added -I options. (gcj_jni_invocation_compile_c_to_binary): Likewise. From-SVN: r102082
2005-06-30Update FSF addressKelley Cook1-2/+2
From-SVN: r101453
2004-11-24NIOServerSocket.java: Added email to @author tag.Michael Koch1-2/+2
2004-11-24 Michael Koch <konqueror@gmx.de> * gnu/java/nio/NIOServerSocket.java: Added email to @author tag. * java/nio/DirectByteBufferImpl.java: Moved native methods to java.nio.VMDirectByteBuffer class. * java/nio/MappedByteBufferImpl.java: Use native methods from java.nio.VMDirectByteBuffer class. * java/nio/VMDirectByteBuffer.java: New file, * java/nio/natDirectByteBufferImpl.cc: Moved all methods into java.nio.VMDirectByteBuffer class. * java/nio/channels/spi/AbstractSelectableChannel.java (register): Only re-use valid keys. * Makefile.am: Added java/nio/VMDirectByteBuffer.java. * Makefile.in: Regenerated. From-SVN: r91146
2004-04-20Buffer.java, [...]: Fixed javadocs and jalopied all over java.nio.Michael Koch1-45/+81
2004-04-20 Michael Koch <konqueror@gmx.de> * java/nio/Buffer.java, java/nio/channels/AlreadyConnectedException.java, java/nio/channels/AsynchronousCloseException.java, java/nio/channels/ByteChannel.java, java/nio/channels/CancelledKeyException.java, java/nio/channels/Channel.java, java/nio/channels/Channels.java, java/nio/channels/ClosedByInterruptException.java, java/nio/channels/ClosedChannelException.java, java/nio/channels/ClosedSelectorException.java, java/nio/channels/ConnectionPendingException.java, java/nio/channels/DatagramChannel.java, java/nio/channels/FileChannel.java, java/nio/channels/FileLock.java, java/nio/channels/FileLockInterruptionException.java, java/nio/channels/GatheringByteChannel.java, java/nio/channels/IllegalBlockingModeException.java, java/nio/channels/IllegalSelectorException.java, java/nio/channels/InterruptibleChannel.java, java/nio/channels/NoConnectionPendingException.java, java/nio/channels/NonReadableChannelException.java, java/nio/channels/NonWritableChannelException.java, java/nio/channels/NotYetBoundException.java, java/nio/channels/NotYetConnectedException.java, java/nio/channels/OverlappingFileLockException.java, java/nio/channels/Pipe.java, java/nio/channels/ReadableByteChannel.java, java/nio/channels/ScatteringByteChannel.java, java/nio/channels/SelectableChannel.java, java/nio/channels/SelectionKey.java, java/nio/channels/Selector.java, java/nio/channels/ServerSocketChannel.java, java/nio/channels/SocketChannel.java, java/nio/channels/UnresolvedAddressException.java, java/nio/channels/UnsupportedAddressTypeException.java, java/nio/channels/WritableByteChannel.java, java/nio/channels/spi/AbstractInterruptibleChannel.java, java/nio/channels/spi/AbstractSelectableChannel.java, java/nio/channels/spi/AbstractSelectionKey.java, java/nio/channels/spi/AbstractSelector.java, java/nio/channels/spi/SelectorProvider.java, java/nio/charset/spi/CharsetProvider.java: Fixed javadocs and jalopied all over java.nio. From-SVN: r80909
2004-03-182004-03-18 Michael Koch <konqueror@gmx.de>Michael Koch1-11/+13
* java/nio/channels/spi/AbstractSelectableChannel.java (keys): Initialize at declaration. (locate): keys cant be null. (add): Removed. (addSelectionKey): New method. (removeSelectionKey): New method. * java/nio/channels/spi/AbstractSelectionKey.java (cancel): Call AbstractSelector.cancelKey(SelectionKey key). * java/nio/channels/spi/AbstractSelector.java (provider): Javadoc added. (cancelledKeys): Javadoc added. (cancelKey): Javadoc added, add key to cancelledKeys. (deregister): Implemented. From-SVN: r79640
2004-02-262004-02-26 Michael Koch <konqueror@gmx.de>Michael Koch1-3/+9
* gnu/java/nio/FileLockImpl.java (finalize): Made protected. * java/nio/channels/FileChannel.java (MapMode.READ_ONLY): Made final. (MapMode.READ_WRITE): Made final. (MapMode.PRIVATE): Made final. * java/nio/channels/SocketChannel.java (open): Simplified code. * java/nio/channels/spi/AbstractSelectableChannel.java (registered): Unused, removed. (keyFor): Check channel is open, only locate key and not add a new one. (register): Don't delete attachments. From-SVN: r78519
2004-01-30* gnu/java/net/PlainSocketImpl.javaMohan Embar1-3/+6
(inChannelOperation): New field. (isInChannelOperation): New accessor. (setInChannelOperation): New modifier. * gnu/java/nio/ServerSocketChannelImpl.java (accept): Set and reset our server socket's PlainSocketImpl's "in channel operation" indicator before and after delegating the accept to our server socket. * gnu/java/nio/SocketChannelImpl.java (connect): Set and reset our socket's PlainSocketImpl's "in channel operation" indicator before and after delegating the operation to our socket. (read): Likewise. (write): Likewise. * java/net/ServerSocket.java (implAccept): Don't throw an IllegalBlockingModeException if we have a non-blocking channel which initiated this accept operation. * java/net/Socket.java (connect): Don't throw an IllegalBlockingModeException if we have a non-blocking channel which initiated this connect operation. * java/nio/channels/spi/AbstractSelectableChannel.java (configureBlocking): Only call implConfigureBlocking() if the desired blocking mode is different from our current one. From-SVN: r76956
2004-01-072004-01-07 Michael Koch <konqueror@gmx.de>Michael Koch1-5/+5
* gnu/java/nio/DatagramChannelImpl.java (blocking): Removed. (DatagramChannelImpl): Call configureBlocking(). (implConfigureBlocking): Dont initialize blocking. * gnu/java/nio/ServerSocketChannelImpl.java (blocking): Removed. (ServerSocketChannelImpl): Call configureBlocking(). (implConfigureBlocking): Dont initialize blocking. * gnu/java/nio/SocketChannelImpl.java (blocking): Removed. (SocketChannelImpl): Call configureBlocking(). (implConfigureBlocking): Dont initialize blocking. (connect): Use isBlocking(). * java/nio/channels/spi/AbstractSelectableChannel.java (configureBlocking): Use blockingLock() instead of LOCK. Set blocking after successfully called implConfigureBlocking(). (register): Use blockingLock() instead of LOCK. From-SVN: r75507
2003-10-092003-10-09 Michael Koch <konqueror@gmx.de>Michael Koch1-27/+21
* java/nio/channels/spi/AbstractSelectableChannel.java (registered): Made private. (blocking): Likewise. (LOCK): Likewise. (provider): Likewise. (keys): Made it a private LinkedList. (AbstractSelectableChannel): Initialize keys. (isRegistered): New implementation. (locate): Rewritten. (register): Rewritten. * java/nio/channels/spi/AbstractSelectionKey.java (ok): Removed. (cancelled): New member variable. (cancel): Rewritten. (isValid): Rewritten. * java/nio/channels/spi/AbstractSelector.java: Some methods moved. (closed): Make private. (provider): Likewise. (cancelledKeys): New member variable. (AbstractSelector): Initialize cancelledKeys. (cancelKey): New method. From-SVN: r72275
2003-02-112003-02-11 Michael Koch <konqueror@gmx.de>Michael Koch1-3/+5
* java/nio/channels/DatagramChannel.java (write): Throws IOException. (connect): Throws IOException. (disconnect): Throws IOException. (read): Throws IOException. (receive): Throws IOException. (send): Throws IOException. * java/nio/channels/Pipe.java (open): Throws IOException. * java/nio/channels/SelectableChannel.java (configureBlocking): Throws IOException. * java/nio/channels/ServerSocketChannel.java (accept): Throws IOException. * java/nio/channels/SocketChannel.java (SocketChannel): Implements ByteChannel, ScatteringByteChannel, GatheringByteChannel. (read): Throws IOException. (write): Throws IOException. (finishConnect): Throws IOException. * java/nio/channels/spi/AbstractInterruptibleChannel.java (end): Throws AsynchronousCloseException. * java/nio/channels/spi/AbstractSelectableChannel.java (configureBlocking): Throws IOException. (implCloseChannel): Throws IOException. (implCloseSelectableChannel): Throws IOException. (implConfigureBlocking): Throws IOException. * java/nio/channels/spi/SelectorProvider.java (openDatagramChannel): Throws IOException. (openPipe): Throws IOException. (openSelector): Throws IOException. (openServerSocketChannel): Throws IOException. (openSocketChannel): Throws IOException. From-SVN: r62682
2002-11-202002-11-20 Michael Koch <konqueror@gmx.de>Michael Koch1-7/+13
* java/io/FileInputStream.java (getChannel): New method. * java/io/FileOutputStream.java (getChannel): New method. * java/net/ServerSocket.java (bind): Removed duplicate code and called another bind method instead. * java/nio/channels/SelectionKey.java (isValid): Removed wrong exception documentation. * java/nio/channels/ServerSocketChannel.java (accept): Added exception documentation. (open): Fixed typo, added exception documentation. * java/nio/channels/spi/AbstractSelectableChannel.java (implCloseChannel): Added exception documentation. (add): Reformated. (register): Added exception documentation. From-SVN: r59307
2002-11-13Buffer.java: Implemented.Michael Koch1-5/+158
2002-11-13 Michael Koch <konqueror@gmx.de> * java/nio/Buffer.java: Implemented. * java/nio/CharBuffer.java: New file. * java/nio/InvalidMarkException.java: New file. * java/nio/channels/DatagramChannel.java: Implemented. * java/nio/channels/ServerSocketChannel.java: Implemented. * java/nio/channels/SocketChannel.java: Implemented. * java/nio/channels/spi/AbstractChannel.java: Removed. * java/nio/channels/spi/AbstractSelectableChannel.java: Implemented. * java/nio/charset/Charset.java: Merge from Classpath. * java/nio/charset/CharsetDecoder.java: New file. * java/nio/charset/CharsetEncoder.java: New file. * java/nio/charset/CoderResult.java: New file. * Makefile.am (ordinary_java_source_files): Added new files. * Makefile.in: Regenerated. From-SVN: r59075
2002-11-01ByteOrder.java: New file.Michael Koch1-0/+44
2002-11-01 Michael Koch <konqueror@gmx.de> * java/nio/ByteOrder.java: New file. * java/nio/channels/DatagramChannel.java: (DatagramChannel): New constructor. * java/nio/channels/Pipe.java: New file. * java/nio/channels/SelectableChannel.java: New file. * java/nio/channels/SelectionKey.java: New file. * java/nio/channels/Selector.java: New file. * java/nio/channels/ServerSocketChannel.java (ServerSocketChannel): New constructor. * java/nio/channels/SocketChannel.java (SocketChannel): New constructor. * java/nio/channels/Pipe.java: New file. * java/nio/channels/spi/AbstractChannel.java: New file. * java/nio/channels/spi/AbstractInterruptibleChannel.java: New file. * java/nio/channels/spi/AbstractSelectableChannel.java: License added (AbstractSelectableChannel): New stubbed method. * java/nio/channels/spi/AbstractSelectionKey.java: New file. * java/nio/channels/spi/AbstractSelector.java: New file. * java/nio/channels/spi/SelectorProvider.java: New file. * java/nio/charset/Charset.java: New file. * java/nio/charset/CoderMalfunctionError.java: New file. * java/nio/charset/CodingErrorAction.java: New file. * java/nio/charset/spi/CharsetProvider.java (charsetForName): Uncommented. * Makefile.am (java_native_source_files): Added new files. * Makefile.in: Regenerated. From-SVN: r58713
2002-09-25AbstractSelectableChannel.java: New file.Michael Koch1-0/+10
2002-09-25 Michael Koch <konqueror@gmx.de> * java/nio/channels/spi/AbstractSelectableChannel.java: New file. * java/nio/channels/DatagramChannel.java: extends AbstractSelectableChannel * java/nio/channels/ServerSocketChannel.java: extends AbstractSelectableChannel * java/nio/channels/SocketChannel.java: extends AbstractSelectableChannel * Makefile.am (ordinary_java_source_files): java/nio/channels/spi/AbstractSelectableChannel.java added. * Makefile.in: Regenerated. This commit fixes the CVS build problems, Sorry for the trouble. From-SVN: r57497