Author: struberg
Date: Wed Feb 23 12:04:42 2011
New Revision: 1073713
URL: http://svn.apache.org/viewvc?rev=1073713&view=rev
Log:
OWB-461 make package scoped variables either private or protected
I also added lots of //X TODO comments to our ugly public ThreadLocals...
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java?rev=1073713&r1=1073712&r2=1073713&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
Wed Feb 23 12:04:42 2011
@@ -172,7 +172,7 @@ public abstract class BuildInOwbBean<T>
// initialize the custom proxy handler class and its constructor.
AccessController.doPrivileged(new PrivilegedAction<T>()
{
- BuildInOwbBean<T> buildinBean;
+ private BuildInOwbBean<T> buildinBean;
public T run()
{
@@ -262,7 +262,7 @@ public abstract class BuildInOwbBean<T>
*/
private static final long serialVersionUID = -2442900183095535369L;
- BuildInOwbBean<T> bean;
+ private BuildInOwbBean<T> bean;
private T actualObject = null;
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java?rev=1073713&r1=1073712&r2=1073713&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/EventBean.java
Wed Feb 23 12:04:42 2011
@@ -38,7 +38,7 @@ import org.apache.webbeans.exception.Web
*/
public class EventBean<T> extends AbstractOwbBean<Event<T>>
{
- // TODO refactor. public static variables are uterly ugly
+ //X TODO refactor. public static variables are utterly ugly
public static ThreadLocal<InjectionPoint> local = new
ThreadLocal<InjectionPoint>();
/**
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java?rev=1073713&r1=1073712&r2=1073713&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
Wed Feb 23 12:04:42 2011
@@ -28,7 +28,7 @@ import javax.enterprise.inject.spi.Injec
public class InjectionPointBean extends AbstractOwbBean<InjectionPoint>
{
- // TODO refactor. public static variables are uterly ugly
+ //X TODO refactor. public static variables are utterly ugly
public static ThreadLocal<InjectionPoint> local = new
ThreadLocal<InjectionPoint>();
/**
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java?rev=1073713&r1=1073712&r2=1073713&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
Wed Feb 23 12:04:42 2011
@@ -41,7 +41,7 @@ public class ManagedBean<T> extends Abst
/** Constructor of the web bean component */
private Constructor<T> constructor;
- boolean isAbstractDecorator;
+ protected boolean isAbstractDecorator;
public ManagedBean(Class<T> returnType, WebBeansContext webBeansContext)
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=1073713&r1=1073712&r2=1073713&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
Wed Feb 23 12:04:42 2011
@@ -76,7 +76,8 @@ public class InjectionResolver
* This Map contains all resolved beans via it's ExpressionLanguage name.
*/
private Map<String, Set<Bean<?>>> resolvedBeansByName = new
ConcurrentHashMap<String, Set<Bean<?>>>();
-
+
+ //X TODO refactor. public static variables are utterly ugly
public static ThreadLocal<InjectionPoint> injectionPoints = new
ThreadLocal<InjectionPoint>();
/**
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1073713&r1=1073712&r2=1073713&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
Wed Feb 23 12:04:42 2011
@@ -52,6 +52,7 @@ public class CreationalContextImpl<T> im
private ConcurrentMap<Object, List<EjbInterceptorContext>> ejbInterceptors
= null;
/**When bean object is destroyed it is set*/
+ //X TODO refactor. public static variables are utterly ugly
public static ThreadLocal<Object> currentRemoveObject = new
ThreadLocal<Object>();
private WebBeansContext webBeansContext;
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java?rev=1073713&r1=1073712&r2=1073713&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java
Wed Feb 23 12:04:42 2011
@@ -47,16 +47,16 @@ public enum ContextTypes
DEPENDENT(4),
SINGLETON(5);
- int name;
+ private int cardinal;
- ContextTypes(int name)
+ ContextTypes(int cardinal)
{
- this.name = name;
+ this.cardinal = cardinal;
}
public int getCardinal()
{
- return name;
+ return cardinal;
}
public String getContextName()
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=1073713&r1=1073712&r2=1073713&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
Wed Feb 23 12:04:42 2011
@@ -67,6 +67,7 @@ public abstract class AbstractInjectable
/**Field, method or constructor injection*/
protected Member injectionMember;
+ //X TODO refactor. public static variables are utterly ugly
public static ThreadLocal<Object> instanceUnderInjection = new
ThreadLocal<Object>();
//X TODO this MUST NOT be public!
