2003-08-01 Sascha Brawer <brawer@dandelis.ch>

	* javax/swing/border/BevelBorder.java,
	javax/swing/border/EtchedBorder.java,
	javax/swing/border/LineBorder.java,
	javax/swing/border/MatteBorder.java,
	javax/swing/border/SoftBevelBorder.java,
	javax/swing/plaf/BorderUIResource.java,
	javax/swing/plaf/ComponentUI.java,
	javax/swing/plaf/TreeUI.java,
	javax/swing/plaf/basic/BasicBorders.java,
	javax/swing/plaf/basic/BasicGraphicsUtils.java,
	javax/swing/plaf/basic/BasicTreeUI.java:
	Prepend "doc-files" to all paths to embedded Javadoc images, so
	that the generated documentation contains the correct URL.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70063 138bc75d-0d04-0410-961f-82ee72b054a4

12 files changed, 99 insertions, 76 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 438e84ff0a4..39f8318d875 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,19 @@
+2003-08-01  Sascha Brawer  <brawer@dandelis.ch>
+
+	* javax/swing/border/BevelBorder.java,
+	javax/swing/border/EtchedBorder.java,
+	javax/swing/border/LineBorder.java,
+	javax/swing/border/MatteBorder.java,
+	javax/swing/border/SoftBevelBorder.java,
+	javax/swing/plaf/BorderUIResource.java,
+	javax/swing/plaf/ComponentUI.java,
+	javax/swing/plaf/TreeUI.java,
+	javax/swing/plaf/basic/BasicBorders.java,
+	javax/swing/plaf/basic/BasicGraphicsUtils.java,
+	javax/swing/plaf/basic/BasicTreeUI.java:
+	Prepend "doc-files" to all paths to embedded Javadoc images, so
+	that the generated documentation contains the correct URL.
+
 2003-08-01  Tom Tromey  <tromey@redhat.com>
 
 	* configure: Rebuilt.
diff --git a/libjava/javax/swing/border/BevelBorder.java b/libjava/javax/swing/border/BevelBorder.java
index 87bf04a0c61..dd5a52b0184 100644
--- a/libjava/javax/swing/border/BevelBorder.java
+++ b/libjava/javax/swing/border/BevelBorder.java
@@ -125,7 +125,7 @@ public class BevelBorder
    * constructed by this method will automatically reflect a change
    * to the component&#x2019;s background color.
    *
-   * <p><img src="BevelBorder-1.png" width="500" height="150"
+   * <p><img src="doc-files/BevelBorder-1.png" width="500" height="150"
    * alt="[An illustration showing raised and lowered BevelBorders]" />
    *
    * @param bevelType the desired appearance of the border. The value
@@ -147,7 +147,7 @@ public class BevelBorder
    * Constructs a BevelBorder given its appearance type and two colors
    * for its highlight and shadow.
    *
-   * <p><img src="BevelBorder-2.png" width="500" height="150"
+   * <p><img src="doc-files/BevelBorder-2.png" width="500" height="150"
    * alt="[An illustration showing BevelBorders that were constructed
    * with this method]" />
    *
@@ -188,7 +188,7 @@ public class BevelBorder
    * Constructs a BevelBorder given its appearance type and all
    * colors.
    *
-   * <p><img src="BevelBorder-3.png" width="500" height="150"
+   * <p><img src="doc-files/BevelBorder-3.png" width="500" height="150"
    * alt="[An illustration showing BevelBorders that were constructed
    * with this method]" />
    *
diff --git a/libjava/javax/swing/border/EtchedBorder.java b/libjava/javax/swing/border/EtchedBorder.java
index bb16ae925b1..859e5f832fd 100644
--- a/libjava/javax/swing/border/EtchedBorder.java
+++ b/libjava/javax/swing/border/EtchedBorder.java
@@ -51,7 +51,7 @@ import java.awt.Insets;
  * explicitly specify the border colors, or to let the colors derive
  * from the background color of the enclosed Component.
  *
- * <p><img src="EtchedBorder-1.png" width="500" height="200"
+ * <p><img src="doc-files/EtchedBorder-1.png" width="500" height="200"
  * alt="[An illustration of the two EtchedBorder variants]" />
  *
  * @author Sascha Brawer (brawer@dandelis.ch)
@@ -119,7 +119,7 @@ public class EtchedBorder
    * colors will be derived from the background color of the enclosed
    * Component when the border gets painted.
    *
-   * <p><img src="EtchedBorder-1.png" width="500" height="200"
+   * <p><img src="doc-files/EtchedBorder-1.png" width="500" height="200"
    * alt="[An illustration of the two EtchedBorder variants]" />
    *
    * @param etchType the desired appearance of the border. The value
@@ -165,7 +165,7 @@ public class EtchedBorder
    * explicitly selecting the colors that will be used for
    * highlight and shadow.
    *
-   * <p><img src="EtchedBorder-2.png" width="500" height="200"
+   * <p><img src="doc-files/EtchedBorder-2.png" width="500" height="200"
    * alt="[An illustration that shows which pixels get painted
    * in what color]" />
    *
diff --git a/libjava/javax/swing/border/LineBorder.java b/libjava/javax/swing/border/LineBorder.java
index 3c85c29dfdb..bf42309a27b 100644
--- a/libjava/javax/swing/border/LineBorder.java
+++ b/libjava/javax/swing/border/LineBorder.java
@@ -128,7 +128,7 @@ public class LineBorder
    * Constructs a LineBorder given its color, thickness, and whether
    * it has rounded corners.
    * 
-   * <p><img src="LineBorder-1.png" width="500" height="200"
+   * <p><img src="doc-files/LineBorder-1.png" width="500" height="200"
    * alt="[An illustration of two LineBorders] />
    *
    * <p>Note that the enlarged view in the right-hand picture shows
diff --git a/libjava/javax/swing/border/MatteBorder.java b/libjava/javax/swing/border/MatteBorder.java
index 1cc66f70a1f..e7b0f62e465 100644
--- a/libjava/javax/swing/border/MatteBorder.java
+++ b/libjava/javax/swing/border/MatteBorder.java
@@ -49,7 +49,7 @@ import javax.swing.Icon;
  * A border that is filled with either a solid color or with repeated
  * icon tiles.
  *
- * <p><img src="MatteBorder-1.png" width="500" height="150"
+ * <p><img src="doc-files/MatteBorder-1.png" width="500" height="150"
  * alt="[Two MatteBorders]" />
  *
  * @author Sascha Brawer (brawer@dandelis.ch)
@@ -88,7 +88,7 @@ public class MatteBorder
    * Constructs a MatteBorder given the width on each side
    * and a fill color.
    *
-   * <p><img src="MatteBorder-2.png" width="500" height="150"
+   * <p><img src="doc-files/MatteBorder-2.png" width="500" height="150"
    * alt="[A picture of a MatteBorder made by this constructor]" />
    *
    * @param top the width of the border at its top edge.
@@ -112,7 +112,7 @@ public class MatteBorder
   /**
    * Constructs a MatteBorder given its insets and fill color.
    *
-   * <p><img src="MatteBorder-3.png" width="500" height="150"
+   * <p><img src="doc-files/MatteBorder-3.png" width="500" height="150"
    * alt="[A picture of a MatteBorder made by this constructor]" />
    *
    * @param borderInsets an Insets object whose <code>top</code>,
@@ -134,7 +134,7 @@ public class MatteBorder
    * Constructs a MatteBorder given the width on each side
    * and an icon for tiling the border area.
    *
-   * <p><img src="MatteBorder-4.png" width="500" height="150"
+   * <p><img src="doc-files/MatteBorder-4.png" width="500" height="150"
    * alt="[A picture of a MatteBorder made by this constructor]" />
    *
    * @param top the width of the border at its top edge.
@@ -159,7 +159,7 @@ public class MatteBorder
    * Constructs a MatteBorder given its insets and an icon
    * for tiling the border area.
    *
-   * <p><img src="MatteBorder-5.png" width="500" height="150"
+   * <p><img src="doc-files/MatteBorder-5.png" width="500" height="150"
    * alt="[A picture of a MatteBorder made by this constructor]" />
    *
    * @param borderInsets an Insets object whose <code>top</code>,
@@ -183,7 +183,7 @@ public class MatteBorder
    * at the left and right edge, the icon height for the top and
    * bottom edge.
    *
-   * <p><img src="MatteBorder-6.png" width="500" height="150"
+   * <p><img src="doc-files/MatteBorder-6.png" width="500" height="150"
    * alt="[A picture of a MatteBorder made by this constructor]" />
    *
    * @param tileIcon an icon for tiling the border area.
diff --git a/libjava/javax/swing/border/SoftBevelBorder.java b/libjava/javax/swing/border/SoftBevelBorder.java
index c08fb00d259..341954c3c9f 100644
--- a/libjava/javax/swing/border/SoftBevelBorder.java
+++ b/libjava/javax/swing/border/SoftBevelBorder.java
@@ -74,7 +74,7 @@ public class SoftBevelBorder
    * constructed by this method will automatically reflect a change
    * to the component&#x2019;s background color.
    *
-   * <p><img src="SoftBevelBorder-1.png" width="500" height="200"
+   * <p><img src="doc-files/SoftBevelBorder-1.png" width="500" height="200"
    * alt="[An illustration showing raised and lowered SoftBevelBorders]" />
    *
    * @param bevelType the desired appearance of the border. The value
@@ -94,7 +94,7 @@ public class SoftBevelBorder
    * Constructs a SoftBevelBorder given its appearance type and two
    * colors for its highlight and shadow.
    *
-   * <p><img src="SoftBevelBorder-2.png" width="500" height="150"
+   * <p><img src="doc-files/SoftBevelBorder-2.png" width="500" height="150"
    * alt="[An illustration showing SoftBevelBorders that were
    * constructed with this method]" />
    *
@@ -136,7 +136,7 @@ public class SoftBevelBorder
    * Constructs a SoftBevelBorder given its appearance type and all
    * colors.
    *
-   * <p><img src="SoftBevelBorder-3.png" width="500" height="150"
+   * <p><img src="doc-files/SoftBevelBorder-3.png" width="500" height="150"
    * alt="[An illustration showing SoftBevelBorders that were
    * constructed with this method]" />
    *
diff --git a/libjava/javax/swing/plaf/BorderUIResource.java b/libjava/javax/swing/plaf/BorderUIResource.java
index aebb1a03fe3..a3f0db026fd 100644
--- a/libjava/javax/swing/plaf/BorderUIResource.java
+++ b/libjava/javax/swing/plaf/BorderUIResource.java
@@ -277,7 +277,8 @@ public class BorderUIResource
      * constructed by this method will automatically reflect a change
      * to the component&#x2019;s background color.
      *
-     * <p><img src="../border/BevelBorder-1.png" width="500" height="150"
+     * <p><img src="../border/doc-files/BevelBorder-1.png"
+     * width="500" height="150"
      * alt="[An illustration showing raised and lowered BevelBorders]" />
      *
      * @param bevelType the desired appearance of the border. The value
@@ -297,9 +298,9 @@ public class BorderUIResource
      * Constructs a BevelBorderUIResource given its appearance type
      * and two colors for its highlight and shadow.
      *
-     * <p><img src="../border/BevelBorder-2.png" width="500" height="150"
-     * alt="[An illustration showing BevelBorders that were constructed
-     * with this method]" />
+     * <p><img src="../border/doc-files/BevelBorder-2.png" width="500"
+     * height="150" alt="[An illustration showing BevelBorders that were
+     * constructed with this method]" />
      *
      * @param bevelType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.BevelBorder#RAISED}
@@ -337,9 +338,9 @@ public class BorderUIResource
      * Constructs a BevelBorderUIResource given its appearance type
      * and all its colors.
      *
-     * <p><img src="../border/BevelBorder-3.png" width="500" height="150"
-     * alt="[An illustration showing BevelBorders that were constructed
-     * with this method]" />
+     * <p><img src="../border/doc-files/BevelBorder-3.png" width="500"
+     * height="150" alt="[An illustration showing BevelBorders that
+     * were constructed with this method]" />
      *
      * @param bevelType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.BevelBorder#RAISED}
@@ -429,7 +430,8 @@ public class BorderUIResource
    * always install borders that implement <code>UIResource</code>,
    * such as the borders provided by this class.
    *
-   * <p><img src="../border/EmptyBorder-1.png" width="290" height="200"
+   * <p><img src="../border/doc-files/EmptyBorder-1.png"
+   * width="290" height="200"
    * alt="[An illustration of EmptyBorder]" />
    *
    * @author Brian Jones (cbj@gnu.org)
@@ -483,8 +485,9 @@ public class BorderUIResource
    * always install borders that implement <code>UIResource</code>,
    * such as the borders provided by this class.
    *
-   * <p><img src="../border/EtchedBorder-1.png" width="500" height="200"
-   * alt="[An illustration of the two EtchedBorder variants]" />
+   * <p><img src="../border/doc-files/EtchedBorder-1.png" width="500"
+   * height="200" alt="[An illustration of the two EtchedBorder
+   * variants]" />
    *
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -509,8 +512,9 @@ public class BorderUIResource
      * appearance. The colors will be derived from the background
      * color of the enclosed Component when the border gets painted.
      *
-     * <p><img src="../border/EtchedBorder-1.png" width="500" height="200"
-     * alt="[An illustration of the two EtchedBorder variants]" />
+     * <p><img src="../border/doc-files/EtchedBorder-1.png"
+     * width="500" height="200" alt="[An illustration of the two
+     * EtchedBorder variants]" />
      *
      * @param etchType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.EtchedBorder#RAISED}
@@ -549,7 +553,7 @@ public class BorderUIResource
      * appearance, explicitly selecting the colors that will be used
      * for highlight and shadow.
      *
-     * <p><img src="../border/EtchedBorder-2.png" width="500"
+     * <p><img src="../border/doc-files/EtchedBorder-2.png" width="500"
      * height="200" alt="[An illustration that shows which pixels get
      * painted in what color]" />
      *
@@ -583,8 +587,8 @@ public class BorderUIResource
    * always install borders that implement <code>UIResource</code>,
    * such as the borders provided by this class.
    *
-   * <p><img src="../border/LineBorder-1.png" width="500" height="200"
-   * alt="[An illustration of two LineBorders] />
+   * <p><img src="../border/doc-files/LineBorder-1.png" width="500"
+   * height="200" alt="[An illustration of two LineBorders] />
    *
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -638,8 +642,8 @@ public class BorderUIResource
    * always install borders that implement <code>UIResource</code>,
    * such as the borders provided by this class.
    *
-   * <p><img src="../border/MatteBorder-1.png" width="500" height="150"
-   * alt="[An illustration of two MatteBorders] />
+   * <p><img src="../border/doc-files/MatteBorder-1.png" width="500"
+   * height="150" alt="[An illustration of two MatteBorders] />
    *
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -652,8 +656,9 @@ public class BorderUIResource
      * Constructs a MatteBorderUIResource given the width on each side
      * and a fill color.
      *
-     * <p><img src="../border/MatteBorder-2.png" width="500" height="150"
-     * alt="[A picture of a MatteBorder made by this constructor]" />
+     * <p><img src="../border/doc-files/MatteBorder-2.png" width="500"
+     * height="150" alt="[A picture of a MatteBorder made by this
+     * constructor]" />
      *
      * @param top the width of the border at its top edge.
      * @param left the width of the border at its left edge.
@@ -673,7 +678,7 @@ public class BorderUIResource
      * Constructs a MatteBorderUIResource given the width on each side
      * and an icon for tiling the border area.
      *
-     * <p><img src="../border/MatteBorder-4.png" width="500"
+     * <p><img src="../border/doc-files/MatteBorder-4.png" width="500"
      * height="150" alt="[A picture of a MatteBorder made by this
      * constructor]" />
      *
@@ -697,10 +702,11 @@ public class BorderUIResource
      * the left and right edge, the icon height for the top and bottom
      * edge.
      *
-     * <p><img src="../border/MatteBorder-6.png" width="500" height="150"
-     * alt="[A picture of a MatteBorder made by this constructor]" />
+     * <p><img src="../border/doc-files/MatteBorder-6.png" width="500"
+     * height="150" alt="[A picture of a MatteBorder made by this
+     * constructor]" />
      *
-     * @param tileIcon an icon for tiling the border area.
+     * @param tileIcon an icon for tiling the border area. 
      */
     public MatteBorderUIResource(Icon tileIcon)
     {
diff --git a/libjava/javax/swing/plaf/ComponentUI.java b/libjava/javax/swing/plaf/ComponentUI.java
index 22c2f30fd7b..5147ebb9609 100644
--- a/libjava/javax/swing/plaf/ComponentUI.java
+++ b/libjava/javax/swing/plaf/ComponentUI.java
@@ -50,7 +50,7 @@ import javax.swing.JComponent;
  * should not need to access this class; it is internal to Swing
  * and the look-and-feel implementations.
  *
- * <p><img src="ComponentUI-1.png" width="700" height="550"
+ * <p><img src="doc-files/ComponentUI-1.png" width="700" height="550"
  * alt="[UML diagram illustrating the architecture for pluggable
  * look and feels]" />
  *
diff --git a/libjava/javax/swing/plaf/TreeUI.java b/libjava/javax/swing/plaf/TreeUI.java
index 59dca9d877f..7c441343bb2 100644
--- a/libjava/javax/swing/plaf/TreeUI.java
+++ b/libjava/javax/swing/plaf/TreeUI.java
@@ -125,7 +125,7 @@ public abstract class TreeUI
   /**
    * Finds the path that is closest to the specified position.
    *
-   * <p><img src="TreeUI-1.png" width="300" height="250"
+   * <p><img src="doc-files/TreeUI-1.png" width="300" height="250"
    * alt="[A screen shot of a JTree] />
    *
    * <p>As shown by the above illustration, the bounds of the
diff --git a/libjava/javax/swing/plaf/basic/BasicBorders.java b/libjava/javax/swing/plaf/basic/BasicBorders.java
index d59ab253322..7002d14332c 100644
--- a/libjava/javax/swing/plaf/basic/BasicBorders.java
+++ b/libjava/javax/swing/plaf/basic/BasicBorders.java
@@ -85,7 +85,7 @@ public class BasicBorders
    * <code>&#x201c;Button.light&#x201d;</code>, and
    * <code>&#x201c;Button.highlight&#x201d;</code>.
    *
-   * <p><img src="BasicBorders.ButtonBorder-1.png" width="300"
+   * <p><img src="doc-files/BasicBorders.ButtonBorder-1.png" width="300"
    * height="170" alt="[A screen shot of the returned border]" />
    *
    * @return a {@link
@@ -135,7 +135,7 @@ public class BasicBorders
    * <code>&#x201c;RadioButton.light&#x201d;</code>, and
    * <code>&#x201c;RadioButton.highlight&#x201d;</code>.
    *
-   * <p><img src="BasicBorders.RadioButtonBorder-1.png" width="300"
+   * <p><img src="doc-files/BasicBorders.RadioButtonBorder-1.png" width="300"
    * height="135" alt="[A screen shot of the returned border]" />
    *
    * @return a {@link
@@ -187,7 +187,7 @@ public class BasicBorders
    * <code>&#x201c;ToggleButton.light&#x201d;</code>, and
    * <code>&#x201c;ToggleButton.highlight&#x201d;</code>.
    *
-   * <p><img src="BasicBorders.ToggleButtonBorder-1.png" width="270"
+   * <p><img src="doc-files/BasicBorders.ToggleButtonBorder-1.png" width="270"
    * height="135" alt="[A screen shot of the returned border]" />
    *
    * @return a {@link
@@ -238,7 +238,7 @@ public class BasicBorders
    * using the keys <code>&#x201c;MenuBar.shadow&#x201d;</code> and
    * <code>&#x201c;MenuBar.highlight&#x201d;</code>.
    *
-   * <p><img src="BasicBorders.MenuBarBorder-1.png" width="500"
+   * <p><img src="doc-files/BasicBorders.MenuBarBorder-1.png" width="500"
    * height="140" alt="[A screen shot of a JMenuBar with this border]" />
    *
    * @return a {@link #MenuBarBorder}.
@@ -266,10 +266,10 @@ public class BasicBorders
    * using the keys <code>&#x201c;SplitPane.darkShadow&#x201d;</code> and
    * <code>&#x201c;SplitPane.highlight&#x201d;</code>.
    *   
-   * <p><img src="BasicBorders.SplitPaneBorder-1.png" width="520"
+   * <p><img src="doc-files/BasicBorders.SplitPaneBorder-1.png" width="520"
    * height="200" alt="[A screen shot for JSplitPane.HORIZONTAL_SPLIT]" />
    *
-   * <p><img src="BasicBorders.SplitPaneBorder-2.png" width="520"
+   * <p><img src="doc-files/BasicBorders.SplitPaneBorder-2.png" width="520"
    * height="200" alt="[A screen shot for JSplitPane.VERTICAL_SPLIT]" />
    *
    * @return a {@link #SplitPaneBorder}.
@@ -299,8 +299,9 @@ public class BasicBorders
    * <code>&#x201c;SplitPane.highlight&#x201d;</code>. The color of the
    * other two edges is the background color of the divider.
    *
-   * <p><img src="BasicBorders.SplitPaneDividerBorder-1.png" width="520"
-   * height="200" alt="[A screen shot for JSplitPane.HORIZONTAL_SPLIT]" />
+   * <p><img src="doc-files/BasicBorders.SplitPaneDividerBorder-1.png"
+   * width="520" height="200" alt= 
+   * "[A screen shot for JSplitPane.HORIZONTAL_SPLIT]" />
    *
    * @return an instance of <code>SplitPaneDividerBorder</code>, which is
    *         not a public API class of this package.
@@ -334,7 +335,7 @@ public class BasicBorders
    * <code>&#x201c;TextField.light&#x201d;</code>, and
    * <code>&#x201c;TextField.highlight&#x201d;</code>.
    *
-   * <p><img src="BasicBorders.FieldBorder-1.png" width="500"
+   * <p><img src="doc-files/BasicBorders.FieldBorder-1.png" width="500"
    * height="200" alt="[A screen shot of a border returned by
    * this method]" />
    *
@@ -364,7 +365,7 @@ public class BasicBorders
    * feels better use different borders for their progress bars, or
    * they will look really terrible.
    *
-   * <p><img src="BasicBorders-1.png" width="120" height="80"
+   * <p><img src="doc-files/BasicBorders-1.png" width="120" height="80"
    * alt="[A screen shot of a border returned by this method]" />
    */
   public static Border getProgressBarBorder()
@@ -380,7 +381,7 @@ public class BasicBorders
    * Returns a border that is composed of a raised bevel border and a
    * one-pixel thick line border.
    *
-   * <p><img src="BasicBorders-2.png" width="300" height="200"
+   * <p><img src="doc-files/BasicBorders-2.png" width="300" height="200"
    * alt="[A screen shot of a border returned by this method]" />
    *
    * <p>The colors of the border are retrieved from the
@@ -440,7 +441,7 @@ public class BasicBorders
    * A border whose appearance depends on the state of
    * the enclosed button.
    *
-   * <p><img src="BasicBorders.ButtonBorder-1.png" width="300"
+   * <p><img src="doc-files/BasicBorders.ButtonBorder-1.png" width="300"
    * height="170" alt="[A screen shot of this border]" />
    *
    * @see javax.swing.plaf.basic.BasicGraphicsUtils#drawBezel
@@ -616,7 +617,7 @@ public class BasicBorders
    * A border that makes its enclosed component appear as lowered
    * into the surface. Typically used for text fields.
    *
-   * <p><img src="BasicBorders.FieldBorder-1.png" width="500"
+   * <p><img src="doc-files/BasicBorders.FieldBorder-1.png" width="500"
    * height="200" alt="[A screen shot of this border]" />
    *
    * @see javax.swing.plaf.basic.BasicGraphicsUtils#drawEtchedRect
@@ -784,7 +785,7 @@ public class BasicBorders
    * component.  If the enclosed component has no such method,
    * this border will not occupy any space.
    *
-   * <p><img src="BasicBorders.MarginBorder-1.png" width="325"
+   * <p><img src="doc-files/BasicBorders.MarginBorder-1.png" width="325"
    * height="200" alt="[An illustration that shows how MarginBorder
    * determines its borders]" />
    *
@@ -885,7 +886,7 @@ public class BasicBorders
   /**
    * A border for drawing a separator line below JMenuBar.
    *
-   * <p><img src="BasicBorders.MenuBarBorder-1.png" width="500"
+   * <p><img src="doc-files/BasicBorders.MenuBarBorder-1.png" width="500"
    * height="140" alt="[A screen shot of a JMenuBar with this border]" />
    *
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -919,7 +920,7 @@ public class BasicBorders
      * Constructs a new MenuBarBorder for drawing a JMenuBar in
      * the Basic look and feel.
      *
-     * <p><img src="BasicBorders.MenuBarBorder-1.png" width="500"
+     * <p><img src="doc-files/BasicBorders.MenuBarBorder-1.png" width="500"
      * height="140" alt="[A screen shot of a JMenuBar with this
      * border]" />
      *
@@ -1041,7 +1042,7 @@ public class BasicBorders
   /**
    * A border for drawing radio buttons in the Basic look and feel.
    *
-   * <p><img src="BasicBorders.RadioButtonBorder-1.png" width="300"
+   * <p><img src="doc-files/BasicBorders.RadioButtonBorder-1.png" width="300"
    * height="135" alt="[A screen shot of this border]" />
    *
    * <p>Note about the screen shot: Normally, the
@@ -1285,10 +1286,10 @@ public class BasicBorders
    * in the middle of the JSplitPane has its own border class, of which
    * an instance can be obtained with {@link #getSplitPaneDividerBorder()}.
    *
-   * <p><img src="BasicBorders.SplitPaneBorder-1.png" width="520"
+   * <p><img src="doc-files/BasicBorders.SplitPaneBorder-1.png" width="520"
    * height="200" alt="[A screen shot for JSplitPane.HORIZONTAL_SPLIT]" />
    *
-   * <p><img src="BasicBorders.SplitPaneBorder-2.png" width="520"
+   * <p><img src="doc-files/BasicBorders.SplitPaneBorder-2.png" width="520"
    * height="200" alt="[A screen shot for JSplitPane.VERTICAL_SPLIT]" />
    *
    * <p>In contrast to the other borders of the Basic look and feel,
@@ -1381,10 +1382,10 @@ public class BasicBorders
     /**
      * Paints the border around a <code>JSplitPane</code>.
      *
-     * <p><img src="BasicBorders.SplitPaneBorder-1.png" width="520"
+     * <p><img src="doc-files/BasicBorders.SplitPaneBorder-1.png" width="520"
      * height="200" alt="[A screen shot for JSplitPane.HORIZONTAL_SPLIT]" />
      *
-     * <p><img src="BasicBorders.SplitPaneBorder-2.png" width="520"
+     * <p><img src="doc-files/BasicBorders.SplitPaneBorder-2.png" width="520"
      * height="200" alt="[A screen shot for JSplitPane.VERTICAL_SPLIT]" />
      *
      * @param c the <code>JSplitPane</code> whose border is to be painted.
@@ -1535,7 +1536,7 @@ public class BasicBorders
   /**
    * A border for the divider inside a JSplitPane.
    *
-   * <p><img src="BasicBorders.SplitPaneDividerBorder-1.png"
+   * <p><img src="doc-files/BasicBorders.SplitPaneDividerBorder-1.png"
    * width="520" height="200" alt="[A screen shot of this border]" />
    *
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -1575,9 +1576,9 @@ public class BasicBorders
     /**
      * Paints the border around the divider of a <code>JSplitPane</code>.
      *
-     * <p><img src="BasicBorders.SplitPaneDividerBorder-1.png" width="520"
-     * height="200" alt="[A picture that shows which pixels get painted
-     * in what color]" />
+     * <p><img src="doc-files/BasicBorders.SplitPaneDividerBorder-1.png"
+     * width="520" height="200" alt="[A picture that shows which pixels
+     * get painted in what color]" />
      *
      * @param c the <code>JSplitPane</code> whose divider&#x2019;s border
      *        is to be painted.
@@ -1687,8 +1688,8 @@ public class BasicBorders
   /**
    * A border for toggle buttons in the Basic look and feel.
    *
-   * <p><img src="BasicBorders.ToggleButtonBorder-1.png" width="270"
-   * height="135" alt="[A screen shot of this border]" />
+   * <p><img src="doc-files/BasicBorders.ToggleButtonBorder-1.png"
+   * width="270" height="135" alt="[A screen shot of this border]" />
    *
    * <p>The Sun implementation always seems to draw exactly
    * the same border, irrespective of the state of the button.
diff --git a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java
index a7b64111f53..d7b53d54f6c 100644
--- a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java
+++ b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java
@@ -78,7 +78,7 @@ public class BasicGraphicsUtils
    * Draws a rectangle that appears etched into the surface, given
    * four colors that are used for drawing.
    *
-   * <p><img src="BasicGraphicsUtils-1.png" width="360"
+   * <p><img src="doc-files/BasicGraphicsUtils-1.png" width="360"
    * height="200" alt="[An illustration that shows which pixels
    * get painted in what color]" />
    *
@@ -166,7 +166,7 @@ public class BasicGraphicsUtils
    * Draws a rectangle that appears etched into the surface, given
    * two colors that are used for drawing.
    *
-   * <p><img src="BasicGraphicsUtils-2.png" width="360"
+   * <p><img src="doc-files/BasicGraphicsUtils-2.png" width="360"
    * height="200" alt="[An illustration that shows which pixels
    * get painted in what color]" />
    *
@@ -224,7 +224,7 @@ public class BasicGraphicsUtils
    * Draws a border that is suitable for buttons of the Basic look and
    * feel.
    *
-   * <p><img src="BasicGraphicsUtils-3.png" width="500"
+   * <p><img src="doc-files/BasicGraphicsUtils-3.png" width="500"
    * height="300" alt="[An illustration that shows which pixels
    * get painted in what color]" />
    *
@@ -305,7 +305,7 @@ public class BasicGraphicsUtils
    * Draws a rectangle that appears lowered into the surface, given
    * four colors that are used for drawing.
    *
-   * <p><img src="BasicGraphicsUtils-4.png" width="360"
+   * <p><img src="doc-files/BasicGraphicsUtils-4.png" width="360"
    * height="200" alt="[An illustration that shows which pixels
    * get painted in what color]" />
    *
@@ -362,7 +362,7 @@ public class BasicGraphicsUtils
    * drawn without underlining. Drawing is performed in the current
    * color and font of <code>g</code>.
    *
-   * <p><img src="BasicGraphicsUtils-5.png" width="500"
+   * <p><img src="doc-files/BasicGraphicsUtils-5.png" width="500"
    * height="100" alt="[An illustration showing how to use the
    * method]" />
    *
@@ -413,7 +413,7 @@ public class BasicGraphicsUtils
    * at the specified index. Drawing is performed in the current color
    * and font of <code>g</code>.
    *
-   * <p><img src="BasicGraphicsUtils-5.png" width="500"
+   * <p><img src="doc-files/BasicGraphicsUtils-5.png" width="500"
    * height="100" alt="[An illustration showing how to use the
    * method]" />
    *
@@ -540,7 +540,7 @@ public class BasicGraphicsUtils
    * those pixels is the current color of the Graphics <code>g</code>.
    * Any other pixels are left unchanged.
    *
-   * <p><img src="BasicGraphicsUtils-7.png" width="360"
+   * <p><img src="doc-files/BasicGraphicsUtils-7.png" width="360"
    * height="200" alt="[An illustration that shows which pixels
    * get painted]" />
    *
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI.java b/libjava/javax/swing/plaf/basic/BasicTreeUI.java
index d9af1010ba7..0c20cb7c710 100644
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI.java
+++ b/libjava/javax/swing/plaf/basic/BasicTreeUI.java
@@ -132,7 +132,7 @@ public class BasicTreeUI
   /**
    * Finds the path that is closest to the specified position.
    *
-   * <p><img src="../TreeUI-1.png" width="300" height="250"
+   * <p><img src="../doc-files/TreeUI-1.png" width="300" height="250"
    * alt="[A screen shot of a JTree] />
    *
    * <p>As shown by the above illustration, the bounds of the