--- /home/cpdev/src/classpath/javax/swing/JProgressBar.java	2005-07-07 17:32:56.000000000 +0000
+++ javax/swing/JProgressBar.java	2005-06-30 05:35:09.000000000 +0000
@@ -45,7 +45,6 @@
 import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleStateSet;
 import javax.accessibility.AccessibleValue;
-import javax.swing.border.Border;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.plaf.ProgressBarUI;
@@ -88,6 +87,8 @@
   
     /**
      * Constructor AccessibleJProgressBar
+     *
+     * @param component TODO
      */
     protected AccessibleJProgressBar()
     {
@@ -198,7 +199,7 @@
    */
   public JProgressBar()
   {
-    this(HORIZONTAL, 0, 100);
+    this(0, 100, HORIZONTAL);
   }
 
   /**
@@ -206,13 +207,10 @@
    * a maximum of 100, and the given orientation.
    *
    * @param orientation The orientation of the JProgressBar.
-   * 
-   * @throws IllegalArgumentException if <code>orientation</code> is not either
-   *         {@link #HORIZONTAL} or {@link #VERTICAL}.
    */
   public JProgressBar(int orientation)
   {
-    this(orientation, 0, 100);
+    this(0, 100, orientation);
   }
 
   /**
@@ -224,7 +222,7 @@
    */
   public JProgressBar(int minimum, int maximum)
   {
-    this(HORIZONTAL, minimum, maximum);
+    this(minimum, maximum, HORIZONTAL);
   }
 
   /**
@@ -234,11 +232,8 @@
    * @param minimum The minimum of the JProgressBar.
    * @param maximum The maximum of the JProgressBar.
    * @param orientation The orientation of the JProgressBar.
-   * 
-   * @throws IllegalArgumentException if <code>orientation</code> is not either
-   *         {@link #HORIZONTAL} or {@link #VERTICAL}.
    */
-  public JProgressBar(int orientation, int minimum, int maximum)
+  public JProgressBar(int minimum, int maximum, int orientation)
   {
     model = new DefaultBoundedRangeModel(minimum, 0, minimum, maximum);
     if (orientation != HORIZONTAL && orientation != VERTICAL)
@@ -290,11 +285,9 @@
    */
   protected void paintBorder(Graphics graphics)
   {
-    Border border = getBorder();
-    if (paintBorder && border != null)
-      border.paintBorder(this, graphics, 0, 0,
-                         getWidth(),
-                         getHeight());
+    getBorder().paintBorder(this, graphics, 0, 0,
+                            getWidth(),
+                            getHeight());
   }
 
   /**