You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by to...@apache.org on 2007/07/20 05:08:46 UTC
svn commit: r557856 - in /harmony/enhanced/classlib/trunk/modules/beans/src:
main/java/java/beans/ main/java/java/beans/beancontext/
main/java/org/apache/harmony/beans/editors/
test/support/java/org/apache/harmony/beans/tests/support/mock/
Author: tonywu
Date: Thu Jul 19 20:08:44 2007
New Revision: 557856
URL: http://svn.apache.org/viewvc?view=rev&rev=557856
Log:
Tidy up compiler warning, add missing license to the mock classes, no functional change
Modified:
harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyChangeSupport.java
harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLDecoder.java
harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLEncoder.java
harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java
harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox03.java
harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox031.java
harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox031BeanInfo.java
harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox03BeanInfo.java
harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox04.java
harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox041.java
harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox0411.java
harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockInterfaceBeanInfo.java
harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockJavaBean.java
harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockSubClassBeanInfo.java
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyChangeSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyChangeSupport.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyChangeSupport.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyChangeSupport.java Thu Jul 19 20:08:44 2007
@@ -36,6 +36,8 @@
private Object source;
+ @SuppressWarnings("unused")
+ // for serialization compatibility
private int propertyChangeSupportSerializedDataVersion = 1;
public PropertyChangeSupport(Object sourceBean) {
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLDecoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLDecoder.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLDecoder.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLDecoder.java Thu Jul 19 20:08:44 2007
@@ -55,7 +55,7 @@
boolean inJavaElem = false;
- HashMap idObjMap = new HashMap();
+ HashMap<String, Object> idObjMap = new HashMap<String, Object>();
public void characters(char[] ch, int start, int length)
throws SAXException {
@@ -289,7 +289,7 @@
private Object executeCommon(Elem elem) throws Exception {
// pop args
- ArrayList args = new ArrayList(5);
+ ArrayList<Object> args = new ArrayList<Object>(5);
while (readObjs.peek() != elem) {
Elem argElem = (Elem) readObjs.pop();
args.add(0, argElem.result);
@@ -415,7 +415,7 @@
private Object owner;
- private Stack readObjs = new Stack();
+ private Stack<Elem> readObjs = new Stack<Elem>();
private int readObjIndex = 0;
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLEncoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLEncoder.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLEncoder.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/XMLEncoder.java Thu Jul 19 20:08:44 2007
@@ -58,7 +58,7 @@
int refCount = 0;
// A list of statements that execute on the object.
- ArrayList stats = new ArrayList();
+ ArrayList<Statement> stats = new ArrayList<Statement>();
}
private static final int INDENT_UNIT = 1;
@@ -66,13 +66,13 @@
private static final boolean isStaticConstantsSupported = true;
// the main record of all root objects
- private ArrayList flushPending = new ArrayList();
+ private ArrayList<Object> flushPending = new ArrayList<Object>();
// the record of root objects with a void tag
- private ArrayList flushPendingStat = new ArrayList();
+ private ArrayList<Object> flushPendingStat = new ArrayList<Object>();
// keep the pre-required objects for each root object
- private ArrayList flushPrePending = new ArrayList();
+ private ArrayList<Object> flushPrePending = new ArrayList<Object>();
private boolean hasXmlHeader = false;
@@ -769,10 +769,10 @@
Statement stat = (Statement) iter.next();
try {
if (stat instanceof Expression) {
- Expression expr = (Expression) stat;
- Object subObj = expr.getValue();
- // if(expr.getTarget().getClass() ==
- // Class.class.getClass())
+ // Expression expr = (Expression) stat;
+ // Object subObj = expr.getValue();
+ // if(expr.getTarget().getClass() ==
+ // Class.class.getClass())
flushPrePending.add(value);
}
} catch (Exception e) {
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java Thu Jul 19 20:08:44 2007
@@ -31,9 +31,9 @@
import org.apache.harmony.beans.internal.nls.Messages;
/**
- * This support class implements <code>BeanContextServices</code> interface.
- * This class can be used directly, or be a super class of your class,
- * or be a delegate of your implementation that needs to support
+ * This support class implements <code>BeanContextServices</code> interface.
+ * This class can be used directly, or be a super class of your class, or be a
+ * delegate of your implementation that needs to support
* <code>BeanContextServices</code> interface.
*
*/
@@ -72,18 +72,19 @@
/**
* Every child of context is companied with a <code>BCSSChild</code>
- * instance. It can hold implementation specific information about
- * each child.
+ * instance. It can hold implementation specific information about each
+ * child.
* <p>
- * This class keeps records of all services requests submitted by
- * this child.</p>
+ * This class keeps records of all services requests submitted by this
+ * child.
+ * </p>
*
*/
protected class BCSSChild extends BeanContextSupport.BCSChild {
- private static final long serialVersionUID = -3263851306889194873L;
+ private static final long serialVersionUID = -3263851306889194873L;
- transient ArrayList serviceRecords;
+ transient ArrayList<ServiceRecord> serviceRecords;
BCSSChild(Object child, Object proxyPeer) {
super(child, proxyPeer);
@@ -92,13 +93,14 @@
}
/**
- * This class implements the <code>BeanContextServiceProvider</code>
+ * This class implements the <code>BeanContextServiceProvider</code>
* interface by wrapping a <code>BeanContextServices</code>. All services
- * registered in the <code>BeanContextServices</code> are accessible
- * via this wrapper service provider.
+ * registered in the <code>BeanContextServices</code> are accessible via
+ * this wrapper service provider.
* <p>
* This class is used by <code>BeanContextServicesSupport</code> to access
- * services provided by its parent context (if there is one).</p>
+ * services provided by its parent context (if there is one).
+ * </p>
*
*/
protected class BCSSProxyServiceProvider implements
@@ -178,11 +180,12 @@
}
/**
- * Every servie registered in this context is companied with a
- * <code>BCSSServiceProvider</code> instance. It can hold implementation
+ * Every servie registered in this context is companied with a
+ * <code>BCSSServiceProvider</code> instance. It can hold implementation
* specific information about each registered service.
* <p>
- * This class holds a reference to the service provider of the service.</p>
+ * This class holds a reference to the service provider of the service.
+ * </p>
*
*/
protected static class BCSSServiceProvider implements Serializable {
@@ -212,11 +215,11 @@
static final long serialVersionUID = -8494482757288719206L;
/**
- * A map of all registered services - key is service class, value is
- * <code>BCSSServiceProvider</code> object.
- * All access to this object should be synchronized on itself.
+ * A map of all registered services - key is service class, value is
+ * <code>BCSSServiceProvider</code> object. All access to this object
+ * should be synchronized on itself.
*/
- protected transient HashMap services;
+ protected transient HashMap<Class, BCSSServiceProvider> services;
/**
* The number of serializable service providers currently registered.
@@ -224,16 +227,16 @@
protected transient int serializable;
/**
- * A proxy service provider that delegates service requests to the
- * parent context.
+ * A proxy service provider that delegates service requests to the parent
+ * context.
*/
protected transient BCSSProxyServiceProvider proxy;
/**
- * A list of registered <code>BeanContextServicesListener</code>s.
- * All access to this object should be synchronized on itself.
+ * A list of registered <code>BeanContextServicesListener</code>s. All
+ * access to this object should be synchronized on itself.
*/
- protected transient ArrayList bcsListeners;
+ protected transient ArrayList<BeanContextServicesListener> bcsListeners;
/**
* Constructs a standload <code>BeanContextServicesSupport</code>.
@@ -243,33 +246,39 @@
}
/**
- * Constructs a <code>BeanContextServicesSupport</code> which is a delegate
- * of the given peer.
+ * Constructs a <code>BeanContextServicesSupport</code> which is a
+ * delegate of the given peer.
*
- * @param peer the peer of this context
+ * @param peer
+ * the peer of this context
*/
public BeanContextServicesSupport(BeanContextServices peer) {
super(peer);
}
/**
- * Constructs a <code>BeanContextServicesSupport</code> which is a delegate
- * of the given peer.
+ * Constructs a <code>BeanContextServicesSupport</code> which is a
+ * delegate of the given peer.
*
- * @param peer the peer of this context
- * @param locale the locale of this context
+ * @param peer
+ * the peer of this context
+ * @param locale
+ * the locale of this context
*/
public BeanContextServicesSupport(BeanContextServices peer, Locale locale) {
super(peer, locale);
}
/**
- * Constructs a <code>BeanContextServicesSupport</code> which is a delegate
- * of the given peer.
+ * Constructs a <code>BeanContextServicesSupport</code> which is a
+ * delegate of the given peer.
*
- * @param peer the peer of this context
- * @param locale the locale of this context
- * @param designTime whether in design mode or not
+ * @param peer
+ * the peer of this context
+ * @param locale
+ * the locale of this context
+ * @param designTime
+ * whether in design mode or not
*/
public BeanContextServicesSupport(BeanContextServices peer, Locale locale,
boolean designTime) {
@@ -277,20 +286,26 @@
}
/**
- * Constructs a <code>BeanContextServicesSupport</code> which is a delegate
- * of the given peer.
+ * Constructs a <code>BeanContextServicesSupport</code> which is a
+ * delegate of the given peer.
*
- * @param peer the peer of this context
- * @param locale the locale of this context
- * @param designTime whether in design mode or not
- * @param okToUseGui whether GUI is usable or not
+ * @param peer
+ * the peer of this context
+ * @param locale
+ * the locale of this context
+ * @param designTime
+ * whether in design mode or not
+ * @param okToUseGui
+ * whether GUI is usable or not
*/
public BeanContextServicesSupport(BeanContextServices peer, Locale locale,
boolean designTime, boolean okToUseGui) {
super(peer, locale, designTime, okToUseGui);
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.beans.beancontext.BeanContextServices#addBeanContextServicesListener(java.beans.beancontext.BeanContextServicesListener)
*/
public void addBeanContextServicesListener(
@@ -306,9 +321,11 @@
/**
* Add a service to this context.
* <p>
- * Delegate to <code>addService(serviceClass, provider, true)</code>.</p>
+ * Delegate to <code>addService(serviceClass, provider, true)</code>.
+ * </p>
*
- * @see java.beans.beancontext.BeanContextServices#addService(java.lang.Class, java.beans.beancontext.BeanContextServiceProvider)
+ * @see java.beans.beancontext.BeanContextServices#addService(java.lang.Class,
+ * java.beans.beancontext.BeanContextServiceProvider)
*/
public boolean addService(Class serviceClass,
BeanContextServiceProvider provider) {
@@ -319,12 +336,17 @@
* Add a service to this context.
* <p>
* If the service already exists in the context, simply return false.
- * Otherwise, the service is added and event is fired if required.</p>
+ * Otherwise, the service is added and event is fired if required.
+ * </p>
*
- * @param serviceClass the service class
- * @param provider the provider of the service
- * @param fireEvent the flag indicating to fire event or not
- * @return true if the service is added; or false if the context already has this service
+ * @param serviceClass
+ * the service class
+ * @param provider
+ * the provider of the service
+ * @param fireEvent
+ * the flag indicating to fire event or not
+ * @return true if the service is added; or false if the context already has
+ * this service
*/
protected boolean addService(Class serviceClass,
BeanContextServiceProvider provider, boolean fireEvent) {
@@ -366,12 +388,13 @@
}
/**
- * Deserializes all serializable services and their providers
- * before the children of this context is deserialized.
+ * Deserializes all serializable services and their providers before the
+ * children of this context is deserialized.
* <p>
* First a <code>int</code> is read, indicating the number of services to
- * read. Then pairs of service class and service provider are read one
- * by one.</p>
+ * read. Then pairs of service class and service provider are read one by
+ * one.
+ * </p>
*
* @see java.beans.beancontext.BeanContextSupport#bcsPreDeserializationHook(java.io.ObjectInputStream)
*/
@@ -385,18 +408,20 @@
for (int i = 0; i < serializable; i++) {
Object serviceClass = ois.readObject();
Object bcssProvider = ois.readObject();
- services.put(serviceClass, bcssProvider);
+ services.put((Class) serviceClass,
+ (BCSSServiceProvider) bcssProvider);
}
}
}
/**
- * Serializes all serializable services and their providers
- * before the children of this context is serialized.
+ * Serializes all serializable services and their providers before the
+ * children of this context is serialized.
* <p>
- * First a <code>int</code> is writtern, indicating the number of
- * serializable services. Then pairs of service class and service
- * provider are writtern one by one.</p>
+ * First a <code>int</code> is writtern, indicating the number of
+ * serializable services. Then pairs of service class and service provider
+ * are writtern one by one.
+ * </p>
*
* @see java.beans.beancontext.BeanContextSupport#bcsPreSerializationHook(java.io.ObjectOutputStream)
*/
@@ -421,9 +446,11 @@
/**
* This method is called everytime a child is removed from this context.
* <p>
- * The implementation releases all services requested by the child.</p>
+ * The implementation releases all services requested by the child.
+ * </p>
*
- * @see java.beans.beancontext.BeanContextSupport#childJustRemovedHook(java.lang.Object, java.beans.beancontext.BeanContextSupport.BCSChild)
+ * @see java.beans.beancontext.BeanContextSupport#childJustRemovedHook(java.lang.Object,
+ * java.beans.beancontext.BeanContextSupport.BCSChild)
*/
protected void childJustRemovedHook(Object child, BCSChild bcsChild) {
if (bcsChild instanceof BCSSChild) {
@@ -434,8 +461,10 @@
/**
* Release all services requested by the given child.
*
- * @param bcssChild a child
- * @param delegatedServices only release services that are delegated to parent context
+ * @param bcssChild
+ * a child
+ * @param delegatedServices
+ * only release services that are delegated to parent context
*/
private void releaseServicesForChild(BCSSChild bcssChild,
boolean delegatedServices) {
@@ -463,17 +492,21 @@
/**
* Creates a <code>BCSSChild</code> object to company the given child.
*
- * @see java.beans.beancontext.BeanContextSupport#createBCSChild(java.lang.Object, java.lang.Object)
+ * @see java.beans.beancontext.BeanContextSupport#createBCSChild(java.lang.Object,
+ * java.lang.Object)
*/
protected BCSChild createBCSChild(Object child, Object proxyPeer) {
return new BCSSChild(child, proxyPeer);
}
/**
- * Creates a <code>BCSSServiceProvider</code> to company the given service.
+ * Creates a <code>BCSSServiceProvider</code> to company the given
+ * service.
*
- * @param serviceClass the service class
- * @param provider the service provider
+ * @param serviceClass
+ * the service class
+ * @param provider
+ * the service provider
* @return a <code>BCSSServiceProvider</code> to company the given service
*/
protected BCSSServiceProvider createBCSSServiceProvider(Class serviceClass,
@@ -482,10 +515,11 @@
}
/**
- * Fires a <code>BeanContextServiceAvailableEvent</code> to registered
+ * Fires a <code>BeanContextServiceAvailableEvent</code> to registered
* <code>BeanContextServicesListener</code>s.
*
- * @param serviceClass the service that has been added
+ * @param serviceClass
+ * the service that has been added
*/
protected final void fireServiceAdded(Class serviceClass) {
fireServiceAdded(new BeanContextServiceAvailableEvent(this,
@@ -493,10 +527,11 @@
}
/**
- * Fires a <code>BeanContextServiceAvailableEvent</code> to registered
+ * Fires a <code>BeanContextServiceAvailableEvent</code> to registered
* <code>BeanContextServicesListener</code>s.
*
- * @param event the event
+ * @param event
+ * the event
*/
protected final void fireServiceAdded(BeanContextServiceAvailableEvent event) {
Object listeners[];
@@ -510,11 +545,13 @@
}
/**
- * Fires a <code>BeanContextServiceRevokedEvent</code> to registered
+ * Fires a <code>BeanContextServiceRevokedEvent</code> to registered
* <code>BeanContextServicesListener</code>s.
*
- * @param serviceClass the service that has been revoked
- * @param revokeNow whether to terminate service immediately
+ * @param serviceClass
+ * the service that has been revoked
+ * @param revokeNow
+ * whether to terminate service immediately
*/
protected final void fireServiceRevoked(Class serviceClass,
boolean revokeNow) {
@@ -523,10 +560,11 @@
}
/**
- * Fires a <code>BeanContextServiceRevokedEvent</code> to registered
+ * Fires a <code>BeanContextServiceRevokedEvent</code> to registered
* <code>BeanContextServicesListener</code>s.
*
- * @param event the event
+ * @param event
+ * the event
*/
protected final void fireServiceRevoked(BeanContextServiceRevokedEvent event) {
Object listeners[];
@@ -540,33 +578,38 @@
}
/**
- * Returns the peer of this context casted as <code>BeanContextServices</code>.
+ * Returns the peer of this context casted as
+ * <code>BeanContextServices</code>.
*
- * @return the peer of this context casted as <code>BeanContextServices</code>
+ * @return the peer of this context casted as
+ * <code>BeanContextServices</code>
*/
public BeanContextServices getBeanContextServicesPeer() {
return (BeanContextServices) beanContextChildPeer;
}
/**
- * Returns the given child casted to <code>BeanContextServicesListener</code>,
- * or null if it does not implements the interface.
- *
- * @param child a child
- * @return the given child casted to <code>BeanContextServicesListener</code>,
- * or null if it does not implements the interface
+ * Returns the given child casted to
+ * <code>BeanContextServicesListener</code>, or null if it does not
+ * implements the interface.
+ *
+ * @param child
+ * a child
+ * @return the given child casted to
+ * <code>BeanContextServicesListener</code>, or null if it does
+ * not implements the interface
*/
protected static final BeanContextServicesListener getChildBeanContextServicesListener(
Object child) {
if (child instanceof BeanContextServicesListener) {
return (BeanContextServicesListener) child;
}
- return null;
+ return null;
}
/**
- * Returns an iterator of all registered service classes,
- * with <code>removed()</code> disabled.
+ * Returns an iterator of all registered service classes, with
+ * <code>removed()</code> disabled.
*
* @return an iterator of all registered service classes
* @see java.beans.beancontext.BeanContextServices#getCurrentServiceClasses()
@@ -598,24 +641,33 @@
if (bcssProvider != null) {
return bcssProvider.getServiceProvider();
}
- return null;
+ return null;
}
}
/**
- * Get a service instance on behalf of the specified child of this
- * context, by calling the registered service provider, or by delegating
- * to the parent context.
+ * Get a service instance on behalf of the specified child of this context,
+ * by calling the registered service provider, or by delegating to the
+ * parent context.
*
- * @param child the child that request service
- * @param requestor the requestor object
- * @param serviceClass the service class
- * @param serviceSelector the service selectors
- * @param bcsrl the <code>BeanContextServiceRevokedListener</code>
- * @return a service instance on behalf of the specified child of this context
- * @throws IllegalArgumentException if <code>child</code> is not a child of this context
+ * @param child
+ * the child that request service
+ * @param requestor
+ * the requestor object
+ * @param serviceClass
+ * the service class
+ * @param serviceSelector
+ * the service selectors
+ * @param bcsrl
+ * the <code>BeanContextServiceRevokedListener</code>
+ * @return a service instance on behalf of the specified child of this
+ * context
+ * @throws IllegalArgumentException
+ * if <code>child</code> is not a child of this context
* @throws TooManyListenersException
- * @see java.beans.beancontext.BeanContextServices#getService(java.beans.beancontext.BeanContextChild, java.lang.Object, java.lang.Class, java.lang.Object, java.beans.beancontext.BeanContextServiceRevokedListener)
+ * @see java.beans.beancontext.BeanContextServices#getService(java.beans.beancontext.BeanContextChild,
+ * java.lang.Object, java.lang.Class, java.lang.Object,
+ * java.beans.beancontext.BeanContextServiceRevokedListener)
*/
public Object getService(BeanContextChild child, Object requestor,
Class serviceClass, Object serviceSelector,
@@ -661,7 +713,7 @@
// save record
synchronized (child) {
if (bcssChild.serviceRecords == null) {
- bcssChild.serviceRecords = new ArrayList();
+ bcssChild.serviceRecords = new ArrayList<ServiceRecord>();
}
bcssChild.serviceRecords.add(new ServiceRecord(provider, child,
requestor, serviceClass, bcsrl, service, isDelegate));
@@ -672,10 +724,11 @@
}
/**
- * Checks whether a service is registed in this context or the
- * parent context.
+ * Checks whether a service is registed in this context or the parent
+ * context.
*
- * @param serviceClass the service class
+ * @param serviceClass
+ * the service class
* @return true if the service is registered
* @see java.beans.beancontext.BeanContextServices#hasService(java.lang.Class)
*/
@@ -695,28 +748,30 @@
return has;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.beans.beancontext.BeanContextSupport#initialize()
*/
public void initialize() {
super.initialize();
- services = new HashMap();
+ services = new HashMap<Class, BCSSServiceProvider>();
serializable = 0;
proxy = null;
- bcsListeners = new ArrayList();
+ bcsListeners = new ArrayList<BeanContextServicesListener>();
}
/**
- * Called after the parent context is updated. The implementation
- * checks if the parent context is a <code>BeanContextServices</code>.
- * If it is, then a <code>BCSSProxyServiceProvider</code> is created
- * to delegate service requests to the parent context.
+ * Called after the parent context is updated. The implementation checks if
+ * the parent context is a <code>BeanContextServices</code>. If it is,
+ * then a <code>BCSSProxyServiceProvider</code> is created to delegate
+ * service requests to the parent context.
*
* @see java.beans.beancontext.BeanContextChildSupport#initializeBeanContextResources()
*/
protected void initializeBeanContextResources() {
super.initializeBeanContextResources();
-
+
BeanContext context = getBeanContext();
if (context instanceof BeanContextServices) {
proxy = new BCSSProxyServiceProvider((BeanContextServices) context);
@@ -726,14 +781,14 @@
}
/**
- * Called before the parent context is updated. The implementation
- * releases any service that is currently provided by the parent context.
+ * Called before the parent context is updated. The implementation releases
+ * any service that is currently provided by the parent context.
*
* @see java.beans.beancontext.BeanContextChildSupport#releaseBeanContextResources()
*/
protected void releaseBeanContextResources() {
super.releaseBeanContextResources();
-
+
releaseAllDelegatedServices();
proxy = null;
}
@@ -749,10 +804,14 @@
/**
* Release a service which has been requested previously.
*
- * @param child the child that request the service
- * @param requestor the requestor object
- * @param service the service instance
- * @throws IllegalArgumentException if <code>child</code> is not a child of this context
+ * @param child
+ * the child that request the service
+ * @param requestor
+ * the requestor object
+ * @param service
+ * the service instance
+ * @throws IllegalArgumentException
+ * if <code>child</code> is not a child of this context
*/
public void releaseService(BeanContextChild child, Object requestor,
Object service) {
@@ -805,7 +864,9 @@
}
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.beans.beancontext.BeanContextServices#removeBeanContextServicesListener(java.beans.beancontext.BeanContextServicesListener)
*/
public void removeBeanContextServicesListener(
@@ -821,15 +882,19 @@
/**
* Revokes a service in this bean context.
* <p>
- * The given service provider is unregistered and a
- * <code>BeanContextServiceRevokedEvent</code> is fired.
- * All registered service listeners and current service users get
- * notified.</p>
- *
- * @param serviceClass the service class
- * @param serviceProvider the service provider
- * @param revokeCurrentServicesNow true if service should be terminated immediantly
- * @see java.beans.beancontext.BeanContextServices#revokeService(java.lang.Class, java.beans.beancontext.BeanContextServiceProvider, boolean)
+ * The given service provider is unregistered and a
+ * <code>BeanContextServiceRevokedEvent</code> is fired. All registered
+ * service listeners and current service users get notified.
+ * </p>
+ *
+ * @param serviceClass
+ * the service class
+ * @param serviceProvider
+ * the service provider
+ * @param revokeCurrentServicesNow
+ * true if service should be terminated immediantly
+ * @see java.beans.beancontext.BeanContextServices#revokeService(java.lang.Class,
+ * java.beans.beancontext.BeanContextServiceProvider, boolean)
*/
public void revokeService(Class serviceClass,
BeanContextServiceProvider serviceProvider,
@@ -910,7 +975,7 @@
}
/**
- * Notify all listeners and children that implements
+ * Notify all listeners and children that implements
* <code>BeanContextServices</code> of the event.
*
* @see java.beans.beancontext.BeanContextServicesListener#serviceAvailable(java.beans.beancontext.BeanContextServiceAvailableEvent)
@@ -919,8 +984,8 @@
if (null == event) {
throw new NullPointerException(Messages.getString("beans.1C")); //$NON-NLS-1$
}
- if(services.containsKey(event.serviceClass)) {
- return;
+ if (services.containsKey(event.serviceClass)) {
+ return;
}
fireServiceAdded(event);
Object childs[] = copyChildren();
@@ -932,7 +997,7 @@
}
/**
- * Notify all listeners and children that implements
+ * Notify all listeners and children that implements
* <code>BeanContextServices</code> of the event.
*
* @see java.beans.beancontext.BeanContextServiceRevokedListener#serviceRevoked(java.beans.beancontext.BeanContextServiceRevokedEvent)
@@ -941,8 +1006,8 @@
if (null == event) {
throw new NullPointerException(Messages.getString("beans.1C")); //$NON-NLS-1$
}
- if(services.containsKey(event.serviceClass)) {
- return;
+ if (services.containsKey(event.serviceClass)) {
+ return;
}
fireServiceRevoked(event);
Object childs[] = copyChildren();
@@ -962,8 +1027,10 @@
* </ol>
* </p>
*
- * @param oos the object output stream
- * @throws IOException if I/O exception occurs
+ * @param oos
+ * the object output stream
+ * @throws IOException
+ * if I/O exception occurs
*/
private void writeObject(ObjectOutputStream oos) throws IOException {
@@ -983,9 +1050,12 @@
* </ol>
* </p>
*
- * @param ois the object input stream
- * @throws IOException if I/O error occurs
- * @throws ClassNotFoundException if class of read object is not found
+ * @param ois
+ * the object input stream
+ * @throws IOException
+ * if I/O error occurs
+ * @throws ClassNotFoundException
+ * if class of read object is not found
*/
private void readObject(ObjectInputStream ois) throws IOException,
ClassNotFoundException {
@@ -998,5 +1068,3 @@
}
}
-
-
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java Thu Jul 19 20:08:44 2007
@@ -103,7 +103,7 @@
* A list of registered membership listeners.
* All access to this object should be synchronized on itself.
*/
- transient protected ArrayList bcmListeners;
+ transient protected ArrayList<BeanContextMembershipListener> bcmListeners;
/**
* A map of children - key is child instance, value is <code>BCSChild</code> instance.
@@ -214,6 +214,7 @@
* @throws IllegalStateException if the child is not valid to add
* @see java.util.Collection#add(java.lang.Object)
*/
+ @SuppressWarnings("unchecked")
public boolean add(Object child) {
if (child == null) {
throw new IllegalArgumentException("null child");
@@ -460,6 +461,7 @@
* @return true if given objects are children of this context
* @see java.util.Collection#containsAll(java.util.Collection)
*/
+ @SuppressWarnings("unchecked")
public boolean containsAll(Collection collection) {
synchronized (children) {
return children.keySet().containsAll(collection);
@@ -511,6 +513,7 @@
* @throws IOException if I/O exception occurs
* @throws ClassNotFoundException if class of any read object is not found
*/
+ @SuppressWarnings("unchecked")
protected final void deserialize(ObjectInputStream ois,
Collection collection) throws IOException, ClassNotFoundException {
int size = ois.readInt();
@@ -726,7 +729,7 @@
*/
protected void initialize() {
// init transient fields
- bcmListeners = new ArrayList();
+ bcmListeners = new ArrayList<BeanContextMembershipListener>();
children = new HashMap();
serializing = false;
inNeedsGui = false;
@@ -865,6 +868,7 @@
* @throws ClassNotFoundException
* if class of read object is not found
*/
+ @SuppressWarnings("unchecked")
public final void readChildren(ObjectInputStream ois) throws IOException,
ClassNotFoundException {
synchronized (children) {
@@ -1125,6 +1129,7 @@
* @return an array of children of this context
* @see java.util.Collection#toArray(java.lang.Object[])
*/
+ @SuppressWarnings("unchecked")
public Object[] toArray(Object[] array) {
synchronized (children) {
return children.keySet().toArray(array);
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java Thu Jul 19 20:08:44 2007
@@ -29,6 +29,7 @@
import java.util.Iterator;
import java.util.List;
+@SuppressWarnings("serial")
public class FontEditor extends Panel implements PropertyEditor {
List<PropertyChangeListener> listeners = new ArrayList<PropertyChangeListener>();
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox03.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox03.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox03.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox03.java Thu Jul 19 20:08:44 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.harmony.beans.tests.support.mock;
public class FakeFox03 {
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox031.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox031.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox031.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox031.java Thu Jul 19 20:08:44 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.harmony.beans.tests.support.mock;
public class FakeFox031 {
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox031BeanInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox031BeanInfo.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox031BeanInfo.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox031BeanInfo.java Thu Jul 19 20:08:44 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.harmony.beans.tests.support.mock;
import java.beans.BeanDescriptor;
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox03BeanInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox03BeanInfo.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox03BeanInfo.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox03BeanInfo.java Thu Jul 19 20:08:44 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.harmony.beans.tests.support.mock;
import java.awt.Image;
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox04.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox04.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox04.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox04.java Thu Jul 19 20:08:44 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.harmony.beans.tests.support.mock;
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox041.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox041.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox041.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox041.java Thu Jul 19 20:08:44 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.harmony.beans.tests.support.mock;
import java.beans.PropertyChangeListener;
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox0411.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox0411.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox0411.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/FakeFox0411.java Thu Jul 19 20:08:44 2007
@@ -1,6 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.harmony.beans.tests.support.mock;
-import java.beans.PropertyVetoException;
public class FakeFox0411 extends FakeFox041 {
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockInterfaceBeanInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockInterfaceBeanInfo.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockInterfaceBeanInfo.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockInterfaceBeanInfo.java Thu Jul 19 20:08:44 2007
@@ -19,7 +19,6 @@
import java.beans.EventSetDescriptor;
import java.beans.IntrospectionException;
-import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.beans.SimpleBeanInfo;
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockJavaBean.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockJavaBean.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockJavaBean.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockJavaBean.java Thu Jul 19 20:08:44 2007
@@ -47,6 +47,7 @@
private boolean booleanProperty;
+ @SuppressWarnings("unused")
private int propertyWithoutGet;
private String propertyWithDifferentGetSet;
@@ -63,6 +64,7 @@
private int propertyWithIsGet;
+ @SuppressWarnings("unused")
private int propertyWithVoidGet;
public Void getPropertyWithVoidGet() {
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockSubClassBeanInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockSubClassBeanInfo.java?view=diff&rev=557856&r1=557855&r2=557856
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockSubClassBeanInfo.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockSubClassBeanInfo.java Thu Jul 19 20:08:44 2007
@@ -21,7 +21,6 @@
import java.beans.EventSetDescriptor;
import java.beans.IntrospectionException;
import java.beans.Introspector;
-import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.beans.SimpleBeanInfo;