I'm checking this in.
Inspired by Wolfgang's note, I looked through the reverse japi
results a bit.
This patch fixes most of the problems in java.awt. The only ones this
does not fix are the extra getAccessibleState methods -- I believe
these should be named getAccessibleStateSet, but I am not 100% sure.
Any opinions?
For the java.awt.dnd changes, I looked and I made these classes
public. I assume this was either a mistake on my part or a bug in
some earlier japi.
Tom
2006-03-15 Tom Tromey <[EMAIL PROTECTED]>
* java/awt/image/RescaleOp.java (getRenderingHints): Now final.
* java/awt/image/LookupOp.java (filter): Now final.
(getBounds2D): Likewise.
(getPoint2D): Likewise.
(getTable): Likewise.
(getRenderingHints): Likewise.
* java/awt/image/ConvolveOp.java (filter): Now final.
(getBounds2D): Likewise.
(getKernel): Likewise.
(getPoint2D): Likewise.
(getRenderingHints): Likewise.
* java/awt/image/BandCombineOp.java (getPoint2D): Now final.
(getMatrix): Likewise.
(getBounds2D): Likewise.
(getRenderingHints): Likewise.
* java/awt/image/AffineTransformOp.java (getPoint2D): Now final.
* java/awt/Button.java (AccessibleAWTButton.serialVersionUID): Now
private.
* java/awt/dnd/DropTargetContext.java (TransferableProxy): Now
protected.
* java/awt/dnd/DropTarget.java (DropTargetAutoScroller): Now
protected.
* java/awt/MenuItem.java (AccessibleAWTMenuItem): Now protected.
Index: java/awt/Button.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Button.java,v
retrieving revision 1.24
diff -u -r1.24 Button.java
--- java/awt/Button.java 20 Sep 2005 01:05:28 -0000 1.24
+++ java/awt/Button.java 16 Mar 2006 00:46:30 -0000
@@ -98,7 +98,7 @@
protected class AccessibleAWTButton extends AccessibleAWTComponent
implements AccessibleAction, AccessibleValue
{
- public static final long serialVersionUID = -5932203980244017102L;
+ private static final long serialVersionUID = -5932203980244017102L;
protected AccessibleAWTButton()
{
Index: java/awt/MenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/MenuItem.java,v
retrieving revision 1.26
diff -u -r1.26 MenuItem.java
--- java/awt/MenuItem.java 20 Sep 2005 01:05:28 -0000 1.26
+++ java/awt/MenuItem.java 16 Mar 2006 00:46:30 -0000
@@ -111,7 +111,7 @@
private static final long serialVersionUID = -217847831945965825L;
/** Constructor */
- public AccessibleAWTMenuItem()
+ protected AccessibleAWTMenuItem()
{
super();
}
Index: java/awt/dnd/DropTarget.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/dnd/DropTarget.java,v
retrieving revision 1.11
diff -u -r1.11 DropTarget.java
--- java/awt/dnd/DropTarget.java 2 Jul 2005 20:32:26 -0000 1.11
+++ java/awt/dnd/DropTarget.java 16 Mar 2006 00:46:30 -0000
@@ -61,9 +61,7 @@
*/
private static final long serialVersionUID = -6283860791671019047L;
- /** @specnote According to the online documentation, this is
- * protected, but in reality it is public. */
- public static class DropTargetAutoScroller
+ protected static class DropTargetAutoScroller
implements ActionListener
{
private Component component;
Index: java/awt/dnd/DropTargetContext.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/dnd/DropTargetContext.java,v
retrieving revision 1.9
diff -u -r1.9 DropTargetContext.java
--- java/awt/dnd/DropTargetContext.java 2 Jul 2005 20:32:26 -0000 1.9
+++ java/awt/dnd/DropTargetContext.java 16 Mar 2006 00:46:30 -0000
@@ -54,9 +54,7 @@
{
static final long serialVersionUID = -634158968993743371L;
- /** @specnote According to the online documentation, this is
- * protected, but in reality it is public. */
- public class TransferableProxy implements Transferable
+ protected class TransferableProxy implements Transferable
{
protected boolean isLocal;
protected Transferable transferable;
Index: java/awt/image/AffineTransformOp.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/AffineTransformOp.java,v
retrieving revision 1.7
diff -u -r1.7 AffineTransformOp.java
--- java/awt/image/AffineTransformOp.java 2 Jul 2005 20:32:29 -0000
1.7
+++ java/awt/image/AffineTransformOp.java 16 Mar 2006 00:46:30 -0000
@@ -347,7 +347,7 @@
* @param dstPt destination point
* @return the location of the transformed source point.
*/
- public Point2D getPoint2D (Point2D srcPt, Point2D dstPt)
+ public final Point2D getPoint2D (Point2D srcPt, Point2D dstPt)
{
return transform.transform (srcPt, dstPt);
}
Index: java/awt/image/BandCombineOp.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/BandCombineOp.java,v
retrieving revision 1.3
diff -u -r1.3 BandCombineOp.java
--- java/awt/image/BandCombineOp.java 2 Jul 2005 20:32:29 -0000 1.3
+++ java/awt/image/BandCombineOp.java 16 Mar 2006 00:46:30 -0000
@@ -118,7 +118,7 @@
/* (non-Javadoc)
* @see java.awt.image.RasterOp#getBounds2D(java.awt.image.Raster)
*/
- public Rectangle2D getBounds2D(Raster src)
+ public final Rectangle2D getBounds2D(Raster src)
{
return src.getBounds();
}
@@ -144,7 +144,7 @@
* @see java.awt.image.RasterOp#getPoint2D(java.awt.geom.Point2D,
*java.awt.geom.Point2D)
*/
- public Point2D getPoint2D(Point2D src, Point2D dst)
+ public final Point2D getPoint2D(Point2D src, Point2D dst)
{
if (dst == null) return (Point2D)src.clone();
dst.setLocation(src);
@@ -154,13 +154,13 @@
/* (non-Javadoc)
* @see java.awt.image.RasterOp#getRenderingHints()
*/
- public RenderingHints getRenderingHints()
+ public final RenderingHints getRenderingHints()
{
return hints;
}
/** Return the matrix for this Op. */
- public float[][] getMatrix()
+ public final float[][] getMatrix()
{
return matrix;
}
Index: java/awt/image/ConvolveOp.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/ConvolveOp.java,v
retrieving revision 1.6
diff -u -r1.6 ConvolveOp.java
--- java/awt/image/ConvolveOp.java 11 Aug 2005 18:29:23 -0000 1.6
+++ java/awt/image/ConvolveOp.java 16 Mar 2006 00:46:30 -0000
@@ -110,7 +110,7 @@
* @see java.awt.image.BufferedImageOp#filter(java.awt.image.BufferedImage,
* java.awt.image.BufferedImage)
*/
- public BufferedImage filter(BufferedImage src, BufferedImage dst)
+ public final BufferedImage filter(BufferedImage src, BufferedImage dst)
{
if (src == dst)
throw new IllegalArgumentException();
@@ -163,7 +163,7 @@
/* (non-Javadoc)
* @see java.awt.image.RasterOp#getRenderingHints()
*/
- public RenderingHints getRenderingHints()
+ public final RenderingHints getRenderingHints()
{
return hints;
}
@@ -181,7 +181,7 @@
*
* @return The convolution kernel.
*/
- public Kernel getKernel()
+ public final Kernel getKernel()
{
return (Kernel) kernel.clone();
}
@@ -190,7 +190,7 @@
* @see java.awt.image.RasterOp#filter(java.awt.image.Raster,
* java.awt.image.WritableRaster)
*/
- public WritableRaster filter(Raster src, WritableRaster dest) {
+ public final WritableRaster filter(Raster src, WritableRaster dest) {
if (src == dest)
throw new IllegalArgumentException();
if (src.getWidth() < kernel.getWidth() ||
@@ -309,7 +309,7 @@
/* (non-Javadoc)
* @see
java.awt.image.BufferedImageOp#getBounds2D(java.awt.image.BufferedImage)
*/
- public Rectangle2D getBounds2D(BufferedImage src)
+ public final Rectangle2D getBounds2D(BufferedImage src)
{
return src.getRaster().getBounds();
}
@@ -330,7 +330,7 @@
* @see java.awt.image.RasterOp#getPoint2D(java.awt.geom.Point2D,
* java.awt.geom.Point2D)
*/
- public Point2D getPoint2D(Point2D src, Point2D dst)
+ public final Point2D getPoint2D(Point2D src, Point2D dst)
{
if (dst == null) return (Point2D)src.clone();
dst.setLocation(src);
Index: java/awt/image/LookupOp.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/LookupOp.java,v
retrieving revision 1.4
diff -u -r1.4 LookupOp.java
--- java/awt/image/LookupOp.java 2 Jul 2005 20:32:35 -0000 1.4
+++ java/awt/image/LookupOp.java 16 Mar 2006 00:46:30 -0000
@@ -81,7 +81,7 @@
/* (non-Javadoc)
* @see java.awt.image.BufferedImageOp#filter(java.awt.image.BufferedImage,
java.awt.image.BufferedImage)
*/
- public BufferedImage filter(BufferedImage src, BufferedImage dst)
+ public final BufferedImage filter(BufferedImage src, BufferedImage dst)
{
if (src.getColorModel() instanceof IndexColorModel)
throw new IllegalArgumentException("LookupOp.filter: IndexColorModel "
@@ -149,7 +149,7 @@
/* (non-Javadoc)
* @see
java.awt.image.BufferedImageOp#getBounds2D(java.awt.image.BufferedImage)
*/
- public Rectangle2D getBounds2D(BufferedImage src)
+ public final Rectangle2D getBounds2D(BufferedImage src)
{
return src.getRaster().getBounds();
}
@@ -173,7 +173,7 @@
* @param dst The destination point.
* @see java.awt.image.RasterOp#getPoint2D(java.awt.geom.Point2D,
java.awt.geom.Point2D)
*/
- public Point2D getPoint2D(Point2D src, Point2D dst)
+ public final Point2D getPoint2D(Point2D src, Point2D dst)
{
if (dst == null)
return (Point2D) src.clone();
@@ -183,7 +183,7 @@
}
/** Return the LookupTable for this op. */
- public LookupTable getTable()
+ public final LookupTable getTable()
{
return lut;
}
@@ -191,7 +191,7 @@
/* (non-Javadoc)
* @see java.awt.image.RasterOp#getRenderingHints()
*/
- public RenderingHints getRenderingHints()
+ public final RenderingHints getRenderingHints()
{
return hints;
}
@@ -209,7 +209,7 @@
* component but not the same as src and dest.
* @see java.awt.image.RasterOp#filter(java.awt.image.Raster,
java.awt.image.WritableRaster)
*/
- public WritableRaster filter(Raster src, WritableRaster dest)
+ public final WritableRaster filter(Raster src, WritableRaster dest)
{
if (dest == null)
// Allocate a raster if needed
@@ -236,7 +236,7 @@
/* (non-Javadoc)
* @see java.awt.image.RasterOp#getBounds2D(java.awt.image.Raster)
*/
- public Rectangle2D getBounds2D(Raster src)
+ public final Rectangle2D getBounds2D(Raster src)
{
return src.getBounds();
}
Index: java/awt/image/RescaleOp.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/RescaleOp.java,v
retrieving revision 1.5
diff -u -r1.5 RescaleOp.java
--- java/awt/image/RescaleOp.java 2 Jul 2005 20:32:36 -0000 1.5
+++ java/awt/image/RescaleOp.java 16 Mar 2006 00:46:31 -0000
@@ -93,7 +93,7 @@
/* (non-Javadoc)
* @see java.awt.image.BufferedImageOp#getRenderingHints()
*/
- public RenderingHints getRenderingHints()
+ public final RenderingHints getRenderingHints()
{
return hints;
}
