myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: cosmetics
Date Sun, 25 Nov 2018 22:42:12 GMT
This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new edd9d4c  cosmetics
edd9d4c is described below

commit edd9d4c20ed7dc8d0a76b31d821c230dd8486c9c
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Sun Nov 25 23:42:06 2018 +0100

    cosmetics
---
 .../main/java/javax/faces/component/UIInput.java   |  6 ----
 .../main/java/javax/faces/component/UIOutput.java  |  3 +-
 .../java/javax/faces/component/UIViewAction.java   |  2 ++
 .../javax/faces/context/PartialResponseWriter.java |  2 +-
 .../javax/faces/validator/LongRangeValidator.java  |  2 +-
 .../myfaces/application/ViewResourceIterator.java  | 32 ++--------------------
 .../digester/elements/ContractMappingImpl.java     |  2 ++
 .../impl/digester/elements/FacesConfigImpl.java    |  2 ++
 .../flow/cdi/ClientWindowFacesFlowLRUMap.java      |  2 ++
 .../myfaces/shared/resource/ResourceLoader.java    |  2 +-
 .../test/mock/resource/MockResourceLoader.java     |  2 +-
 .../mock/resource/MockSimpleResourceHandler.java   |  2 +-
 12 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/api/src/main/java/javax/faces/component/UIInput.java b/api/src/main/java/javax/faces/component/UIInput.java
index 6786500..e8fc83c 100644
--- a/api/src/main/java/javax/faces/component/UIInput.java
+++ b/api/src/main/java/javax/faces/component/UIInput.java
@@ -377,12 +377,6 @@ public class UIInput extends UIOutput implements EditableValueHolder
     {
         // invoke standard listeners attached to this component first
         super.broadcast(event);
-
-        // Check if the event is applicable for ValueChangeListener
-        if (event instanceof ValueChangeEvent)
-        {
-
-        }
     }
 
     public void updateModel(FacesContext context)
diff --git a/api/src/main/java/javax/faces/component/UIOutput.java b/api/src/main/java/javax/faces/component/UIOutput.java
index 18fa91a..9ae3ecb 100644
--- a/api/src/main/java/javax/faces/component/UIOutput.java
+++ b/api/src/main/java/javax/faces/component/UIOutput.java
@@ -192,8 +192,7 @@ public class UIOutput extends UIComponentBase implements ValueHolder
                 // so if the parent returns null, this part will return
                 // null and when is restored, it will return null, but it prevents
                 // add the attached object into the state.
-                if (!_isSetConverter() && _converter != null &&
-                    !(_converter instanceof StateHolder))
+                if (!_isSetConverter() && _converter != null && !(_converter
instanceof StateHolder))
                 {
                     //No op. Note converterSaved is not taken into account if
                     //nullDelta is true.
diff --git a/api/src/main/java/javax/faces/component/UIViewAction.java b/api/src/main/java/javax/faces/component/UIViewAction.java
index 7425c01..241cf49 100644
--- a/api/src/main/java/javax/faces/component/UIViewAction.java
+++ b/api/src/main/java/javax/faces/component/UIViewAction.java
@@ -273,6 +273,8 @@ public class UIViewAction extends UIComponentBase implements ActionSource2
     
     private static class ViewActionEvent extends ActionEvent
     {
+        private static final long serialVersionUID = 1L;
+
         private transient FacesContext facesContext;
 
         public ViewActionEvent(FacesContext facesContext, UIComponent uiComponent)
diff --git a/api/src/main/java/javax/faces/context/PartialResponseWriter.java b/api/src/main/java/javax/faces/context/PartialResponseWriter.java
index 48c6258..a631593 100644
--- a/api/src/main/java/javax/faces/context/PartialResponseWriter.java
+++ b/api/src/main/java/javax/faces/context/PartialResponseWriter.java
@@ -207,7 +207,7 @@ public class PartialResponseWriter extends ResponseWriterWrapper
         {
             String attrName = attrNames.next();
             
-            _wrapped.writeAttribute (attrName, attributes.get (attrName), null);
+            _wrapped.writeAttribute(attrName, attributes.get(attrName), null);
         }
         
         // Leave open; caller will write extension elements.
diff --git a/api/src/main/java/javax/faces/validator/LongRangeValidator.java b/api/src/main/java/javax/faces/validator/LongRangeValidator.java
index 246402a..5bf473f 100755
--- a/api/src/main/java/javax/faces/validator/LongRangeValidator.java
+++ b/api/src/main/java/javax/faces/validator/LongRangeValidator.java
@@ -176,7 +176,7 @@ public class LongRangeValidator
 
     public void setMinimum(long minimum)
     {
-        _minimum = new Long(minimum);
+        _minimum = Long.valueOf(minimum);
         clearInitialState();
     }
 
diff --git a/impl/src/main/java/org/apache/myfaces/application/ViewResourceIterator.java b/impl/src/main/java/org/apache/myfaces/application/ViewResourceIterator.java
index 79cf8d4..5b0fd35 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ViewResourceIterator.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ViewResourceIterator.java
@@ -23,7 +23,6 @@ import java.util.Deque;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 import javax.faces.application.ResourceVisitOption;
 import javax.faces.context.FacesContext;
 import org.apache.myfaces.shared.resource.ContractResourceLoader;
@@ -45,11 +44,6 @@ public class ViewResourceIterator implements Iterator<String>
     private ResourceVisitOption[] options;
     private FacesContext facesContext;
 
-    /**
-     * register a set 
-     */
-    private Set<String> pathSet;
-
     public ViewResourceIterator(FacesContext facesContext, ResourceHandlerSupport support,

             String localePrefix, List<String> contracts, String contractPreferred,

             String path, int maxDepth, ResourceVisitOption... options) 
@@ -161,30 +155,8 @@ public class ViewResourceIterator implements Iterator<String>
             {
                 return currentIterator.next();
             }
-            else
-            {
-                //Should not happen, return null
-                return null;
-            }
-        }
-        else
-        {
-            return null;
-        }
-        /*
-        if (currentIterator == null)
-        {
-            ResourceLoader loader = (ResourceLoader) stack.pop();
-            if (loader != null)
-            {
-                currentIterator = loader.iterator(facesContext, basePath, maxDepth, options);
-            }
-            else
-            {
-                return null;
-            }
         }
-        return currentIterator.next();
-        */
+
+        return null;
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ContractMappingImpl.java
b/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ContractMappingImpl.java
index f26c48d..186d502 100644
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ContractMappingImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ContractMappingImpl.java
@@ -29,6 +29,8 @@ import org.apache.myfaces.config.element.ContractMapping;
  */
 public class ContractMappingImpl extends ContractMapping
 {
+    private static final long serialVersionUID = 1L;
+
     private List<String> urlPatternList;
     private List<String> contractsList;
     
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java
b/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java
index 7fcb78c..867780c 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java
@@ -44,6 +44,8 @@ import org.apache.myfaces.config.element.facelets.FaceletTagLibrary;
  */
 public class FacesConfigImpl extends org.apache.myfaces.config.element.FacesConfig implements
Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     private static final Logger log = Logger.getLogger(FacesConfigImpl.class.getName());
 
     private List<Application> applications;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/ClientWindowFacesFlowLRUMap.java
b/impl/src/main/java/org/apache/myfaces/flow/cdi/ClientWindowFacesFlowLRUMap.java
index ec2aa44..c662cd3 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/ClientWindowFacesFlowLRUMap.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/ClientWindowFacesFlowLRUMap.java
@@ -28,6 +28,8 @@ import org.apache.myfaces.shared.util.LRULinkedHashMap;
  */
 class ClientWindowFacesFlowLRUMap extends LRULinkedHashMap<String, String> implements
Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     private transient FlowScopeBeanHolder holder;
 
     public ClientWindowFacesFlowLRUMap(int capacity)
diff --git a/impl/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java b/impl/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java
index 316739e..cb66cdd 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java
@@ -129,7 +129,7 @@ public abstract class ResourceLoader
                     if (o1.length() > 0)
                     {
                         p1 = false;
-                        n1 = Integer.valueOf(o1);
+                        n1 = Integer.parseInt(o1);
                         o1 = "";
                     }
                     else
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/resource/MockResourceLoader.java
b/test/src/main/java/org/apache/myfaces/test/mock/resource/MockResourceLoader.java
index 33ba348..fa578ef 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/resource/MockResourceLoader.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/resource/MockResourceLoader.java
@@ -103,7 +103,7 @@ public abstract class MockResourceLoader
                     if (o1.length() > 0)
                     {
                         p1 = false;
-                        n1 = Integer.valueOf(o1);
+                        n1 = Integer.parseInt(o1);
                         o1 = "";
                     }
                     else
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/resource/MockSimpleResourceHandler.java
b/test/src/main/java/org/apache/myfaces/test/mock/resource/MockSimpleResourceHandler.java
index 916b907..c7fb896 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/resource/MockSimpleResourceHandler.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/resource/MockSimpleResourceHandler.java
@@ -330,7 +330,7 @@ public class MockSimpleResourceHandler extends ResourceHandler
                 if (o1.length() > 0)
                 {
                     p1 = false;
-                    n1 = Integer.valueOf(o1);
+                    n1 = Integer.parseInt(o1);
                     o1 = "";
                 }
                 else


Mime
View raw message