jdk-sandbox: comparison jdk/src/share/classes/java/beans/Beans.java

equal deleted inserted replaced

-:77898184e343
+:71aa8bfff99d
 /*
-* Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.
+* Copyright 1996-2009 Sun Microsystems, Inc.  All Rights Reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Sun designates this
 package java.beans;
 import com.sun.beans.finder.ClassFinder;
-import java.applet.*;
+import java.applet.Applet;
+import java.applet.AppletContext;
-import java.awt.*;
+import java.applet.AppletStub;
+import java.applet.AudioClip;
-import java.beans.AppletInitializer;
+import java.awt.GraphicsEnvironment;
+import java.awt.Image;
 import java.beans.beancontext.BeanContext;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
-import java.lang.reflect.Constructor;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+import java.io.StreamCorruptedException;
 import java.net.URL;
-import java.lang.reflect.Array;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Vector;
+import sun.awt.AppContext;
 /**
 * This class provides some general purpose beans control methods.
 */
 public class Beans {
+private static final Object DESIGN_TIME = new Object();
+private static final Object GUI_AVAILABLE = new Object();
 /**
 * <p>
 * Instantiate a JavaBean.
 * </p>
 *                        the bean.  If this is null, then the system
 *                        class-loader is used.
 * @param     beanName    the name of the bean within the class-loader.
 *                        For example "sun.beanbox.foobah"
 *
-* @exception java.lang.ClassNotFoundException if the class of a serialized
+* @exception ClassNotFoundException if the class of a serialized
 *              object could not be found.
-* @exception java.io.IOException if an I/O error occurs.
+* @exception IOException if an I/O error occurs.
 */
-public static Object instantiate(ClassLoader cls, String beanName) throws java.io.IOException, ClassNotFoundException {
+public static Object instantiate(ClassLoader cls, String beanName) throws IOException, ClassNotFoundException {
 return Beans.instantiate(cls, beanName, null, null);
 }
 /**
 * <p>
 *                        class-loader is used.
 * @param     beanName    the name of the bean within the class-loader.
 *                        For example "sun.beanbox.foobah"
 * @param     beanContext The BeanContext in which to nest the new bean
 *
-* @exception java.lang.ClassNotFoundException if the class of a serialized
+* @exception ClassNotFoundException if the class of a serialized
 *              object could not be found.
-* @exception java.io.IOException if an I/O error occurs.
+* @exception IOException if an I/O error occurs.
 */
-public static Object instantiate(ClassLoader cls, String beanName, BeanContext beanContext) throws java.io.IOException, ClassNotFoundException {
+public static Object instantiate(ClassLoader cls, String beanName, BeanContext beanContext) throws IOException, ClassNotFoundException {
 return Beans.instantiate(cls, beanName, beanContext, null);
 }
 /**
 * Instantiate a bean.
 * @param     beanName    the name of the bean within the class-loader.
 *                        For example "sun.beanbox.foobah"
 * @param     beanContext The BeanContext in which to nest the new bean
 * @param     initializer The AppletInitializer for the new bean
 *
-* @exception java.lang.ClassNotFoundException if the class of a serialized
+* @exception ClassNotFoundException if the class of a serialized
 *              object could not be found.
-* @exception java.io.IOException if an I/O error occurs.
+* @exception IOException if an I/O error occurs.
 */
 public static Object instantiate(ClassLoader cls, String beanName, BeanContext beanContext, AppletInitializer initializer)
-throws java.io.IOException, ClassNotFoundException {
+throws IOException, ClassNotFoundException {
-java.io.InputStream ins;
+InputStream ins;
-java.io.ObjectInputStream oins = null;
+ObjectInputStream oins = null;
 Object result = null;
 boolean serialized = false;
-java.io.IOException serex = null;
+IOException serex = null;
 // If the given classloader is null, we check if an
 // system classloader is available and (if so)
 // use that instead.
 // Note that calls on the system class loader will
 }
 // Try to find a serialized object with this name
 final String serName = beanName.replace('.','/').concat(".ser");
 final ClassLoader loader = cls;
-ins = (InputStream)java.security.AccessController.doPrivileged
+ins = (InputStream)AccessController.doPrivileged
-(new java.security.PrivilegedAction() {
+(new PrivilegedAction() {
 public Object run() {
 if (loader == null)
 return ClassLoader.getSystemResourceAsStream(serName);
 else
 return loader.getResourceAsStream(serName);
 oins = new ObjectInputStreamWithLoader(ins, cls);
 }
 result = oins.readObject();
 serialized = true;
 oins.close();
-} catch (java.io.IOException ex) {
+} catch (IOException ex) {
 ins.close();
 // Drop through and try opening the class.  But remember
 // the exception in case we can't find the class either.
 serex = ex;
 } catch (ClassNotFoundException ex) {
 // Now get the URL correponding to the resource name.
 final ClassLoader cloader = cls;
 objectUrl = (URL)
-java.security.AccessController.doPrivileged
+AccessController.doPrivileged
-(new java.security.PrivilegedAction() {
+(new PrivilegedAction() {
 public Object run() {
 if (cloader == null)
 return ClassLoader.getSystemResource
 (resourceName);
 else
 * Test if we are in design-mode.
 *
 * @return  True if we are running in an application construction
 *          environment.
 *
-* @see java.beans.DesignMode
+* @see DesignMode
 */
 public static boolean isDesignTime() {
-return designTime;
+Object value = AppContext.getAppContext().get(DESIGN_TIME);
+return (value instanceof Boolean) && (Boolean) value;
 }
 /**
 * Determines whether beans can assume a GUI is available.
 *
 *     can pop up dialog boxes, etc.  This will normally return
 *     true in a windowing environment, and will normally return
 *     false in a server environment or if an application is
 *     running as part of a batch job.
 *
-* @see java.beans.Visibility
+* @see Visibility
 *
 */
 public static boolean isGuiAvailable() {
-return guiAvailable;
+Object value = AppContext.getAppContext().get(GUI_AVAILABLE);
+return (value instanceof Boolean) ? (Boolean) value : !GraphicsEnvironment.isHeadless();
 }
 /**
 * Used to indicate whether of not we are running in an application
 * builder environment.
 throws SecurityException {
 SecurityManager sm = System.getSecurityManager();
 if (sm != null) {
 sm.checkPropertiesAccess();
 }
-designTime = isDesignTime;
+AppContext.getAppContext().put(DESIGN_TIME, Boolean.valueOf(isDesignTime));
 }
 /**
 * Used to indicate whether of not we are running in an environment
 * where GUI interaction is available.
 throws SecurityException {
 SecurityManager sm = System.getSecurityManager();
 if (sm != null) {
 sm.checkPropertiesAccess();
 }
-guiAvailable = isGuiAvailable;
+AppContext.getAppContext().put(GUI_AVAILABLE, Boolean.valueOf(isGuiAvailable));
-}
-private static boolean designTime;
-private static boolean guiAvailable;
-static {
-guiAvailable = !GraphicsEnvironment.isHeadless();
 }
 }
 /**
 * This subclass of ObjectInputStream delegates loading of classes to
 * for beans which are applets.
 */
 class BeansAppletContext implements AppletContext {
 Applet target;
-java.util.Hashtable imageCache = new java.util.Hashtable();
+Hashtable imageCache = new Hashtable();
 BeansAppletContext(Applet target) {
 this.target = target;
 }
 public Applet getApplet(String name) {
 return null;
 }
-public java.util.Enumeration getApplets() {
+public Enumeration getApplets() {
-java.util.Vector applets = new java.util.Vector();
+Vector applets = new Vector();
 applets.addElement(target);
 return applets.elements();
 }
 public void showDocument(URL url) {
 public InputStream getStream(String key){
 // We do nothing.
 return null;
 }
-public java.util.Iterator getStreamKeys(){
+public Iterator getStreamKeys(){
 // We do nothing.
 return null;
 }
 }

changeset 2483	71aa8bfff99d
parent 2	90ce3da70b43
child 5506	202f599c92aa