classpath-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[cp-patches] FYI: javax.swing reformatting from libgcj gui branch


From: Mark Wielaard
Subject: [cp-patches] FYI: javax.swing reformatting from libgcj gui branch
Date: Fri, 30 Jul 2004 22:24:00 +0200

Hi,

This long, but boring, patch only changes the formatting of some
javax.swing classes as it is on the libgcj gui branch.

2004-07-30  Mark Wielaard  <address@hidden>

        * javax/swing/AbstractButton.java: Reformat.
        * javax/swing/ActionMap.java: Likewise.
        * javax/swing/ComponentInputMap.java: Likewise.
        * javax/swing/DefaultDesktopManager.java: Likewise.
        * javax/swing/ImageIcon.java: Likewise.
        * javax/swing/InputMap.java: Likewise.
        * javax/swing/JButton.java: Likewise.
        * javax/swing/JEditorPane.java: Likewise.
        * javax/swing/JInternalFrame.java: Likewise.
        * javax/swing/JMenu.java: Likewise.
        * javax/swing/JMenuBar.java: Likewise.
        * javax/swing/JMenuItem.java: Likewise.
        * javax/swing/JOptionPane.java: Likewise.
        * javax/swing/JPopupMenu.java: Likewise.
        * javax/swing/JRootPane.java: Likewise.
        * javax/swing/JScrollPane.java: Likewise.
        * javax/swing/JTable.java: Likewise.
        * javax/swing/JTextField.java: Likewise.
        * javax/swing/JToolBar.java: Likewise.
        * javax/swing/MenuSelectionManager.java: Likewise.
        * javax/swing/RepaintManager.java: Likewise.
        * javax/swing/ScrollPaneLayout.java: Likewise.
        * javax/swing/UIManager.java: Likewise.
        * javax/swing/ViewportLayout.java: Likewise.

Committed.

Mark
Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/AbstractButton.java,v
retrieving revision 1.16
diff -u -r1.16 AbstractButton.java
--- javax/swing/AbstractButton.java     22 Jul 2004 19:45:38 -0000      1.16
+++ javax/swing/AbstractButton.java     30 Jul 2004 20:17:29 -0000
@@ -731,10 +731,10 @@
 
     if (old != mne)
       {
-    getModel().setMnemonic(mne);
+       getModel().setMnemonic(mne);
 
        if (text != null && ! text.equals(""))
-      {
+         {
            // Since lower case char = upper case char for 
            // mnemonic, we will convert both text and mnemonic 
            // to upper case before checking if mnemonic character occurs
@@ -744,9 +744,9 @@
            setDisplayedMnemonicIndex(upperCaseText.indexOf(upperCaseMne));
          }
 
-        firePropertyChange(MNEMONIC_CHANGED_PROPERTY, old, mne);
-        revalidate();
-        repaint();
+       firePropertyChange(MNEMONIC_CHANGED_PROPERTY, old, mne);
+       revalidate();
+       repaint();
       }
   }
 
@@ -1153,9 +1153,9 @@
     if (t != old)
       {
         firePropertyChange(TEXT_CHANGED_PROPERTY, old, t);
-    revalidate();
-    repaint();
-  }
+        revalidate();
+        repaint();
+      }
   }
 
   /**
@@ -1441,7 +1441,7 @@
 
         // Set actionCommand to button's text by default if it is not specified
         if (actionCommand != null)
-        setActionCommand((String)(a.getValue(Action.ACTION_COMMAND_KEY)));
+          setActionCommand((String)(a.getValue(Action.ACTION_COMMAND_KEY)));
         else
           setActionCommand(getText());
       }
Index: javax/swing/ActionMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ActionMap.java,v
retrieving revision 1.5
diff -u -r1.5 ActionMap.java
--- javax/swing/ActionMap.java  22 Jul 2004 19:45:38 -0000      1.5
+++ javax/swing/ActionMap.java  30 Jul 2004 20:17:29 -0000
@@ -50,7 +50,7 @@
 
 
 /**
- * @author     Andrew Selkirk
+ * @author Andrew Selkirk
  * @author Michael Koch
  */
 public class ActionMap
@@ -58,154 +58,154 @@
 {
   private static final long serialVersionUID = -6277518704513986346L;
 
-       /**
-        * actionMap
-        */
-       private Map actionMap = new HashMap();
-
-       /**
-        * parent
-        */
+  /**
+   * actionMap
+   */
+  private Map actionMap = new HashMap();
+
+  /**
+   * parent
+   */
   private ActionMap parent;
 
-       /**
+  /**
    * Creates a new <code>ActionMap</code> instance.
-        */
+   */
   public ActionMap()
   {
   }
 
-       /**
+  /**
    * Returns an action associated with an object.
    *
    * @param key the key of the enty
    *
    * @return the action associated with key, may be null
-        */
+   */
   public Action get(Object key)
   {
     Object result = actionMap.get(key);
 
     if (result == null)
-                       result = parent.get(key);
+      result = parent.get(key);
 
-               return (Action) result;
+    return (Action) result;
   }
 
-       /**
+  /**
    * Puts a new <code>Action</code> into the <code>ActionMap</code>.
    * If action is null an existing entry will be removed.
    *
    * @param key the key for the entry
    * @param action the action.
-        */
+   */
   public void put(Object key, Action action)
   {
     if (action == null)
-                       actionMap.remove(key);
+      actionMap.remove(key);
     else
-                       actionMap.put(key, action);
+      actionMap.put(key, action);
   }
 
-       /**
+  /**
    * Remove an entry from the <code>ActionMap</code>.
    *
    * @param key the key of the entry to remove
-        */
+   */
   public void remove(Object key)
   {
-               actionMap.remove(key);
+    actionMap.remove(key);
   }
 
-       /**
+  /**
    * Returns the parent of this <code>ActionMap</code>.
    *
    * @return the parent, may be null.
-        */
+   */
   public ActionMap getParent()
   {
-               return parent;
+    return parent;
   }
 
-       /**
+  /**
    * Sets a parent for this <code>ActionMap</code>.
    *
    * @param parentMap the new parent
-        */
+   */
   public void setParent(ActionMap parentMap)
   {
-               parent = parentMap;
+    parent = parentMap;
   }
 
-       /**
+  /**
    * Returns the number of entries in this <code>ActionMap</code>.
    *
    * @return the number of entries
-        */
+   */
   public int size()
   {
-               return actionMap.size();
+    return actionMap.size();
   }
 
-       /**
+  /**
    * Clears the <code>ActionMap</code>.
-        */
+   */
   public void clear()
   {
-               actionMap.clear();
+    actionMap.clear();
   }
 
-       /**
+  /**
    * Returns all keys of entries in this <code>ActionMap</code>.
    *
    * @return an array of keys
-        */
+   */
   public Object[] keys()
   {
     return actionMap.keySet().toArray();
   }
 
-       /**
+  /**
    * Returns all keys of entries in this <code>ActionMap</code>
    * and all its parents.
    *
    * @return an array of keys
-        */
+   */
   public Object[] allKeys()
   {
     Set set = new HashSet();
 
     if (parent != null)
-                       set.addAll(Arrays.asList(parent.allKeys()));
+      set.addAll(Arrays.asList(parent.allKeys()));
 
     set.addAll(actionMap.keySet());
     return set.toArray();
   }
 
-       /**
-        * writeObject
+  /**
+   * writeObject
    *
    * @param stream the stream to write to
    *
    * @exception IOException If an error occurs
-        */
+   */
   private void writeObject(ObjectOutputStream stream)
     throws IOException
   {
-               // TODO
+    // TODO
   }
 
-       /**
-        * readObject
+  /**
+   * readObject
    *
    * @param stream the stream to read from
    *
    * @exception ClassNotFoundException If the serialized class cannot be found
    * @exception IOException If an error occurs
-        */
+   */
   private void readObject(ObjectInputStream stream)
     throws ClassNotFoundException, IOException
   {
-               // TODO
+    // TODO
   }
 }
Index: javax/swing/ComponentInputMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ComponentInputMap.java,v
retrieving revision 1.4
diff -u -r1.4 ComponentInputMap.java
--- javax/swing/ComponentInputMap.java  22 Jul 2004 19:45:39 -0000      1.4
+++ javax/swing/ComponentInputMap.java  30 Jul 2004 20:17:29 -0000
@@ -39,17 +39,17 @@
 
 
 /**
- * @author     Andrew Selkirk
+ * @author Andrew Selkirk
  * @author Michael Koch
  */
 public class ComponentInputMap extends InputMap
 {
-       /**
+  /**
    * The component to notify.
-        */
-       private JComponent component;
+   */
+  private JComponent component;
 
-       /**
+  /**
    * Creates <code>ComponentInputMap</code> object that notifies the given
    * component about changes to it.
    *
Index: javax/swing/DefaultDesktopManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/DefaultDesktopManager.java,v
retrieving revision 1.5
diff -u -r1.5 DefaultDesktopManager.java
--- javax/swing/DefaultDesktopManager.java      22 Jul 2004 19:45:39 -0000      
1.5
+++ javax/swing/DefaultDesktopManager.java      30 Jul 2004 20:17:29 -0000
@@ -84,7 +84,7 @@
   private transient Container pane;
 
   /**
-   * An array of Rectangles that holds the bounds of the JDesktopIcons in the 
+   * An array of Rectangles that holds the bounds of the JDesktopIcons in the
    * JDesktopPane when looking for where to place a new icon.
    */
   private transient Rectangle[] iconRects;
Index: javax/swing/ImageIcon.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ImageIcon.java,v
retrieving revision 1.8
diff -u -r1.8 ImageIcon.java
--- javax/swing/ImageIcon.java  22 Jul 2004 19:45:39 -0000      1.8
+++ javax/swing/ImageIcon.java  30 Jul 2004 20:17:29 -0000
@@ -1,4 +1,4 @@
-/* ImageIcon.java -- 
+/* ImageIcon.java --
    Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -57,7 +57,7 @@
   public ImageIcon()
   {
   }
-
+  
   public ImageIcon(String file)
   {
     this(file, file);
@@ -98,12 +98,12 @@
     this.image = Toolkit.getDefaultToolkit().createImage(image.getSource());
     this.description = description;
   }
-
+    
   public ImageObserver getImageObserver()
   {
     return observer;
   }
-
+  
   public void setImageObserver(ImageObserver newObserver)
   {
     observer = newObserver;
Index: javax/swing/InputMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/InputMap.java,v
retrieving revision 1.6
diff -u -r1.6 InputMap.java
--- javax/swing/InputMap.java   22 Jul 2004 19:45:39 -0000      1.6
+++ javax/swing/InputMap.java   30 Jul 2004 20:17:29 -0000
@@ -50,7 +50,7 @@
 
 
 /**
- * @author     Andrew Selkirk
+ * @author Andrew Selkirk
  * @author Michael Koch
  *
  * @since 1.3
@@ -60,155 +60,155 @@
 {
   private static final long serialVersionUID = -5429059542008604257L;
 
-       /**
-        * inputMap
-        */
-       private Map inputMap = new HashMap();
-
-       /**
-        * parent
-        */
+  /**
+   * inputMap
+   */
+  private Map inputMap = new HashMap();
+
+  /**
+   * parent
+   */
   private InputMap parent;
 
-       /**
+  /**
    * Creates a new <code>InputMap</code> instance.
-        */
+   */
   public InputMap()
   {
-               // TODO
+    // TODO
   }
 
-       /**
+  /**
    * Returns the binding for keystroke.
    *
    * @param key the key of the enty
    *
    * @return the binding associated with keystroke may be null
-        */
+   */
   public Object get(KeyStroke keystroke)
   {
     Object result = inputMap.get(keystroke);
 
     if (result == null)
-                       result = parent.get(keystroke);
-               return result;
+      result = parent.get(keystroke);
+    return result;
   }
 
-       /**
+  /**
    * Puts a new entry into the <code>InputMap</code>.
    * If actionMapKey is null an existing entry will be removed.
    *
    * @param keystroke the keystroke for the entry
    * @param actionMapKey the action.
-        */
+   */
   public void put(KeyStroke keystroke, Object actionMapKey)
   {
     if (actionMapKey == null)
-                       inputMap.remove(keystroke);
+      inputMap.remove(keystroke);
     else
-                       inputMap.put(keystroke, actionMapKey);
+      inputMap.put(keystroke, actionMapKey);
   }
 
-       /**
+  /**
    * Remove an entry from the <code>InputMap</code>.
    *
    * @param key the key of the entry to remove
-        */
+   */
   public void remove(KeyStroke keystroke)
   {
-               inputMap.remove(keystroke);
+    inputMap.remove(keystroke);
   }
 
-       /**
+  /**
    * Returns the parent of this <code>InputMap</code>.
    *
    * @return the parent, may be null.
-        */
+   */
   public InputMap getParent()
   {
-               return parent;
+    return parent;
   }
 
-       /**
+  /**
    * Sets a parent for this <code>InputMap</code>.
    *
    * @param parentMap the new parent
-        */
+   */
   public void setParent(InputMap parentMap)
   {
-               parent = parentMap;
+    parent = parentMap;
   }
 
-       /**
+  /**
    * Returns the number of entries in this <code>InputMap</code>.
    *
    * @return the number of entries
-        */
+   */
   public int size()
   {
-               return inputMap.size();
+    return inputMap.size();
   }
 
-       /**
+  /**
    * Clears the <code>InputMap</code>.
-        */
+   */
   public void clear()
   {
-               inputMap.clear();
+    inputMap.clear();
   }
 
-       /**
+  /**
    * Returns all keys of entries in this <code>InputMap</code>.
    *
    * @return an array of keys
-        */
+   */
   public KeyStroke[] keys()
   {
     KeyStroke[] array = new KeyStroke[size()];
     return (KeyStroke[]) inputMap.keySet().toArray(array);
   }
 
-       /**
+  /**
    * Returns all keys of entries in this <code>InputMap</code>
    * and all its parents.
    *
    * @return an array of keys
-        */
+   */
   public KeyStroke[] allKeys()
   {
     Set set = new HashSet();
 
     if (parent != null)
-                       set.addAll(Arrays.asList(parent.allKeys()));
+      set.addAll(Arrays.asList(parent.allKeys()));
 
     set.addAll(inputMap.keySet());
     KeyStroke[] array = new KeyStroke[size()];
     return (KeyStroke[]) set.toArray(array);
   }
 
-       /**
-        * writeObject
+  /**
+   * writeObject
    *
    * @param stream the stream to write to
    *
    * @exception IOException If an error occurs
-        */
+   */
   private void writeObject(ObjectOutputStream stream) throws IOException
   {
-               // TODO
+    // TODO
   }
 
-       /**
-        * readObject
+  /**
+   * readObject
    *
    * @param stream the stream to read from
    *
    * @exception ClassNotFoundException If the serialized class cannot be found
    * @exception IOException If an error occurs
-        */
+   */
   private void readObject(ObjectInputStream stream)
     throws ClassNotFoundException, IOException
   {
-               // TODO
+    // TODO
   }
 }
Index: javax/swing/JButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JButton.java,v
retrieving revision 1.10
diff -u -r1.10 JButton.java
--- javax/swing/JButton.java    22 Jul 2004 19:45:39 -0000      1.10
+++ javax/swing/JButton.java    30 Jul 2004 20:17:29 -0000
@@ -53,90 +53,90 @@
   private static final long serialVersionUID = -1907255238954382202L;
   boolean def;
   boolean is_def;
-    
-    public JButton()
-    {
-       this(null, null);
-    }
-
-    public JButton(Action a)
-    {
-       this();
-       setAction(a);
-    }
-
-    public JButton(Icon icon)
-    { 
-       this(null, icon);
-    }    
-  
-    public JButton(String text)
-    {
-       this(text, null);
-    }
-      
-    public JButton(String text, Icon icon)
-    {
-       super(text, icon);
-    }
-
-    public Object[] getSelectedObjects()
-    {
-       return null;
-    }
-  
-    protected  void configurePropertiesFromAction(Action a)
-    {
-       //Factory method which sets the AbstractButton's properties according 
to values from the Action instance. 
-       super.configurePropertiesFromAction(a);
-    }
-    
-    public AccessibleContext getAccessibleContext()
-    {
-       //Gets the AccessibleContext associated with this JButton. 
-       return null;
-    }
-  
-    public String getUIClassID()
-    {
+
+  public JButton()
+  {
+    this(null, null);
+  }
+
+  public JButton(Action a)
+  {
+    this();
+    setAction(a);
+  }
+
+  public JButton(Icon icon)
+  {
+    this(null, icon);
+  }
+
+  public JButton(String text)
+  {
+    this(text, null);
+  }
+
+  public JButton(String text, Icon icon)
+  {
+    super(text, icon);
+  }
+
+  public Object[] getSelectedObjects()
+  {
+    return null;
+  }
+
+  protected void configurePropertiesFromAction(Action a)
+  {
+    //Factory method which sets the AbstractButton's properties according to 
values from the Action instance. 
+    super.configurePropertiesFromAction(a);
+  }
+
+  public AccessibleContext getAccessibleContext()
+  {
+    //Gets the AccessibleContext associated with this JButton. 
+    return null;
+  }
+
+  public String getUIClassID()
+  {
     //Returns a string that specifies the name of the L&F class that renders 
this component.  
-       return "ButtonUI";
-    }
-  
-    public boolean isDefaultButton()
-    {
-       //Returns whether or not this button is the default button on the 
RootPane.  
-       return is_def;
-    }
-  
-    public boolean isDefaultCapable()
-    {
-       //Returns whether or not this button is capable of being the default 
button on the RootPane. 
-       return def;
-    }
-
-    protected  String paramString()
-    {
-       return "JButton";
-    }
-    
+    return "ButtonUI";
+  }
+
+  public boolean isDefaultButton()
+  {
+    //Returns whether or not this button is the default button on the 
RootPane.  
+    return is_def;
+  }
+
+  public boolean isDefaultCapable()
+  {
+    //Returns whether or not this button is capable of being the default 
button on the RootPane. 
+    return def;
+  }
+
+  protected String paramString()
+  {
+    return "JButton";
+  }
+
   /**
    * Overrides JComponent.removeNotify to check if this button is currently
    * set as the default button on the RootPane, and if so, sets the RootPane's
    * default button to null to ensure the RootPane doesn't hold onto an invalid
    * button reference.
    */
-    public void removeNotify()
-    {
-    }
-    
-    public void setDefaultCapable(boolean defaultCapable)
+  public void removeNotify()
+  {
+  }
+
+  public void setDefaultCapable(boolean defaultCapable)
   {
     def = defaultCapable;
   }
-    
-    public void updateUI()
-    {
+
+  public void updateUI()
+  {
     setUI((ButtonUI) UIManager.getUI(this));
-    }
+  }
 }
Index: javax/swing/JEditorPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JEditorPane.java,v
retrieving revision 1.11
diff -u -r1.11 JEditorPane.java
--- javax/swing/JEditorPane.java        22 Jul 2004 19:45:39 -0000      1.11
+++ javax/swing/JEditorPane.java        30 Jul 2004 20:17:29 -0000
@@ -221,7 +221,7 @@
   }
 
   /**
-   * Establishes the default bindings of type to classname.  
+   * Establishes the default bindings of type to classname.
    */
   public static void registerEditorKitForContentType(String type,
                                                      String classname,
Index: javax/swing/JInternalFrame.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JInternalFrame.java,v
retrieving revision 1.5
diff -u -r1.5 JInternalFrame.java
--- javax/swing/JInternalFrame.java     26 Jun 2004 16:07:00 -0000      1.5
+++ javax/swing/JInternalFrame.java     30 Jul 2004 20:17:29 -0000
@@ -1,4 +1,4 @@
-/* JInternalFrame.java -- 
+/* JInternalFrame.java --
    Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
Index: javax/swing/JMenu.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenu.java,v
retrieving revision 1.7
diff -u -r1.7 JMenu.java
--- javax/swing/JMenu.java      22 Jul 2004 19:45:39 -0000      1.7
+++ javax/swing/JMenu.java      30 Jul 2004 20:17:29 -0000
@@ -349,7 +349,7 @@
     // display popup associated with this menu 
     if (selected)
       {
-    super.setArmed(true);
+       super.setArmed(true);
        super.setSelected(true);
 
        // FIXME: The popup menu should be shown on the screen after certain
@@ -357,7 +357,7 @@
        // this amount of seconds. 'delay' property is 0 by default.
        if (this.isShowing())
          {
-    fireMenuSelected();
+           fireMenuSelected();
 
            int x = 0;
            int y = 0;
Index: javax/swing/JMenuBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenuBar.java,v
retrieving revision 1.8
diff -u -r1.8 JMenuBar.java
--- javax/swing/JMenuBar.java   22 Jul 2004 19:45:39 -0000      1.8
+++ javax/swing/JMenuBar.java   30 Jul 2004 20:17:29 -0000
@@ -1,4 +1,4 @@
-/* JMenuBar.java -- 
+/* JMenuBar.java --
    Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -83,7 +83,7 @@
 
   /** Fired in a PropertyChangeEvent when the "model" changes. */
   public static final String MODEL_CHANGED_PROPERTY = "model";
-  
+
   /** Fired in a PropertyChangeEvent when the "margin" changes. */
   public static final String MARGIN_CHANGED_PROPERTY = "margin";
   private static final long serialVersionUID = -8191026883931977036L;
@@ -311,7 +311,7 @@
    * This method does nothing by default. This method is need for the
    * MenuElement interface to be implemented.
    *
-   * @param isIncluded true if menuBar is included in the selection 
+   * @param isIncluded true if menuBar is included in the selection
    * and false otherwise
    */
   public void menuSelectionChanged(boolean isIncluded)
@@ -320,7 +320,7 @@
   }
 
   /**
-   * Paints border of the menu bar, if its borderPainted property is set to 
+   * Paints border of the menu bar, if its borderPainted property is set to
    * true.
    *
    * @param g The graphics context with which to paint the border
Index: javax/swing/JMenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenuItem.java,v
retrieving revision 1.8
diff -u -r1.8 JMenuItem.java
--- javax/swing/JMenuItem.java  22 Jul 2004 19:45:39 -0000      1.8
+++ javax/swing/JMenuItem.java  30 Jul 2004 20:17:30 -0000
@@ -323,11 +323,11 @@
        break;
       case MouseEvent.MOUSE_ENTERED:
        if (isRolloverEnabled())
-             model.setRollover(true);
+         model.setRollover(true);
        break;
       case MouseEvent.MOUSE_EXITED:
        if (isRolloverEnabled())
-             model.setRollover(false);
+         model.setRollover(false);
 
        // for JMenu last element on the path is its popupMenu.
        // JMenu shouldn't me disarmed. 
@@ -335,11 +335,11 @@
          setArmed(false);
        break;
       case MouseEvent.MOUSE_PRESSED:
-           if ((event.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
-             {
-               model.setArmed(true);
-               model.setPressed(true);
-             }
+       if ((event.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+         {
+           model.setArmed(true);
+           model.setPressed(true);
+         }
        break;
       case MouseEvent.MOUSE_RELEASED:
        break;
@@ -529,14 +529,14 @@
   {
     if (changed)
       {
-      model.setArmed(true);
+       model.setArmed(true);
 
        if (this.getParent() instanceof JPopupMenu)
          ((JPopupMenu) this.getParent()).setSelected(this);
       }
     else
       {
-      model.setArmed(false);
+       model.setArmed(false);
 
        if (this.getParent() instanceof JPopupMenu)
          ((JPopupMenu) this.getParent()).getSelectionModel().clearSelection();
@@ -548,7 +548,7 @@
    *
    * @return $MenuElement[]$ Returns array of sub-components for this menu
    *         item. By default menuItem doesn't have any subcomponents and so
-   *             empty array is returned instead.
+   *         empty array is returned instead.
    */
   public MenuElement[] getSubElements()
   {
Index: javax/swing/JOptionPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JOptionPane.java,v
retrieving revision 1.10
diff -u -r1.10 JOptionPane.java
--- javax/swing/JOptionPane.java        22 Jul 2004 19:45:39 -0000      1.10
+++ javax/swing/JOptionPane.java        30 Jul 2004 20:17:30 -0000
@@ -66,7 +66,7 @@
   {
     /** DOCUMENT ME! */
     private static final long serialVersionUID = 686071432213084821L;
-  
+
     /**
      * Creates a new AccessibleJOptionPane object.
      */
@@ -87,7 +87,7 @@
 
   /** DOCUMENT ME! */
   private static final long serialVersionUID = 5231143276678566796L;
-  
+
   /** The value returned when cancel option is selected. */
   public static final int CANCEL_OPTION = 2;
 
Index: javax/swing/JPopupMenu.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JPopupMenu.java,v
retrieving revision 1.7
diff -u -r1.7 JPopupMenu.java
--- javax/swing/JPopupMenu.java 22 Jul 2004 19:45:39 -0000      1.7
+++ javax/swing/JPopupMenu.java 30 Jul 2004 20:17:30 -0000
@@ -179,12 +179,12 @@
   }
 
   /**
-   * Adds given menu item to the popup menu
-   *
-   * @param item menu item to add to the popup menu
-   *
-   * @return menu item that was added to the popup menu
-   */
+  * Adds given menu item to the popup menu
+  *
+  * @param item menu item to add to the popup menu
+  *
+  * @return menu item that was added to the popup menu
+  */
   public JMenuItem add(JMenuItem item)
   {
     this.insert(item, -1);
@@ -463,7 +463,7 @@
     if (label != this.label)
       {
        String oldLabel = this.label;
-    this.label = label;
+       this.label = label;
        firePropertyChange(LABEL_CHANGED_PROPERTY, oldLabel, label);
       }
   }
@@ -621,11 +621,11 @@
              {
                // Subtract insets of the top-level container if popup menu's
                // top-left corner is inside it.
-                   Insets insets = rootContainer.getInsets();
-                   popup.show(popupLocation.x - insets.left,
-                              popupLocation.y - insets.top, size.width,
-                              size.height);
-                 }
+               Insets insets = rootContainer.getInsets();
+               popup.show(popupLocation.x - insets.left,
+                          popupLocation.y - insets.top, size.width,
+                          size.height);
+             }
          }
        else
          {
Index: javax/swing/JRootPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JRootPane.java,v
retrieving revision 1.11
diff -u -r1.11 JRootPane.java
--- javax/swing/JRootPane.java  22 Jul 2004 19:45:39 -0000      1.11
+++ javax/swing/JRootPane.java  30 Jul 2004 20:17:30 -0000
@@ -47,6 +47,7 @@
 import javax.accessibility.AccessibleRole;
 import javax.swing.plaf.RootPaneUI;
 
+
 /**
  * This class is where JComponents are added to. Unlike awt where you could
  * just say frame.add(), with swing you need to say frame.getRootPane()
@@ -96,7 +97,7 @@
     protected RootLayout()
     {
     }
-    
+
     /**
      * DOCUMENT ME!
      *
@@ -226,8 +227,8 @@
            {
              glassPane.setBounds(0, 0, containerSize.width,
                                  containerSize.height);
-           contentPane.setBounds(0, 0, containerSize.width,
-                                 containerSize.height);
+             contentPane.setBounds(0, 0, containerSize.width,
+                                   containerSize.height);
            }
 
          layeredPane.setSize(containerSize.width, containerSize.height);
Index: javax/swing/JScrollPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JScrollPane.java,v
retrieving revision 1.11
diff -u -r1.11 JScrollPane.java
--- javax/swing/JScrollPane.java        29 Jul 2004 06:12:04 -0000      1.11
+++ javax/swing/JScrollPane.java        30 Jul 2004 20:17:30 -0000
@@ -497,7 +497,7 @@
                       || vsb.getMaximum() != vs.height
                       || vsb.getValue() != vr.y
                       || vsb.getVisibleAmount() != vr.height))
-                  vsb.setValue(vr.y, vr.height, 0, vs.height);
+                vsb.setValue(vr.y, vr.height, 0, vs.height);
 
               if (hsb != null
                   && (hsb.getMinimum() != 0
Index: javax/swing/JTable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTable.java,v
retrieving revision 1.8
diff -u -r1.8 JTable.java
--- javax/swing/JTable.java     22 Jul 2004 19:45:39 -0000      1.8
+++ javax/swing/JTable.java     30 Jul 2004 20:17:30 -0000
@@ -41,8 +41,8 @@
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Rectangle;
-import java.util.Vector;
 import java.util.Hashtable;
+import java.util.Vector;
 
 import javax.accessibility.Accessible;
 import javax.swing.event.CellEditorListener;
@@ -72,7 +72,7 @@
   public static final int AUTO_RESIZE_NEXT_COLUMN = 1;
   public static final int AUTO_RESIZE_OFF = 0;
   public static final int AUTO_RESIZE_SUBSEQUENT_COLUMNS = 2;
-  
+
   protected boolean autoCreateColumnsFromModel;
   protected int autoResizeMode;
   protected TableCellEditor cellEditor;
Index: javax/swing/JTextField.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTextField.java,v
retrieving revision 1.10
diff -u -r1.10 JTextField.java
--- javax/swing/JTextField.java 22 Jul 2004 19:45:39 -0000      1.10
+++ javax/swing/JTextField.java 30 Jul 2004 20:17:30 -0000
@@ -42,6 +42,7 @@
 import java.awt.FontMetrics;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+
 import javax.accessibility.AccessibleStateSet;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
Index: javax/swing/JToolBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JToolBar.java,v
retrieving revision 1.6
diff -u -r1.6 JToolBar.java
--- javax/swing/JToolBar.java   22 Jul 2004 19:45:39 -0000      1.6
+++ javax/swing/JToolBar.java   30 Jul 2004 20:17:30 -0000
@@ -102,7 +102,7 @@
     }
   }
 
-       /**
+  /**
    * This is the private JToolBar layout manager.
    */
   private class DefaultToolBarLayout implements LayoutManager
@@ -112,7 +112,7 @@
      *
      * @param name The name of the component added.
      * @param comp The component that was added.
-        */
+     */
     public void addLayoutComponent(String name, Component comp)
     {
       // Do nothing.
@@ -144,7 +144,7 @@
       Dimension tdims = c.getSize();
       int start = 0;
       Dimension pref;
-    
+
       if (getOrientation() == SwingUtilities.HORIZONTAL)
         {
          start += insets.left;
@@ -196,14 +196,14 @@
       return preferredLayoutSize(parent);
     }
 
-               /**
+    /**
      * This method returns the preferred size of the given container given the
      * child components.
      *
      * @param parent The container to measure.
      *
      * @return The preferred size of the given container.
-                */
+     */
     public Dimension preferredLayoutSize(Container parent)
     {
       int orientation = getOrientation();
@@ -261,23 +261,23 @@
       return new Dimension(w, h);
     }
 
-               /**
+    /**
      * This method is called when the given component  is removed from the
      * container.
      *
      * @param comp The component removed.
-                */
+     */
     public void removeLayoutComponent(Component comp)
     {
       // Do nothing.
     }
   }
 
-               /**
+  /**
    * This is an extension of JSeparator used in toolbars. Unlike JSeparator,
    * nothing is painted for this Separator, it is only blank space that
    * separates components.
-                */
+   */
   public static class Separator extends JSeparator
   {
     /** DOCUMENT ME! */
@@ -301,70 +301,70 @@
       setPreferredSize(size);
     } // Separator()
 
-               /**
+    /**
      * This method returns the String ID of the UI class of  Separator.
      *
      * @return The UI class' String ID.
-                */
+     */
     public String getUIClassID()
     {
       return "ToolBarSeparatorUI";
-               } // getUIClassID()
+    } // getUIClassID()
 
-               /**
+    /**
      * This method returns the preferred size of the Separator.
      *
      * @return The preferred size of the Separator.
-                */
+     */
     public Dimension getPreferredSize()
     {
       return super.getPreferredSize();
-               } // getPreferredSize()
+    } // getPreferredSize()
 
-               /**
+    /**
      * This method returns the maximum size of the Separator.
      *
      * @return The maximum size of the Separator.
-                */
+     */
     public Dimension getMaximumSize()
     {
       return super.getPreferredSize();
-               } // getMaximumSize()
+    } // getMaximumSize()
 
-               /**
+    /**
      * This method returns the minimum size of the Separator.
      *
      * @return The minimum size of the Separator.
-                */
+     */
     public Dimension getMinimumSize()
     {
       return super.getPreferredSize();
-               } // getMinimumSize()
+    } // getMinimumSize()
 
-               /**
+    /**
      * This method returns the size of the Separator.
      *
      * @return The size of the Separator.
-                */
+     */
     public Dimension getSeparatorSize()
     {
       return super.getPreferredSize();
-               } // getSeparatorSize()
+    } // getSeparatorSize()
 
-               /**
+    /**
      * This method sets the size of the Separator.
      *
      * @param size The new size of the Separator.
-                */
+     */
     public void setSeparatorSize(Dimension size)
     {
       setPreferredSize(size);
-               } // setSeparatorSize()
-       } // Separator
+    } // setSeparatorSize()
+  } // Separator
 
   /** DOCUMENT ME! */
-    private static final long serialVersionUID = -1269915519555129643L;
-    
+  private static final long serialVersionUID = -1269915519555129643L;
+
   /** Whether the JToolBar paints its border. */
   private transient boolean paintBorder = true;
 
@@ -378,10 +378,10 @@
   private transient boolean rollover;
 
   /** The orientation of the JToolBar. */
-       private int orientation = HORIZONTAL;
+  private int orientation = HORIZONTAL;
 
   /** Fired in a PropertyChangeEvent when the orientation property changes. */
-       public static final String ORIENTATION_CHANGED_PROPERTY = "orientation";
+  public static final String ORIENTATION_CHANGED_PROPERTY = "orientation";
 
   /** Fired in a PropertyChangeEvent when the floatable property changes. */
   public static final String FLOATABLE_CHANGED_PROPERTY = "floatable";
@@ -395,127 +395,127 @@
   /** Fired in a PropertyChangeEvent when the rollover property changes. */
   public static final String ROLLOVER_CHANGED_PROPERTY = "rollover";
 
-       /**
+  /**
    * This method creates a new JToolBar object with horizontal orientation
    * and no name.
-        */
+   */
   public JToolBar()
   {
     this(null, HORIZONTAL);
-       } // JToolBar()
+  } // JToolBar()
 
-       /**
+  /**
    * This method creates a new JToolBar with the given orientation and  no
    * name.
    *
-        * @param orientation JToolBar orientation (HORIZONTAL or VERTICAL)
-        */
+   * @param orientation JToolBar orientation (HORIZONTAL or VERTICAL)
+   */
   public JToolBar(int orientation)
   {
-          this(null, orientation);
-       } // JToolBar()
+    this(null, orientation);
+  } // JToolBar()
 
-       /**
+  /**
    * This method creates a new JToolBar object with the given name and
    * horizontal orientation.
    *
-        * @param name Name assigned to undocked tool bar.
-        */
+   * @param name Name assigned to undocked tool bar.
+   */
   public JToolBar(String name)
   {
-          this(name, HORIZONTAL);
-       } // JToolBar()
+    this(name, HORIZONTAL);
+  } // JToolBar()
 
-       /**
+  /**
    * This method creates a new JToolBar object with the given name and
    * orientation.
    *
-        * @param name Name assigned to undocked tool bar.
-        * @param orientation JToolBar orientation (HORIZONTAL or VERTICAL)
-        */
+   * @param name Name assigned to undocked tool bar.
+   * @param orientation JToolBar orientation (HORIZONTAL or VERTICAL)
+   */
   public JToolBar(String name, int orientation)
   {
-               setName(name);
+    setName(name);
     setOrientation(orientation);
     setLayout(new DefaultToolBarLayout());
     revalidate();
-                updateUI();    
-       } // JToolBar()
+    updateUI();
+  } // JToolBar()
 
-       /**
+  /**
    * This method adds a new JButton that performs the given Action to the
    * JToolBar.
    *
    * @param action The Action to add to the JToolBar.
    *
    * @return The JButton that wraps the Action.
-        */
+   */
   public JButton add(Action action)
   {
     JButton b = createActionComponent(action);
     add(b);
     return b;
-       } // add()
+  } // add()
 
-       /**
+  /**
    * This method paints the border if the borderPainted property is true.
    *
    * @param graphics The graphics object to paint with.
-        */
+   */
   protected void paintBorder(Graphics graphics)
   {
     if (paintBorder && isFloatable())
       super.paintBorder(graphics);
-       } // paintBorder()
+  } // paintBorder()
 
-       /**
+  /**
    * This method returns the UI class used to paint this JToolBar.
    *
    * @return The UI class for this JToolBar.
-        */
+   */
   public ToolBarUI getUI()
   {
-               return (ToolBarUI) ui;
-       } // getUI()
+    return (ToolBarUI) ui;
+  } // getUI()
 
-       /**
+  /**
    * This method sets the UI used with the JToolBar.
    *
    * @param ui The UI used with the JToolBar.
-        */
+   */
   public void setUI(ToolBarUI ui)
   {
-               super.setUI(ui);
-       } // setUI()
+    super.setUI(ui);
+  } // setUI()
 
-       /**
+  /**
    * This method resets the UI used to the Look and Feel defaults.
-        */
+   */
   public void updateUI()
   {
-          setUI((ToolBarUI)UIManager.getUI(this));
+    setUI((ToolBarUI) UIManager.getUI(this));
     revalidate();
     repaint();
-       } // updateUI()
+  } // updateUI()
 
-       /**
+  /**
    * This method returns the String identifier for the UI class to the used
    * with the JToolBar.
    *
    * @return The String identifier for the UI class.
-        */
+   */
   public String getUIClassID()
   {
     return "ToolBarUI";
-       } // getUIClassID()
+  } // getUIClassID()
 
-       /**
+  /**
    * This method sets the rollover property for the JToolBar. In rollover
    * mode, JButtons inside the JToolBar will only display their borders when
    * the mouse is moving over them.
    *
    * @param b The new rollover property.
-        */
+   */
   public void setRollover(boolean b)
   {
     if (b != rollover)
@@ -555,37 +555,37 @@
        return i;
 
     return -1;
-       } // getComponentIndex()
+  } // getComponentIndex()
 
-       /**
+  /**
    * This method returns the component at the given index.
    *
    * @param index The index of the component.
    *
    * @return The component at the given index.
-        */
+   */
   public Component getComponentAtIndex(int index)
   {
     return getComponent(index);
-       } // getComponentAtIndex()
+  } // getComponentAtIndex()
 
-       /**
+  /**
    * This method returns the margin property.
    *
    * @return The margin property.
-        */
+   */
   public Insets getMargin()
   {
     return margin;
-       } // getMargin()
+  } // getMargin()
 
-       /**
+  /**
    * This method sets the margin property. The margin property determines the
    * extra space between the children components of the JToolBar and the
    * border.
    *
    * @param margin The margin property.
-        */
+   */
   public void setMargin(Insets margin)
   {
     if ((this.margin != null && margin == null)
@@ -601,24 +601,24 @@
        revalidate();
        repaint();
       }
-       } // setMargin()
+  } // setMargin()
 
-       /**
+  /**
    * This method returns the borderPainted property.
    *
    * @return The borderPainted property.
-        */
+   */
   public boolean isBorderPainted()
   {
     return paintBorder;
-       } // isBorderPainted()
+  } // isBorderPainted()
 
-       /**
+  /**
    * This method sets the borderPainted property. If set to false, the border
    * will not be painted.
    *
    * @param painted Whether the border will be painted.
-        */
+   */
   public void setBorderPainted(boolean painted)
   {
     if (painted != paintBorder)
@@ -628,24 +628,24 @@
                           paintBorder);
        repaint();
       }
-       } // setBorderPainted()
+  } // setBorderPainted()
 
-       /**
+  /**
    * This method returns the floatable property.
    *
    * @return The floatable property.
-        */
+   */
   public boolean isFloatable()
   {
     return floatable;
-       } // isFloatable()
+  } // isFloatable()
 
-       /**
+  /**
    * This method sets the floatable property. If set to false, the JToolBar
    * cannot be dragged.
    *
    * @param floatable Whether the JToolBar can be dragged.
-        */
+   */
   public void setFloatable(boolean floatable)
   {
     if (floatable != this.floatable)
@@ -653,86 +653,86 @@
        this.floatable = floatable;
        firePropertyChange(FLOATABLE_CHANGED_PROPERTY, ! floatable, floatable);
       }
-       } // setFloatable()
+  } // setFloatable()
 
-       /**
+  /**
    * This method returns the orientation of the JToolBar.
    *
    * @return The orientation of the JToolBar.
-        */
+   */
   public int getOrientation()
   {
     return orientation;
-       } // getOrientation()
+  } // getOrientation()
 
-       /**
+  /**
    * This method sets the layout manager to be used with the JToolBar.
    *
    * @param mgr The Layout Manager used with the JToolBar.
-        */
+   */
   public void setLayout(LayoutManager mgr)
   {
-           super.setLayout(mgr);
+    super.setLayout(mgr);
     revalidate();
     repaint();
-       } // setLayout()
+  } // setLayout()
 
-       /**
+  /**
    * This method sets the orientation property for JToolBar.
    *
    * @param orientation The new orientation for JToolBar.
    *
    * @throws IllegalArgumentException If the orientation is not HORIZONTAL or
    *         VERTICAL.
-        */
+   */
   public void setOrientation(int orientation)
   {
-               if (orientation != HORIZONTAL && orientation != VERTICAL)
+    if (orientation != HORIZONTAL && orientation != VERTICAL)
       throw new IllegalArgumentException(orientation
                                          + " is not a legal orientation");
-           if (orientation != this.orientation)
-           {
-               int oldOrientation = this.orientation;
-               this.orientation = orientation;
-               firePropertyChange(ORIENTATION_CHANGED_PROPERTY, oldOrientation,
-                       this.orientation);
+    if (orientation != this.orientation)
+      {
+       int oldOrientation = this.orientation;
+       this.orientation = orientation;
+       firePropertyChange(ORIENTATION_CHANGED_PROPERTY, oldOrientation,
+                          this.orientation);
        revalidate();
        repaint();
-           }
-       } // setOrientation()
+      }
+  } // setOrientation()
 
-       /**
+  /**
    * This method adds a Separator of default size to the JToolBar.
-        */
+   */
   public void addSeparator()
   {
     add(new Separator());
-       } // addSeparator()
+  } // addSeparator()
 
-       /**
+  /**
    * This method adds a Separator with the given size to the JToolBar.
    *
    * @param size The size of the Separator.
-        */
+   */
   public void addSeparator(Dimension size)
   {
     add(new Separator(size));
-       } // addSeparator()
+  } // addSeparator()
 
-       /**
+  /**
    * This method is used to create JButtons which can be added to the JToolBar
    * for the given action.
    *
    * @param action The action to create a JButton for.
    *
    * @return The JButton created from the action.
-        */
+   */
   protected JButton createActionComponent(Action action)
   {
     return new JButton(action);
-       } // createActionComponent()
+  } // createActionComponent()
 
-       /**
+  /**
    * This method creates a pre-configured PropertyChangeListener which updates
    * the control as changes are made to the Action. However, this is no
    * longer the recommended way of adding Actions to Containers. As such,
@@ -741,36 +741,36 @@
    * @param button The JButton to configure a PropertyChangeListener for.
    *
    * @return null.
-        */
+   */
   protected PropertyChangeListener createActionChangeListener(JButton button)
   {
     // XXX: As specified, this returns null. But seems kind of strange, 
usually deprecated methods don't just return null, verify!
     return null;
-       } // createActionChangeListener()
+  } // createActionChangeListener()
 
-       /**
+  /**
    * This method overrides Container's addImpl method. If a JButton is added,
    * it is disabled.
    *
    * @param component The Component to add.
    * @param constraints The Constraints placed on the component.
    * @param index The index to place the Component at.
-  */
+   */
   protected void addImpl(Component component, Object constraints, int index)
   {
     // XXX: Sun says disable button but test cases show otherwise.
     super.addImpl(component, constraints, index);
   } // addImpl()
 
-       /**
+  /**
    * This method returns a String description of the JToolBar.
    *
    * @return A String description of the JToolBar.
-        */
+   */
   protected String paramString()
   {
     return "JToolBar";
-       } // paramString()
+  } // paramString()
 
   /**
    * getAccessibleContext
@@ -781,7 +781,7 @@
   {
     if (accessibleContext == null)
       accessibleContext = new AccessibleJToolBar();
-    
+
     return accessibleContext;
   }
 }
Index: javax/swing/MenuSelectionManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/MenuSelectionManager.java,v
retrieving revision 1.6
diff -u -r1.6 MenuSelectionManager.java
--- javax/swing/MenuSelectionManager.java       22 Jul 2004 19:45:39 -0000      
1.6
+++ javax/swing/MenuSelectionManager.java       30 Jul 2004 20:17:30 -0000
@@ -272,10 +272,10 @@
        MenuElement[] subComponents = ((MenuElement) mouseOverMenuComp)
                                      .getSubElements();
 
-    for (int i = 0; i < subComponents.length; i++)
-      {
-         subComponents[i].processMouseEvent(event, path, manager);
-      }
+       for (int i = 0; i < subComponents.length; i++)
+        {
+             subComponents[i].processMouseEvent(event, path, manager);
+        }
        */
       }
   }
Index: javax/swing/RepaintManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/RepaintManager.java,v
retrieving revision 1.5
diff -u -r1.5 RepaintManager.java
--- javax/swing/RepaintManager.java     22 Jul 2004 19:45:39 -0000      1.5
+++ javax/swing/RepaintManager.java     30 Jul 2004 20:17:30 -0000
@@ -263,7 +263,7 @@
         && ancestor instanceof JComponent
         && ((JComponent) ancestor).isValidateRoot())
       component = (JComponent) ancestor;
-    
+
     if (invalidComponents.contains(component))
       return;
 
Index: javax/swing/ScrollPaneLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ScrollPaneLayout.java,v
retrieving revision 1.7
diff -u -r1.7 ScrollPaneLayout.java
--- javax/swing/ScrollPaneLayout.java   22 Jul 2004 19:45:39 -0000      1.7
+++ javax/swing/ScrollPaneLayout.java   30 Jul 2004 20:17:30 -0000
@@ -237,7 +237,7 @@
 
             if (viewportBorder != null)
               {
-              viewportInsets = viewportBorder.getBorderInsets(parent);
+                viewportInsets = viewportBorder.getBorderInsets(parent);
                 if (viewportInsets != null)
                   viewportInsetsSize.setSize(viewportInsets.left + 
viewportInsets.right,
                                              viewportInsets.top + 
viewportInsets.bottom);
@@ -308,12 +308,12 @@
 
             if (viewportBorder != null)
               {
-              viewportInsets = viewportBorder.getBorderInsets(parent);
+                viewportInsets = viewportBorder.getBorderInsets(parent);
                 if (viewportInsets != null)
                   viewportInsetsSize.setSize(viewportInsets.left + 
viewportInsets.right,
                                              viewportInsets.top + 
viewportInsets.bottom);
               }
-
+            
             if (insets != null)
               insetsSize.setSize(insets.left + insets.right,
                                  insets.top + insets.bottom);
@@ -321,7 +321,7 @@
             maybeSetMinimumSize(viewport, viewportSize);
             maybeSetMinimumSize(colHead, columnHeaderSize);
             maybeSetMinimumSize(rowHead, rowHeaderSize);
-
+            
             if (vsbPolicy != VERTICAL_SCROLLBAR_NEVER)
               maybeSetMinimumSize(vsb, verticalScrollBarSize);
 
@@ -418,7 +418,7 @@
             
             if (!showVsb)
               x3 = x4;
-
+            
             if (!showHsb)
               y3 = y4;
 
@@ -436,7 +436,7 @@
             if (showVsb)
               {
                 vsb.setVisible(true);
-             vsb.setBounds(new Rectangle(x3, y2, x4-x3, y3-y2));
+                vsb.setBounds(new Rectangle(x3, y2, x4-x3, y3-y2));
               }
             else if (vsb != null)
               vsb.setVisible(false);
@@ -444,7 +444,7 @@
             if (showHsb)
               {
                 hsb.setVisible(true);
-              hsb.setBounds(new Rectangle(x2, y3, x3-x2, y4-y3));
+                hsb.setBounds(new Rectangle(x2, y3, x3-x2, y4-y3));
               }
             else if (hsb != null)
               hsb.setVisible(false);
Index: javax/swing/UIManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/UIManager.java,v
retrieving revision 1.13
diff -u -r1.13 UIManager.java
--- javax/swing/UIManager.java  22 Jul 2004 19:45:39 -0000      1.13
+++ javax/swing/UIManager.java  30 Jul 2004 20:17:30 -0000
@@ -1,5 +1,5 @@
 /* UIManager.java -- 
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -92,7 +92,7 @@
    *
    * @param listener the listener to add
    */
-  public static void addPropertyChangeListener (PropertyChangeListener 
listener)
+  public static void addPropertyChangeListener(PropertyChangeListener listener)
   {
     // FIXME
   }
@@ -102,7 +102,7 @@
    *
    * @param listener the listener to remove
    */
-  public static void removePropertyChangeListener (PropertyChangeListener 
listener)
+  public static void removePropertyChangeListener(PropertyChangeListener 
listener)
   {
     // FIXME
   }
@@ -114,7 +114,7 @@
    *
    * @since 1.4
    */
-  public static PropertyChangeListener[] getPropertyChangeListeners ()
+  public static PropertyChangeListener[] getPropertyChangeListeners()
   {
     // FIXME
     throw new Error ("Not implemented");
Index: javax/swing/ViewportLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ViewportLayout.java,v
retrieving revision 1.9
diff -u -r1.9 ViewportLayout.java
--- javax/swing/ViewportLayout.java     22 Jul 2004 19:45:39 -0000      1.9
+++ javax/swing/ViewportLayout.java     30 Jul 2004 20:17:30 -0000
@@ -67,7 +67,7 @@
   {
     JViewport vp = (JViewport)parent;
     Component view = vp.getView();
-      return view.getPreferredSize();
+    return view.getPreferredSize();
   }
   public Dimension minimumLayoutSize(Container parent) 
   {

Attachment: signature.asc
Description: This is a digitally signed message part


reply via email to

[Prev in Thread] Current Thread [Next in Thread]