2004-10-22 Michael Koch <konqueror@gmx.de>

	* javax/swing/JWindow.java
	javax/swing/SpinnerModel.java
	javax/swing/Timer.java
	javax/swing/event/MenuKeyEvent.java
	javax/swing/plaf/basic/BasicButtonUI.java
	javax/swing/plaf/basic/BasicIconFactory.java
	javax/swing/plaf/basic/BasicTabbedPaneUI.java
	javax/swing/text/AttributeSet.java
	javax/swing/text/Highlighter.java
	javax/swing/text/StyleConstants.java
	javax/swing/tree/TreeCellEditor.java:
	Removed redundant and reordered modifiers.

11 files changed, 56 insertions, 61 deletions

diff --git a/javax/swing/JWindow.java b/javax/swing/JWindow.java
index c035a1bd9..3601b6941 100644
--- a/javax/swing/JWindow.java
+++ b/javax/swing/JWindow.java
@@ -62,10 +62,10 @@ public class JWindow extends Window implements Accessible, RootPaneContainer
 {
   private static final long serialVersionUID = 5420698392125238833L;
   
-    public final static int HIDE_ON_CLOSE        = 0;
-    public final static int EXIT_ON_CLOSE        = 1;
-    public final static int DISPOSE_ON_CLOSE     = 2;
-    public final static int DO_NOTHING_ON_CLOSE  = 3;
+  public static final int HIDE_ON_CLOSE = 0;
+  public static final int EXIT_ON_CLOSE = 1;
+  public static final int DISPOSE_ON_CLOSE = 2;
+  public static final int DO_NOTHING_ON_CLOSE  = 3;
 
     protected  AccessibleContext accessibleContext;
 
diff --git a/javax/swing/SpinnerModel.java b/javax/swing/SpinnerModel.java
index 82efe1236..ea5f431d4 100644
--- a/javax/swing/SpinnerModel.java
+++ b/javax/swing/SpinnerModel.java
@@ -1,5 +1,5 @@
 /* SpinnerModel.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,7 +45,6 @@ import javax.swing.event.ChangeListener;
  */
 public interface SpinnerModel
 {
-
   /**
    * Sets the current value of the model to that specified.
    * Implementations can choose to refuse to accept the value
@@ -68,7 +67,7 @@ public interface SpinnerModel
    *
    * @return The current value.
    */
-  public Object getValue();
+  Object getValue();
 
   /**
    * Returns the next value from the model.  If the model is bounded,
@@ -78,7 +77,7 @@ public interface SpinnerModel
    * @return The next value, or null if there are no more values
    *         to retrieve.
    */
-  public Object getNextValue();
+  Object getNextValue();
 
   /**
    * Returns the previous value from the model.  If the model is
@@ -88,7 +87,7 @@ public interface SpinnerModel
    * @return The previous value, or null if there are no more
    *         values to retrieve.
    */
-  public Object getPreviousValue();
+  Object getPreviousValue();
 
   /**
    * Adds a <code>ChangeListener</code> to the list of registered
diff --git a/javax/swing/Timer.java b/javax/swing/Timer.java
index ae706959f..afdf4f32d 100644
--- a/javax/swing/Timer.java
+++ b/javax/swing/Timer.java
@@ -41,12 +41,7 @@ package javax.swing;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.Serializable;
-import java.util.Comparator;
 import java.util.EventListener;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.TreeSet;
 
 import javax.swing.event.EventListenerList;
 
diff --git a/javax/swing/event/MenuKeyEvent.java b/javax/swing/event/MenuKeyEvent.java
index 34653366f..aecc99268 100644
--- a/javax/swing/event/MenuKeyEvent.java
+++ b/javax/swing/event/MenuKeyEvent.java
@@ -1,5 +1,5 @@
 /* MenuKeyEvent.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,11 +35,12 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package javax.swing.event;
 
-// Imports
 import java.awt.Component;
 import java.awt.event.KeyEvent;
+
 import javax.swing.MenuElement;
 import javax.swing.MenuSelectionManager;
 
diff --git a/javax/swing/plaf/basic/BasicButtonUI.java b/javax/swing/plaf/basic/BasicButtonUI.java
index 21c888bb3..ed04d2812 100644
--- a/javax/swing/plaf/basic/BasicButtonUI.java
+++ b/javax/swing/plaf/basic/BasicButtonUI.java
@@ -202,7 +202,7 @@ public class BasicButtonUI extends ButtonUI
     return d;
   }
 
-  static private Icon currentIcon(AbstractButton b)
+  private static Icon currentIcon(AbstractButton b)
   {
     Icon i = b.getIcon();
     ButtonModel model = b.getModel();
diff --git a/javax/swing/plaf/basic/BasicIconFactory.java b/javax/swing/plaf/basic/BasicIconFactory.java
index 985a68d1a..a2acc8116 100644
--- a/javax/swing/plaf/basic/BasicIconFactory.java
+++ b/javax/swing/plaf/basic/BasicIconFactory.java
@@ -56,7 +56,7 @@ public class BasicIconFactory implements Serializable
 {
   static final long serialVersionUID = 5605588811185324383L;
 
-  static private class DummyIcon 
+  private static class DummyIcon 
     implements Icon
   {    
     public int getIconHeight() { return 10; }
diff --git a/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index e80ee5242..cbf16808d 100644
--- a/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -28,7 +28,7 @@ permission to link this library with independent modules to produce an
 executable, regardless of the license terms of these independent
 modules, and to copy and distribute the resulting executable under
 terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of7 the license of that
+independent module, the terms and conditions of the license of that
 module.  An independent module is a module which is not derived from
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
diff --git a/javax/swing/text/AttributeSet.java b/javax/swing/text/AttributeSet.java
index 3f38a4cd2..68d36bcf4 100644
--- a/javax/swing/text/AttributeSet.java
+++ b/javax/swing/text/AttributeSet.java
@@ -57,8 +57,8 @@ public interface AttributeSet
   {
   }
 
-  static Object NameAttribute = StyleConstants.NameAttribute;
-  static Object ResolveAttribute = StyleConstants.ResolveAttribute;
+  Object NameAttribute = StyleConstants.NameAttribute;
+  Object ResolveAttribute = StyleConstants.ResolveAttribute;
 
   boolean containsAttribute(Object name, Object value);
   boolean containsAttributes(AttributeSet attributes);
diff --git a/javax/swing/text/Highlighter.java b/javax/swing/text/Highlighter.java
index 77471d177..affec9b7a 100644
--- a/javax/swing/text/Highlighter.java
+++ b/javax/swing/text/Highlighter.java
@@ -55,8 +55,7 @@ public interface Highlighter
 
   public interface HighlightPainter
   {
-    public void paint(Graphics g, int p0, int p1, Shape bounds,
-		      JTextComponent c);
+    void paint(Graphics g, int p0, int p1, Shape bounds, JTextComponent c);
   }
   
   void install(JTextComponent c);
diff --git a/javax/swing/text/StyleConstants.java b/javax/swing/text/StyleConstants.java
index 89379adb8..d566c03e2 100644
--- a/javax/swing/text/StyleConstants.java
+++ b/javax/swing/text/StyleConstants.java
@@ -45,8 +45,45 @@ import javax.swing.Icon;
 
 public class StyleConstants
 {
+  public static final int ALIGN_LEFT = 0;
+  public static final int ALIGN_CENTER = 1;
+  public static final int ALIGN_RIGHT = 2;
+  public static final int ALIGN_JUSTIFIED = 3;
+
+  public static final Object Background = CharacterConstants.Background;
+  public static final Object BidiLevel = CharacterConstants.BidiLevel;
+  public static final Object Bold = CharacterConstants.Bold;
+  public static final Object ComponentAttribute = CharacterConstants.ComponentAttribute;
+  public static final Object FontFamily = CharacterConstants.Family;
+  public static final Object FontSize = CharacterConstants.Size;
+  public static final Object Foreground = CharacterConstants.Foreground;
+  public static final Object IconAttribute = CharacterConstants.IconAttribute;
+  public static final Object Italic = CharacterConstants.Italic;
+  public static final Object StrikeThrough = CharacterConstants.StrikeThrough;
+  public static final Object Subscript = CharacterConstants.Subscript;
+  public static final Object Superscript = CharacterConstants.Superscript;
+  public static final Object Underline = CharacterConstants.Underline;
+
+  public static final Object Alignment = ParagraphConstants.Alignment;
+  public static final Object FirstLineIndent = ParagraphConstants.FirstLineIndent;
+  public static final Object LeftIndent = ParagraphConstants.LeftIndent;
+  public static final Object LineSpacing = ParagraphConstants.LineSpacing;
+  public static final Object Orientation = ParagraphConstants.Orientation;
+  public static final Object RightIndent = ParagraphConstants.RightIndent;
+  public static final Object SpaceAbove = ParagraphConstants.SpaceAbove;
+  public static final Object SpaceBelow = ParagraphConstants.SpaceBelow;
+  public static final Object TabSet = ParagraphConstants.TabSet;
+
+  public static final String ComponentElementName = "component";
+  public static final String IconElementName = "icon";
+
+  public static final Object ComposedTextAttribute = new StyleConstants("composed text");
+  public static final Object ModelAttribute = new StyleConstants("model");
+  public static final Object NameAttribute = new StyleConstants("name");
+  public static final Object ResolveAttribute = new StyleConstants("resolver");
 
   String keyname;
+  
   private StyleConstants(String k) 
   {
     keyname = k;
@@ -57,43 +94,6 @@ public class StyleConstants
     return keyname;
   }
 
-  public static int ALIGN_CENTER;
-  public static int ALIGN_JUSTIFIED;
-  public static int ALIGN_LEFT;
-  public static int ALIGN_RIGHT;
-
-  public static Object Background = CharacterConstants.Background;
-  public static Object BidiLevel = CharacterConstants.BidiLevel;
-  public static Object Bold = CharacterConstants.Bold;
-  public static Object ComponentAttribute = CharacterConstants.ComponentAttribute;
-  public static Object FontFamily = CharacterConstants.Family;
-  public static Object FontSize = CharacterConstants.Size;
-  public static Object Foreground = CharacterConstants.Foreground;
-  public static Object IconAttribute = CharacterConstants.IconAttribute;
-  public static Object Italic = CharacterConstants.Italic;
-  public static Object StrikeThrough = CharacterConstants.StrikeThrough;
-  public static Object Subscript = CharacterConstants.Subscript;
-  public static Object Superscript = CharacterConstants.Superscript;
-  public static Object Underline = CharacterConstants.Underline;
-
-  public static Object Alignment = ParagraphConstants.Alignment;
-  public static Object FirstLineIndent = ParagraphConstants.FirstLineIndent;
-  public static Object LeftIndent = ParagraphConstants.LeftIndent;
-  public static Object LineSpacing = ParagraphConstants.LineSpacing;
-  public static Object Orientation = ParagraphConstants.Orientation;
-  public static Object RightIndent = ParagraphConstants.RightIndent;
-  public static Object SpaceAbove = ParagraphConstants.SpaceAbove;
-  public static Object SpaceBelow = ParagraphConstants.SpaceBelow;
-  public static Object TabSet = ParagraphConstants.TabSet;
-
-  public static String ComponentElementName = new String("component");
-  public static String IconElementName = new String("icon");
-
-  public static Object ComposedTextAttribute = new StyleConstants("composed text");
-  public static Object ModelAttribute = new StyleConstants("model");
-  public static Object NameAttribute = new StyleConstants("name");
-  public static Object ResolveAttribute = new StyleConstants("resolver");
-
   public static int getAlignment(AttributeSet a)
   {
     if (a.isDefined(Alignment))
diff --git a/javax/swing/tree/TreeCellEditor.java b/javax/swing/tree/TreeCellEditor.java
index bdc0b5d64..dd73a7cb6 100644
--- a/javax/swing/tree/TreeCellEditor.java
+++ b/javax/swing/tree/TreeCellEditor.java
@@ -1,5 +1,5 @@
 /* TreeCellEditor.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@ exception statement from your version. */
 package javax.swing.tree;
 
 import java.awt.Component;
+
 import javax.swing.JTree;
 
 /**