svn commit: r1438773 - in /myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core: AttributesHandler.java CoreLibrary.java

[lu...@apache.org]

Author: lu4242
Date: Fri Jan 25 23:46:37 2013
New Revision: 1438773

URL: http://svn.apache.org/viewvc?rev=1438773&view=rev
Log:
MYFACES-3685 Implement f:attributes facelet tag 

Added:
    myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributesHandler.java   (with props)
Modified:
    myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/CoreLibrary.java

Added: myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributesHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributesHandler.java?rev=1438773&view=auto
==============================================================================
--- myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributesHandler.java (added)
+++ myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributesHandler.java Fri Jan 25 23:46:37 2013
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.view.facelets.tag.jsf.core;
+
+import java.io.IOException;
+import java.util.Map;
+import javax.el.ValueExpression;
+import javax.faces.component.UIComponent;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.TagAttribute;
+import javax.faces.view.facelets.TagConfig;
+import javax.faces.view.facelets.TagException;
+import javax.faces.view.facelets.TagHandler;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
+
+/**
+ *
+ * @since 2.2
+ * @author Leonardo Uribe
+ */
+@JSFFaceletTag(
+        name = "f:attributes",
+        bodyContent = "empty")
+public final class AttributesHandler extends TagHandler 
+{
+    private final TagAttribute _value;
+    
+    public AttributesHandler(TagConfig config)
+    {
+        super(config);
+        _value = getRequiredAttribute("value");
+    }
+
+    public void apply(FaceletContext ctx, UIComponent parent) throws IOException
+    {
+        if (parent == null)
+        {
+            throw new TagException(this.tag, "Parent UIComponent was null");
+        }
+
+        // only process if the parent is new to the tree
+        if (parent.getParent() == null)
+        {
+            Map<String, Object> map = (Map<String, Object>) _value.getObject(ctx, Map.class);
+            Map<String, Object> attributesMap = parent.getAttributes();
+            
+            for (Map.Entry<String, Object> entry : map.entrySet())
+            {
+                if (!attributesMap.containsKey(entry.getKey()))
+                {
+                    if (entry.getValue() instanceof ValueExpression)
+                    {
+                        parent.setValueExpression(entry.getKey(), (ValueExpression) entry.getValue());
+                    }
+                    else
+                    {
+                        attributesMap.put(entry.getKey(), entry.getValue());
+                    }
+                }
+            }
+        }
+    }
+}

Propchange: myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributesHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/CoreLibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/CoreLibrary.java?rev=1438773&r1=1438772&r2=1438773&view=diff
==============================================================================
--- myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/CoreLibrary.java (original)
+++ myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/CoreLibrary.java Fri Jan 25 23:46:37 2013
@@ -57,6 +57,8 @@ public final class CoreLibrary extends A
         this.addTagHandler("ajax", AjaxHandler.class);
         
         this.addTagHandler("attribute", AttributeHandler.class);
+        
+        this.addTagHandler("attributes", AttributesHandler.class);
 
         this.addConverter("convertDateTime", DateTimeConverter.CONVERTER_ID, ConvertDateTimeHandler.class);
 
@@ -73,6 +75,10 @@ public final class CoreLibrary extends A
         this.addTagHandler("metadata", ViewMetadataHandler.class);
         
         this.addComponent("param", UIParameter.COMPONENT_TYPE, null);
+        
+        this.addTagHandler("passThroughAttribute", PassThroughAttributeHandler.class);
+        
+        this.addTagHandler("passThroughAttributes", PassThroughAttributesHandler.class);
 
         this.addTagHandler("phaseListener", PhaseListenerHandler.class);