You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by co...@apache.org on 2010/09/10 19:59:23 UTC
svn commit: r995910 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
context/creational/EjbInterceptorContext.java
intercept/InterceptorDataImpl.java
Author: covener
Date: Fri Sep 10 17:59:23 2010
New Revision: 995910
URL: http://svn.apache.org/viewvc?rev=995910&view=rev
Log:
whitespace change only, apply OWB formatting in eclipse
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/EjbInterceptorContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/EjbInterceptorContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/EjbInterceptorContext.java?rev=995910&r1=995909&r2=995910&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/EjbInterceptorContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/EjbInterceptorContext.java Fri Sep 10 17:59:23 2010
@@ -27,17 +27,15 @@ public class EjbInterceptorContext imple
private static final long serialVersionUID = 1L;
private Object interceptorInstance;
-
+
private OWBInjector injectorInstance;
-
+
private Class<?> interceptorClass;
-
+
public EjbInterceptorContext()
{
-
+
}
-
-
/**
* @return the interceptorClass
@@ -47,7 +45,6 @@ public class EjbInterceptorContext imple
return interceptorClass;
}
-
/**
* @param interceptorClass the interceptorClass to set
*/
@@ -56,8 +53,6 @@ public class EjbInterceptorContext imple
this.interceptorClass = interceptorClass;
}
-
-
/**
* @return the interceptorInstance
*/
@@ -89,6 +84,5 @@ public class EjbInterceptorContext imple
{
this.injectorInstance = injectorInstance;
}
-
-
+
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java?rev=995910&r1=995909&r2=995910&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java Fri Sep 10 17:59:23 2010
@@ -39,13 +39,14 @@ import org.apache.webbeans.util.WebBeans
/**
* Abstract implementation of the {@link InterceptorData} api contract.
- * @version $Rev$Â $Date$
+ *
+ * @version $Rev$Â $Date$
*/
public class InterceptorDataImpl implements InterceptorData
{
- //Logger instance
+ // Logger instance
private final WebBeansLogger logger = WebBeansLogger.getLogger(InterceptorDataImpl.class);
-
+
/** Around invokes method */
private Method aroundInvoke = null;
@@ -64,21 +65,21 @@ public class InterceptorDataImpl impleme
private boolean definedInMethod;
/**
- * If defined in method true, then this method holds
- * interceptor binding annotated method
+ * If defined in method true, then this method holds interceptor binding
+ * annotated method
*/
private Method annotatedMethod;
/** Defined with webbeans specific interceptor */
private boolean isDefinedWithWebBeansInterceptor;
-
+
private Class<?> interceptorClass = null;
-
+
private WebBeansDecoratorInterceptor decoratorInterceptor = null;
public InterceptorDataImpl(boolean isDefinedWithWebBeansInterceptor)
{
- this(isDefinedWithWebBeansInterceptor,null);
+ this(isDefinedWithWebBeansInterceptor, null);
}
public InterceptorDataImpl(boolean isDefinedWithWebBeansInterceptor, WebBeansDecoratorInterceptor decoratorInterceptor)
@@ -86,18 +87,17 @@ public class InterceptorDataImpl impleme
this.isDefinedWithWebBeansInterceptor = isDefinedWithWebBeansInterceptor;
this.decoratorInterceptor = decoratorInterceptor;
}
-
+
public Class<?> getInterceptorClass()
{
return this.interceptorClass;
}
-
+
public void setInterceptorClass(Class<?> clazz)
{
this.interceptorClass = clazz;
}
-
/*
* (non-Javadoc)
* @see
@@ -266,7 +266,7 @@ public class InterceptorDataImpl impleme
{
this.webBeansInterceptor = webBeansInterceptor;
}
-
+
public Method getInterceptorMethod()
{
if (aroundInvoke != null)
@@ -288,61 +288,61 @@ public class InterceptorDataImpl impleme
@Override
public boolean isLifecycleInterceptor()
{
- if(this.preDestroy != null || this.postConstruct != null)
+ if (this.preDestroy != null || this.postConstruct != null)
{
return true;
}
-
+
return false;
}
-
+
@Override
@SuppressWarnings("unchecked")
- public Object createNewInstance(Object ownerInstance,CreationalContextImpl<?> ownerCreationalContext)
+ public Object createNewInstance(Object ownerInstance, CreationalContextImpl<?> ownerCreationalContext)
{
- //check for this InterceptorData is defined by interceptor class
- if(this.isDefinedWithWebBeansInterceptor && this.definedInInterceptorClass)
+ // check for this InterceptorData is defined by interceptor class
+ if (this.isDefinedWithWebBeansInterceptor && this.definedInInterceptorClass)
{
Object interceptor = null;
-
- //Means that it is the last interceptor added by InterceptorHandler
- if(this.webBeansInterceptor == null)
+
+ // Means that it is the last interceptor added by InterceptorHandler
+ if (this.webBeansInterceptor == null)
{
- return this.decoratorInterceptor;
+ return this.decoratorInterceptor;
}
-
- interceptor = ownerCreationalContext.getDependentInterceptor(ownerInstance,this.webBeansInterceptor);
- //There is no define interceptor, define and add it into dependent
- if(interceptor == null)
+
+ interceptor = ownerCreationalContext.getDependentInterceptor(ownerInstance, this.webBeansInterceptor);
+ // There is no define interceptor, define and add it into dependent
+ if (interceptor == null)
{
BeanManagerImpl manager = BeanManagerImpl.getManager();
-
- WebBeansInterceptor<Object> actualInterceptor = (WebBeansInterceptor<Object>)this.webBeansInterceptor;
+
+ WebBeansInterceptor<Object> actualInterceptor = (WebBeansInterceptor<Object>) this.webBeansInterceptor;
CreationalContext<Object> creationalContext = manager.createCreationalContext(actualInterceptor);
- interceptor = manager.getReference(actualInterceptor,actualInterceptor.getBeanClass(), creationalContext);
-
+ interceptor = manager.getReference(actualInterceptor, actualInterceptor.getBeanClass(), creationalContext);
+
actualInterceptor.setInjections(interceptor, creationalContext);
- ownerCreationalContext.addDependent(ownerInstance, (WebBeansInterceptor<Object>)this.webBeansInterceptor, interceptor);
+ ownerCreationalContext.addDependent(ownerInstance, (WebBeansInterceptor<Object>) this.webBeansInterceptor, interceptor);
}
-
+
return interceptor;
}
EjbInterceptorContext ctx = null;
- Object interceptor = null;
- //control for this InterceptorData is defined by interceptor class
- if(this.definedInInterceptorClass)
+ Object interceptor = null;
+ // control for this InterceptorData is defined by interceptor class
+ if (this.definedInInterceptorClass)
{
- ctx = ownerCreationalContext.getEjbInterceptor(ownerInstance, this.interceptorClass);
- if(ctx == null)
- {
+ ctx = ownerCreationalContext.getEjbInterceptor(ownerInstance, this.interceptorClass);
+ if (ctx == null)
+ {
interceptor = WebBeansUtil.newInstanceForced(this.interceptorClass);
try
{
OWBInjector injector = new OWBInjector();
injector.inject(interceptor);
-
+
ctx = new EjbInterceptorContext();
ctx.setInjectorInstance(injector);
ctx.setInterceptorInstance(interceptor);
@@ -350,8 +350,8 @@ public class InterceptorDataImpl impleme
catch (Exception e)
{
logger.error(OWBLogConst.ERROR_0022, e, interceptorClass);
- }
-
+ }
+
ownerCreationalContext.addEjbInterceptor(interceptorClass, ctx);
}
else
@@ -360,9 +360,9 @@ public class InterceptorDataImpl impleme
}
}
- return interceptor;
+ return interceptor;
}
-
+
@Override
public String toString()
{