You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/12/01 10:08:23 UTC
svn commit: r1040907 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/
examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/q...
Author: gpetracek
Date: Wed Dec 1 09:08:22 2010
New Revision: 1040907
URL: http://svn.apache.org/viewvc?rev=1040907&view=rev
Log:
minor cleanup
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/qualifier/QualifierInstances.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/advanced/DefaultELProvider.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleList.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleListEntry.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/config/CodiConfig.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleList.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleListEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/TransactionalInterceptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/ViewControllerInterceptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java Wed Dec 1 09:08:22 2010
@@ -60,6 +60,7 @@ public class DefaultAnnotation implement
if (annotation == null)
{
// switch into paranoia mode
+ //noinspection SynchronizationOnLocalVariableOrMethodParameter
synchronized (annotationCache)
{
annotation = annotationCache.get(key);
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/qualifier/QualifierInstances.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/qualifier/QualifierInstances.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/qualifier/QualifierInstances.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/qualifier/QualifierInstances.java Wed Dec 1 09:08:22 2010
@@ -30,6 +30,7 @@ public class QualifierInstances
{
private static class QualifierAnnotation extends AnnotationLiteral<Qualifier3> implements Qualifier3
{
+ private static final long serialVersionUID = 6638619823102047921L;
}
public static Qualifier3 qualifier3()
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/advanced/DefaultELProvider.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/advanced/DefaultELProvider.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/advanced/DefaultELProvider.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/advanced/DefaultELProvider.java Wed Dec 1 09:08:22 2010
@@ -33,6 +33,8 @@ import javax.el.ExpressionFactory;
*/
public class DefaultELProvider implements ELProvider
{
+ private static final long serialVersionUID = 2641255245468004320L;
+
public ExpressionFactory createExpressionFactory()
{
return new ExpressionFactoryImpl();
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleList.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleList.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleList.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleList.java Wed Dec 1 09:08:22 2010
@@ -34,6 +34,8 @@ import java.util.logging.Logger;
@Named
public class SampleList implements Serializable
{
+ private static final long serialVersionUID = 5655240534902984821L;
+
private Logger log = Logger.getLogger(SampleList.class.getName());
/**
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleListEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleListEntry.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleListEntry.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleListEntry.java Wed Dec 1 09:08:22 2010
@@ -32,6 +32,8 @@ import java.util.logging.Logger;
@Named
public class SampleListEntry implements Serializable
{
+ private static final long serialVersionUID = 723390662860977802L;
+
private Logger log = Logger.getLogger(SampleListEntry.class.getName());
private Integer id;
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/config/CodiConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/config/CodiConfig.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/config/CodiConfig.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/config/CodiConfig.java Wed Dec 1 09:08:22 2010
@@ -30,6 +30,8 @@ import javax.enterprise.inject.Specializ
@Specializes
public class CodiConfig extends DefaultWindowContextConfig
{
+ private static final long serialVersionUID = -4094949435815088068L;
+
@Override
public boolean isInitialRedirectEnabled()
{
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleList.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleList.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleList.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleList.java Wed Dec 1 09:08:22 2010
@@ -35,6 +35,8 @@ import javax.enterprise.context.SessionS
@Named
public class SampleList implements Serializable
{
+ private static final long serialVersionUID = 5655240534902984821L;
+
private Logger log = Logger.getLogger(SampleList.class.getName());
/**
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleListEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleListEntry.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleListEntry.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/windowhandler_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/listsample/SampleListEntry.java Wed Dec 1 09:08:22 2010
@@ -32,6 +32,8 @@ import java.util.logging.Logger;
@Named
public class SampleListEntry implements Serializable
{
+ private static final long serialVersionUID = 723390662860977802L;
+
private Logger log = Logger.getLogger(SampleListEntry.class.getName());
private Integer id;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/TransactionalInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/TransactionalInterceptor.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/TransactionalInterceptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/TransactionalInterceptor.java Wed Dec 1 09:08:22 2010
@@ -156,6 +156,7 @@ public class TransactionalInterceptor im
{
//only in case of add-ons synchronize
//-> nested calls (across beans) which share the same entity manager aren't supported
+ //noinspection SynchronizationOnLocalVariableOrMethodParameter
synchronized (entityManager)
{
return proceedMethodInTransaction(context,
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/ViewControllerInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/ViewControllerInterceptor.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/ViewControllerInterceptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/ViewControllerInterceptor.java Wed Dec 1 09:08:22 2010
@@ -48,16 +48,10 @@ public class ViewControllerInterceptor i
public Object filterPhaseListenerMethods(InvocationContext invocationContext) throws Exception
{
Object result = null;
- try
- {
- if(invokeListenerMethod(invocationContext))
- {
- result = invocationContext.proceed();
- }
- }
- catch (Exception e)
+
+ if(invokeListenerMethod(invocationContext))
{
- throw e;
+ result = invocationContext.proceed();
}
return result;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java Wed Dec 1 09:08:22 2010
@@ -39,7 +39,6 @@ import javax.faces.context.ExternalConte
import javax.faces.context.FacesContext;
import javax.enterprise.inject.spi.BeanManager;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -158,14 +157,7 @@ public class ViewConfigAwareNavigationHa
}
result.append("includeViewParams=true");
- try
- {
- return JsfUtils.addRequestParameter(externalContext, result.toString());
- }
- catch (UnsupportedEncodingException e)
- {
- throw new RuntimeException(e);
- }
+ return JsfUtils.addRequestParameter(externalContext, result.toString());
}
return result.toString();
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java Wed Dec 1 09:08:22 2010
@@ -41,7 +41,7 @@ import java.util.Set;
*/
public class RedirectedConversationAwareExternalContext extends ExternalContext
{
- private ExternalContext wrapped;
+ private final ExternalContext wrapped;
private WindowHandler windowHandler;
@@ -68,7 +68,7 @@ public class RedirectedConversationAware
throws IOException
{
lazyInit();
- sendRedirect(this.wrapped, url, windowHandler);
+ sendRedirect(this.wrapped, url, this.windowHandler);
}
private synchronized void lazyInit()
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java Wed Dec 1 09:08:22 2010
@@ -128,7 +128,6 @@ public class JsfUtils
}
public static String addRequestParameter(ExternalContext externalContext, String url)
- throws UnsupportedEncodingException
{
StringBuilder finalUrl = new StringBuilder(url);
boolean existingParameters = url.contains("?");
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java Wed Dec 1 09:08:22 2010
@@ -50,14 +50,6 @@ public class RedirectedConversationAware
return this.wrapped;
}
- @Override
- public void redirect(String url)
- throws IOException
- {
- lazyInit();
- sendRedirect(this.wrapped, url, this.windowHandler);
- }
-
public String encodeActionURL(String s)
{
lazyInit();
@@ -70,6 +62,13 @@ public class RedirectedConversationAware
return this.wrapped.encodeActionURL(s);
}
+ @Override
+ public void redirect(String url)
+ throws IOException
+ {
+ lazyInit();
+ sendRedirect(this.wrapped, url, this.windowHandler);
+ }
private synchronized void lazyInit()
{
if(this.windowHandler == null)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java?rev=1040907&r1=1040906&r2=1040907&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java Wed Dec 1 09:08:22 2010
@@ -115,6 +115,7 @@ public class ViewScopedContext implement
return null;
}
+ //noinspection SynchronizationOnLocalVariableOrMethodParameter
synchronized (componentInstanceMap)
{
// just to make sure...