This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[Patch] doc fixes
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Wed, 22 Sep 2004 15:35:08 +0200
- Subject: [Patch] doc fixes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I just commited the attached patcht to merge it from GNU classpath.
Michael
2004-09-22 Sven de Marothy <sven@physto.se>
*java/awt/AWTEventMulticaster.java,
java/awt/Adjustable.java,
java/awt/Point.java,
java/awt/Polygon.java,
java/awt/Rectangle.java,
java/awt/Shape.java,
java/awt/geom/Area.java,
java/awt/geom/Ellipse2D.java,
java/awt/geom/PathIterator.java,
java/awt/geom/Point2D.java,
java/awt/geom/Rectangle2D.java,
java/lang/Comparable.java,
java/util/Arrays.java:
Fixed documentation errors
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFBUX+OWSOgCCdjSDsRAn70AKCRHSWI+0XK7GWeY6AbHR8zkMQ8+gCfdPX8
VQrseWKhiUEOtN3J/hVFMr0=
=NWTl
-----END PGP SIGNATURE-----
Index: java/awt/AWTEventMulticaster.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/AWTEventMulticaster.java,v
retrieving revision 1.4
diff -u -r1.4 AWTEventMulticaster.java
--- java/awt/AWTEventMulticaster.java 9 Aug 2002 04:26:13 -0000 1.4
+++ java/awt/AWTEventMulticaster.java 22 Sep 2004 13:28:27 -0000
@@ -181,7 +181,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void componentResized(ComponentEvent e)
{
@@ -193,7 +193,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void componentMoved(ComponentEvent e)
{
@@ -205,7 +205,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void componentShown(ComponentEvent e)
{
@@ -217,7 +217,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void componentHidden(ComponentEvent e)
{
@@ -229,7 +229,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void componentAdded(ContainerEvent e)
{
@@ -241,7 +241,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void componentRemoved(ContainerEvent e)
{
@@ -253,7 +253,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void focusGained(FocusEvent e)
{
@@ -265,7 +265,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void focusLost(FocusEvent e)
{
@@ -277,7 +277,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void keyTyped(KeyEvent e)
{
@@ -289,7 +289,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void keyPressed(KeyEvent e)
{
@@ -301,7 +301,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void keyReleased(KeyEvent e)
{
@@ -313,7 +313,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void mouseClicked(MouseEvent e)
{
@@ -325,7 +325,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void mousePressed(MouseEvent e)
{
@@ -337,7 +337,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void mouseReleased(MouseEvent e)
{
@@ -349,7 +349,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void mouseEntered(MouseEvent e)
{
@@ -361,7 +361,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void mouseExited(MouseEvent e)
{
@@ -373,7 +373,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void mouseDragged(MouseEvent e)
{
@@ -385,7 +385,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void mouseMoved(MouseEvent e)
{
@@ -397,7 +397,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void windowOpened(WindowEvent e)
{
@@ -409,7 +409,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void windowClosing(WindowEvent e)
{
@@ -421,7 +421,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void windowClosed(WindowEvent e)
{
@@ -433,7 +433,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void windowIconified(WindowEvent e)
{
@@ -445,7 +445,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void windowDeiconified(WindowEvent e)
{
@@ -457,7 +457,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void windowActivated(WindowEvent e)
{
@@ -469,7 +469,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void windowDeactivated(WindowEvent e)
{
@@ -481,7 +481,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
* @since 1.4
*/
public void windowStateChanged(WindowEvent e)
@@ -494,7 +494,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
* @since 1.4
*/
public void windowGainedFocus(WindowEvent e)
@@ -507,7 +507,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
* @since 1.4
*/
public void windowLostFocus(WindowEvent e)
@@ -520,7 +520,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void actionPerformed(ActionEvent e)
{
@@ -532,7 +532,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void itemStateChanged(ItemEvent e)
{
@@ -544,7 +544,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void adjustmentValueChanged(AdjustmentEvent e)
{
@@ -556,7 +556,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
*/
public void textValueChanged(TextEvent e)
{
@@ -568,7 +568,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
* @since 1.2
*/
public void inputMethodTextChanged(InputMethodEvent e)
@@ -581,7 +581,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
* @since 1.2
*/
public void caretPositionChanged(InputMethodEvent e)
@@ -594,7 +594,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
* @since 1.3
*/
public void hierarchyChanged(HierarchyEvent e)
@@ -607,7 +607,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
* @since 1.3
*/
public void ancestorMoved(HierarchyEvent e)
@@ -620,7 +620,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
* @since 1.3
*/
public void ancestorResized(HierarchyEvent e)
@@ -633,7 +633,7 @@
* Handles this event by dispatching it to the "a" and "b" listener
* instances.
*
- * @param event the event to handle
+ * @param e the event to handle
* @since 1.4
*/
public void mouseWheelMoved(MouseWheelEvent e)
Index: java/awt/Adjustable.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Adjustable.java,v
retrieving revision 1.5
diff -u -r1.5 Adjustable.java
--- java/awt/Adjustable.java 9 Aug 2002 04:26:13 -0000 1.5
+++ java/awt/Adjustable.java 22 Sep 2004 13:28:27 -0000
@@ -157,7 +157,7 @@
* Adds a listener that will receive adjustment events for this object.
*
* @param listener the adjustment listener to add
- * @see AdjustmentEvent
+ * @see java.awt.event.AdjustmentEvent
*/
void addAdjustmentListener(AdjustmentListener listener);
@@ -165,7 +165,7 @@
* Removes an adjustment listener from this object.
*
* @param listener the adjustment listener to remove
- * @see AdjustmentEvent
+ * @see java.awt.event.AdjustmentEvent
*/
void removeAdjustmentListener(AdjustmentListener listener);
} // interface Adjustable
Index: java/awt/Point.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Point.java,v
retrieving revision 1.7
diff -u -r1.7 Point.java
--- java/awt/Point.java 9 Aug 2002 04:26:14 -0000 1.7
+++ java/awt/Point.java 22 Sep 2004 13:28:27 -0000
@@ -95,7 +95,7 @@
* Initializes a new instance of <code>Point</code> with coordinates
* identical to the coordinates of the specified points.
*
- * @param point the point to copy the coordinates from
+ * @param p the point to copy the coordinates from
* @throws NullPointerException if p is null
*/
public Point(Point p)
Index: java/awt/Polygon.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Polygon.java,v
retrieving revision 1.4.2.1
diff -u -r1.4.2.1 Polygon.java
--- java/awt/Polygon.java 24 Jun 2004 05:30:16 -0000 1.4.2.1
+++ java/awt/Polygon.java 22 Sep 2004 13:28:27 -0000
@@ -684,7 +684,7 @@
* path iterator is not either.
*
* @param transform an optional transform to apply to the iterator
- * @param double the maximum distance for deviation from the real boundary
+ * @param flatness the maximum distance for deviation from the real boundary
* @return a new iterator over the boundary
* @since 1.2
*/
Index: java/awt/Rectangle.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Rectangle.java,v
retrieving revision 1.12.2.1
diff -u -r1.12.2.1 Rectangle.java
--- java/awt/Rectangle.java 14 Aug 2004 21:39:10 -0000 1.12.2.1
+++ java/awt/Rectangle.java 22 Sep 2004 13:28:27 -0000
@@ -338,7 +338,7 @@
* its upper left corner.
*
* @return the point where this rectangle is located
- * @see setLocation(Point)
+ * @see #setLocation(Point)
* @since 1.1
*/
public Point getLocation()
Index: java/awt/Shape.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Shape.java,v
retrieving revision 1.6
diff -u -r1.6 Shape.java
--- java/awt/Shape.java 9 Aug 2002 04:26:14 -0000 1.6
+++ java/awt/Shape.java 22 Sep 2004 13:28:27 -0000
@@ -57,8 +57,8 @@
* @author Aaron M. Renn <arenn@urbanophile.com>
* @see PathIterator
* @see AffineTransform
- * @see FlatteningPathIterator
- * @see GeneralPath
+ * @see java.awt.geom.FlatteningPathIterator
+ * @see java.awt.geom.GeneralPath
* @since 1.0
* @status updated to 1.4
*/
@@ -109,15 +109,15 @@
* Test if a high-precision rectangle intersects the shape. This is true
* if any point in the rectangle is in the shape, with the caveat that the
* operation may include high probability estimates when the actual
- * calculation is prohibitively expensive. The {@link Area} class can
- * be used for more precise answers.
+ * calculation is prohibitively expensive. The {@link java.awt.geom.Area}
+ * class can be used for more precise answers.
*
* @param x the x coordinate of the rectangle
* @param y the y coordinate of the rectangle
* @param w the width of the rectangle, undefined results if negative
* @param h the height of the rectangle, undefined results if negative
* @return true if the rectangle intersects this shape
- * @see Area
+ * @see java.awt.geom.Area
* @since 1.2
*/
boolean intersects(double x, double y, double w, double h);
@@ -126,8 +126,8 @@
* Test if a high-precision rectangle intersects the shape. This is true
* if any point in the rectangle is in the shape, with the caveat that the
* operation may include high probability estimates when the actual
- * calculation is prohibitively expensive. The {@link Area} class can
- * be used for more precise answers.
+ * calculation is prohibitively expensive. The {@link java.awt.geom.Area}
+ * class can be used for more precise answers.
*
* @param r the rectangle
* @return true if the rectangle intersects this shape
@@ -141,15 +141,15 @@
* Test if a high-precision rectangle lies completely in the shape. This is
* true if all points in the rectangle are in the shape, with the caveat
* that the operation may include high probability estimates when the actual
- * calculation is prohibitively expensive. The {@link Area} class can
- * be used for more precise answers.
+ * calculation is prohibitively expensive. The {@link java.awt.geom.Area}
+ * class can be used for more precise answers.
*
* @param x the x coordinate of the rectangle
* @param y the y coordinate of the rectangle
* @param w the width of the rectangle, undefined results if negative
* @param h the height of the rectangle, undefined results if negative
* @return true if the rectangle is contained in this shape
- * @see Area
+ * @see java.awt.geom.Area
* @since 1.2
*/
boolean contains(double x, double y, double w, double h);
@@ -158,8 +158,8 @@
* Test if a high-precision rectangle lies completely in the shape. This is
* true if all points in the rectangle are in the shape, with the caveat
* that the operation may include high probability estimates when the actual
- * calculation is prohibitively expensive. The {@link Area} class can
- * be used for more precise answers.
+ * calculation is prohibitively expensive. The {@link java.awt.geom.Area}
+ * class can be used for more precise answers.
*
* @param r the rectangle
* @return true if the rectangle is contained in this shape
@@ -195,7 +195,7 @@
* iterations from future changes to the boundary, and document this fact.
*
* @param transform an optional transform to apply to the iterator
- * @param double the maximum distance for deviation from the real boundary
+ * @param flatness the maximum distance for deviation from the real boundary
* @return a new iterator over the boundary
* @since 1.2
*/
Index: java/awt/geom/Area.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/geom/Area.java,v
retrieving revision 1.1.54.1
diff -u -r1.1.54.1 Area.java
--- java/awt/geom/Area.java 4 Sep 2004 00:52:17 -0000 1.1.54.1
+++ java/awt/geom/Area.java 22 Sep 2004 13:28:27 -0000
@@ -124,6 +124,10 @@
* of non-self-intersecting subpaths, and any inner paths which
* are found redundant in accordance with the Shape's winding rule
* will not be included.
+ *
+ * @param s the shape (<code>null</code> not permitted).
+ *
+ * @throws NullPointerException if <code>s</code> is <code>null</code>.
*/
public Area(Shape s)
{
@@ -261,7 +265,8 @@
/**
* Performs a subtraction operation on this Area.<BR>
- * @param area - the area to be subtracted from this area.
+ * @param area the area to be subtracted from this area.
+ * @throws NullPointerException if <code>area</code> is <code>null</code>.
*/
public void subtract(Area area)
{
@@ -357,6 +362,7 @@
/**
* Performs an intersection operation on this Area.<BR>
* @param area - the area to be intersected with this area.
+ * @throws NullPointerException if <code>area</code> is <code>null</code>.
*/
public void intersect(Area area)
{
@@ -448,6 +454,7 @@
/**
* Performs an exclusive-or operation on this Area.<BR>
* @param area - the area to be XORed with this area.
+ * @throws NullPointerException if <code>area</code> is <code>null</code>.
*/
public void exclusiveOr(Area area)
{
@@ -584,6 +591,9 @@
*/
public boolean isRectangular()
{
+ if (isEmpty())
+ return true;
+
if (holes.size() != 0 || solids.size() != 1)
return false;
@@ -663,6 +673,8 @@
/**
* Returns the bounds of this object in Rectangle format.
* Please note that this may lead to loss of precision.
+ *
+ * @return The bounds.
* @see #getBounds2D()
*/
public Rectangle getBounds()
@@ -695,11 +707,17 @@
/**
* Compares two Areas.
- *
- * @return true if the areas are equal. False otherwise.
+ *
+ * @param area the area to compare against this area (<code>null</code>
+ * permitted).
+ * @return <code>true</code> if the areas are equal, and <code>false</code>
+ * otherwise.
*/
public boolean equals(Area area)
{
+ if (area == null)
+ return false;
+
if (! getBounds2D().equals(area.getBounds2D()))
return false;
@@ -736,7 +754,9 @@
}
/**
- * Transforms this area by the AffineTransform at
+ * Transforms this area by the AffineTransform at.
+ *
+ * @param at the transform.
*/
public void transform(AffineTransform at)
{
@@ -755,8 +775,10 @@
/**
* Returns a new Area equal to this one, transformed
- * by the AffineTransform at
+ * by the AffineTransform at.
+ * @param at the transform.
* @return the transformed area
+ * @throws NullPointerException if <code>at</code> is <code>null</code>.
*/
public Area createTransformedArea(AffineTransform at)
{
@@ -768,6 +790,8 @@
/**
* Determines if the point (x,y) is contained within this Area.
*
+ * @param x the x-coordinate of the point.
+ * @param y the y-coordinate of the point.
* @return true if the point is contained, false otherwise.
*/
public boolean contains(double x, double y)
@@ -787,7 +811,10 @@
/**
* Determines if the Point2D p is contained within this Area.
*
- * @return true if the point is contained, false otherwise.
+ * @param p the point.
+ * @return <code>true</code> if the point is contained, <code>false</code>
+ * otherwise.
+ * @throws NullPointerException if <code>p</code> is <code>null</code>.
*/
public boolean contains(Point2D p)
{
@@ -801,7 +828,12 @@
*
* This method should always produce the correct results, unlike for other
* classes in geom.
- * @return true if the rectangle is considered contained
+ *
+ * @param x the x-coordinate of the rectangle.
+ * @param y the y-coordinate of the rectangle.
+ * @param w the width of the the rectangle.
+ * @param h the height of the rectangle.
+ * @return <code>true</code> if the rectangle is considered contained
*/
public boolean contains(double x, double y, double w, double h)
{
@@ -853,7 +885,7 @@
Rectangle2D r = new Rectangle2D.Double(x, y, w, h);
for (int path = 0; path < holes.size(); path++)
if (! ((Segment) holes.elementAt(path)).isSegmentOutside(r))
- return false;
+ return false;
return true;
}
@@ -864,7 +896,11 @@
*
* This method should always produce the correct results, unlike for other
* classes in geom.
- * @return true if the rectangle is considered contained
+ *
+ * @param r the rectangle.
+ * @return <code>true</code> if the rectangle is considered contained
+ *
+ * @throws NullPointerException if <code>r</code> is <code>null</code>.
*/
public boolean contains(Rectangle2D r)
{
@@ -874,7 +910,13 @@
/**
* Determines if the rectangle specified by (x,y) as the upper-left
* and with width w and height h intersects any part of this Area.
- * @return true if the rectangle intersects the area, false otherwise.
+ *
+ * @param x the x-coordinate for the rectangle.
+ * @param y the y-coordinate for the rectangle.
+ * @param w the width of the rectangle.
+ * @param h the height of the rectangle.
+ * @return <code>true</code> if the rectangle intersects the area,
+ * <code>false</code> otherwise.
*/
public boolean intersects(double x, double y, double w, double h)
{
@@ -919,7 +961,7 @@
}
// Non-intersecting, Is any point inside?
- if (contains(x, y))
+ if (contains(x + w * 0.5, y + h * 0.5))
return true;
// What if the rectangle encloses the whole shape?
@@ -932,7 +974,11 @@
/**
* Determines if the Rectangle2D specified by r intersects any
* part of this Area.
- * @return true if the rectangle intersects the area, false otherwise.
+ * @param r the rectangle to test intersection with (<code>null</code>
+ * not permitted).
+ * @return <code>true</code> if the rectangle intersects the area,
+ * <code>false</code> otherwise.
+ * @throws NullPointerException if <code>r</code> is <code>null</code>.
*/
public boolean intersects(Rectangle2D r)
{
@@ -942,24 +988,31 @@
/**
* Returns a PathIterator object defining the contour of this Area,
* transformed by at.
+ *
+ * @param at the transform.
+ * @return A path iterator.
*/
public PathIterator getPathIterator(AffineTransform at)
{
return (new AreaIterator(at));
}
- //---------------------------------------------------------------------
- // Non-public methods and classes
-
/**
* Returns a flattened PathIterator object defining the contour of this
* Area, transformed by at and with a defined flatness.
+ *
+ * @param at the transform.
+ * @param flatness the flatness.
+ * @return A path iterator.
*/
public PathIterator getPathIterator(AffineTransform at, double flatness)
{
return new FlatteningPathIterator(getPathIterator(at), flatness);
}
+ //---------------------------------------------------------------------
+ // Non-public methods and classes
+
/**
* Private pathiterator object.
*/
@@ -2515,12 +2568,13 @@
return 0;
if (y0 == 0.0)
- y0 += EPSILON;
+ y0 -= EPSILON;
if (y1 == 0.0)
- y1 += EPSILON;
+ y1 -= EPSILON;
- if (Line2D.linesIntersect(x0, y0, x1, y1, 0.0, 0.0, Double.MAX_VALUE, 0.0))
+ if (Line2D.linesIntersect(x0, y0, x1, y1,
+ EPSILON, 0.0, Double.MAX_VALUE, 0.0))
return 1;
return 0;
}
@@ -2727,9 +2781,9 @@
if ((x0 > 0.0 || x1 > 0.0 || x2 > 0.0) && (y0 * y1 <= 0 || y1 * y2 <= 0))
{
if (y0 == 0.0)
- y0 += EPSILON;
+ y0 -= EPSILON;
if (y2 == 0.0)
- y2 += EPSILON;
+ y2 -= EPSILON;
r[0] = y0;
r[1] = 2 * (y1 - y0);
@@ -3139,9 +3193,9 @@
&& (y0 * y1 <= 0 || y1 * y2 <= 0 || y2 * y3 <= 0))
{
if (y0 == 0.0)
- y0 += EPSILON;
+ y0 -= EPSILON;
if (y3 == 0.0)
- y3 += EPSILON;
+ y3 -= EPSILON;
r[0] = y0;
r[1] = 3 * (y1 - y0);
Index: java/awt/geom/Ellipse2D.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/geom/Ellipse2D.java,v
retrieving revision 1.4.46.1
diff -u -r1.4.46.1 Ellipse2D.java
--- java/awt/geom/Ellipse2D.java 4 Sep 2004 00:52:17 -0000 1.4.46.1
+++ java/awt/geom/Ellipse2D.java 22 Sep 2004 13:28:27 -0000
@@ -101,6 +101,9 @@
* Note: An ellipse cannot be represented exactly in PathIterator
* segments, the outline is thefore approximated with cubic
* Bezier segments.
+ *
+ * @param at an optional transform.
+ * @return A path iterator.
*/
public PathIterator getPathIterator(AffineTransform at)
{
@@ -139,6 +142,10 @@
return false;
}
+ /**
+ * An {@link Ellipse2D} that stores its coordinates using <code>double</code>
+ * primitives.
+ */
public static class Double extends Ellipse2D
{
/**
@@ -162,7 +169,7 @@
public double y;
/**
- * Creates a new Ellipse2D with an upper-right coordinate of (0,0)
+ * Creates a new Ellipse2D with an upper-left coordinate of (0,0)
* and a zero size.
*/
public Double()
@@ -172,11 +179,10 @@
/**
* Creates a new Ellipse2D within a given rectangle
* using double-precision coordinates.<P>
- * @param x - x coordinate of the upper-right of the bounding rectangle
- * @param y - y coordinate of the upper-right of the bounding rectangle
+ * @param x - x coordinate of the upper-left of the bounding rectangle
+ * @param y - y coordinate of the upper-left of the bounding rectangle
* @param w - width of the ellipse
* @param h - height of the ellipse
- *
*/
public Double(double x, double y, double w, double h)
{
@@ -188,6 +194,7 @@
/**
* Returns the bounding-box of the ellipse.
+ * @return The bounding box.
*/
public Rectangle2D getBounds2D()
{
@@ -196,6 +203,7 @@
/**
* Returns the height of the ellipse.
+ * @return The height of the ellipse.
*/
public double getHeight()
{
@@ -204,6 +212,7 @@
/**
* Returns the width of the ellipse.
+ * @return The width of the ellipse.
*/
public double getWidth()
{
@@ -213,6 +222,7 @@
/**
* Returns x coordinate of the upper-left corner of
* the ellipse's bounding-box.
+ * @return The x coordinate.
*/
public double getX()
{
@@ -222,6 +232,7 @@
/**
* Returns y coordinate of the upper-left corner of
* the ellipse's bounding-box.
+ * @return The y coordinate.
*/
public double getY()
{
@@ -229,7 +240,10 @@
}
/**
- * Returns true if the ellipse encloses any area.
+ * Returns <code>true</code> if the ellipse encloses no area, and
+ * <code>false</code> otherwise.
+ *
+ * @return A boolean.
*/
public boolean isEmpty()
{
@@ -239,8 +253,8 @@
/**
* Sets the geometry of the ellipse's bounding box.<P>
*
- * @param x - x coordinate of the upper-right of the bounding rectangle
- * @param y - y coordinate of the upper-right of the bounding rectangle
+ * @param x - x coordinate of the upper-left of the bounding rectangle
+ * @param y - y coordinate of the upper-left of the bounding rectangle
* @param w - width of the ellipse
* @param h - height of the ellipse
*/
@@ -253,6 +267,10 @@
}
} // class Double
+ /**
+ * An {@link Ellipse2D} that stores its coordinates using <code>float</code>
+ * primitives.
+ */
public static class Float extends Ellipse2D
{
/**
@@ -276,7 +294,7 @@
public float y;
/**
- * Creates a new Ellipse2D with an upper-right coordinate of (0,0)
+ * Creates a new Ellipse2D with an upper-left coordinate of (0,0)
* and a zero size.
*/
public Float()
@@ -286,8 +304,8 @@
/**
* Creates a new Ellipse2D within a given rectangle
* using floating-point precision.<P>
- * @param x - x coordinate of the upper-right of the bounding rectangle
- * @param y - y coordinate of the upper-right of the bounding rectangle
+ * @param x - x coordinate of the upper-left of the bounding rectangle
+ * @param y - y coordinate of the upper-left of the bounding rectangle
* @param w - width of the ellipse
* @param h - height of the ellipse
*
@@ -302,6 +320,7 @@
/**
* Returns the bounding-box of the ellipse.
+ * @return The bounding box.
*/
public Rectangle2D getBounds2D()
{
@@ -310,6 +329,7 @@
/**
* Returns the height of the ellipse.
+ * @return The height of the ellipse.
*/
public double getHeight()
{
@@ -318,6 +338,7 @@
/**
* Returns the width of the ellipse.
+ * @return The width of the ellipse.
*/
public double getWidth()
{
@@ -327,6 +348,7 @@
/**
* Returns x coordinate of the upper-left corner of
* the ellipse's bounding-box.
+ * @return The x coordinate.
*/
public double getX()
{
@@ -336,6 +358,7 @@
/**
* Returns y coordinate of the upper-left corner of
* the ellipse's bounding-box.
+ * @return The y coordinate.
*/
public double getY()
{
@@ -343,7 +366,10 @@
}
/**
- * Returns true if the ellipse encloses any area.
+ * Returns <code>true</code> if the ellipse encloses no area, and
+ * <code>false</code> otherwise.
+ *
+ * @return A boolean.
*/
public boolean isEmpty()
{
@@ -353,8 +379,8 @@
/**
* Sets the geometry of the ellipse's bounding box.<P>
*
- * @param x - x coordinate of the upper-right of the bounding rectangle
- * @param y - y coordinate of the upper-right of the bounding rectangle
+ * @param x - x coordinate of the upper-left of the bounding rectangle
+ * @param y - y coordinate of the upper-left of the bounding rectangle
* @param w - width of the ellipse
* @param h - height of the ellipse
*/
@@ -371,8 +397,8 @@
*
* Note: This leads to a loss of precision.<P>
*
- * @param x - x coordinate of the upper-right of the bounding rectangle
- * @param y - y coordinate of the upper-right of the bounding rectangle
+ * @param x - x coordinate of the upper-left of the bounding rectangle
+ * @param y - y coordinate of the upper-left of the bounding rectangle
* @param w - width of the ellipse
* @param h - height of the ellipse
*/
Index: java/awt/geom/PathIterator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/geom/PathIterator.java,v
retrieving revision 1.8
diff -u -r1.8 PathIterator.java
--- java/awt/geom/PathIterator.java 9 Jan 2004 08:58:56 -0000 1.8
+++ java/awt/geom/PathIterator.java 22 Sep 2004 13:28:27 -0000
@@ -46,8 +46,8 @@
*
* @author Tom Tromey <tromey@cygnus.com>
* @author Eric Blake <ebb9@email.byu.edu>
- * @see Shape
- * @see Stroke
+ * @see java.awt.Shape
+ * @see java.awt.Stroke
* @see FlatteningPathIterator
* @since 1.2
* @status updated to 1.4
Index: java/awt/geom/Point2D.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/geom/Point2D.java,v
retrieving revision 1.10
diff -u -r1.10 Point2D.java
--- java/awt/geom/Point2D.java 9 Aug 2002 04:26:16 -0000 1.10
+++ java/awt/geom/Point2D.java 22 Sep 2004 13:28:28 -0000
@@ -52,7 +52,7 @@
/**
* The default constructor.
*
- * @see Point
+ * @see java.awt.Point
* @see Point2D.Float
* @see Point2D.Double
*/
Index: java/awt/geom/Rectangle2D.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/geom/Rectangle2D.java,v
retrieving revision 1.8
diff -u -r1.8 Rectangle2D.java
--- java/awt/geom/Rectangle2D.java 25 Sep 2003 14:38:00 -0000 1.8
+++ java/awt/geom/Rectangle2D.java 22 Sep 2004 13:28:28 -0000
@@ -368,7 +368,7 @@
*
* @param r the rectangle to add to this rectangle
* @throws NullPointerException if r is null
- * @see #union(Rectangle2D)
+ * @see #union(Rectangle2D, Rectangle2D, Rectangle2D)
*/
public void add(Rectangle2D r)
{
Index: java/lang/Comparable.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/Comparable.java,v
retrieving revision 1.6
diff -u -r1.6 Comparable.java
--- java/lang/Comparable.java 15 Jun 2002 19:45:31 -0000 1.6
+++ java/lang/Comparable.java 22 Sep 2004 13:28:28 -0000
@@ -52,18 +52,19 @@
*
* <p>Lists, arrays, and sets of objects that implement this interface can
* be sorted automatically, without the need for an explicit
- * {@link Comparator}. Note that <code>e1.compareTo(null)</code> should
- * throw an Exception; as should comparison between incompatible classes.
+ * {@link java.util.Comparator}. Note that <code>e1.compareTo(null)</code>
+ * should throw an Exception; as should comparison between incompatible
+ * classes.
*
* @author Geoff Berry
* @author Warren Levy <warrenl@cygnus.com>
- * @see Comparator
- * @see Collections#sort(List)
- * @see Arrays#sort(Object[])
- * @see SortedSet
- * @see SortedMap
- * @see TreeSet
- * @see TreeMap
+ * @see java.util.Comparator
+ * @see java.util.Collections#sort(java.util.List)
+ * @see java.util.Arrays#sort(Object[])
+ * @see java.util.SortedSet
+ * @see java.util.SortedMap
+ * @see java.util.TreeSet
+ * @see java.util.TreeMap
* @since 1.2
* @status updated to 1.4
*/
Index: java/util/Arrays.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/Arrays.java,v
retrieving revision 1.9.14.1
diff -u -r1.9.14.1 Arrays.java
--- java/util/Arrays.java 24 Jun 2004 05:30:49 -0000 1.9.14.1
+++ java/util/Arrays.java 22 Sep 2004 13:28:28 -0000
@@ -1,5 +1,6 @@
/* Arrays.java -- Utility class with methods to operate on arrays
- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+ Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -1018,7 +1019,7 @@
/**
* Performs a recursive modified quicksort.
*
- * @param a the array to sort
+ * @param array the array to sort
* @param from the start index (inclusive)
* @param count the number of elements to sort
*/
@@ -1180,7 +1181,7 @@
/**
* Performs a recursive modified quicksort.
*
- * @param a the array to sort
+ * @param array the array to sort
* @param from the start index (inclusive)
* @param count the number of elements to sort
*/
@@ -1342,7 +1343,7 @@
/**
* Performs a recursive modified quicksort.
*
- * @param a the array to sort
+ * @param array the array to sort
* @param from the start index (inclusive)
* @param count the number of elements to sort
*/
@@ -1516,7 +1517,7 @@
/**
* Performs a recursive modified quicksort.
*
- * @param a the array to sort
+ * @param array the array to sort
* @param from the start index (inclusive)
* @param count the number of elements to sort
*/
@@ -1690,7 +1691,7 @@
/**
* Performs a recursive modified quicksort.
*
- * @param a the array to sort
+ * @param array the array to sort
* @param from the start index (inclusive)
* @param count the number of elements to sort
*/
@@ -1854,7 +1855,7 @@
/**
* Performs a recursive modified quicksort.
*
- * @param a the array to sort
+ * @param array the array to sort
* @param from the start index (inclusive)
* @param count the number of elements to sort
*/
@@ -2022,7 +2023,7 @@
/**
* Performs a recursive modified quicksort.
*
- * @param a the array to sort
+ * @param array the array to sort
* @param from the start index (inclusive)
* @param count the number of elements to sort
*/