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 Thu, 13 Dec 2018 21:07:32 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 da56891  cosmetics
da56891 is described below

commit da56891a46e2b9310ecec21bea7b138f55491aa0
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Thu Dec 13 22:07:37 2018 +0100

    cosmetics
---
 .../facelets/el/DefaultContextAwareELException.java     |  4 +---
 .../myfaces/view/facelets/el/DefaultVariableMapper.java | 17 ++++-------------
 .../org/apache/myfaces/view/facelets/el/ELText.java     |  7 +------
 .../view/facelets/el/FaceletStateValueExpression.java   |  3 ---
 4 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultContextAwareELException.java
b/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultContextAwareELException.java
index 4c84091..4cb7841 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultContextAwareELException.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultContextAwareELException.java
@@ -32,9 +32,7 @@ public class DefaultContextAwareELException implements ContextAwareExceptionWrap
     private String _qName;
     private Throwable _wrapped;
 
-    public DefaultContextAwareELException(Location location,
-                                          String expressionString, String qName,
-                                          Throwable wrapped)
+    public DefaultContextAwareELException(Location location, String expressionString, String
qName, Throwable wrapped)
     {
         _location = location;
         _expressionString = expressionString;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultVariableMapper.java
b/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultVariableMapper.java
index 92f2ce7..346e076 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultVariableMapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultVariableMapper.java
@@ -40,15 +40,10 @@ import org.apache.myfaces.view.facelets.TemplateContext;
 public final class DefaultVariableMapper extends VariableMapperBase
 {
     private Map<String, ValueExpression> _vars;
-    
     private PageContext _pageContext;
-    
     private TemplateContext _templateContext;
-    
     private VariableMapper _delegate;
-    
     public boolean _trackResolveVariables;
-    
     public boolean _variableResolved;
 
     public DefaultVariableMapper()
@@ -92,8 +87,7 @@ public final class DefaultVariableMapper extends VariableMapperBase
                         {
                             if (returnValue instanceof CacheableValueExpressionWrapper)
                             {
-                                returnValue = ((CacheableValueExpressionWrapper)returnValue).
-                                    getWrapped();
+                                returnValue = ((CacheableValueExpressionWrapper)returnValue).getWrapped();
                             }
                         }
                         else
@@ -107,19 +101,16 @@ public final class DefaultVariableMapper extends VariableMapperBase
             
             if (_templateContext != null)
             {
-                if (!_templateContext.isParameterEmpty() &&
-                    _templateContext.containsParameter(name))
+                if (!_templateContext.isParameterEmpty() &&_templateContext.containsParameter(name))
                 {
                     returnValue = _templateContext.getParameter(name);
-                    if (_trackResolveVariables &&
-                        !(returnValue instanceof CacheableValueExpression))
+                    if (_trackResolveVariables && !(returnValue instanceof CacheableValueExpression))
                     {
                         _variableResolved = true;
                     }
                     return returnValue;
                 }
-                else if (!_templateContext.isKnownParametersEmpty() &&
-                    _templateContext.containsKnownParameter(name))
+                else if (!_templateContext.isKnownParametersEmpty() && _templateContext.containsKnownParameter(name))
                 {
                     // This part is the most important in alwaysRecompile EL cache hack.
                     // The idea is maintain a list of the parameters used in a template,
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
index 31d59e5..29c2e0e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
@@ -239,15 +239,12 @@ public class ELText
     
     private static final class ELCacheableTextVariable extends ELText
     {
-        private final ValueExpression ve;
-        
         //Just like TagAttributeImpl
         private final static int EL_CC = 2;
-        
         private final static int EL_RESOURCE = 8;
         
+        private final ValueExpression ve;
         private final int capabilities;
-        
         private volatile ELTextVariable cached;
         
         public ELCacheableTextVariable(ValueExpression ve)
@@ -457,8 +454,6 @@ public class ELText
      */
     public static boolean isLiteral(String in)
     {
-        //ELText txt = parse(in);
-        //return txt == null || txt.isLiteral();
         return isLiteral(null, null, in);
     }
 
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
b/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
index 7c65d8a..f5b3f14 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
@@ -34,9 +34,6 @@ import javax.faces.context.FacesContext;
 import org.apache.myfaces.view.facelets.tag.jsf.ComponentSupport;
 import org.apache.myfaces.view.facelets.tag.jsf.FaceletState;
 
-/**
- *
- */
 public class FaceletStateValueExpression extends ValueExpression 
     implements Externalizable, FacesWrapper<ValueExpression>
 {


Mime
View raw message