Beans.java, [...]: Reformated to GNU style.

2003-02-27  Michael Koch  <konqueror@gmx.de>

	* java/beans/Beans.java,
	java/beans/FeatureDescriptor.java
	java/beans/PropertyEditorManager.java:
	Reformated to GNU style.

From-SVN: r63501

1 files changed, 207 insertions, 157 deletions

diff --git a/libjava/java/beans/Beans.java b/libjava/java/beans/Beans.java
index 747e7cc..aa52c03 100644
--- a/libjava/java/beans/Beans.java
+++ b/libjava/java/beans/Beans.java
@@ -43,166 +43,216 @@ import java.applet.*;
 import gnu.java.io.*;
 
 /**
- * <code>Beans</code> provides some helper methods that allow the basic operations of Bean-ness.
+ * <code>Beans</code> provides some helper methods that allow the basic
+ * operations of Bean-ness.
  *
  * @author John Keiser
- * @since JDK1.1
+ * @since 1.1
  * @version 1.1.0, 29 Jul 1998
  *
  */
-public class Beans {
-	static boolean designTime = false;
-	static boolean guiAvailable = true;
-
-
-	/**
-	 * Once again, we have a java.beans class with only
-	 * static methods that can be instantiated.  When
-	 * will the madness end? :)
-	 */
-	public Beans() {
-	}
-
-	/**
-	 * Allows you to instantiate a Bean.  This method takes
-	 * a ClassLoader from which to read the Bean and the
-	 * name of the Bean.<P>
-	 *
-	 * The Bean name should be a dotted name, like a class.
-	 * It can represent several things.  Beans will search
-	 * for the Bean using the name like this:<P>
-	 * <OL>
-	 * <LI>Searches for a serialized instance of the Bean
-	 * using getResource(), mangling the Bean name by
-	 * replacing the dots with slashes and appending .ser
-	 * (for example, gnu.beans.BlahDeBlah would cause
-	 * Beans to search for gnu/beans/BlahDeBlah.ser using
-	 * getResource()).</LI>
-	 * <LI>Searches for the Bean class using the beanName,
-	 * and then instantiates it with the no-arg constructor.
-	 * At that point, if it is an Applet, it provides it
-	 * with AppletContext and AppletStub, and then calls
-	 * init().</LI>
-	 * </OL>
-	 * @param cl the ClassLoader to use, or <CODE>null</CODE>
-	 *        to use the default ClassLoader.
-	 * @param beanName the name of the Bean.
-	 * @return the Bean.
-	 * @XXX
-	 */
-	public static Object instantiate(ClassLoader cl, String beanName) throws IOException, ClassNotFoundException {
-		Object bean;
-
-		InputStream serStream;
-		if(cl == null) {
-			serStream = ClassLoader.getSystemResourceAsStream(beanName.replace('.','/')+".ser");
-		} else {
-			serStream = cl.getResourceAsStream(beanName.replace('.','/')+".ser");
-		}
-		if(serStream != null) {
-			if(cl == null) {
-				ObjectInputStream ois = new ObjectInputStream(serStream);
-				bean = ois.readObject();
-			} else {
-				ClassLoaderObjectInputStream ois = new ClassLoaderObjectInputStream(serStream, cl);
-				bean = ois.readObject();
-			}
-		} else if(cl == null) {
-			Class beanClass = Class.forName(beanName);
-			try {
-				bean = beanClass.newInstance();
-			} catch(IllegalAccessException E) {
-				bean = null;
-			} catch(InstantiationException E) {
-				bean = null;
-			}
-		} else {
-			Class beanClass = cl.loadClass(beanName);
-			try {
-				bean = beanClass.newInstance();
-			} catch(IllegalAccessException E) {
-				bean = null;
-			} catch(InstantiationException E) {
-				bean = null;
-			}
-		}
-
-		if(bean instanceof Applet) {
-			Applet a = (Applet)bean;
-			//a.setAppletContext(???);
-			//a.setStub(???);
-			if(serStream == null) {
-				a.init();
-			}
-		}
-
-		return bean;
-	}
-
-	/**
-	 * Get the Bean as a different class type.
-	 * This should be used instead of casting to get a new
-	 * type view of a Bean, because in the future there may
-	 * be new types of Bean, even Beans spanning multiple
-	 * Objects.
-	 * @param bean the Bean to cast.
-	 * @param newClass the Class to cast it to.
-	 * @return the Bean as a new view, or if the operation
-	 *         could not be performed, the Bean itself.
-	 */
-	public static Object getInstanceOf(Object bean, Class newClass) {
-		return bean;
-	}
-
-	/**
-	 * Determine whether the Bean can be cast to a different
-	 * class type.
-	 * This should be used instead of instanceof to determine
-	 * a Bean's castability, because in the future there may
-	 * be new types of Bean, even Beans spanning multiple
-	 * Objects.
-	 * @param bean the Bean to cast.
-	 * @param newClass the Class to cast it to.
-	 * @return whether the Bean can be cast to the class type
-	 *         in question.
-	 */
-	public static boolean isInstanceOf(Object bean, Class newBeanClass) {
-		return newBeanClass.isInstance(bean);
-	}
-
-	/**
-	 * Find out whether the GUI is available to use.
-	 * Defaults to true.
-	 * @return whether the GUI is available to use.
-	 */
-	public static boolean isGuiAvailable() {
-		return guiAvailable;
-	}
-
-	/**
-	 * Find out whether it is design time.  Design time means
-	 * we are in a RAD tool.
-	 * Defaults to false.
-	 * @return whether it is design time.
-	 */
-	public static boolean isDesignTime() {
-		return designTime;
-	}
-
-	/**
-	 * Set whether the GUI is available to use.
-	 * @param guiAvailable whether the GUI is available to use.
-	 */
-	public static void setGuiAvailable(boolean guiAvailable) throws SecurityException {
-		Beans.guiAvailable = guiAvailable;
-	}
-
-	/**
-	 * Set whether it is design time.  Design time means we
-	 * are in a RAD tool.
-	 * @param designTime whether it is design time.
-	 */
-	public static void setDesignTime(boolean designTime) throws SecurityException {
-		Beans.designTime = designTime;
-	}
+public class Beans
+{
+  static boolean designTime = false;
+  static boolean guiAvailable = true;
+
+  /**
+   * Once again, we have a java.beans class with only
+   * static methods that can be instantiated.  When
+   * will the madness end? :)
+   */
+  public Beans()
+  {
+    // Do nothing here.
+  }
+
+  /**
+   * Allows you to instantiate a Bean.  This method takes
+   * a ClassLoader from which to read the Bean and the
+   * name of the Bean.<P>
+   *
+   * The Bean name should be a dotted name, like a class.
+   * It can represent several things.  Beans will search
+   * for the Bean using the name like this:<P>
+   * <OL>
+   * <LI>Searches for a serialized instance of the Bean
+   * using getResource(), mangling the Bean name by
+   * replacing the dots with slashes and appending .ser
+   * (for example, gnu.beans.BlahDeBlah would cause
+   * Beans to search for gnu/beans/BlahDeBlah.ser using
+   * getResource()).</LI>
+   * <LI>Searches for the Bean class using the beanName,
+   * and then instantiates it with the no-arg constructor.
+   * At that point, if it is an Applet, it provides it
+   * with AppletContext and AppletStub, and then calls
+   * init().</LI>
+   * </OL>
+   *
+   * @param cl the ClassLoader to use, or <CODE>null</CODE>
+   *        to use the default ClassLoader.
+   * @param beanName the name of the Bean.
+   *
+   * @return the Bean.
+   *
+   * @XXX
+   */
+  public static Object instantiate (ClassLoader cl, String beanName)
+    throws IOException, ClassNotFoundException
+  {
+    Object bean;
+    InputStream serStream;
+    
+    if (cl == null)
+      {
+        serStream = ClassLoader.getSystemResourceAsStream
+          (beanName.replace ('.','/')+".ser");
+      }
+    else
+      {
+        serStream = cl.getResourceAsStream (beanName.replace ('.', '/')
+                                            + ".ser");
+      }
+    
+    if (serStream != null)
+      {
+        if(cl == null)
+          {
+            ObjectInputStream ois = new ObjectInputStream(serStream);
+            bean = ois.readObject();
+          }
+        else
+          {
+            ClassLoaderObjectInputStream ois =
+              new ClassLoaderObjectInputStream (serStream, cl);
+            bean = ois.readObject();
+          }
+      }
+    else if(cl == null)
+      {
+        Class beanClass = Class.forName(beanName);
+        try
+          {
+            bean = beanClass.newInstance();
+          }
+        catch(IllegalAccessException E)
+          {
+            bean = null;
+          }
+        catch(InstantiationException E)
+          {
+            bean = null;
+          }
+      }
+    else
+      {
+        Class beanClass = cl.loadClass(beanName);
+        try
+          {
+            bean = beanClass.newInstance();
+          }
+        catch(IllegalAccessException E)
+          {
+            bean = null;
+          }
+        catch(InstantiationException E)
+          {
+            bean = null;
+          }
+      }
+
+    if(bean instanceof Applet)
+      {
+        Applet a = (Applet)bean;
+        //a.setAppletContext(???);
+        //a.setStub(???);
+        if(serStream == null)
+          {
+            a.init();
+          }
+      }
+
+    return bean;
+  }
+
+  /**
+   * Get the Bean as a different class type.
+   * This should be used instead of casting to get a new
+   * type view of a Bean, because in the future there may
+   * be new types of Bean, even Beans spanning multiple
+   * Objects.
+   *
+   * @param bean the Bean to cast.
+   * @param newClass the Class to cast it to.
+   *
+   * @return the Bean as a new view, or if the operation
+   *         could not be performed, the Bean itself.
+   */
+  public static Object getInstanceOf(Object bean, Class newClass)
+  {
+    return bean;
+  }
+
+  /**
+   * Determine whether the Bean can be cast to a different
+   * class type.
+   * This should be used instead of instanceof to determine
+   * a Bean's castability, because in the future there may
+   * be new types of Bean, even Beans spanning multiple
+   * Objects.
+   *
+   * @param bean the Bean to cast.
+   * @param newClass the Class to cast it to.
+   *
+   * @return whether the Bean can be cast to the class type
+   *         in question.
+   */
+  public static boolean isInstanceOf(Object bean, Class newBeanClass)
+  {
+    return newBeanClass.isInstance(bean);
+  }
+
+  /**
+   * Find out whether the GUI is available to use.
+   * Defaults to true.
+   *
+   * @return whether the GUI is available to use.
+   */
+  public static boolean isGuiAvailable()
+  {
+    return guiAvailable;
+  }
+
+  /**
+   * Find out whether it is design time.  Design time means
+   * we are in a RAD tool.
+   * Defaults to false.
+   *
+   * @return whether it is design time.
+   */
+  public static boolean isDesignTime()
+  {
+    return designTime;
+  }
+
+  /**
+   * Set whether the GUI is available to use.
+   * @param guiAvailable whether the GUI is available to use.
+   */
+  public static void setGuiAvailable(boolean guiAvailable)
+    throws SecurityException
+  {
+    Beans.guiAvailable = guiAvailable;
+  }
+
+  /**
+   * Set whether it is design time.  Design time means we
+   * are in a RAD tool.
+   *
+   * @param designTime whether it is design time.
+   */
+  public static void setDesignTime(boolean designTime)
+    throws SecurityException
+  {
+    Beans.designTime = designTime;
+  }
 }