myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1073483 - in /myfaces/extensions/cdi/trunk: jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/ jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/ jee-module...
Date Tue, 22 Feb 2011 20:13:16 GMT
Author: gpetracek
Date: Tue Feb 22 20:13:15 2011
New Revision: 1073483

URL: http://svn.apache.org/viewvc?rev=1073483&view=rev
Log:
cleanup

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfPhaseId.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigExtractor.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextFactory.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversationKey.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextFactory.java
    myfaces/extensions/cdi/trunk/maven-utils/src/main/java/org/apache/myfaces/extensions/cdi/maven/BeansXmlTransformer.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.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/DefaultTransactionalInterceptorStrategy.java?rev=1073483&r1=1073482&r2=1073483&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java
Tue Feb 22 20:13:15 2011
@@ -61,7 +61,7 @@ public class DefaultTransactionalInterce
 
     private static transient ThreadLocal<AtomicInteger> refCount = new ThreadLocal<AtomicInteger>();
 
-    protected final Logger logger = Logger.getLogger(TransactionalInterceptor.class.getName());
+    private final Logger logger = Logger.getLogger(TransactionalInterceptor.class.getName());
 
     /** key=qualifier name, value= EntityManager */
     private static transient ThreadLocal<HashMap<String, EntityManager>> entityManagerMap
=

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfPhaseId.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfPhaseId.java?rev=1073483&r1=1073482&r2=1073483&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfPhaseId.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfPhaseId.java
Tue Feb 22 20:13:15 2011
@@ -33,7 +33,7 @@ public enum JsfPhaseId
     RENDER_RESPONSE(javax.faces.event.PhaseId.RENDER_RESPONSE),
     ANY_PHASE(javax.faces.event.PhaseId.ANY_PHASE);
 
-    javax.faces.event.PhaseId phaseId;
+    private javax.faces.event.PhaseId phaseId;
 
     JsfPhaseId(javax.faces.event.PhaseId phaseId)
     {

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigExtractor.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/config/view/DefaultViewConfigExtractor.java?rev=1073483&r1=1073482&r2=1073483&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigExtractor.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigExtractor.java
Tue Feb 22 20:13:15 2011
@@ -39,6 +39,8 @@ import static org.apache.myfaces.extensi
  */
 class DefaultViewConfigExtractor implements ViewConfigExtractor
 {
+    private static final long serialVersionUID = 5794817257216134993L;
+
     public ViewConfigEntry extractViewConfig(Class<? extends ViewConfig> viewDefinitionClass)
     {
         //use the interface to make clear which information we really need

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.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/config/view/ExtractedViewConfigDefinitionEntry.java?rev=1073483&r1=1073482&r2=1073483&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java
Tue Feb 22 20:13:15 2011
@@ -40,10 +40,11 @@ class ExtractedViewConfigDefinitionEntry
     private static final long serialVersionUID = -8387356240329549455L;
 
     final static String ROOT_PATH = "/";
-    final static String DEFAULT_PAGE_NAME = "";
+    protected final static String DEFAULT_PAGE_NAME = "";
     final static String DEFAULT_EXTENSION = Page.Extension.XHTML;
 
-    List<Class<? extends Annotation>> foundAndBlockedMetaDataTypes = new ArrayList<Class<?
extends Annotation>>();
+    private List<Class<? extends Annotation>> foundAndBlockedMetaDataTypes
+            = new ArrayList<Class<? extends Annotation>>();
 
     //security
     private List<Class<? extends AccessDecisionVoter>> foundVoters =

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextFactory.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/request/CodiFacesContextFactory.java?rev=1073483&r1=1073482&r2=1073483&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextFactory.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextFactory.java
Tue Feb 22 20:13:15 2011
@@ -31,7 +31,7 @@ import javax.faces.FacesException;
  */
 public class CodiFacesContextFactory extends FacesContextFactory implements Deactivatable
 {
-    protected final FacesContextFactory wrappedFacesContextFactory;
+    private final FacesContextFactory wrappedFacesContextFactory;
 
     private final boolean deactivated;
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversationKey.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/DefaultConversationKey.java?rev=1073483&r1=1073482&r2=1073483&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversationKey.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversationKey.java
Tue Feb 22 20:13:15 2011
@@ -36,11 +36,11 @@ class DefaultConversationKey implements 
 {
     private static final long serialVersionUID = 3577945095460042939L;
 
-    protected Class<? extends Annotation> scopeType;
+    private Class<? extends Annotation> scopeType;
 
     private Class<?> groupKey;
 
-    private HashSet<Annotation> qualifiers;
+    private Set<Annotation> qualifiers;
 
     DefaultConversationKey(Class<? extends Annotation> scopeType,
                            Class<?> groupKey,
@@ -61,15 +61,14 @@ class DefaultConversationKey implements 
                     ConversationGroup.class.isAssignableFrom(annotationType))
             {
                 //won't be used for this key!
+                continue;
             }
-            else
+
+            if (this.qualifiers == null)
             {
-                if (this.qualifiers == null)
-                {
-                    this.qualifiers = new HashSet<Annotation>();
-                }
-                this.qualifiers.add(qualifier);
+                this.qualifiers = new HashSet<Annotation>();
             }
+            this.qualifiers.add(qualifier);
         }
     }
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.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/InjectableConversation.java?rev=1073483&r1=1073482&r2=1073483&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java
Tue Feb 22 20:13:15 2011
@@ -37,11 +37,11 @@ public class InjectableConversation impl
 {
     private static final long serialVersionUID = 7754789230388003028L;
 
-    protected final Class conversationGroup;
+    private final Class conversationGroup;
 
-    protected final Set<Annotation> qualifiers;
+    private final Set<Annotation> qualifiers;
 
-    protected transient EditableWindowContext editableWindowContext;
+    private transient EditableWindowContext editableWindowContext;
 
     protected InjectableConversation(Bean<?> bean, WindowContextManager windowContextManager)
     {

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextFactory.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/listener/request/CodiFacesContextFactory.java?rev=1073483&r1=1073482&r2=1073483&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextFactory.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextFactory.java
Tue Feb 22 20:13:15 2011
@@ -31,7 +31,7 @@ import javax.faces.FacesException;
  */
 public class CodiFacesContextFactory extends FacesContextFactory implements Deactivatable
 {
-    protected final FacesContextFactory wrappedFacesContextFactory;
+    private final FacesContextFactory wrappedFacesContextFactory;
 
     private final boolean deactivated;
 

Modified: myfaces/extensions/cdi/trunk/maven-utils/src/main/java/org/apache/myfaces/extensions/cdi/maven/BeansXmlTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/maven-utils/src/main/java/org/apache/myfaces/extensions/cdi/maven/BeansXmlTransformer.java?rev=1073483&r1=1073482&r2=1073483&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/maven-utils/src/main/java/org/apache/myfaces/extensions/cdi/maven/BeansXmlTransformer.java
(original)
+++ myfaces/extensions/cdi/trunk/maven-utils/src/main/java/org/apache/myfaces/extensions/cdi/maven/BeansXmlTransformer.java
Tue Feb 22 20:13:15 2011
@@ -41,31 +41,25 @@ import java.util.jar.JarOutputStream;
 /**
  * A resource transformer for the maven shade-plugin which
  * processes beans.xml files correctly.
- *
+ * <p/>
  * Most of the code is taken from the XmlAppendingTransformer from the shade-plugin.
  */
 public class BeansXmlTransformer implements ResourceTransformer
 {
     public static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
 
-    boolean ignoreDtd = true;
+    private boolean ignoreDtd = true;
 
-    String resource;
+    private String resource;
 
-    Document doc;
+    private Document doc;
 
     public boolean canTransformResource(String r)
     {
-        if (resource != null && resource.equalsIgnoreCase(r))
-        {
-            return true;
-        }
-
-        return false;
+        return resource != null && resource.equalsIgnoreCase(r);
     }
 
-    public void processResource(String resource, InputStream is, List relocators)
-            throws IOException
+    public void processResource(String resource, InputStream is, List relocators) throws
IOException
     {
         Document r;
         try
@@ -76,8 +70,7 @@ public class BeansXmlTransformer impleme
             {
                 builder.setEntityResolver(new EntityResolver()
                 {
-                    public InputSource resolveEntity(String publicId, String systemId)
-                            throws SAXException, IOException
+                    public InputSource resolveEntity(String publicId, String systemId) throws
SAXException, IOException
                     {
                         return new InputSource(new StringReader(""));
                     }



Mime
View raw message