You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2019/07/11 09:41:22 UTC

[myfaces] 02/02: cosmetics

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

commit a1615933e1790a4b2bde31909a6556ff82e29a30
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Thu Jul 11 11:41:13 2019 +0200

    cosmetics
---
 .../myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java   | 2 +-
 .../view/facelets/tag/jstl/core/IndexedValueExpression.java       | 4 +---
 .../view/facelets/tag/jstl/core/IteratedValueExpression.java      | 2 --
 .../myfaces/view/facelets/util/FaceletsTemplateMappingUtils.java  | 8 ++++----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java
index 717558f..dd6f019 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java
@@ -322,7 +322,7 @@ public class DefaultTagDecorator implements TagDecorator
                 //convertedTagAttributes[j] = tagAttribute;
                 
                 convertedNamespace = PASS_THROUGH_NAMESPACE;
-                qname = "p:"+tagAttribute.getLocalName();
+                qname = "p:" + tagAttribute.getLocalName();
                 
                 convertedTagAttributes[j] = new TagAttributeImpl(tagAttribute.getLocation(), 
                     convertedNamespace, tagAttribute.getLocalName(), qname, tagAttribute.getValue());
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java
index 1946ac3..da15452 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java
@@ -27,16 +27,14 @@ import javax.el.ValueExpression;
  */
 public final class IndexedValueExpression extends ValueExpression
 {
-
     private static final long serialVersionUID = 1L;
 
     private final Integer i;
-
     private final ValueExpression orig;
 
     public IndexedValueExpression(ValueExpression orig, int i)
     {
-        this.i = Integer.valueOf(i);
+        this.i = i;
         this.orig = orig;
     }
 
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java
index ebe7dea..5fa34b4 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java
@@ -27,11 +27,9 @@ import javax.el.ValueExpression;
  */
 public final class IteratedValueExpression extends ValueExpression
 {
-
     private static final long serialVersionUID = 1L;
 
     private ValueExpression orig;
-
     private Object value;
 
     public IteratedValueExpression(ValueExpression orig, Object value)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/util/FaceletsTemplateMappingUtils.java b/impl/src/main/java/org/apache/myfaces/view/facelets/util/FaceletsTemplateMappingUtils.java
index 834b370..7272733 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/util/FaceletsTemplateMappingUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/util/FaceletsTemplateMappingUtils.java
@@ -18,19 +18,19 @@
  */
 package org.apache.myfaces.view.facelets.util;
 
+import java.util.List;
 import org.apache.myfaces.config.RuntimeConfig;
 import org.apache.myfaces.config.element.FaceletsTemplateMapping;
 import org.apache.myfaces.util.UrlPatternMatcher;
 
-/**
- *
- */
 public class FaceletsTemplateMappingUtils
 {
     public static final boolean matchTemplate(RuntimeConfig runtimeConfig, String path)
     {
-        for (FaceletsTemplateMapping mapping : runtimeConfig.getFaceletsTemplateMappings())
+        List<FaceletsTemplateMapping> mappings = runtimeConfig.getFaceletsTemplateMappings();
+        for (int i = 0; i < mappings.size(); i++)
         {
+            FaceletsTemplateMapping mapping = mappings.get(i);
             if (UrlPatternMatcher.match(path, mapping.getUrlPattern()))
             {
                 return true;