You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/01/17 04:00:03 UTC
svn commit: r369649 - in /beehive/trunk/controls/src:
api/org/apache/beehive/controls/api/
api/org/apache/beehive/controls/api/bean/
api/org/apache/beehive/controls/api/context/
api/org/apache/beehive/controls/api/events/ api/org/apache/beehive/control...
Author: ekoneil
Date: Mon Jan 16 18:59:28 2006
New Revision: 369649
URL: http://svn.apache.org/viewcvs?rev=369649&view=rev
Log:
Controls mods. Nothing functional -- just adding comments on control flow, code generation, and removing unused imports.
BB: self
Test: Controls pass
Modified:
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/ControlException.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/AnnotationConstraints.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Control.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlBean.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlChecker.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlExtension.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlImplementation.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlInterface.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlReferences.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/DefaultControlChecker.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Extensible.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ExternalPropertySets.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Threading.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ThreadingPolicy.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/Context.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlBeanContext.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlContainerContext.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlHandle.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlThreadContext.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventDispatchHelper.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventHandler.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/RemoteEventDispatcher.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BaseProperties.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyKey.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyMap.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySet.java
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySetProxy.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/AnnotationConstraintValidator.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanListener.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanPersistenceDelegate.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ContextPersistenceDelegate.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanInfo.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlContainerContext.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/EventNotifier.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ImplInitializer.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ResourceContextImpl.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ControlFilter.java
beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/bean/ControlFactory.java
beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/bean/JavaControlFactory.java
beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/InterceptorAnnotation.java
beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/InterceptorPivotException.java
beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/ServiceException.java
beehive/trunk/controls/src/test-container/org/apache/beehive/controls/test/util/ControlContainerContextManagerFactory.java
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/ControlException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/ControlException.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/ControlException.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/ControlException.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api;
/**
* The ControlException class declares an unchecked exception that is thrown by the Controls
@@ -38,8 +38,7 @@
* specified Throwable as a nested exception.
*
* @param message The message to use.
- * @param t The exception to nest within this
- * exception.
+ * @param t The exception to nest within this exception.
*/
public ControlException(String message, Throwable t)
{
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/AnnotationConstraints.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/AnnotationConstraints.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/AnnotationConstraints.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/AnnotationConstraints.java Mon Jan 16 18:59:28 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.controls.api.bean;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,8 +15,12 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
-import java.lang.annotation.*;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Retention;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
/**
* AnnotationConstraints defines meta-annotations that allow
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/AnnotationMemberTypes.java Mon Jan 16 18:59:28 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.controls.api.bean;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,9 +15,9 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Control.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Control.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Control.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Control.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlBean.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlBean.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlBean.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlBean.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,11 +15,13 @@
*
* $Header:$
*/
-
-import org.apache.beehive.controls.api.context.ControlBeanContext;
+package org.apache.beehive.controls.api.bean;
import java.beans.beancontext.BeanContext;
import java.beans.beancontext.BeanContextProxy;
+
+import org.apache.beehive.controls.api.context.ControlBeanContext;
+
/**
* The ControlBean interface defines a base set of methods that are implemented by all
* <code>JavaBeans</code> that host Java Controls.
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlChecker.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlChecker.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlChecker.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlChecker.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
import com.sun.mirror.apt.AnnotationProcessorEnvironment;
import com.sun.mirror.declaration.Declaration;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlExtension.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlExtension.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlExtension.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlExtension.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlImplementation.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlImplementation.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlImplementation.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlImplementation.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlInterface.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlInterface.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlInterface.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlInterface.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlReferences.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlReferences.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlReferences.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ControlReferences.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Controls.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -16,20 +15,17 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
import org.apache.beehive.controls.api.properties.PropertyMap;
-import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.api.context.ControlBeanContext;
import org.apache.beehive.controls.api.ControlException;
-
import org.apache.beehive.controls.spi.bean.ControlFactory;
import org.apache.beehive.controls.spi.bean.JavaControlFactory;
-
import org.apache.commons.discovery.tools.DiscoverClass;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
/**
* Helper class for using controls. Includes static methods to help instantiate controls, and initialize
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/DefaultControlChecker.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/DefaultControlChecker.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/DefaultControlChecker.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/DefaultControlChecker.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
import com.sun.mirror.apt.AnnotationProcessorEnvironment;
import com.sun.mirror.declaration.Declaration;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Extensible.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Extensible.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Extensible.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Extensible.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
import java.lang.reflect.Method;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ExternalPropertySets.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ExternalPropertySets.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ExternalPropertySets.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ExternalPropertySets.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Threading.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Threading.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Threading.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/Threading.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ThreadingPolicy.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ThreadingPolicy.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ThreadingPolicy.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/bean/ThreadingPolicy.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.bean;
/**
* Specifies threading policy for control implementations. The constants
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/Context.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/Context.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/Context.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/Context.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.context;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.context;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlBeanContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlBeanContext.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlBeanContext.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlBeanContext.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.context;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.context;
import java.beans.beancontext.BeanContextServices;
import java.beans.PropertyChangeEvent;
@@ -34,7 +34,7 @@
* <p>
* ControlBeanContext also extends the <code>java.beans.beancontext.BeanContextServices</code>
* interface, so it also provide core Java Beans services for managing contained controls,
- * looking up contextual services, and locating the parent BeanContext context.
+ * looking up contextual services, and locating the parent {@link java.beans.beancontext.BeanContext} context.
* <p>
* A Control implementation class can obtain access to the ControlBeanContext associated
* with it by declaring an instance field of this type and annotating it with the
@@ -87,7 +87,7 @@
* @see org.apache.beehive.controls.api.properties.PropertySet
*/
public <T extends Annotation> T getMethodPropertySet(Method m, Class<T> propertySet)
- throws IllegalArgumentException;
+ throws IllegalArgumentException;
/**
* Returns the current value of PropertySet for the selected (by index) method parameter,
@@ -99,7 +99,7 @@
* @return the request PropertySet instance, or null if not bound
*/
public <T extends Annotation> T getParameterPropertySet(Method m, int i, Class<T> propertySet)
- throws IllegalArgumentException, IndexOutOfBoundsException;
+ throws IllegalArgumentException, IndexOutOfBoundsException;
/**
* Returns an array containing the parameter names for the specified method
@@ -107,7 +107,8 @@
* @param m the Method whose parameter names should be returned.
* @return the array of parameter names (or an empty array if no parameters)
*/
- public String [] getParameterNames(Method m) throws IllegalArgumentException;
+ public String [] getParameterNames(Method m)
+ throws IllegalArgumentException;
/**
* Returns the value of a named method parameter from the input parameter array.
@@ -119,7 +120,7 @@
* parameter
*/
public Object getParameterValue(Method m, String parameterName, Object [] parameters)
- throws IllegalArgumentException;
+ throws IllegalArgumentException;
/**
* Returns the current set of properties (in PropertyMap format) for the control
@@ -233,4 +234,4 @@
* @see org.apache.beehive.controls.api.context.ControlBeanContext.LifeCycle
*/
public void removeLifeCycleListener(LifeCycle listener);
-}
+}
\ No newline at end of file
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlContainerContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlContainerContext.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlContainerContext.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlContainerContext.java Mon Jan 16 18:59:28 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.controls.api.context;
-
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -17,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.context;
import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.api.events.EventDispatcher;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlHandle.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlHandle.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlHandle.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlHandle.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.context;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.context;
import org.apache.beehive.controls.api.events.EventRef;
import java.lang.reflect.InvocationTargetException;
@@ -41,5 +41,5 @@
* Delivers the specified event to the target control referenced by this handle.
*/
public Object sendEvent(EventRef event, Object [] args)
- throws IllegalAccessException,IllegalArgumentException,InvocationTargetException;
+ throws IllegalAccessException,IllegalArgumentException,InvocationTargetException;
}
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlThreadContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlThreadContext.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlThreadContext.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ControlThreadContext.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.context;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.context;
import java.util.Stack;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.context;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,8 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.context;
+
import org.apache.beehive.controls.api.events.EventSet;
/**
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventDispatchHelper.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventDispatchHelper.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventDispatchHelper.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventDispatchHelper.java Mon Jan 16 18:59:28 2006
@@ -32,8 +32,7 @@
public class EventDispatchHelper implements EventDispatcher
{
public Object dispatchEvent(ControlHandle target, EventRef event, Object [] args)
- throws IllegalAccessException, IllegalArgumentException,
- InvocationTargetException
+ throws IllegalAccessException, IllegalArgumentException, InvocationTargetException
{
//
// Obtain the current active control container context
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventHandler.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventHandler.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventHandler.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/EventHandler.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.events;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.events;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/RemoteEventDispatcher.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/RemoteEventDispatcher.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/RemoteEventDispatcher.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/events/RemoteEventDispatcher.java Mon Jan 16 18:59:28 2006
@@ -41,5 +41,5 @@
* handler.
*/
public Object dispatchEvent(ControlHandle target, EventRef event, Object [] args)
- throws RemoteException;
+ throws RemoteException;
}
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/AnnotatedElementMap.java Mon Jan 16 18:59:28 2006
@@ -23,10 +23,6 @@
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-
import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.api.bean.ControlExtension;
@@ -34,9 +30,11 @@
/**
* The AnnotatedElementMap represents a read-only PropertyMap where property values are
- * derived from JSR-175 annotations.
+ * derived from Java 5.0 (JSR-175) annotations.
*/
-public class AnnotatedElementMap extends BaseMap implements PropertyMap,java.io.Serializable
+public class AnnotatedElementMap
+ extends BaseMap
+ implements PropertyMap,java.io.Serializable
{
/**
* Creates a new PropertyMap that is initialized based upon the type and annotations
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BaseProperties.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BaseProperties.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BaseProperties.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/BaseProperties.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.api.properties;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,14 +15,12 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.api.properties;
-import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.reflect.Method;
-import java.util.HashMap;
/**
* Base properties that are present intrinsically on all controls.
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyKey.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyKey.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyKey.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyKey.java Mon Jan 16 18:59:28 2006
@@ -19,7 +19,6 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
-import java.util.HashMap;
import org.apache.beehive.controls.api.ControlException;
@@ -37,8 +36,7 @@
{
if (!propertySet.isAnnotation())
{
- throw new IllegalArgumentException("Class " + propertySet +
- " is not a valid annotation type");
+ throw new IllegalArgumentException("Class " + propertySet + " is not a valid annotation type");
}
try
@@ -131,9 +129,9 @@
return "PropertyKey: " + _propertySet.getName() + "." + _propertyName;
}
- public Class<? extends Annotation> getPropertySet() { return _propertySet; }
- public String getPropertyName() { return _propertyName; }
- public Class getPropertyType() { return _propertyType; }
+ public Class<? extends Annotation> getPropertySet() { return _propertySet; }
+ public String getPropertyName() { return _propertyName; }
+ public Class getPropertyType() { return _propertyType; }
public Annotation[] getAnnotations() { return getMethod().getAnnotations();}
Class<? extends Annotation> _propertySet;
@@ -144,4 +142,4 @@
// WARNING: This field should never be accessed directly but instead via the getMethod()
// API. This ensures that the (transient) value is appropriately recomputed when necessary.
private transient Method _getMethod;
-}
+}
\ No newline at end of file
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyMap.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyMap.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyMap.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertyMap.java Mon Jan 16 18:59:28 2006
@@ -18,22 +18,11 @@
*/
import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-
-
-import org.apache.beehive.controls.api.bean.ControlBean;
-import org.apache.beehive.controls.api.bean.ControlExtension;
-import org.apache.beehive.controls.api.bean.ControlInterface;
/**
* The PropertyMap interface represents a collection of ControlBean properties. Concrete
- * implementations of this interface might derive property values from a local Map, JSR-175
- * annotation, external configuration, or other property sources.
+ * implementations of this interface might derive property values from a local Map, Java 5.0
+ * annotations, external configuration, or other property sources.
*/
public interface PropertyMap
{
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySet.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySet.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySet.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySet.java Mon Jan 16 18:59:28 2006
@@ -95,4 +95,4 @@
* setter methods.
*/
boolean hasSetters() default true;
-}
+}
\ No newline at end of file
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySetProxy.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySetProxy.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySetProxy.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/properties/PropertySetProxy.java Mon Jan 16 18:59:28 2006
@@ -22,10 +22,6 @@
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import org.apache.beehive.controls.api.properties.PropertyKey;
-import org.apache.beehive.controls.api.properties.PropertyMap;
-import org.apache.beehive.controls.api.properties.PropertySet;
-
/**
* The PropertySetProxy class is a dynamic proxy InvocationHandler class that exposes the
* values held within a PropertyMap as an Object implementing an annotation type interface.
@@ -59,9 +55,9 @@
if (!propertySet.isAnnotation())
throw new IllegalArgumentException(propertySet + " is not an annotation type");
- return (T) Proxy.newProxyInstance(propertySet.getClassLoader(),
- new Class [] {propertySet },
- new PropertySetProxy(propertySet, propertyMap));
+ return (T)Proxy.newProxyInstance(propertySet.getClassLoader(),
+ new Class [] {propertySet },
+ new PropertySetProxy(propertySet, propertyMap));
}
/**
@@ -125,13 +121,17 @@
/**
* Returns the PropertySet annotation type associated with the proxy
*/
- public Class<T> getPropertySet() { return _propertySet; }
+ public Class<T> getPropertySet() {
+ return _propertySet;
+ }
/**
* Returns the underlying PropertyMap containing the property values exposed by the
* proxy.
*/
- public PropertyMap getPropertyMap() { return _propertyMap; }
+ public PropertyMap getPropertyMap() {
+ return _propertyMap;
+ }
private Class<T> _propertySet;
private PropertyMap _propertyMap;
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/AnnotationConstraintValidator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/AnnotationConstraintValidator.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/AnnotationConstraintValidator.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/AnnotationConstraintValidator.java Mon Jan 16 18:59:28 2006
@@ -80,8 +80,7 @@
public static void validateMembership(Annotation propertySet)
{
Class c = propertySet.annotationType();
- MembershipRule rule = (MembershipRule) c
- .getAnnotation(MembershipRule.class);
+ MembershipRule rule = (MembershipRule) c.getAnnotation(MembershipRule.class);
if (rule == null)
return;
MembershipRuleValues ruleValue = rule.value();
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanListener.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanListener.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanListener.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanListener.java Mon Jan 16 18:59:28 2006
@@ -21,14 +21,24 @@
* The BeanListener class acts as the abstract base class for generated event listeners
* associated with a ControlBean.
*/
-abstract public class BeanListener implements java.io.Serializable
+abstract public class BeanListener
+ implements java.io.Serializable
{
- protected BeanListener() { this(null); }
- protected BeanListener(Object source) { _source = source; }
+ protected BeanListener()
+ {
+ this(null);
+ }
+
+ protected BeanListener(Object source)
+ {
+ _source = source;
+ }
abstract public BeanListener cloneListener(Object source);
- public Object getSource() { return _source; }
+ public Object getSource() {
+ return _source;
+ }
Object _source;
}
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanPersistenceDelegate.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanPersistenceDelegate.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanPersistenceDelegate.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/BeanPersistenceDelegate.java Mon Jan 16 18:59:28 2006
@@ -31,7 +31,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Iterator;
-import java.util.Set;
import org.apache.beehive.controls.api.ControlException;
import org.apache.beehive.controls.api.properties.AnnotatedElementMap;
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ContextPersistenceDelegate.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ContextPersistenceDelegate.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ContextPersistenceDelegate.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ContextPersistenceDelegate.java Mon Jan 16 18:59:28 2006
@@ -17,19 +17,10 @@
* $Header:$
*/
-import java.beans.BeanInfo;
import java.beans.DefaultPersistenceDelegate;
import java.beans.Encoder;
import java.beans.Expression;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PersistenceDelegate;
-import java.beans.PropertyDescriptor;
-import java.beans.Statement;
import java.beans.XMLEncoder;
-import java.util.Set;
-
-import org.apache.beehive.controls.api.ControlException;
/**
* The ContextPersistenceDelegate class supports the XML persistance of ControlBeanContext
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.runtime.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.runtime.bean;
import java.beans.beancontext.BeanContext;
import java.beans.beancontext.BeanContextServices;
@@ -26,10 +26,22 @@
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.*;
import java.util.concurrent.Semaphore;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TooManyListenersException;
+import java.util.Vector;
import org.apache.beehive.controls.api.ControlException;
+import org.apache.beehive.controls.api.properties.BaseProperties;
+import org.apache.beehive.controls.api.properties.AnnotatedElementMap;
+import org.apache.beehive.controls.api.properties.PropertyMap;
+import org.apache.beehive.controls.api.properties.BeanPropertyMap;
+import org.apache.beehive.controls.api.properties.PropertyKey;
+import org.apache.beehive.controls.api.properties.PropertySetProxy;
import org.apache.beehive.controls.api.versioning.VersionRequired;
import org.apache.beehive.controls.api.versioning.Version;
import org.apache.beehive.controls.api.bean.Threading;
@@ -40,24 +52,23 @@
import org.apache.beehive.controls.api.context.ControlThreadContext;
import org.apache.beehive.controls.api.events.EventRef;
import org.apache.beehive.controls.api.events.EventSet;
-import org.apache.beehive.controls.api.properties.*;
import org.apache.beehive.controls.spi.svc.Interceptor;
import org.apache.beehive.controls.spi.svc.InterceptorPivotException;
/**
* The ControlBean class is an abstract base class for the JavaBean classes generated to support
- * Workshop controls.
+ * Beehive Controls.
* <p>
* The ControlBean class indirectly implements BeanContextProxy; the ControlBeanContext that it contains/scopes
* acts as that proxy.
* <p>
- * All support APIs (which may be called from derived derived subclasses or contextual services
+ * All support APIs (which may be called from derived subclasses or contextual services)
* are generally marked as protected and have names that start with an underscore. This avoids the
* possibility that the name might conflict with a user-defined method on a control's public or
- * extended (JCX) interface.
+ * extended Control interfaces.
* <p>
* NOTE: Adding public methods should be done with great care; any such method becomes part of the
- * public API, and occupies namespace for all controls.
+ * public API, and occupies the method namespace for all controls.
*/
abstract public class ControlBean
implements org.apache.beehive.controls.api.bean.ControlBean
@@ -270,7 +281,7 @@
//
if (_implClass.getAnnotation(ControlImplementation.class) == null)
{
- throw new ControlException("@org.apache.beehive.controls.api.bean.ControlImplementation annotation is missing from control implementation class: " + _implClass.getName());
+ throw new ControlException("@" + ControlImplementation.class.getName() + " annotation is missing from control implementation class: " + _implClass.getName());
}
}
catch (ClassNotFoundException cnfe)
@@ -298,6 +309,12 @@
try
{
+ /*
+ Run the ImplInitializer. This class is code generated based on metadata from a control
+ implementation. If a Control implementation declares event handlers for the
+ ControlBeanContext or for the ResourceContext, executing this code generated class
+ will add the appropriate LifeCycle and / or Resource event listeners.
+ */
getImplInitializer().initialize(this, _control);
_hasServices = true;
}
@@ -310,10 +327,18 @@
// Once the control is initialized, then allow the associated context
// to do any initialization.
//
- ControlBeanContext cbcs = (ControlBeanContext)getBeanContextProxy();
+ ControlBeanContext cbcs = getBeanContextProxy();
+
+ /*
+ Implementation note: this call will run the LifeCycleListener(s) that have
+ been wired-up to the ControlBeanContext object associated with this ControlBean.
+ */
cbcs.initializeControl();
}
- catch (RuntimeException re) { throw re; } // never mask RuntimeExceptions
+ catch (RuntimeException re) {
+ // never mask RuntimeExceptions
+ throw re;
+ }
catch (Exception e)
{
throw new ControlException("Unable to create control instance", e);
@@ -336,7 +361,9 @@
/**
* Returns the implementation instance associated with this ControlBean.
*/
- /* package */ Object getImplementation() { return _control; }
+ /* package */ Object getImplementation() {
+ return _control;
+ }
/**
* The preinvoke method is called before all operations on the control. In addition to
@@ -360,8 +387,6 @@
//
if ( interceptorNames != null )
{
- ControlBeanContext cbc = getControlBeanContext();
-
for ( String n : interceptorNames )
{
Interceptor i = ensureInterceptor( n );
@@ -567,7 +592,6 @@
_localID = localID;
}
-
/**
* Returns the bean context instance associated with the this bean, as opposed to the
* parent context returned by the public getBeanContext() API.
@@ -577,7 +601,7 @@
//
// The peer context instance is the context provider for this ControlBean
//
- return (ControlBeanContext)getBeanContextProxy();
+ return getBeanContextProxy();
}
/**
@@ -694,6 +718,7 @@
return value;
}
+ /* this method is implemented during code generation by a ControlBean extension */
/**
* Returns the local cache for ControlBean property maps.
*/
@@ -781,7 +806,7 @@
* built in synchronization mechanisms.
*/
protected void fireVetoableChange(PropertyKey propertyKey, Object oldValue, Object newValue)
- throws java.beans.PropertyVetoException
+ throws java.beans.PropertyVetoException
{
// No veto support instance means no listeners
if (_vetoSupport == null)
@@ -874,7 +899,7 @@
* Implementation of the Java serialization writeObject method
*/
private synchronized void writeObject(ObjectOutputStream oos)
- throws IOException
+ throws IOException
{
if (_control != null)
{
@@ -910,7 +935,7 @@
{
if (impl != _control)
throw new ControlException("Cannot change implementation");
- };
+ }
/**
* Retrieves interceptor instances, creates them lazily.
@@ -939,7 +964,7 @@
// isn't present on this system at runtime (ClassNotFoundException), or if the container of the
// control didn't registers the service.
- // TODO log a message here to that effect, but just swallow the exception for now.
+ /* TODO log a message here to that effect, but just swallow the exception for now. */
}
finally
{
@@ -958,7 +983,8 @@
* The "null" interceptor that does nothing. Used when a specific interceptor
* is unavailable at runtime.
*/
- static private class NullInterceptor implements Interceptor
+ static private class NullInterceptor
+ implements Interceptor
{
public void preInvoke( org.apache.beehive.controls.api.bean.ControlBean cb, Method m, Object [] args ) {}
public void postInvoke( org.apache.beehive.controls.api.bean.ControlBean cb, Method m, Object [] args, Object retval, Throwable t) {}
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java Mon Jan 16 18:59:28 2006
@@ -347,8 +347,9 @@
* Returns true if this container associated with this context service enforces
* single-threaded invocation, false otherwise.
*
- * This MUST be overridden by container-specific subclasses. If they guarantee
- * single-threaded behavior (such as the EJB container), they should return true.
+ * This MUST be overridden by container-specific subclasses in order to change
+ * the default behavior. If a single-threaded container intends to guarantee
+ * single-threaded behavior (such as the EJB container), this should return true.
*/
public synchronized boolean isSingleThreadedContainer()
{
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanInfo.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanInfo.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanInfo.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanInfo.java Mon Jan 16 18:59:28 2006
@@ -53,7 +53,6 @@
return input;
String bundleName = input.substring(1, input.length()-1);
String resourceName = null;
- String output = input;
int lastDot = bundleName.lastIndexOf('.');
while (lastDot != -1 && lastDot != 0 && (lastDot+1 < bundleName.length()))
{
@@ -80,7 +79,6 @@
{ }
lastDot = bundleName.lastIndexOf('.');
-
}
return input;
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlContainerContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlContainerContext.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlContainerContext.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlContainerContext.java Mon Jan 16 18:59:28 2006
@@ -184,4 +184,4 @@
boolean _releasingAll;
Stack<ResourceContext> _resourceContexts = new Stack<ResourceContext>();
-}
+}
\ No newline at end of file
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/EventNotifier.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/EventNotifier.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/EventNotifier.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/EventNotifier.java Mon Jan 16 18:59:28 2006
@@ -17,8 +17,8 @@
* $Header:$
*/
-import java.util.ArrayList;
import java.util.Iterator;
+import java.util.LinkedList;
/**
* The EventNotifier class provides basic callback listener management and event delivery
@@ -69,5 +69,5 @@
_listeners.toArray(listeners);
}
- private ArrayList _listeners = new ArrayList();
+ private LinkedList _listeners = new LinkedList();
}
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ImplInitializer.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ImplInitializer.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ImplInitializer.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ImplInitializer.java Mon Jan 16 18:59:28 2006
@@ -17,8 +17,6 @@
* $Header:$
*/
-
-
/**
* The ImplInitializer class is an abstract base class that all generated Control
* initalization classes will extend. It provides common utilities and supporting code
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ResourceContextImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ResourceContextImpl.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ResourceContextImpl.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ResourceContextImpl.java Mon Jan 16 18:59:28 2006
@@ -35,13 +35,13 @@
* The ResourceContextProvider inner class acts as a single BeanContext service
* provider for the ResourceContext service class.
*/
- private static class ResourceContextProvider implements BeanContextServiceProvider
- {
+ private static class ResourceContextProvider
+ implements BeanContextServiceProvider {
+
//
// BeanContextServiceProvider.getService()
//
- public Object getService(BeanContextServices bcs, Object requestor, Class serviceClass,
- Object serviceSelector)
+ public Object getService(BeanContextServices bcs, Object requestor, Class serviceClass, Object serviceSelector)
{
//
// There is an implied contract between ControlContainerContext and ControlBean
@@ -50,8 +50,7 @@
//
if (requestor instanceof ControlBean)
{
- return new ResourceContextImpl((ControlContainerContext)bcs,
- (ControlBean)requestor);
+ return new ResourceContextImpl((ControlContainerContext)bcs, (ControlBean)requestor);
}
return null;
@@ -114,7 +113,7 @@
/**
* Implements the InvokeListener.postInvoke method.
*/
- public void postInvoke(Object retval, Throwable t) {};
+ public void postInvoke(Object retval, Throwable t) {}
// ResourceContext.acquire()
public void acquire()
@@ -131,7 +130,7 @@
// Set the flag to indicate resources have been acquired.
_hasAcquired = true;
- };
+ }
// ResourceContext.release()
public void release()
@@ -148,7 +147,7 @@
// Reset the flag to indicate resources have been released.
_hasAcquired = false;
- };
+ }
// ResourceContext.hasResources()
public boolean hasResources() { return _hasAcquired; }
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ControlFilter.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ControlFilter.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ControlFilter.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/servlet/ControlFilter.java Mon Jan 16 18:59:28 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.runtime.servlet;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.runtime.servlet;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -126,5 +126,5 @@
/**
* The BeanContext class to use as the container for controls running in the ServletContainer
*/
- private Class _contextClass = ServletBeanContext.class;
+ private Class _contextClass = ServletBeanContext.class;
}
Modified: beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/bean/ControlFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/bean/ControlFactory.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/bean/ControlFactory.java (original)
+++ beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/bean/ControlFactory.java Mon Jan 16 18:59:28 2006
@@ -21,8 +21,6 @@
import org.apache.beehive.controls.api.context.ControlBeanContext;
import org.apache.beehive.controls.api.properties.PropertyMap;
-import java.lang.reflect.Method;
-
/**
* The ControlFactory interface defines a service provider interface for integrating
* an external JavaBean instantation/configuration framework with the Controls runtime.
@@ -41,7 +39,7 @@
* execution context.
* @param id the bean control ID. Must be unique within the containing context. If
* null, a unique identifier will be auto-generated.
- * @returns a new ControlBean instance of the requested class.
+ * @return a new ControlBean instance of the requested class.
*/
public <T extends ControlBean> T instantiate(Class<T> beanClass,
PropertyMap props,
Modified: beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/bean/JavaControlFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/bean/JavaControlFactory.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/bean/JavaControlFactory.java (original)
+++ beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/bean/JavaControlFactory.java Mon Jan 16 18:59:28 2006
@@ -41,8 +41,7 @@
*/
public class JavaControlFactory implements ControlFactory
{
- private static ConcurrentHashMap<Class, Constructor> _constructors =
- new ConcurrentHashMap<Class, Constructor>();
+ private static ConcurrentHashMap<Class, Constructor> _constructors = new ConcurrentHashMap<Class, Constructor>();
private static final Properties _extImplBindings = new Properties();
@@ -50,8 +49,7 @@
static
{
- InputStream is = JavaControlFactory.class.getClassLoader().
- getResourceAsStream( EXT_IMPL_BINDING_CONFIG );
+ InputStream is = JavaControlFactory.class.getClassLoader().getResourceAsStream( EXT_IMPL_BINDING_CONFIG );
if ( is != null )
{
@@ -59,7 +57,7 @@
{
_extImplBindings.load( is );
}
- catch ( IOException ie ) { }
+ catch(IOException ignore) { }
}
}
Modified: beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/InterceptorAnnotation.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/InterceptorAnnotation.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/InterceptorAnnotation.java (original)
+++ beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/InterceptorAnnotation.java Mon Jan 16 18:59:28 2006
@@ -17,7 +17,11 @@
* $Header:$
*/
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Documented;
/**
* InterceptorAnnotation is the meta-annotation used to identify annotations
Modified: beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/InterceptorPivotException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/InterceptorPivotException.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/InterceptorPivotException.java (original)
+++ beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/InterceptorPivotException.java Mon Jan 16 18:59:28 2006
@@ -1,5 +1,4 @@
package org.apache.beehive.controls.spi.svc;
-
/*
* Copyright 2004 The Apache Software Foundation.
*
Modified: beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/ServiceException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/ServiceException.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/ServiceException.java (original)
+++ beehive/trunk/controls/src/spi/org/apache/beehive/controls/spi/svc/ServiceException.java Mon Jan 16 18:59:28 2006
@@ -1,5 +1,4 @@
package org.apache.beehive.controls.spi.svc;
-
/*
* Copyright 2004 The Apache Software Foundation.
*
Modified: beehive/trunk/controls/src/test-container/org/apache/beehive/controls/test/util/ControlContainerContextManagerFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/test-container/org/apache/beehive/controls/test/util/ControlContainerContextManagerFactory.java?rev=369649&r1=369648&r2=369649&view=diff
==============================================================================
--- beehive/trunk/controls/src/test-container/org/apache/beehive/controls/test/util/ControlContainerContextManagerFactory.java (original)
+++ beehive/trunk/controls/src/test-container/org/apache/beehive/controls/test/util/ControlContainerContextManagerFactory.java Mon Jan 16 18:59:28 2006
@@ -24,10 +24,6 @@
*/
public final class ControlContainerContextManagerFactory {
- public static ControlContainerContextManager getInstance() {
- return new ControlContainerContextManager(new ControlTestContainerContext());
- }
-
public static ControlContainerContextManager getInstance(ControlContainerContext controlContainerContext) {
return new ControlContainerContextManager(controlContainerContext);
}