9 files changed, 20 insertions, 17 deletions
diff --git a/libjava/java/beans/BeanDescriptor.java b/libjava/java/beans/BeanDescriptor.java
index b781530..84a7921 100644
--- a/libjava/java/beans/BeanDescriptor.java
+++ b/libjava/java/beans/BeanDescriptor.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package java.beans;
 
-import java.util.*;
-
 /**
  ** BeanDescriptor describes general information about a Bean, plus
  ** stores the Bean's Class and it's customizer's Class.<P>
diff --git a/libjava/java/beans/EventSetDescriptor.java b/libjava/java/beans/EventSetDescriptor.java
index d0f412a..66bf8e5 100644
--- a/libjava/java/beans/EventSetDescriptor.java
+++ b/libjava/java/beans/EventSetDescriptor.java
@@ -38,9 +38,10 @@ exception statement from your version. */
 
 package java.beans;
 
-import java.util.*;
-import java.lang.reflect.*;
-import gnu.java.lang.*;
+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/FeatureDescriptor.java b/libjava/java/beans/FeatureDescriptor.java
index 32f54a4..68141cf 100644
--- a/libjava/java/beans/FeatureDescriptor.java
+++ b/libjava/java/beans/FeatureDescriptor.java
@@ -38,7 +38,8 @@ exception statement from your version. */
 
 package java.beans;
 
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
 
 /**
  * FeatureDescriptor is the common superclass for all JavaBeans Descriptor
diff --git a/libjava/java/beans/IndexedPropertyDescriptor.java b/libjava/java/beans/IndexedPropertyDescriptor.java
index 42c9a24..8d80be9 100644
--- a/libjava/java/beans/IndexedPropertyDescriptor.java
+++ b/libjava/java/beans/IndexedPropertyDescriptor.java
@@ -38,8 +38,8 @@ exception statement from your version. */
 
 package java.beans;
 
-import java.util.*;
-import java.lang.reflect.*;
+import java.lang.reflect.Array;
+import java.lang.reflect.Method;
 
 /**
  ** IndexedPropertyDescriptor describes information about a JavaBean
diff --git a/libjava/java/beans/Introspector.java b/libjava/java/beans/Introspector.java
index b930b74..078f98e 100644
--- a/libjava/java/beans/Introspector.java
+++ b/libjava/java/beans/Introspector.java
@@ -38,10 +38,12 @@ exception statement from your version. */
 
 package java.beans;
 
-import gnu.java.beans.*;
-import java.util.*;
-import java.lang.reflect.*;
-import gnu.java.lang.*;
+import gnu.java.beans.BeanInfoEmbryo;
+import gnu.java.beans.ExplicitBeanInfo;
+import gnu.java.beans.IntrospectionIncubator;
+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/MethodDescriptor.java b/libjava/java/beans/MethodDescriptor.java
index fe1a7db..27503b8 100644
--- a/libjava/java/beans/MethodDescriptor.java
+++ b/libjava/java/beans/MethodDescriptor.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package java.beans;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Method;
 
 /** MethodDescriptor describes information about a JavaBeans method.
  ** It's a fairly straightforward class (at least something in this
diff --git a/libjava/java/beans/PropertyDescriptor.java b/libjava/java/beans/PropertyDescriptor.java
index 00db416..21ab360 100644
--- a/libjava/java/beans/PropertyDescriptor.java
+++ b/libjava/java/beans/PropertyDescriptor.java
@@ -38,9 +38,7 @@ exception statement from your version. */
 
 package java.beans;
 
-import java.util.*;
-import java.lang.reflect.*;
-
+import java.lang.reflect.Method;
 
 /**
  ** PropertyDescriptor describes information about a JavaBean property,
diff --git a/libjava/java/beans/SimpleBeanInfo.java b/libjava/java/beans/SimpleBeanInfo.java
index b98c5ef..deadfbf 100644
--- a/libjava/java/beans/SimpleBeanInfo.java
+++ b/libjava/java/beans/SimpleBeanInfo.java
@@ -38,7 +38,8 @@ exception statement from your version. */
 
 package java.beans;
 
-import java.awt.*;
+import java.awt.Image;
+import java.awt.Toolkit;
 
 /**
  ** SimpleBeanInfo is a class you may extend to more easily
diff --git a/libjava/java/beans/beancontext/BeanContextServicesSupport.java b/libjava/java/beans/beancontext/BeanContextServicesSupport.java
index 02ee53a..60aab69 100644
--- a/libjava/java/beans/beancontext/BeanContextServicesSupport.java
+++ b/libjava/java/beans/beancontext/BeanContextServicesSupport.java
@@ -100,6 +100,8 @@ public class BeanContextServicesSupport
   protected static class BCSSServiceProvider
     implements Serializable
   {
+    private static final long serialVersionUID = 861278251667444782L;
+
     protected BeanContextServiceProvider serviceProvider;
 
     protected BeanContextServiceProvider getServiceProvider()