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/23 18:43:58 UTC
svn commit: r371604 - in /beehive/trunk/controls/src:
runtime/org/apache/beehive/controls/runtime/bean/
runtime/org/apache/beehive/controls/runtime/generator/
runtime/org/apache/beehive/controls/runtime/generator/apt/
spi/org/apache/beehive/controls/sp...
Author: ekoneil
Date: Mon Jan 23 09:43:43 2006
New Revision: 371604
URL: http://svn.apache.org/viewcvs?rev=371604&view=rev
Log:
Minor cleanup -- no real code changes.
BB: self
Test: Controls pass
Modified:
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ResourceContextImpl.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptEventSet.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.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
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=371604&r1=371603&r2=371604&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 23 09:43:43 2006
@@ -29,11 +29,19 @@
import java.beans.beancontext.BeanContextServiceProvider;
import java.beans.beancontext.BeanContextServices;
import java.beans.beancontext.BeanContextServicesSupport;
-import java.util.*;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.BufferedReader;
import java.io.IOException;
+import java.util.Iterator;
+import java.util.HashMap;
+import java.util.TooManyListenersException;
+import java.util.ArrayList;
+import java.util.Vector;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Map;
+import java.util.Collections;
import org.apache.beehive.controls.api.ControlException;
import org.apache.beehive.controls.api.bean.ControlInterface;
@@ -55,11 +63,11 @@
* bean has lost access to services.
*/
public class ControlBeanContext
- extends BeanContextServicesSupport
- implements BeanContextServiceRevokedListener,
- org.apache.beehive.controls.api.context.ControlBeanContext,
- java.beans.PropertyChangeListener,
- java.beans.VetoableChangeListener
+ extends BeanContextServicesSupport
+ implements BeanContextServiceRevokedListener,
+ org.apache.beehive.controls.api.context.ControlBeanContext,
+ java.beans.PropertyChangeListener,
+ java.beans.VetoableChangeListener
{
/**
* Creates a new ControlBeanContext instance associated with a specific
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=371604&r1=371603&r2=371604&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 23 09:43:43 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.runtime.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,14 +15,15 @@
*
* $Header:$
*/
-
-import org.apache.beehive.controls.api.context.ResourceContext;
+package org.apache.beehive.controls.runtime.bean;
import java.beans.beancontext.BeanContextServiceProvider;
import java.beans.beancontext.BeanContextServices;
import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.Vector;
+
+import org.apache.beehive.controls.api.context.ResourceContext;
/**
* The ResourceContextImpl class provides an implementation of the ResourceContext service,
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptEventSet.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptEventSet.java?rev=371604&r1=371603&r2=371604&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptEventSet.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptEventSet.java Mon Jan 23 09:43:43 2006
@@ -166,8 +166,7 @@
won't be added to the event adapter which results in an incomplete
implementation of the event set interface.
/*
- if (_superEventSet != null &&
- _superEventSet.getClassName().equals(intfDecl.getQualifiedName()))
+ if (_superEventSet != null && _superEventSet.getClassName().equals(intfDecl.getQualifiedName()))
continue;
*/
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java?rev=371604&r1=371603&r2=371604&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/apt/ControlClientAnnotationProcessor.java Mon Jan 23 09:43:43 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.controls.runtime.generator.apt;
-
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -17,26 +15,46 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.runtime.generator.apt;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.io.File;
+import java.io.IOException;
import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.apt.Filer;
import com.sun.mirror.declaration.AnnotationTypeDeclaration;
import com.sun.mirror.declaration.FieldDeclaration;
import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.apt.*;
-import com.sun.mirror.type.*;
-
-import java.util.*;
+import com.sun.mirror.declaration.Declaration;
+import com.sun.mirror.declaration.Modifier;
+import com.sun.mirror.declaration.ClassDeclaration;
+import com.sun.mirror.declaration.AnnotationValue;
+import com.sun.mirror.declaration.AnnotationMirror;
+import com.sun.mirror.declaration.InterfaceDeclaration;
+import com.sun.mirror.type.TypeMirror;
+import com.sun.mirror.type.ClassType;
+import com.sun.mirror.type.InterfaceType;
+import com.sun.mirror.type.DeclaredType;
import org.apache.beehive.controls.runtime.bean.ControlBeanContext;
-import org.apache.beehive.controls.runtime.generator.*;
-import org.apache.beehive.controls.api.bean.*;
+import org.apache.beehive.controls.runtime.generator.CodeGenerationException;
+import org.apache.beehive.controls.runtime.generator.AptAnnotationHelper;
+import org.apache.beehive.controls.runtime.generator.AptControlClient;
+import org.apache.beehive.controls.runtime.generator.GeneratorOutput;
+import org.apache.beehive.controls.runtime.generator.Generator;
+import org.apache.beehive.controls.runtime.generator.VelocityGenerator;
+import org.apache.beehive.controls.runtime.generator.CodeGenerator;
import org.apache.beehive.controls.api.versioning.Version;
import org.apache.beehive.controls.api.versioning.VersionRequired;
-
-import java.util.Set;
-import java.io.File;
-import java.io.IOException;
+import org.apache.beehive.controls.api.bean.ControlInterface;
+import org.apache.beehive.controls.api.bean.ControlExtension;
public class ControlClientAnnotationProcessor extends TwoPhaseAnnotationProcessor
{
@@ -49,7 +67,7 @@
@Override
public void check( Declaration d )
- {
+ {
if ( d instanceof FieldDeclaration )
checkControlField( (FieldDeclaration)d );
@@ -58,7 +76,7 @@
if ( d instanceof TypeDeclaration )
checkControlClientType( (TypeDeclaration)d );
-
+
// When a control is instantiated declaratively, values may be assigned to
// the control's properties declaratively as well. The property constraint
// validator is called here to ensure all values assigned satisfy any
@@ -86,7 +104,7 @@
controlTypes.add( controlFieldType );
}
-
+
/**
* Each control client requires a manifest that documents the controls that it references.
*
@@ -135,7 +153,7 @@
if ( td instanceof ClassDeclaration )
{
ClassType superclass = ( ( ClassDeclaration ) td ).getSuperclass();
-
+
while ( superclass != null )
{
if ( superclass.getDeclaration().equals( clientType ) )
@@ -143,7 +161,7 @@
addControlType( clientsMap, td, controlFieldType );
break;
}
-
+
superclass = superclass.getSuperclass();
}
}
@@ -264,7 +282,7 @@
}
}
}
-
+
@Override
public void generate(Declaration decl)
{
@@ -277,13 +295,13 @@
// Make sure that this field doesn't try to override another that's inherited.
String fieldName = f.getSimpleName();
TypeDeclaration declaringType = f.getDeclaringType();
-
+
if ( declaringType instanceof ClassDeclaration )
{
for ( ClassType i = ( ( ClassDeclaration ) declaringType ).getSuperclass(); i != null; i = i.getSuperclass() )
{
ClassDeclaration decl = i.getDeclaration();
-
+
if ( decl != null )
{
for ( FieldDeclaration baseClassField : decl.getFields() )
@@ -291,7 +309,7 @@
if ( fieldName.equals( baseClassField.getSimpleName() ) )
{
Collection<Modifier> modifiers = baseClassField.getModifiers();
-
+
if ( modifiers.contains( Modifier.PROTECTED ) || modifiers.contains( Modifier.PUBLIC ) )
{
printError( f, "control.field.override", decl.getQualifiedName() );
@@ -301,7 +319,7 @@
}
}
}
-
+
// Valid control field instances can be of an interface type
// or a class type.
if ( fieldType instanceof InterfaceType )
@@ -501,7 +519,7 @@
// best we can do is look for a best fit match against the input types
for (TypeDeclaration td :ape.getSpecifiedTypeDeclarations())
{
- if (td instanceof InterfaceDeclaration &&
+ if (td instanceof InterfaceDeclaration &&
td.getSimpleName().equals(intfName))
{
return (InterfaceDeclaration)td;
@@ -513,7 +531,7 @@
else
{
// direct supers only
- Collection<InterfaceType> intfs = classType.getSuperinterfaces();
+ Collection<InterfaceType> intfs = classType.getSuperinterfaces();
// per the code in checkControlField, this set must be of size 1
// and the 1 super interface must be a control interface/extension
@@ -567,12 +585,12 @@
VersionRequired versionRequired = f.getAnnotation(VersionRequired.class);
Version versionPresent = controlIntf.getAnnotation(Version.class);
- if ( versionRequired != null )
- {
+ if (versionRequired != null) {
int majorRequired = versionRequired.major();
int minorRequired = versionRequired.minor();
- if ( majorRequired < 0 ) // no real version requirement
+ /* no version requirement, so return */
+ if(majorRequired < 0)
return;
int majorPresent = -1;
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=371604&r1=371603&r2=371604&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 23 09:43:43 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.spi.bean;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.spi.bean;
import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.api.context.ControlBeanContext;
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=371604&r1=371603&r2=371604&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 23 09:43:43 2006
@@ -1,4 +1,3 @@
-package org.apache.beehive.controls.spi.bean;
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -16,13 +15,14 @@
*
* $Header:$
*/
+package org.apache.beehive.controls.spi.bean;
+import java.io.InputStream;
+import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.Properties;
-import java.io.InputStream;
-import java.io.IOException;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.beehive.controls.api.properties.PropertyMap;
import org.apache.beehive.controls.api.properties.BeanPropertyMap;
@@ -46,6 +46,7 @@
private static final Properties _extImplBindings = new Properties();
private static final String EXT_IMPL_BINDING_CONFIG = "controlbindings.properties";
+ private static final String KEY_CONTROL_IMPLEMENTATION = "controlImplementation";
static
{
@@ -89,8 +90,8 @@
if ( extImplBinding != null )
{
BeanPropertyMap bpm = props == null ? new BeanPropertyMap( beanClass ) : new BeanPropertyMap( props );
- PropertyKey propKey = new PropertyKey( org.apache.beehive.controls.api.properties.BaseProperties.class,
- "controlImplementation" );
+ PropertyKey propKey = new PropertyKey(org.apache.beehive.controls.api.properties.BaseProperties.class,
+ KEY_CONTROL_IMPLEMENTATION);
bpm.setProperty( propKey, extImplBinding );
props = bpm;
@@ -102,8 +103,10 @@
Constructor<T> ctor = _constructors.get(beanClass);
if (ctor == null)
{
- ctor = beanClass.getConstructor(ControlBeanContext.class, String.class,
+ ctor = beanClass.getConstructor(ControlBeanContext.class,
+ String.class,
PropertyMap.class);
+
_constructors.put(beanClass, ctor);
}
ret = ctor.newInstance(context, id, props);