openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1182780 [4/4] - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/annotation/ webbeans-impl/src/main/java/org/apache/webbeans/boot/ webbeans-impl/src/main/java/org/apache/webbeans/component/ webbeans-impl/src/main/jav...
Date Thu, 13 Oct 2011 11:11:06 GMT
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
Thu Oct 13 11:11:03 2011
@@ -59,7 +59,7 @@ public class ProcessAnnotatedTypeImpl<X>
     @Override
     public AnnotatedType<X> getAnnotatedType()
     {
-        return this.annotatedType;
+        return annotatedType;
     }
 
     /**
@@ -68,8 +68,8 @@ public class ProcessAnnotatedTypeImpl<X>
     @Override
     public void setAnnotatedType(AnnotatedType<X> type)
     {
-        this.annotatedType = type;
-        this.modifiedAnnotatedType = true;
+        annotatedType = type;
+        modifiedAnnotatedType = true;
     }
     
     /**
@@ -79,7 +79,7 @@ public class ProcessAnnotatedTypeImpl<X>
      */
     public boolean isModifiedAnnotatedType()
     {
-        return this.modifiedAnnotatedType;
+        return modifiedAnnotatedType;
     }
 
     /**
@@ -88,7 +88,7 @@ public class ProcessAnnotatedTypeImpl<X>
     @Override
     public void veto()
     {
-        this.veto = true;
+        veto = true;
     }
     
     /**
@@ -98,7 +98,7 @@ public class ProcessAnnotatedTypeImpl<X>
      */
     public boolean isVeto()
     {
-        return this.veto;
+        return veto;
     }
 
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java
Thu Oct 13 11:11:03 2011
@@ -60,7 +60,7 @@ public  class ProcessBeanImpl<X> impleme
     @Override
     public Annotated getAnnotated()
     {
-        return this.annotated;
+        return annotated;
     }
 
     /**
@@ -69,7 +69,7 @@ public  class ProcessBeanImpl<X> impleme
     @Override
     public Bean<X> getBean()
     {
-        return this.bean;
+        return bean;
     }
 
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java
Thu Oct 13 11:11:03 2011
@@ -65,7 +65,7 @@ public class ProcessInjectionTargetImpl<
     @Override
     public AnnotatedType<X> getAnnotatedType()
     {
-        return this.annotatedType;
+        return annotatedType;
     }
 
     /**
@@ -74,7 +74,7 @@ public class ProcessInjectionTargetImpl<
     @Override
     public InjectionTarget<X> getInjectionTarget()
     {
-        return this.injectionTarget;
+        return injectionTarget;
     }
 
     /**
@@ -84,7 +84,7 @@ public class ProcessInjectionTargetImpl<
     public void setInjectionTarget(InjectionTarget<X> injectionTarget)
     {
         this.injectionTarget = injectionTarget;
-        this.set = true;
+        set = true;
     }
 
     /**
@@ -94,6 +94,6 @@ public class ProcessInjectionTargetImpl<
      */
     public boolean isSet()
     {
-        return this.set;
+        return set;
     }
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java
Thu Oct 13 11:11:03 2011
@@ -38,7 +38,7 @@ public class ProcessManagedBeanImpl<X> e
     public ProcessManagedBeanImpl(ManagedBean<X> bean, AnnotatedType<X> annotatedType)
     {        
         super(bean, annotatedType);
-        this.annotatedBeanClass = annotatedType;
+        annotatedBeanClass = annotatedType;
     }
     
     /**
@@ -47,7 +47,7 @@ public class ProcessManagedBeanImpl<X> e
     @Override
     public AnnotatedType<X> getAnnotatedBeanClass()
     {
-        return this.annotatedBeanClass;
+        return annotatedBeanClass;
     }
 
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
Thu Oct 13 11:11:03 2011
@@ -61,7 +61,7 @@ public class ProcessObserverMethodImpl<T
     @Override
     public AnnotatedMethod<X> getAnnotatedMethod()
     {
-        return this.annotatedMethod;
+        return annotatedMethod;
     }
 
     /**
@@ -70,7 +70,7 @@ public class ProcessObserverMethodImpl<T
     @Override
     public ObserverMethod<T> getObserverMethod()
     {
-        return this.observerMethod;
+        return observerMethod;
     }
 
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java
Thu Oct 13 11:11:03 2011
@@ -48,7 +48,7 @@ public class ProcessProducerFieldImpl<X,
     @Override
     public AnnotatedField<X> getAnnotatedProducerField()
     {
-        return this.annotatedField;
+        return annotatedField;
     }
     
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java
Thu Oct 13 11:11:03 2011
@@ -64,7 +64,7 @@ public class ProcessProducerImpl<X,T> im
     @Override
     public AnnotatedMember<X> getAnnotatedMember()
     {
-        return this.annotateMember;
+        return annotateMember;
     }
 
     /**
@@ -73,7 +73,7 @@ public class ProcessProducerImpl<X,T> im
     @Override
     public Producer<T> getProducer()
     {
-        return this.producer;
+        return producer;
     }
 
     /**
@@ -83,7 +83,7 @@ public class ProcessProducerImpl<X,T> im
     public void setProducer(Producer<T> producer)
     {
         this.producer = producer;
-        this.set = true;
+        set = true;
     }
     
     /**
@@ -93,7 +93,7 @@ public class ProcessProducerImpl<X,T> im
      */
     public boolean isProducerSet()
     {
-        return this.set;
+        return set;
     }
     
     public void setProducerSet(boolean set)
@@ -101,4 +101,4 @@ public class ProcessProducerImpl<X,T> im
         this.set = set;
     }
 
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java
Thu Oct 13 11:11:03 2011
@@ -43,8 +43,8 @@ public class ProcessProducerMethodImpl<X
     public ProcessProducerMethodImpl(ProducerMethodBean<T> bean, AnnotatedMethod<X>
method, AnnotatedParameter<X> disposeParameter)
     {
         super(bean, method);
-        this.annotatedProducerMethod = method;
-        this.annotatedDisposedParameter = disposeParameter;
+        annotatedProducerMethod = method;
+        annotatedDisposedParameter = disposeParameter;
     }
     
     /**
@@ -53,7 +53,7 @@ public class ProcessProducerMethodImpl<X
     @Override
     public AnnotatedParameter<X> getAnnotatedDisposedParameter()
     {
-        return this.annotatedDisposedParameter;
+        return annotatedDisposedParameter;
     }
 
     /**
@@ -62,7 +62,7 @@ public class ProcessProducerMethodImpl<X
     @Override
     public AnnotatedMethod<X> getAnnotatedProducerMethod()
     {
-        return this.annotatedProducerMethod;
+        return annotatedProducerMethod;
     }
     
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java
Thu Oct 13 11:11:03 2011
@@ -44,8 +44,8 @@ public class ProcessSessionBeanImpl<X> e
     public ProcessSessionBeanImpl(Bean<Object> bean, AnnotatedType<Object> annotatedType,
String name, SessionBeanType type)
     {
         super(bean, annotatedType);
-        this.annotatedBeanClass = annotatedType;
-        this.ejbName = name;
+        annotatedBeanClass = annotatedType;
+        ejbName = name;
         this.type = type;
     }
     
@@ -56,7 +56,7 @@ public class ProcessSessionBeanImpl<X> e
     @Override
     public String getEjbName()
     {
-        return this.ejbName;
+        return ejbName;
     }
     
     /**
@@ -65,7 +65,7 @@ public class ProcessSessionBeanImpl<X> e
     @Override
     public SessionBeanType getSessionBeanType()
     {
-        return this.type;
+        return type;
     }
 
     /**
@@ -77,4 +77,4 @@ public class ProcessSessionBeanImpl<X> e
         return annotatedBeanClass;
     }
 
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
Thu Oct 13 11:11:03 2011
@@ -56,7 +56,7 @@ public class AfterBeanDiscoveryImpl impl
     public AfterBeanDiscoveryImpl(WebBeansContext webBeansContext)
     {
         this.webBeansContext = webBeansContext;
-        this.beanManager = this.webBeansContext.getBeanManagerImpl();
+        beanManager = this.webBeansContext.getBeanManagerImpl();
     }
     
     /**
@@ -70,7 +70,7 @@ public class AfterBeanDiscoveryImpl impl
         
         //Fire Event
         ProcessBean<?> processBeanEvent = new GProcessBean(bean,annotatedType);
-        this.beanManager.fireEvent(processBeanEvent, AnnotationUtil.EMPTY_ANNOTATION_ARRAY);
+        beanManager.fireEvent(processBeanEvent, AnnotationUtil.EMPTY_ANNOTATION_ARRAY);
         
         if(bean instanceof Interceptor)
         {
@@ -103,8 +103,8 @@ public class AfterBeanDiscoveryImpl impl
                     logger.warn(OWBLogConst.WARN_0005_3, interceptor.getBeanClass().getName());
                 }                
             }
-            
-            this.beanManager.addInterceptor(interceptor);
+
+            beanManager.addInterceptor(interceptor);
             webBeansContext.getBeanManagerImpl().addCustomInterceptorClass(bean.getBeanClass());
         }
         
@@ -136,15 +136,15 @@ public class AfterBeanDiscoveryImpl impl
                 {
                     logger.warn(OWBLogConst.WARN_0005_3, managedBean.getBeanClass().getName());
                 }                
-            }            
-            
-            
-            this.beanManager.addDecorator(new WebBeansDecorator(managedBean, (Decorator)bean));
+            }
+
+
+            beanManager.addDecorator(new WebBeansDecorator(managedBean, (Decorator) bean));
             webBeansContext.getBeanManagerImpl().addCustomDecoratorClass(bean.getBeanClass());
         }
         else
         {
-            this.beanManager.addBean(bean);    
+            beanManager.addBean(bean);
         }                
     }
 
@@ -154,8 +154,8 @@ public class AfterBeanDiscoveryImpl impl
     @Override
     public void addContext(Context context)
     {
-        this.beanManager.addContext(context);
-        
+        beanManager.addContext(context);
+
     }
 
     /**
@@ -164,7 +164,7 @@ public class AfterBeanDiscoveryImpl impl
     @Override
     public void addDefinitionError(Throwable t)
     {
-        this.beanManager.getErrorStack().pushError(t);
+        beanManager.getErrorStack().pushError(t);
     }
 
     /**
@@ -174,8 +174,8 @@ public class AfterBeanDiscoveryImpl impl
     public void addObserverMethod(ObserverMethod<?> observerMethod)
     {
         ProcessObserverMethod<?, ?> event = new GProcessObservableMethod(null,observerMethod);
-        this.beanManager.fireEvent(event, AnnotationUtil.EMPTY_ANNOTATION_ARRAY);
-        this.beanManager.getNotificationManager().addObserver(observerMethod, observerMethod.getObservedType());
+        beanManager.fireEvent(event, AnnotationUtil.EMPTY_ANNOTATION_ARRAY);
+        beanManager.getNotificationManager().addObserver(observerMethod, observerMethod.getObservedType());
     }
 
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java
Thu Oct 13 11:11:03 2011
@@ -46,17 +46,17 @@ public class ErrorStack
 
     public Throwable[] popErrors()
     {
-        Throwable[] list = new Throwable[this.errorStack.size()];
-        list = this.errorStack.toArray(list);
+        Throwable[] list = new Throwable[errorStack.size()];
+        list = errorStack.toArray(list);
         
         return list;
     }
     
     public void logErrors()
     {
-        if(!this.errorStack.isEmpty())
+        if(!errorStack.isEmpty())
         {
-            Iterator<Throwable> it = this.errorStack.iterator();
+            Iterator<Throwable> it = errorStack.iterator();
             while(it.hasNext())
             {
                 Throwable t = it.next();
@@ -67,11 +67,11 @@ public class ErrorStack
     
     public void clear()
     {
-        this.errorStack.clear();
+        errorStack.clear();
     }
     
     public boolean hasErrors()
     {
-        return !this.errorStack.isEmpty();
+        return !errorStack.isEmpty();
     }
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
Thu Oct 13 11:11:03 2011
@@ -121,13 +121,13 @@ public final class JavassistProxyFactory
         Class<?> proxyClass = null;
         try
         {
-            proxyClass = this.resourceBeanProxyClasses.get(resourceBean);
+            proxyClass = resourceBeanProxyClasses.get(resourceBean);
             if (proxyClass == null)
             {
                 ProxyFactory fact = createProxyFactory(resourceBean);
                 proxyClass = getProxyClass(fact);
 
-                Class<?> oldClazz = this.resourceBeanProxyClasses.putIfAbsent(resourceBean,
proxyClass);
+                Class<?> oldClazz = resourceBeanProxyClasses.putIfAbsent(resourceBean,
proxyClass);
                 if (oldClazz != null)
                 {
                     return oldClazz;

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ResourceProxyHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ResourceProxyHandler.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ResourceProxyHandler.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ResourceProxyHandler.java
Thu Oct 13 11:11:03 2011
@@ -58,7 +58,7 @@ public class ResourceProxyHandler implem
     {
         try
         {
-            return actualMethod.invoke(this.actualResource, args);
+            return actualMethod.invoke(actualResource, args);
         }
         catch (InvocationTargetException e)
         {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/ManualImplementationLoaderService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/ManualImplementationLoaderService.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/ManualImplementationLoaderService.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/ManualImplementationLoaderService.java
Thu Oct 13 11:11:03 2011
@@ -74,7 +74,7 @@ class ManualImplementationLoaderService<
             loadConfiguredServices(configFile);
         }
 
-        return this.foundServiceClasses;
+        return foundServiceClasses;
     }
 
     private List<URL> getConfigFileList()
@@ -83,7 +83,7 @@ class ManualImplementationLoaderService<
 
         try
         {
-            Enumeration<URL> serviceFileEnumerator = this.currentClassLoader.getResources(getConfigFileLocation());
+            Enumeration<URL> serviceFileEnumerator = currentClassLoader.getResources(getConfigFileLocation());
 
             while (serviceFileEnumerator.hasMoreElements())
             {
@@ -93,14 +93,14 @@ class ManualImplementationLoaderService<
         catch (Exception e)
         {
             throw new IllegalStateException(
-                    "Failed to load " + this.serviceType.getName() + " configured in " +
getConfigFileLocation(), e);
+                    "Failed to load " + serviceType.getName() + " configured in " + getConfigFileLocation(),
e);
         }
         return serviceFiles;
     }
 
     private String getConfigFileLocation()
     {
-        return SERVICE_CONFIG + this.serviceType.getName();
+        return SERVICE_CONFIG + serviceType.getName();
     }
 
     private void loadConfiguredServices(URL serviceFile)
@@ -157,9 +157,9 @@ class ManualImplementationLoaderService<
     {
         Class<T> serviceClass = (Class<T>) loadClass(serviceClassName);
 
-        if (serviceClass != null && !this.foundServiceClasses.contains(serviceClass))
+        if (serviceClass != null && !foundServiceClasses.contains(serviceClass))
         {
-            this.foundServiceClasses.add(serviceClass);
+            foundServiceClasses.add(serviceClass);
         }
         else if (serviceClass == null)
         {
@@ -175,7 +175,7 @@ class ManualImplementationLoaderService<
 
         if (targetClass == null)
         {
-            targetClass = loadClassForName(serviceClassName, this.currentClassLoader);
+            targetClass = loadClassForName(serviceClassName, currentClassLoader);
 
             if (targetClass == null)
             {
@@ -183,7 +183,7 @@ class ManualImplementationLoaderService<
             }
         }
 
-        return targetClass.asSubclass(this.serviceType);
+        return targetClass.asSubclass(serviceType);
     }
 
     private static Class<?> loadClassForName(String serviceClassName, ClassLoader classLoader)

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OpenWebBeansClassLoaderProvider.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OpenWebBeansClassLoaderProvider.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OpenWebBeansClassLoaderProvider.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OpenWebBeansClassLoaderProvider.java
Thu Oct 13 11:11:03 2011
@@ -31,7 +31,7 @@ public class OpenWebBeansClassLoaderProv
 
     OpenWebBeansClassLoaderProvider()
     {
-        this.wrapped = ProxyFactory.classLoaderProvider;
+        wrapped = ProxyFactory.classLoaderProvider;
     }
 
     public void useCurrentClassLoader()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OwbCustomObjectInputStream.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OwbCustomObjectInputStream.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OwbCustomObjectInputStream.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OwbCustomObjectInputStream.java
Thu Oct 13 11:11:03 2011
@@ -35,7 +35,7 @@ public class OwbCustomObjectInputStream 
     
     protected Class<?> resolveClass(ObjectStreamClass desc) throws ClassNotFoundException
     {
-        return Class.forName(desc.getName(), false, this.classLoader);
+        return Class.forName(desc.getName(), false, classLoader);
     }
 
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Thu Oct 13 11:11:03 2011
@@ -1326,7 +1326,7 @@ public final class WebBeansUtil
 
         if(clazzName.length() > 0)
         {
-            StringBuffer name = new StringBuffer(clazzName);
+            StringBuilder name = new StringBuilder(clazzName);
             name.setCharAt(0, Character.toLowerCase(name.charAt(0)));
 
             return name.toString();
@@ -1337,7 +1337,7 @@ public final class WebBeansUtil
 
     public static String getProducerDefaultName(String methodName)
     {
-        StringBuffer buffer = new StringBuffer(methodName);
+        StringBuilder buffer = new StringBuilder(methodName);
 
         if (buffer.length() > 3 &&  (buffer.substring(0, 3).equals("get") || buffer.substring(0,
3).equals("set")))
         {

Modified: openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java
(original)
+++ openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java
Thu Oct 13 11:11:03 2011
@@ -50,7 +50,6 @@ public class CdiTestOpenWebBeansContaine
     private MockServletContext  servletContext = null;
     private MockHttpSession     session = null;
 
-    @Override
     public void bootContainer() throws Exception 
     {
         servletContext = new MockServletContext();
@@ -59,7 +58,6 @@ public class CdiTestOpenWebBeansContaine
         lifecycle.startApplication(servletContext);
     }
 
-    @Override
     public void shutdownContainer() throws Exception 
     {
         if (lifecycle != null) 
@@ -68,7 +66,6 @@ public class CdiTestOpenWebBeansContaine
         }
     }
 
-    @Override
     public void startContexts() throws Exception 
     {
         WebBeansContext webBeansContext = WebBeansContext.getInstance();
@@ -81,7 +78,6 @@ public class CdiTestOpenWebBeansContaine
         contextFactory.initRequestContext(null);
     }
 
-    @Override
     public void startApplicationScope() throws Exception 
     {
         WebBeansContext webBeansContext = WebBeansContext.getInstance();
@@ -90,7 +86,6 @@ public class CdiTestOpenWebBeansContaine
         contextFactory.initApplicationContext(servletContext);
     }
 
-    @Override
     public void startConversationScope() throws Exception 
     {
         WebBeansContext webBeansContext = WebBeansContext.getInstance();
@@ -99,13 +94,11 @@ public class CdiTestOpenWebBeansContaine
         contextFactory.initConversationContext(null);
     }
 
-    @Override
     public void startCustomScope(Class<? extends Annotation> scopeClass) throws Exception

     {
         //X TODO
     }
 
-    @Override
     public void startRequestScope() throws Exception 
     {
         WebBeansContext webBeansContext = WebBeansContext.getInstance();
@@ -114,7 +107,6 @@ public class CdiTestOpenWebBeansContaine
         contextFactory.initRequestContext(null);
     }
 
-    @Override
     public void startSessionScope() throws Exception 
     {
         WebBeansContext webBeansContext = WebBeansContext.getInstance();
@@ -123,7 +115,6 @@ public class CdiTestOpenWebBeansContaine
         contextFactory.initSessionContext(session);
     }
 
-    @Override
     public void stopContexts() throws Exception 
     {
         WebBeansContext webBeansContext = WebBeansContext.getInstance();
@@ -151,7 +142,6 @@ public class CdiTestOpenWebBeansContaine
         //ContextFactory.cleanUpContextFactory();
     }
 
-    @Override
     public void stopApplicationScope() throws Exception 
     {
         WebBeansContext webBeansContext = WebBeansContext.getInstance();
@@ -171,7 +161,6 @@ public class CdiTestOpenWebBeansContaine
         }
     }
 
-    @Override
     public void stopConversationScope() throws Exception 
     {
         WebBeansContext webBeansContext = WebBeansContext.getInstance();
@@ -191,13 +180,11 @@ public class CdiTestOpenWebBeansContaine
         }
     }
 
-    @Override
     public void stopCustomScope(Class<? extends Annotation> scopeClass) throws Exception

     {
         //X TODO
     }
 
-    @Override
     public void stopRequestScope() throws Exception 
     {
         WebBeansContext webBeansContext = WebBeansContext.getInstance();
@@ -217,7 +204,6 @@ public class CdiTestOpenWebBeansContaine
         }
     }
 
-    @Override
     public void stopSessionScope() throws Exception 
     {
         WebBeansContext webBeansContext = WebBeansContext.getInstance();
@@ -242,7 +228,6 @@ public class CdiTestOpenWebBeansContaine
         return lifecycle.getBeanManager();
     }
 
-    @Override
     public <T> T getInstance(Class<T> type, Annotation... qualifiers)
     throws ResolutionException 
     {
@@ -265,7 +250,6 @@ public class CdiTestOpenWebBeansContaine
         return instance;
     }
 
-    @Override
     public Object getInstance(String name)
     throws ResolutionException 
     {

Modified: openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/MockHttpSession.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/MockHttpSession.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/MockHttpSession.java
(original)
+++ openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/MockHttpSession.java
Thu Oct 13 11:11:03 2011
@@ -30,97 +30,80 @@ import javax.servlet.http.HttpSessionCon
 public class MockHttpSession implements HttpSession
 {
 
-    @Override
     public long getCreationTime()
     {
         return 0;
     }
 
-    @Override
     public String getId()
     {
         return "sessId1";
     }
 
-    @Override
     public long getLastAccessedTime()
     {
         return 0;
     }
 
-    @Override
     public ServletContext getServletContext()
     {
         return null;
     }
 
-    @Override
     public void setMaxInactiveInterval(int interval)
     {
     }
 
-    @Override
     public int getMaxInactiveInterval()
     {
         return 0;
     }
 
-    @Override
     public HttpSessionContext getSessionContext()
     {
         return null;
     }
 
-    @Override
     public Object getAttribute(String name)
     {
         return null;
     }
 
-    @Override
     public Object getValue(String name)
     {
         return null;
     }
 
-    @Override
     public Enumeration getAttributeNames()
     {
         return null;
     }
 
-    @Override
     public String[] getValueNames()
     {
         return new String[0];
     }
 
-    @Override
     public void setAttribute(String name, Object value)
     {
     }
 
-    @Override
     public void putValue(String name, Object value)
     {
     }
 
-    @Override
     public void removeAttribute(String name)
     {
     }
 
-    @Override
     public void removeValue(String name)
     {
     }
 
-    @Override
     public void invalidate()
     {
     }
 
-    @Override
     public boolean isNew()
     {
         return false;



Mime
View raw message