diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f9ec6170336..156b3f68a7b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,16 @@
+2004-09-30  Michael Koch  <konqueror@gmx.de>
+
+	* java/beans/Beans.java,
+	java/beans/EventHandler.java,
+	java/beans/EventSetDescriptor.java,
+	java/beans/Introspector.java,
+	java/beans/PropertyEditorManager.java,
+	java/beans/beancontext/BeanContext.java,
+	java/beans/beancontext/BeanContextChild.java,
+	java/beans/beancontext/BeanContextChildSupport.java,
+	java/beans/beancontext/BeanContextMembershipEvent.java:
+	Reordered import statements and removed redundant modifiers.
+
 2004-09-29  Tom Tromey  <tromey@redhat.com>
 
 	PR libgcj/17715:
diff --git a/libjava/java/beans/Beans.java b/libjava/java/beans/Beans.java
index 7ee0522f823..96813d30b0d 100644
--- a/libjava/java/beans/Beans.java
+++ b/libjava/java/beans/Beans.java
@@ -39,10 +39,11 @@ exception statement from your version. */
 package java.beans;
 
 import gnu.java.io.ClassLoaderObjectInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
+
 import java.applet.Applet;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
 
 /**
  * <code>Beans</code> provides some helper methods that allow the basic
diff --git a/libjava/java/beans/EventHandler.java b/libjava/java/beans/EventHandler.java
index e1cf6b97551..112fbe28021 100644
--- a/libjava/java/beans/EventHandler.java
+++ b/libjava/java/beans/EventHandler.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package java.beans;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -82,7 +81,7 @@ public class EventHandler implements InvocationHandler
   private String property;
 
   // String class doesn't already have a capitalize routine.
-  final private String capitalize(String s)
+  private String capitalize(String s)
   {
     return s.substring(0, 1).toUpperCase() + s.substring(1);
   }
diff --git a/libjava/java/beans/EventSetDescriptor.java b/libjava/java/beans/EventSetDescriptor.java
index 66bf8e559e3..b68916eb213 100644
--- a/libjava/java/beans/EventSetDescriptor.java
+++ b/libjava/java/beans/EventSetDescriptor.java
@@ -38,10 +38,11 @@ exception statement from your version. */
 
 package java.beans;
 
+import gnu.java.lang.ClassHelper;
+
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Vector;
-import gnu.java.lang.ClassHelper;
 
 /**
  ** EventSetDescriptor describes the hookup between an event source
diff --git a/libjava/java/beans/Introspector.java b/libjava/java/beans/Introspector.java
index b3f67c521ba..f9b95696ce3 100644
--- a/libjava/java/beans/Introspector.java
+++ b/libjava/java/beans/Introspector.java
@@ -41,9 +41,10 @@ package java.beans;
 import gnu.java.beans.BeanInfoEmbryo;
 import gnu.java.beans.ExplicitBeanInfo;
 import gnu.java.beans.IntrospectionIncubator;
+import gnu.java.lang.ClassHelper;
+
 import java.util.Hashtable;
 import java.util.Vector;
-import gnu.java.lang.ClassHelper;
 
 /**
  * Introspector is the class that does the bulk of the
diff --git a/libjava/java/beans/PropertyEditorManager.java b/libjava/java/beans/PropertyEditorManager.java
index 85c9ba5d8dc..89c474f0b84 100644
--- a/libjava/java/beans/PropertyEditorManager.java
+++ b/libjava/java/beans/PropertyEditorManager.java
@@ -38,7 +38,6 @@ exception statement from your version. */
 
 package java.beans;
 
-import gnu.java.lang.ClassHelper;
 import gnu.java.beans.editors.ColorEditor;
 import gnu.java.beans.editors.FontEditor;
 import gnu.java.beans.editors.NativeBooleanEditor;
@@ -49,6 +48,8 @@ import gnu.java.beans.editors.NativeIntEditor;
 import gnu.java.beans.editors.NativeLongEditor;
 import gnu.java.beans.editors.NativeShortEditor;
 import gnu.java.beans.editors.StringEditor;
+import gnu.java.lang.ClassHelper;
+
 import java.awt.Color;
 import java.awt.Font;
 
diff --git a/libjava/java/beans/beancontext/BeanContext.java b/libjava/java/beans/beancontext/BeanContext.java
index c996013e760..d23ee456266 100644
--- a/libjava/java/beans/beancontext/BeanContext.java
+++ b/libjava/java/beans/beancontext/BeanContext.java
@@ -38,12 +38,12 @@ exception statement from your version. */
 
 package java.beans.beancontext;
 
-import java.util.Collection;
-import java.beans.Visibility;
 import java.beans.DesignMode;
-import java.net.URL;
-import java.io.InputStream;
+import java.beans.Visibility;
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collection;
 
 /**
  * Acts as a container for sub-beans and as a sub-bean,
diff --git a/libjava/java/beans/beancontext/BeanContextChild.java b/libjava/java/beans/beancontext/BeanContextChild.java
index 4421273e8fd..acded069c14 100644
--- a/libjava/java/beans/beancontext/BeanContextChild.java
+++ b/libjava/java/beans/beancontext/BeanContextChild.java
@@ -39,8 +39,8 @@ exception statement from your version. */
 package java.beans.beancontext;
 
 import java.beans.PropertyChangeListener;
-import java.beans.VetoableChangeListener;
 import java.beans.PropertyVetoException;
+import java.beans.VetoableChangeListener;
 
 /**
  * Beans implement this to get information about the execution environment and
diff --git a/libjava/java/beans/beancontext/BeanContextChildSupport.java b/libjava/java/beans/beancontext/BeanContextChildSupport.java
index 8cc17508e9e..c5d1387a25c 100644
--- a/libjava/java/beans/beancontext/BeanContextChildSupport.java
+++ b/libjava/java/beans/beancontext/BeanContextChildSupport.java
@@ -38,11 +38,11 @@ exception statement from your version. */
 
 package java.beans.beancontext;
 
-import java.beans.PropertyChangeListener;
-import java.beans.VetoableChangeListener;
-import java.beans.PropertyVetoException;
 import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
+import java.beans.PropertyVetoException;
+import java.beans.VetoableChangeListener;
 import java.beans.VetoableChangeSupport;
 import java.io.Serializable;
 
@@ -59,7 +59,6 @@ import java.io.Serializable;
  * @since 1.2
  * @see java.beans.beancontext.BeanContextChild
  */
-
 public class BeanContextChildSupport
   implements BeanContextChild, BeanContextServicesListener, Serializable
 {
diff --git a/libjava/java/beans/beancontext/BeanContextMembershipEvent.java b/libjava/java/beans/beancontext/BeanContextMembershipEvent.java
index 0824b8dcb4c..129d0309e9a 100644
--- a/libjava/java/beans/beancontext/BeanContextMembershipEvent.java
+++ b/libjava/java/beans/beancontext/BeanContextMembershipEvent.java
@@ -1,5 +1,5 @@
 /* java.beans.beancontext.BeanContextMembershipEvent
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,8 +38,8 @@ exception statement from your version. */
 
 package java.beans.beancontext;
 
-import java.util.Collection;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Iterator;
 
 /**
@@ -48,10 +48,9 @@ import java.util.Iterator;
  * of the listener interface was called.
  *
  * @author John Keiser
- * @since JDK1.2
+ * @since 1.2
  * @see java.beans.beancontext.BeanContextMembershipListener
  */
-
 public class BeanContextMembershipEvent extends BeanContextEvent {
 	/**
 	 * The children that were added or removed.