Commit 3894fe32 by Michael Koch Committed by Michael Koch

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
parent 6fc19dc9
2003-02-27 Michael Koch <konqueror@gmx.de>
* java/beans/Beans.java,
java/beans/FeatureDescriptor.java
java/beans/PropertyEditorManager.java:
Reformated to GNU style.
2003-02-25 Michael Koch <konqueror@gmx.de> 2003-02-25 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/MappedByteFileBuffer.java, * gnu/java/nio/MappedByteFileBuffer.java,
......
...@@ -43,166 +43,216 @@ import java.applet.*; ...@@ -43,166 +43,216 @@ import java.applet.*;
import gnu.java.io.*; 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 * @author John Keiser
* @since JDK1.1 * @since 1.1
* @version 1.1.0, 29 Jul 1998 * @version 1.1.0, 29 Jul 1998
* *
*/ */
public class Beans { public class Beans
static boolean designTime = false; {
static boolean guiAvailable = true; static boolean designTime = false;
static boolean guiAvailable = true;
/** /**
* Once again, we have a java.beans class with only * Once again, we have a java.beans class with only
* static methods that can be instantiated. When * static methods that can be instantiated. When
* will the madness end? :) * will the madness end? :)
*/ */
public Beans() { 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> * Allows you to instantiate a Bean. This method takes
* * a ClassLoader from which to read the Bean and the
* The Bean name should be a dotted name, like a class. * name of the Bean.<P>
* It can represent several things. Beans will search *
* for the Bean using the name like this:<P> * The Bean name should be a dotted name, like a class.
* <OL> * It can represent several things. Beans will search
* <LI>Searches for a serialized instance of the Bean * for the Bean using the name like this:<P>
* using getResource(), mangling the Bean name by * <OL>
* replacing the dots with slashes and appending .ser * <LI>Searches for a serialized instance of the Bean
* (for example, gnu.beans.BlahDeBlah would cause * using getResource(), mangling the Bean name by
* Beans to search for gnu/beans/BlahDeBlah.ser using * replacing the dots with slashes and appending .ser
* getResource()).</LI> * (for example, gnu.beans.BlahDeBlah would cause
* <LI>Searches for the Bean class using the beanName, * Beans to search for gnu/beans/BlahDeBlah.ser using
* and then instantiates it with the no-arg constructor. * getResource()).</LI>
* At that point, if it is an Applet, it provides it * <LI>Searches for the Bean class using the beanName,
* with AppletContext and AppletStub, and then calls * and then instantiates it with the no-arg constructor.
* init().</LI> * At that point, if it is an Applet, it provides it
* </OL> * with AppletContext and AppletStub, and then calls
* @param cl the ClassLoader to use, or <CODE>null</CODE> * init().</LI>
* to use the default ClassLoader. * </OL>
* @param beanName the name of the Bean. *
* @return the Bean. * @param cl the ClassLoader to use, or <CODE>null</CODE>
* @XXX * to use the default ClassLoader.
*/ * @param beanName the name of the Bean.
public static Object instantiate(ClassLoader cl, String beanName) throws IOException, ClassNotFoundException { *
Object bean; * @return the Bean.
*
InputStream serStream; * @XXX
if(cl == null) { */
serStream = ClassLoader.getSystemResourceAsStream(beanName.replace('.','/')+".ser"); public static Object instantiate (ClassLoader cl, String beanName)
} else { throws IOException, ClassNotFoundException
serStream = cl.getResourceAsStream(beanName.replace('.','/')+".ser"); {
} Object bean;
if(serStream != null) { InputStream serStream;
if(cl == null) {
ObjectInputStream ois = new ObjectInputStream(serStream); if (cl == null)
bean = ois.readObject(); {
} else { serStream = ClassLoader.getSystemResourceAsStream
ClassLoaderObjectInputStream ois = new ClassLoaderObjectInputStream(serStream, cl); (beanName.replace ('.','/')+".ser");
bean = ois.readObject(); }
} else
} else if(cl == null) { {
Class beanClass = Class.forName(beanName); serStream = cl.getResourceAsStream (beanName.replace ('.', '/')
try { + ".ser");
bean = beanClass.newInstance(); }
} catch(IllegalAccessException E) {
bean = null; if (serStream != null)
} catch(InstantiationException E) { {
bean = null; if(cl == null)
} {
} else { ObjectInputStream ois = new ObjectInputStream(serStream);
Class beanClass = cl.loadClass(beanName); bean = ois.readObject();
try { }
bean = beanClass.newInstance(); else
} catch(IllegalAccessException E) { {
bean = null; ClassLoaderObjectInputStream ois =
} catch(InstantiationException E) { new ClassLoaderObjectInputStream (serStream, cl);
bean = null; bean = ois.readObject();
} }
} }
else if(cl == null)
if(bean instanceof Applet) { {
Applet a = (Applet)bean; Class beanClass = Class.forName(beanName);
//a.setAppletContext(???); try
//a.setStub(???); {
if(serStream == null) { bean = beanClass.newInstance();
a.init(); }
} catch(IllegalAccessException E)
} {
bean = null;
return bean; }
} catch(InstantiationException E)
{
/** bean = 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 else
* be new types of Bean, even Beans spanning multiple {
* Objects. Class beanClass = cl.loadClass(beanName);
* @param bean the Bean to cast. try
* @param newClass the Class to cast it to. {
* @return the Bean as a new view, or if the operation bean = beanClass.newInstance();
* could not be performed, the Bean itself. }
*/ catch(IllegalAccessException E)
public static Object getInstanceOf(Object bean, Class newClass) { {
return bean; bean = null;
} }
catch(InstantiationException E)
/** {
* Determine whether the Bean can be cast to a different bean = null;
* 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 if(bean instanceof Applet)
* Objects. {
* @param bean the Bean to cast. Applet a = (Applet)bean;
* @param newClass the Class to cast it to. //a.setAppletContext(???);
* @return whether the Bean can be cast to the class type //a.setStub(???);
* in question. if(serStream == null)
*/ {
public static boolean isInstanceOf(Object bean, Class newBeanClass) { a.init();
return newBeanClass.isInstance(bean); }
} }
/** return bean;
* Find out whether the GUI is available to use. }
* Defaults to true.
* @return whether the GUI is available to use. /**
*/ * Get the Bean as a different class type.
public static boolean isGuiAvailable() { * This should be used instead of casting to get a new
return guiAvailable; * type view of a Bean, because in the future there may
} * be new types of Bean, even Beans spanning multiple
* Objects.
/** *
* Find out whether it is design time. Design time means * @param bean the Bean to cast.
* we are in a RAD tool. * @param newClass the Class to cast it to.
* Defaults to false. *
* @return whether it is design time. * @return the Bean as a new view, or if the operation
*/ * could not be performed, the Bean itself.
public static boolean isDesignTime() { */
return designTime; public static Object getInstanceOf(Object bean, Class newClass)
} {
return bean;
/** }
* Set whether the GUI is available to use.
* @param guiAvailable whether the GUI is available to use. /**
*/ * Determine whether the Bean can be cast to a different
public static void setGuiAvailable(boolean guiAvailable) throws SecurityException { * class type.
Beans.guiAvailable = guiAvailable; * 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.
* Set whether it is design time. Design time means we *
* are in a RAD tool. * @param bean the Bean to cast.
* @param designTime whether it is design time. * @param newClass the Class to cast it to.
*/ *
public static void setDesignTime(boolean designTime) throws SecurityException { * @return whether the Bean can be cast to the class type
Beans.designTime = designTime; * 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;
}
} }
...@@ -41,126 +41,175 @@ package java.beans; ...@@ -41,126 +41,175 @@ package java.beans;
import java.util.*; import java.util.*;
/** /**
** FeatureDescriptor is the common superclass for all JavaBeans Descriptor classes. * FeatureDescriptor is the common superclass for all JavaBeans Descriptor
** JavaBeans descriptors are abstract descriptors of properties, * classes. JavaBeans descriptors are abstract descriptors of properties,
** events, methods, beans, etc.<P> * events, methods, beans, etc.<P>
** *
** <STRONG>Documentation Convention:</STRONG> for proper * <STRONG>Documentation Convention:</STRONG> for proper
** Internalization of Beans inside an RAD tool, sometimes there * Internalization of Beans inside an RAD tool, sometimes there
** are two names for a property or method: a programmatic, or * are two names for a property or method: a programmatic, or
** locale-independent name, which can be used anywhere, and a * locale-independent name, which can be used anywhere, and a
** localized, display name, for ease of use. In the * localized, display name, for ease of use. In the
** documentation I will specify different String values as * documentation I will specify different String values as
** either <EM>programmatic</EM> or <EM>localized</EM> to * either <EM>programmatic</EM> or <EM>localized</EM> to
** make this distinction clear. * make this distinction clear.
** *
** @author John Keiser * @author John Keiser
** @since JDK1.1 * @since 1.1
** @version 1.1.0, 31 May 1998 * @version 1.1.0, 31 May 1998
**/ */
public class FeatureDescriptor { public class FeatureDescriptor
String name; {
String displayName; String name;
String shortDescription; String displayName;
boolean expert; String shortDescription;
boolean hidden; boolean expert;
boolean hidden;
Hashtable valueHash;
Hashtable valueHash;
/** Instantiate this FeatureDescriptor with appropriate default values.**/
public FeatureDescriptor() { /**
valueHash = new Hashtable(); * Instantiate this FeatureDescriptor with appropriate default values.
} */
public FeatureDescriptor()
/** Get the programmatic name of this feature. **/ {
public String getName() { valueHash = new Hashtable();
return name; }
}
/**
/** Set the programmatic name of this feature. * Get the programmatic name of this feature.
** @param name the new name for this feature. */
**/ public String getName()
public void setName(String name) { {
this.name = name; return name;
} }
/** Get the localized (display) name of this feature. **/ /**
public String getDisplayName() { * Set the programmatic name of this feature.
return displayName; *
} * @param name the new name for this feature.
*/
/** Set the localized (display) name of this feature. public void setName(String name)
** @param displayName the new display name for this feature. {
**/ this.name = name;
public void setDisplayName(String displayName) { }
this.displayName = displayName;
} /**
* Get the localized (display) name of this feature.
/** Get the localized short description for this feature. **/ */
public String getShortDescription() { public String getDisplayName()
return shortDescription; {
} return displayName;
}
/** Set the localized short description for this feature.
** @param shortDescription the new short description for this feature. /**
**/ * Set the localized (display) name of this feature.
public void setShortDescription(String shortDescription) { *
this.shortDescription = shortDescription; * @param displayName the new display name for this feature.
} */
public void setDisplayName(String displayName)
/** Indicates whether this feature is for expert use only. {
** @return true if for use by experts only, or false if anyone can use it. this.displayName = displayName;
**/ }
public boolean isExpert() {
return expert; /**
} * Get the localized short description for this feature.
*/
/** Set whether this feature is for expert use only. public String getShortDescription()
** @param expert true if for use by experts only, or false if anyone can use it. {
**/ return shortDescription;
public void setExpert(boolean expert) { }
this.expert = expert;
} /**
* Set the localized short description for this feature.
/** Indicates whether this feature is for use by tools only. *
** If it is for use by tools only, then it should not be displayed. * @param shortDescription the new short description for this feature.
** @return true if tools only should use it, or false if anyone can see it. */
**/ public void setShortDescription(String shortDescription)
public boolean isHidden() { {
return hidden; this.shortDescription = shortDescription;
} }
/** Set whether this feature is for use by tools only. /**
** If it is for use by tools only, then it should not be displayed. * Indicates whether this feature is for expert use only.
** @param hidden true if tools only should use it, or false if anyone can see it. *
**/ * @return true if for use by experts only,
public void setHidden(boolean hidden) { * or false if anyone can use it.
this.hidden = hidden; */
} public boolean isExpert()
{
return expert;
/** Get an arbitrary value set with setValue(). }
** @param name the programmatic name of the key.
** @return the value associated with this name, or null if there is none. /**
**/ * Set whether this feature is for expert use only.
public Object getValue(String name) { *
return valueHash.get(name); * @param expert true if for use by experts only,
} * or false if anyone can use it.
*/
/** Set an arbitrary string-value pair with this feature. public void setExpert(boolean expert)
** @param name the programmatic name of the key. {
** @param value the value to associate with the name. this.expert = expert;
**/ }
public void setValue(String name, Object value) {
valueHash.put(name, value); /**
} * Indicates whether this feature is for use by tools only.
* If it is for use by tools only, then it should not be displayed.
/** Get a list of the programmatic key names set with setValue(). *
** @return an Enumerator over all the programmatic key names associated * @return true if tools only should use it,
** with this feature. * or false if anyone can see it.
**/ */
public Enumeration attributeNames() { public boolean isHidden()
return valueHash.keys(); {
} return hidden;
}
/**
* Set whether this feature is for use by tools only.
* If it is for use by tools only, then it should not be displayed.
*
* @param hidden true if tools only should use it,
* or false if anyone can see it.
*/
public void setHidden(boolean hidden)
{
this.hidden = hidden;
}
/**
* Get an arbitrary value set with setValue().
*
* @param name the programmatic name of the key.
*
* @return the value associated with this name,
* or null if there is none.
*/
public Object getValue(String name)
{
return valueHash.get(name);
}
/**
* Set an arbitrary string-value pair with this feature.
*
* @param name the programmatic name of the key.
* @param value the value to associate with the name.
*/
public void setValue(String name, Object value)
{
valueHash.put(name, value);
}
/**
* Get a list of the programmatic key names set with setValue().
*
* @return an Enumerator over all the programmatic key names associated
* with this feature.
*/
public Enumeration attributeNames()
{
return valueHash.keys();
}
} }
...@@ -41,121 +41,152 @@ package java.beans; ...@@ -41,121 +41,152 @@ package java.beans;
import gnu.java.lang.ClassHelper; import gnu.java.lang.ClassHelper;
/** /**
** PropertyEditorManager is used to find property editors * PropertyEditorManager is used to find property editors
** for various types (not necessarily Beans).<P> * for various types (not necessarily Beans).<P>
** *
** It first checks to see if the property editor is * It first checks to see if the property editor is
** already registered; if it is, that property editor is * already registered; if it is, that property editor is
** used. Next it takes the type's classname and appends * used. Next it takes the type's classname and appends
** "Editor" to it, and searches first in the class's * "Editor" to it, and searches first in the class's
** package and then in the property editor search path.<P> * package and then in the property editor search path.<P>
** *
** Default property editors are provided for:<P> * Default property editors are provided for:<P>
** <OL> * <OL>
** <LI>boolean, byte, short, int, long, float, and double</LI> * <LI>boolean, byte, short, int, long, float, and double</LI>
** <LI>java.lang.String</LI> * <LI>java.lang.String</LI>
** <LI>java.awt.Color</LI> * <LI>java.awt.Color</LI>
** <LI>java.awt.Font</LI> * <LI>java.awt.Font</LI>
** <OL> * <OL>
** *
** <STRONG>Spec Suggestion:</STRONG> Perhaps an editor for * <STRONG>Spec Suggestion:</STRONG> Perhaps an editor for
** Filename or something like it should be provided. As well * Filename or something like it should be provided. As well
** as char. * as char.
** *
** @author John Keiser * @author John Keiser
** @since JDK1.1 * @since 1.1
** @version 1.1.0, 29 Jul 1998 * @version 1.1.0, 29 Jul 1998
**/ */
public class PropertyEditorManager { public class PropertyEditorManager
static java.util.Hashtable editors = new java.util.Hashtable(); {
static String[] editorSearchPath = {"gnu.java.beans.editors","sun.beans.editors"}; static java.util.Hashtable editors = new java.util.Hashtable();
static String[] editorSearchPath = {"gnu.java.beans.editors","sun.beans.editors"};
static {
registerEditor(java.lang.Boolean.TYPE, gnu.java.beans.editors.NativeBooleanEditor.class); static
registerEditor(java.lang.Byte.TYPE, gnu.java.beans.editors.NativeByteEditor.class); {
registerEditor(java.lang.Short.TYPE, gnu.java.beans.editors.NativeShortEditor.class); registerEditor(java.lang.Boolean.TYPE, gnu.java.beans.editors.NativeBooleanEditor.class);
registerEditor(java.lang.Integer.TYPE, gnu.java.beans.editors.NativeIntEditor.class); registerEditor(java.lang.Byte.TYPE, gnu.java.beans.editors.NativeByteEditor.class);
registerEditor(java.lang.Long.TYPE, gnu.java.beans.editors.NativeLongEditor.class); registerEditor(java.lang.Short.TYPE, gnu.java.beans.editors.NativeShortEditor.class);
registerEditor(java.lang.Float.TYPE, gnu.java.beans.editors.NativeFloatEditor.class); registerEditor(java.lang.Integer.TYPE, gnu.java.beans.editors.NativeIntEditor.class);
registerEditor(java.lang.Double.TYPE, gnu.java.beans.editors.NativeDoubleEditor.class); registerEditor(java.lang.Long.TYPE, gnu.java.beans.editors.NativeLongEditor.class);
registerEditor(java.lang.String.class, gnu.java.beans.editors.StringEditor.class); registerEditor(java.lang.Float.TYPE, gnu.java.beans.editors.NativeFloatEditor.class);
registerEditor(java.awt.Color.class, gnu.java.beans.editors.ColorEditor.class); registerEditor(java.lang.Double.TYPE, gnu.java.beans.editors.NativeDoubleEditor.class);
registerEditor(java.awt.Font.class, gnu.java.beans.editors.FontEditor.class); registerEditor(java.lang.String.class, gnu.java.beans.editors.StringEditor.class);
} registerEditor(java.awt.Color.class, gnu.java.beans.editors.ColorEditor.class);
registerEditor(java.awt.Font.class, gnu.java.beans.editors.FontEditor.class);
/** Beats me why this class can be instantiated, but there }
** you have it.
**/ /**
public PropertyEditorManager() { } * Beats me why this class can be instantiated, but there
* you have it.
/** Register an editor for a class. Replaces old editor */
** if there was one registered before. public PropertyEditorManager()
** @param editedClass the class that the property editor {
** will edit. // Do nothing here
** @param editorClass the PropertyEditor class. }
**/
public static void registerEditor(Class editedClass, Class editorClass) { /**
editors.put(editedClass, editorClass); * Register an editor for a class. Replaces old editor
} * if there was one registered before.
*
/** Returns a new instance of the property editor for the * @param editedClass the class that the property editor
** specified class. * will edit.
** @param editedClass the class that the property editor * @param editorClass the PropertyEditor class.
** will edit. */
** @return a PropertyEditor instance that can edit the public static void registerEditor(Class editedClass, Class editorClass)
** specified class. {
**/ editors.put(editedClass, editorClass);
public static PropertyEditor findEditor(Class editedClass) { }
try {
/**
Class found = (Class)editors.get(editedClass); * Returns a new instance of the property editor for the
if(found != null) { * specified class.
return (PropertyEditor)found.newInstance(); *
} * @param editedClass the class that the property editor
* will edit.
try { * @return a PropertyEditor instance that can edit the
found = Class.forName(editedClass.getName()+"Editor"); * specified class.
registerEditor(editedClass,found); */
return (PropertyEditor)found.newInstance(); public static PropertyEditor findEditor(Class editedClass)
} catch(ClassNotFoundException E) { {
} try
{
String appendName = "." + ClassHelper.getTruncatedClassName(editedClass) + "Editor"; Class found = (Class)editors.get(editedClass);
synchronized(editorSearchPath) { if(found != null)
for(int i=0;i<editorSearchPath.length;i++) { {
try { return (PropertyEditor)found.newInstance();
found = Class.forName(editorSearchPath[i] + appendName); }
registerEditor(editedClass,found);
return (PropertyEditor)found.newInstance(); try
} catch(ClassNotFoundException E) { {
} found = Class.forName(editedClass.getName()+"Editor");
} registerEditor(editedClass,found);
} return (PropertyEditor)found.newInstance();
}
} catch(InstantiationException E) { catch(ClassNotFoundException E)
} catch(IllegalAccessException E) { {
} }
return null;
} String appendName = "." + ClassHelper.getTruncatedClassName(editedClass) + "Editor";
synchronized(editorSearchPath)
/** Get the editor search path. {
** As a minor departure from the spec, the default value for(int i=0;i<editorSearchPath.length;i++)
** for the editor search path is "gnu.java.beans.editors", {
** "sun.beans.editors". try
** @return the editor search path. {
**/ found = Class.forName(editorSearchPath[i] + appendName);
public static String[] getEditorSearchPath() { registerEditor(editedClass,found);
return editorSearchPath; return (PropertyEditor)found.newInstance();
} }
catch(ClassNotFoundException E)
/** Set the editor search path. {
** @param editorSearchPath the new value for the editor }
** search path. }
**/ }
public static void setEditorSearchPath(String[] editorSearchPath) { }
synchronized(editorSearchPath) { catch(InstantiationException E)
PropertyEditorManager.editorSearchPath = editorSearchPath; {
} }
} catch(IllegalAccessException E)
{
}
return null;
}
/**
* Get the editor search path.
* As a minor departure from the spec, the default value
* for the editor search path is "gnu.java.beans.editors",
* "sun.beans.editors".
*
* @return the editor search path.
*/
public static String[] getEditorSearchPath()
{
return editorSearchPath;
}
/**
* Set the editor search path.
*
* @param editorSearchPath the new value for the editor search path.
*/
public static void setEditorSearchPath(String[] editorSearchPath)
{
synchronized(editorSearchPath)
{
PropertyEditorManager.editorSearchPath = editorSearchPath;
}
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment