2006-07-04 Lillian Angel <langel@redhat.com>

        * javax/swing/plaf/basic/BasicOptionPaneUI.java:
        Fixed name of constant.
        (getIconWidth): Changed name of constant returned.
        (getIconHeight): Likewise.
        (paint): Likewise.
        (createSeparator): Marked as unimplemented.
        * javax/swing/plaf/basic/BasicTableUI.java
        (focusGained): Marked as unimplemented.
        (focusLost): Marked as unimplemented.
        (mouseEntered): Likewise.
        (mouseMoved): Likewise.
        (uninstallDefaults): Likewise.
        * javax/swing/plaf/basic/BasicToolBarUI.java
        (mouseClicked): Changed comment.
        (mouseEntered): Likewise.
        (mouseExited): Likewise.
        (mouseMoved): Likewise.
        (setOrientation): Implemented.
        (ToolBarFocusListener): Marked as unimplemented.
        (focusGained): Marked as unimplemented.
        (focusLost): Marked as unimplemented.

3 files changed, 30 insertions, 30 deletions

diff --git a/javax/swing/plaf/basic/BasicOptionPaneUI.java b/javax/swing/plaf/basic/BasicOptionPaneUI.java
index 9acf8210d..27bcb8c46 100644
--- a/javax/swing/plaf/basic/BasicOptionPaneUI.java
+++ b/javax/swing/plaf/basic/BasicOptionPaneUI.java
@@ -460,8 +460,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
   protected JOptionPane optionPane;
 
   /** The size of the icons. */
-  // FIXME: wrong name for a constant.
-  private static final int iconSize = 36;
+  private static final int ICON_SIZE = 36;
 
   /** The foreground color for the message area. */
   private transient Color messageForeground;
@@ -505,7 +504,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
      */
     public int getIconWidth()
     {
-      return iconSize;
+      return ICON_SIZE;
     }
 
     /**
@@ -515,7 +514,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
      */
     public int getIconHeight()
     {
-      return iconSize;
+      return ICON_SIZE;
     }
 
     /**
@@ -566,7 +565,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
 	// Should be purple.
 	g.setColor(Color.RED);
 
-	g.fillOval(0, 0, iconSize, iconSize);
+	g.fillOval(0, 0, ICON_SIZE, ICON_SIZE);
 
 	g.setColor(Color.BLACK);
 	g.drawOval(16, 6, 4, 4);
@@ -615,7 +614,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
 	Color saved = g.getColor();
 	g.setColor(Color.GREEN);
 
-	g.fillRect(0, 0, iconSize, iconSize);
+	g.fillRect(0, 0, ICON_SIZE, ICON_SIZE);
 
 	g.setColor(Color.BLACK);
 
@@ -623,7 +622,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
 	g.drawOval(14, 5, 10, 10);
 
 	g.setColor(Color.GREEN);
-	g.fillRect(0, 10, iconSize, iconSize - 10);
+	g.fillRect(0, 10, ICON_SIZE, ICON_SIZE - 10);
 
 	g.setColor(Color.BLACK);
 
@@ -640,10 +639,6 @@ public class BasicOptionPaneUI extends OptionPaneUI
       }
     };
 
-  // FIXME: Uncomment when the ImageIcons are fixed.
-
-  /*  IconUIResource warningIcon, questionIcon, infoIcon, errorIcon;*/
-
   /**
    * Creates a new BasicOptionPaneUI object.
    */
@@ -940,6 +935,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
    * @return A Container that will separate the message and button areas.
    */
   protected Container createSeparator()
+    throws NotImplementedException
   {
     // FIXME: Figure out what this method is supposed to return and where
     // this should be added to the OptionPane.
diff --git a/javax/swing/plaf/basic/BasicTableUI.java b/javax/swing/plaf/basic/BasicTableUI.java
index cdd44a711..85c6b574d 100644
--- a/javax/swing/plaf/basic/BasicTableUI.java
+++ b/javax/swing/plaf/basic/BasicTableUI.java
@@ -164,12 +164,12 @@ public class BasicTableUI extends TableUI
 
   public class FocusHandler implements FocusListener
   {
-    public void focusGained(FocusEvent e) 
+    public void focusGained(FocusEvent e) throws NotImplementedException
     {
       // TODO: Implement this properly.
     }
 
-    public void focusLost(FocusEvent e) 
+    public void focusLost(FocusEvent e) throws NotImplementedException
     {
       // TODO: Implement this properly.
     }
@@ -243,16 +243,17 @@ public class BasicTableUI extends TableUI
     }
 
     public void mouseEntered(MouseEvent e) 
+    throws NotImplementedException
     {
       // TODO: What should be done here, if anything?
     }
 
-    public void mouseExited(MouseEvent e) 
+    public void mouseExited(MouseEvent e) throws NotImplementedException
     {
       // TODO: What should be done here, if anything?
     }
 
-    public void mouseMoved(MouseEvent e) 
+    public void mouseMoved(MouseEvent e) throws NotImplementedException
     {
       // TODO: What should be done here, if anything?
     }
@@ -1167,7 +1168,7 @@ public class BasicTableUI extends TableUI
     table.addPropertyChangeListener(propertyChangeListener);
   }
 
-  protected void uninstallDefaults() 
+  protected void uninstallDefaults() throws NotImplementedException
   {
     // TODO: this method used to do the following which is not
     // quite right (at least it breaks apps that run fine with the
@@ -1187,8 +1188,7 @@ public class BasicTableUI extends TableUI
     // though. / Roman Kennke
   }
 
-  protected void uninstallKeyboardActions() 
-    throws NotImplementedException
+  protected void uninstallKeyboardActions() throws NotImplementedException
   {
     // TODO: Implement this properly.
   }
diff --git a/javax/swing/plaf/basic/BasicToolBarUI.java b/javax/swing/plaf/basic/BasicToolBarUI.java
index 8fce2f08a..a4ed0c87d 100644
--- a/javax/swing/plaf/basic/BasicToolBarUI.java
+++ b/javax/swing/plaf/basic/BasicToolBarUI.java
@@ -998,7 +998,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
      */
     public void mouseClicked(MouseEvent e)
     {
-      // Don't care.
+      // Nothing to do here.
     }
 
     /**
@@ -1020,7 +1020,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
      */
     public void mouseEntered(MouseEvent e)
     {
-      // Don't care (yet).
+      // Nothing to do here.
     }
 
     /**
@@ -1030,7 +1030,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
      */
     public void mouseExited(MouseEvent e)
     {
-      // Don't care (yet).
+      // Nothing to do here.
     }
 
     /**
@@ -1040,7 +1040,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
      */
     public void mouseMoved(MouseEvent e)
     {
-      // TODO: What should be done here, if anything?
+      // Nothing to do here.
     }
 
     /**
@@ -1203,13 +1203,17 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     }
 
     /**
-     * FIXME: Do something.
+     * Sets the orientation of the toolbar and the
+     * drag window.
      *
-     * @param o DOCUMENT ME!
+     * @param o - the new orientation of the toolbar and drag
+     * window.
      */
     public void setOrientation(int o)
     {
-      // FIXME: implement.
+      toolBar.setOrientation(o);
+      if (dragWindow != null) 
+        dragWindow.setOrientation(o);
     }
   }
 
@@ -1330,27 +1334,27 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     /**
      * Creates a new ToolBarFocusListener object.
      */
-    protected ToolBarFocusListener()
+    protected ToolBarFocusListener() throws NotImplementedException
     {
       // FIXME: implement.
     }
 
     /**
      * DOCUMENT ME!
-     *
+     * 
      * @param e DOCUMENT ME!
      */
-    public void focusGained(FocusEvent e)
+    public void focusGained(FocusEvent e) throws NotImplementedException
     {
       // FIXME: implement.
     }
 
     /**
      * DOCUMENT ME!
-     *
+     * 
      * @param e DOCUMENT ME!
      */
-    public void focusLost(FocusEvent e)
+    public void focusLost(FocusEvent e) throws NotImplementedException
     {
       // FIXME: implement.
     }