FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[multiple changes]

Browse source 
2005-02-19  Michael Koch  <konqueror@gmx.de>

	* Makefile.am: Added new files in gnu/java/beans and
	java/beans/XMLDecoder.java.
	* Makefile.in: Regenerated.

2005-02-19  Robert Schuster  <thebohemian@gmx.net>

	* gnu/java/beans/decoder/GrowableArrayContext.java: Fixed
	assignment behavior by using java.lang.reflect.Array.set()
	directly.

2005-02-19  Dalibor Topic  <robilad@kaffe.org>

	* gnu/java/beans/EmptyBeanInfo.java,
	gnu/java/beans/info/ComponentBeanInfo.java:
	Removed unused files.

2005-02-19  Robert Schuster <thebohemian@gmx.net>

	* gnu/java/beans/DummyAppletStub.java: Add dummy implementation
	of AppletStub for java.beans.Beans.instantiate.
	* gnu/java/beans/DummyAppletContext.java: Add dummy implementation
	of AppletContext.
	* java/beans/Beans: Added 1.4 functionality, fixed user documentation
	to be conformant with Javadoc guidelines.
	(instantiate): Added two more overloaded variants, reworked user
	documentation, fixed exception behavior, fixed behavior when
	deserializing null.

2005-02-19  Mark Wielaard  <mark@klomp.org>

	* gnu/java/beans/decoder/DummyHandler.java: Add return statements for
	failing methods.
	* gnu/java/beans/decoder/DummyContext.java: Likewise.

2005-02-19  Robert Schuster  <theBohemian@gmx.net>

	* gnu/java/beans/decoder/AbstractContext.java,
	gnu/java/beans/decoder/AbstractCreatableContext.java,
	gnu/java/beans/decoder/AbstractElementHandler.java,
	gnu/java/beans/decoder/AbstractObjectContext.java,
	gnu/java/beans/decoder/ArrayContext.java,
	gnu/java/beans/decoder/ArrayHandler.java,
	gnu/java/beans/decoder/AssemblyException.java,
	gnu/java/beans/decoder/BooleanHandler.java,
	gnu/java/beans/decoder/ByteHandler.java,
	gnu/java/beans/decoder/CharHandler.java,
	gnu/java/beans/decoder/ClassHandler.java,
	gnu/java/beans/decoder/ConstructorContext.java,
	gnu/java/beans/decoder/Context.java,
	gnu/java/beans/decoder/DecoderContext.java,
	gnu/java/beans/decoder/DefaultExceptionListener.java,
	gnu/java/beans/decoder/DoubleHandler.java,
	gnu/java/beans/decoder/DummyContext.java,
	gnu/java/beans/decoder/DummyHandler.java,
	gnu/java/beans/decoder/ElementHandler.java,
	gnu/java/beans/decoder/FloatHandler.java,
	gnu/java/beans/decoder/GrowableArrayContext.java,
	gnu/java/beans/decoder/IndexContext.java,
	gnu/java/beans/decoder/IntHandler.java,
	gnu/java/beans/decoder/JavaHandler.java,
	gnu/java/beans/decoder/LongHandler.java,
	gnu/java/beans/decoder/MethodContext.java,
	gnu/java/beans/decoder/MethodFinder.java,
	gnu/java/beans/decoder/NullHandler.java,
	gnu/java/beans/decoder/ObjectContext.java,
	gnu/java/beans/decoder/ObjectHandler.java,
	gnu/java/beans/decoder/PersistenceParser.java,
	gnu/java/beans/decoder/PropertyContext.java,
	gnu/java/beans/decoder/ShortHandler.java,
	gnu/java/beans/decoder/SimpleHandler.java,
	gnu/java/beans/decoder/StaticMethodContext.java,
	gnu/java/beans/decoder/StringHandler.java,
	gnu/java/beans/decoder/VoidHandler.java: New class
	implementing java.beans.XMLDecoder decoding functionality.
	* java/beans/XMLDecoder.java: New class.

From-SVN: r95287
This commit is contained in:
Michael Koch 2005-02-19 18:47:29 +00:00
parent 2cdc207340
commit 6ca84a804a
44 changed files with 5609 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

477
libjava/java/beans/Beans.java
View file

@ -1,5 +1,5 @@
/* java.beans.Beans
Copyright (C) 1998, 1999 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -35,23 +35,26 @@ 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 java.beans;
import gnu.java.beans.DummyAppletStub;
import gnu.java.io.ClassLoaderObjectInputStream;
import java.applet.Applet;
import java.beans.beancontext.BeanContext;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.net.URL;
/**
* <code>Beans</code> provides some helper methods that allow the basic
* operations of Bean-ness.
*
* @author John Keiser
* @author Robert Schuster
*
* @since 1.1
* @version 1.1.0, 29 Jul 1998
* @status updated to 1.4
*
*/
public class Beans
@ -66,196 +69,300 @@ public class Beans
*/
public Beans()
{
// Do nothing here.
// Does intentionally 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);
/** Creates a bean.
* <p>This is a convenience method that calls <code>instantiate(cl, beanName, null, null)</code>.</p>
*
* @see instantiate(ClassLoader, String, BeanContext, AppletInitializer)
* @param cl ClassLoader to be used or <code>null</code> for the system classloader.
* @param beanName Name of a serialized bean or class name.
* @return A newly created bean.
* @throws IOException If access of an IO resource failed.
* @throws ClassNotFoundException If the class name is not known or does not lead to a proper bean class.
*/
public static Object instantiate(ClassLoader cl, String beanName)
throws IOException, ClassNotFoundException
{
return instantiate(cl, beanName, null, null);
}
/** Creates a bean.
*
* <p>This is a convenience method that calls <code>instantiate(cl, beanName, beanContext, null)</code>.</p>
*
* @see instantiate(ClassLoader, String, BeanContext, AppletInitializer)
* @param cl ClassLoader to be used or <code>null</code> for the system classloader.
* @param beanName Name of a serialized bean or class name.
* @param beanContext Context to which the newly created Bean should be added.
* @return A newly created bean.
* @throws IOException If access of an IO resource failed.
* @throws ClassNotFoundException If the class name is not known or does not lead to a proper bean class.
*/
public static Object instantiate(
ClassLoader cl,
String beanName,
BeanContext beanContext)
throws IOException, ClassNotFoundException
{
return instantiate(cl, beanName, beanContext, null);
}
/** Instantiates a bean according to Beans 1.0.
*
* <p>In Beans 1.0 the instantiation scheme is as follows:</p>
* <p>The name should be dot-separated (e.g "place.for.beans.myBean") and indicate either a
* serialized object or a class name. In the first case all dots in the name are replaced with
* slashes ('/') and ".ser" is appended ("place.for.beans.myBean" becomes "place/for/beans/myBean.ser").
* The bean is then loaded as an application or system resource depending on whether a
* <code>ClassLoader</code> was provided.</p>
*
* <p>If no such resource exists or if it contains no bean the name is interpreted as a class name of
* which an instance is then created.</p>
*
* <p>If a <code>BeanContext</code> instance is available the created bean is added to it.</p>
*
* <p>If the created Bean is an <code>Applet</code> or subclass and an <code>AppletInitializer</code>
* instance is available the applet is initialized and afterwards activated using the initializer. Additionally
* every instantiated <code>Applet</code> bean is initialized using the {@link Applet.init} method.
* Furthermore every applet gets a default <code>AppletStub</code>. The <code>Applet</code>'s
* document base is the location of the ".ser" file if it was deserialized or the location of its class
* file if it was instantiated.</p>
*
* <p>A <code>ClassNotFoundException</code> is not only thrown when a class name was unknown
* but even when the class has public no-argument constructor
* (<code>IllegalAccessException</code> is wrapped) or an exception is thrown while
* invoking such a constructor (causing exception is wrapped).</p>
*
* @param cl ClassLoader to be used or <code>null</code> for the system classloader.
* @param beanName Name of a serialized bean or class name.
* @param beanContext Context to which the newly created Bean should be added.
* @param initializer The AppletInitializer which is used for initializing <code>Applet</code> beans.
* @return A newly created bean.
* @throws IOException If access of an IO resource failed.
* @throws ClassNotFoundException If the class name is not known or does not lead to a proper bean class.
*/
public static Object instantiate(
ClassLoader cl,
String beanName,
BeanContext beanContext,
AppletInitializer initializer)
throws IOException, ClassNotFoundException
{
Object bean = null;
URL beanLocation = null;
URL classLocation = null;
// Converts bean name into a resource name (eg. "a.b.c" -> "a/b/c").
String resourceName = beanName.replace('.', '/');
/* Tries to get an input stream of the Bean, reading it as a system resource
* if no ClassLoader is present or as an application resource if a classloader
* is given.
*/
beanLocation =
(cl == null)
? ClassLoader.getSystemResource(resourceName + ".ser")
: cl.getResource(resourceName + ".ser");
// Reads the serialized Bean from the returned URL.
if (beanLocation != null)
{
// Deserializes the bean instance.
ObjectInputStream ois =
(cl == null)
? new ObjectInputStream(beanLocation.openStream())
: new ClassLoaderObjectInputStream(
beanLocation.openStream(),
cl);
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();
}
}
/* Implementation note: The result of ObjectInputStream.readObject()
* may have been null at this point (its a valid value to deserialize)
* and we explicitly want to try instantiation in such a case
* (this is important for compatibility).
*/
}
return bean;
}
// Instantiates the Bean using reflective instantiation if it has not been created yet.
if (bean == null)
{
// Makes sure that the deserialization was NOT done.
beanLocation = null;
/**
* 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;
}
Class beanClass;
if (cl == null)
{
beanClass = Class.forName(beanName);
classLocation =
ClassLoader.getSystemResource(resourceName + ".class");
}
else
{
beanClass = cl.loadClass(beanName);
classLocation = cl.getResource(resourceName + ".class");
}
/**
* 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 newBeanClass 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);
}
// Instantiates and optionally registers the new bean.
try
{
bean = beanClass.newInstance();
}
catch(Exception e) {
/* Wraps all kinds of Exceptions in a ClassNotFoundException (this behavior
* matches with official >= 1.5, this was different for <=1.4)
*/
throw new ClassNotFoundException(null, e);
}
}
/**
* 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;
}
/* Applet beans are treated in the following way:
* - all AppletS get a default AppletStub
* - all AppletS are initialized using the AppletInitializer instance (if it is available)
* - as every other Bean Applets are added to a BeanContext if one is available
* - each instantiated Applet is initialized using Applet.init() (this is not done for deserialized ones)
* - finally AppletS get activated using the AppletInitializerS activate-Method
*
* The order of operations is important for compatibility.
*/
Applet applet = null;
if (bean instanceof Applet)
{
// Makes a second instanceof call unneccessary (instanceof is expensive).
applet = (Applet) bean;
/**
* 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;
}
/* The AppletStub's code and document base is set as follows:
* The code base is always the URL from where the class data originated
* (without the package name).
* If the Applet was deserialized the document base is the location of
* the serialized instance (usually the ".ser" file) otherwise its the URL
* from where the class data originated (usually the absolute directory
* location of the ".class" file).
*/
applet.setStub(
new DummyAppletStub(
applet
.getClass()
.getProtectionDomain()
.getCodeSource()
.getLocation(),
(beanLocation == null) ? classLocation : beanLocation));
/**
* 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;
}
// Runs the Applet's initialization using an AppletInitializer.
if (initializer != null)
{
initializer.initialize(applet, beanContext);
}
}
// Adds the new bean to its BeanContext.
if (beanContext != null)
{
beanContext.add(bean);
}
if (applet != null)
{
// Initializes an instantiated (not deserialized) Applet using its own method.
if (beanLocation == null)
{
applet.init();
}
// Runs the Applet's activation using an AppletInitializer.
if (initializer != null)
{
initializer.activate(applet);
}
}
return bean;
}
/**
* Returns 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;
}
/**
* Determines 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);
}
/**
* Returns whether the GUI is available to use.
* <p>Defaults to true.</p>
*
* @return whether the GUI is available to use.
*/
public static boolean isGuiAvailable()
{
return guiAvailable;
}
/**
* Returns whether it is design time. Design time means
* we are in a RAD tool.
* <p>Defaults to false.</p>
*
* @return whether it is design time.
*/
public static boolean isDesignTime()
{
return designTime;
}
/**
* Sets 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;
}
/**
* Sets 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;
}
/**
* 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;
}
}