summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog31
-rw-r--r--gnu/java/nio/FileChannelImpl.java6
-rw-r--r--java/awt/font/GraphicAttribute.java2
-rw-r--r--java/awt/font/ImageGraphicAttribute.java2
-rw-r--r--java/awt/image/DataBufferByte.java2
-rw-r--r--java/awt/image/DataBufferInt.java2
-rw-r--r--java/awt/image/DataBufferUShort.java2
-rw-r--r--java/awt/image/DirectColorModel.java4
-rw-r--r--java/awt/image/PixelGrabber.java8
-rw-r--r--java/beans/beancontext/BeanContextSupport.java2
-rw-r--r--java/io/RandomAccessFile.java2
-rw-r--r--java/net/Inet4Address.java2
-rw-r--r--java/net/Inet6Address.java2
-rw-r--r--java/nio/channels/FileChannel.java2
-rw-r--r--java/nio/channels/ServerSocketChannel.java2
15 files changed, 49 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ecb76f8b..39a5eb9d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,36 @@
2003-06-26 Michael Koch <konqueror@gmx.de>
+ * gnu/java/nio/FileChannelImpl.java
+ (write): Removed.
+ * java/awt/font/GraphicAttribute.java
+ (getAlignment): Made final.
+ * java/awt/font/ImageGraphicAttribute.java
+ (ImageGraphicAttribute): Made final.
+ * java/awt/image/DataBufferByte.java
+ (DataBufferByte): Made final.
+ * java/awt/image/DataBufferInt.java
+ (DataBufferInt): Made final.
+ * java/awt/image/DataBufferUShort.java
+ (DataBufferUShort): Made final.
+ * java/awt/image/DirectColorModel.java
+ (coerceData): Made final.
+ * java/awt/image/PixelGrabber.java
+ (status): Removed @deprecated tag.
+ * java/beans/beancontext/BeanContextSupport.java
+ (BCSIterator): Made final.
+ * java/io/RandomAccessFile.java
+ (readLine): Removed @deprecated tag.
+ * java/net/Inet4Address.java
+ (Inet4Address): Made package-private.
+ * java/net/Inet6Address.java
+ (Inet6Address): Made package-private.
+ * java/nio/channels/FileChannel.java
+ (write): Made final.
+ * java/nio/channels/ServerSocketChannel.java
+ (ServerSocketChannel): Made protected.
+
+2003-06-26 Michael Koch <konqueror@gmx.de>
+
* javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
javax/swing/event/ListDataEvent.java,
diff --git a/gnu/java/nio/FileChannelImpl.java b/gnu/java/nio/FileChannelImpl.java
index fc4db0daa..1812bddab 100644
--- a/gnu/java/nio/FileChannelImpl.java
+++ b/gnu/java/nio/FileChannelImpl.java
@@ -276,12 +276,6 @@ public class FileChannelImpl extends FileChannel
return ch.buf;
}
- public long write (ByteBuffer[] srcs)
- throws IOException
- {
- return write (srcs, 0, srcs.length);
- }
-
/**
* msync with the disk
*/
diff --git a/java/awt/font/GraphicAttribute.java b/java/awt/font/GraphicAttribute.java
index 377b8da4c..b4a92168b 100644
--- a/java/awt/font/GraphicAttribute.java
+++ b/java/awt/font/GraphicAttribute.java
@@ -63,7 +63,7 @@ public abstract class GraphicAttribute
public abstract float getAdvance ();
- public int getAlignment ()
+ public final int getAlignment ()
{
return alignment;
}
diff --git a/java/awt/font/ImageGraphicAttribute.java b/java/awt/font/ImageGraphicAttribute.java
index ca5b95fc6..9f691078d 100644
--- a/java/awt/font/ImageGraphicAttribute.java
+++ b/java/awt/font/ImageGraphicAttribute.java
@@ -45,7 +45,7 @@ import java.awt.geom.Rectangle2D;
/**
* @author Michael Koch
*/
-public class ImageGraphicAttribute extends GraphicAttribute
+public final class ImageGraphicAttribute extends GraphicAttribute
{
private Image image;
diff --git a/java/awt/image/DataBufferByte.java b/java/awt/image/DataBufferByte.java
index fe2e83bed..84df55106 100644
--- a/java/awt/image/DataBufferByte.java
+++ b/java/awt/image/DataBufferByte.java
@@ -49,7 +49,7 @@ package java.awt.image;
/**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
*/
-public class DataBufferByte extends DataBuffer
+public final class DataBufferByte extends DataBuffer
{
private byte[] data;
private byte[][] bankData;
diff --git a/java/awt/image/DataBufferInt.java b/java/awt/image/DataBufferInt.java
index 1de1f5148..54308fefd 100644
--- a/java/awt/image/DataBufferInt.java
+++ b/java/awt/image/DataBufferInt.java
@@ -49,7 +49,7 @@ package java.awt.image;
/**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
*/
-public class DataBufferInt extends DataBuffer
+public final class DataBufferInt extends DataBuffer
{
private int[] data;
private int[][] bankData;
diff --git a/java/awt/image/DataBufferUShort.java b/java/awt/image/DataBufferUShort.java
index a3743fb47..e11b4ab10 100644
--- a/java/awt/image/DataBufferUShort.java
+++ b/java/awt/image/DataBufferUShort.java
@@ -49,7 +49,7 @@ package java.awt.image;
/**
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
*/
-public class DataBufferUShort extends DataBuffer
+public final class DataBufferUShort extends DataBuffer
{
private short[] data;
private short[][] bankData;
diff --git a/java/awt/image/DirectColorModel.java b/java/awt/image/DirectColorModel.java
index b502bdf3b..9444e831f 100644
--- a/java/awt/image/DirectColorModel.java
+++ b/java/awt/image/DirectColorModel.java
@@ -376,8 +376,8 @@ public class DirectColorModel extends PackedColorModel
return Buffers.getData(buffer);
}
- public ColorModel coerceData(WritableRaster raster,
- boolean isAlphaPremultiplied)
+ public final ColorModel coerceData (WritableRaster raster,
+ boolean isAlphaPremultiplied)
{
if (this.isAlphaPremultiplied == isAlphaPremultiplied)
return this;
diff --git a/java/awt/image/PixelGrabber.java b/java/awt/image/PixelGrabber.java
index 24dd6d3fc..b94ed8fbe 100644
--- a/java/awt/image/PixelGrabber.java
+++ b/java/awt/image/PixelGrabber.java
@@ -336,8 +336,12 @@ public class PixelGrabber implements ImageConsumer
}
/**
- @deprecated by getStatus
- */
+ Get the status of the pixel grabbing representing by ImageObserver flags
+
+ @return the status
+
+ @specnote This method is not deprecated but getStatus is preferred to use
+ */
public synchronized int status()
{
return getStatus();
diff --git a/java/beans/beancontext/BeanContextSupport.java b/java/beans/beancontext/BeanContextSupport.java
index 5af299f5b..e9e26cc99 100644
--- a/java/beans/beancontext/BeanContextSupport.java
+++ b/java/beans/beancontext/BeanContextSupport.java
@@ -82,7 +82,7 @@ public class BeanContextSupport extends BeanContextChildSupport
private static final long serialVersionUID = 3289144128843950629L;
}
- protected static class BCSIterator implements Iterator
+ protected static final class BCSIterator implements Iterator
{
public boolean hasNext ()
{
diff --git a/java/io/RandomAccessFile.java b/java/io/RandomAccessFile.java
index 0ff2ff65c..edd12a0b1 100644
--- a/java/io/RandomAccessFile.java
+++ b/java/io/RandomAccessFile.java
@@ -488,8 +488,6 @@ public class RandomAccessFile implements DataOutput, DataInput
* @exception IOException If an error occurs
*
* @see DataOutput
- *
- * @deprecated
*/
public final String readLine () throws IOException
{
diff --git a/java/net/Inet4Address.java b/java/net/Inet4Address.java
index bcfc46ed8..25d296f99 100644
--- a/java/net/Inet4Address.java
+++ b/java/net/Inet4Address.java
@@ -72,7 +72,7 @@ public final class Inet4Address extends InetAddress
* @param addr The IP address
* @param host The Hostname
*/
- protected Inet4Address(byte[] addr, String host)
+ Inet4Address(byte[] addr, String host)
{
super (addr, host);
}
diff --git a/java/net/Inet6Address.java b/java/net/Inet6Address.java
index 5514f67d1..4f4563ddc 100644
--- a/java/net/Inet6Address.java
+++ b/java/net/Inet6Address.java
@@ -66,7 +66,7 @@ public final class Inet6Address extends InetAddress
* @param addr The IP address
* @param host The hostname
*/
- protected Inet6Address (byte[] addr, String host)
+ Inet6Address (byte[] addr, String host)
{
super (addr, host);
this.ipaddress = addr;
diff --git a/java/nio/channels/FileChannel.java b/java/nio/channels/FileChannel.java
index 3fa0f3584..770e08e71 100644
--- a/java/nio/channels/FileChannel.java
+++ b/java/nio/channels/FileChannel.java
@@ -112,7 +112,7 @@ public abstract class FileChannel extends AbstractInterruptibleChannel
*
* @exception IOException If an I/O error occurs.
*/
- public long write (ByteBuffer[] srcs) throws IOException
+ public final long write (ByteBuffer[] srcs) throws IOException
{
long result = 0;
diff --git a/java/nio/channels/ServerSocketChannel.java b/java/nio/channels/ServerSocketChannel.java
index 278700776..a116731c6 100644
--- a/java/nio/channels/ServerSocketChannel.java
+++ b/java/nio/channels/ServerSocketChannel.java
@@ -53,7 +53,7 @@ public abstract class ServerSocketChannel
/**
* Initializes this channel.
*/
- public ServerSocketChannel (SelectorProvider provider)
+ protected ServerSocketChannel (SelectorProvider provider)
{
super (provider);
}
View Lorry Controller Status