Author: lfryc(a)redhat.com Date: 2010-07-10 15:34:28 -0400 (Sat, 10 Jul 2010) New Revision: 17851 Modified: root/tests/metamer/trunk/pom.xml root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Attributes.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JAjaxBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandButtonBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JLogBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JMediaOutputBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JOutputPanelBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JParamBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPollBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPushBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/CommandButtonBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataScrollerBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataTableBean.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichExtendedDataTableBean.java root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hCommandButton.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hCommandLink.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputSecret.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputText.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jLog/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/image.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jOutputPanel/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jParam/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jPoll/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/a4jPush/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/commandButton/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/filtering.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/richDataTable/sorting.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/filtering.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/sorting.xhtml root/tests/metamer/trunk/src/main/webapp/resources/testapp/attributes.xhtml Log: * refactoring of class Attributes Modified: root/tests/metamer/trunk/pom.xml =================================================================== --- root/tests/metamer/trunk/pom.xml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/pom.xml 2010-07-10 19:34:28 UTC (rev 17851) @@ -99,15 +99,9 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <version>2.2</version> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> </dependency> @@ -284,13 +278,8 @@ <artifactId>el-api</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <version>2.2</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <scope>provided</scope> @@ -345,12 +334,6 @@ <artifactId>el-api</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <version>2.2</version> - <scope>provided</scope> - </dependency> </dependencies> </profile> </profiles> Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Attributes.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Attributes.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/Attributes.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -19,7 +19,6 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *******************************************************************************/ - package org.richfaces.testapp; import java.beans.IntrospectionException; @@ -29,7 +28,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Enumeration; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -58,17 +56,11 @@ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ -public final class Attributes implements Map<String, Object> { +public final class Attributes implements Map<String, Attribute> { private Logger logger; // K - name of a component attribute, V - value of the component attribute - private Map<String, Object> attributes; - // K - name of a component attribute, V - type of the component attribute - private Map<String, Class<?>> attributesTypes; - // K - name of a component attribute, V - help for the component attribute - private Map<String, String> helpMap; - // K - name of a component attribute, V - select items used on page to select value for the attribute - private Map<String, List<SelectItem>> attributesSelectOptions; + private Map<String, Attribute> attributes; // class object of managed bean private Class<?> beanClass; @@ -82,7 +74,7 @@ */ private Attributes(Class<?> componentClass, Class<?> beanClass) { logger = LoggerFactory.getLogger(Attributes.class); - logger.info("creating attributes map for " + componentClass); + logger.debug("creating attributes map for " + componentClass); this.beanClass = beanClass; @@ -95,23 +87,24 @@ return; } - attributes = new TreeMap<String, Object>(); - attributesTypes = new TreeMap<String, Class<?>>(); + attributes = new TreeMap<String, Attribute>(); // not all attributes of given class are needed Set<String> excludeSet = getExcludeSet(); + Attribute attribute = null; // create list of all attributes and their types for (PropertyDescriptor descriptor : descriptors) { if (!excludeSet.contains(descriptor.getName())) { - attributes.put(descriptor.getName(), null); - attributesTypes.put(descriptor.getName(), descriptor.getPropertyType()); + attribute = new Attribute(descriptor.getName()); + attribute.setType(descriptor.getPropertyType()); + attributes.put(descriptor.getName(), attribute); } } logger.info(attributes.keySet().toString()); - helpMap = loadHelp(); - attributesSelectOptions = loadSelectOptions(); + loadHelp(); + loadSelectOptions(); } /** @@ -139,24 +132,23 @@ } /** - * Loads help. - * - * @return map where key is attribute's name and value is help for this attribute + * Loads help strings from property file. */ - private Map<String, String> loadHelp() { + private void loadHelp() { ResourceBundle rb = ResourceBundle.getBundle(beanClass.getName()); Enumeration<String> keys = rb.getKeys(); String key = null; - Map<String, String> result = new HashMap<String, String>(); + Attribute attribute = null; while (keys.hasMoreElements()) { key = keys.nextElement(); if (key.startsWith("testapp.help.")) { - result.put(key.replaceFirst("testapp.help.", ""), rb.getString(key)); + attribute = attributes.get(key.replaceFirst("testapp.help.", "")); + if (attribute != null) { + attribute.setHelp(rb.getString(key)); + } } } - - return result; } /** @@ -164,16 +156,16 @@ * * @return map where key is attribute's name and value is list of select items usable to select attribute value */ - private Map<String, List<SelectItem>> loadSelectOptions() { + private void loadSelectOptions() { ResourceBundle rb = ResourceBundle.getBundle(beanClass.getName()); Enumeration<String> keys = rb.getKeys(); String key = null; - Map<String, List<SelectItem>> result = new HashMap<String, List<SelectItem>>(); // e.g. attr.action.toUpperCaseAction Pattern pattern = Pattern.compile("(.*)\\.(.*)\\.(.*)"); Matcher matcher = null; SelectItem item = null; + Attribute attribute = null; while (keys.hasMoreElements()) { key = keys.nextElement(); @@ -181,21 +173,27 @@ matcher = pattern.matcher(key); matcher.find(); - if (result.get(matcher.group(2)) == null) { - result.put(matcher.group(2), new ArrayList<SelectItem>()); + attribute = attributes.get(matcher.group(2)); + if (attribute == null) { + continue; } + if (attribute.getSelectOptions() == null) { + attribute.setSelectOptions(new ArrayList<SelectItem>()); + } + item = new SelectItem(rb.getString(key), matcher.group(3)); - result.get(matcher.group(2)).add(item); + attribute.getSelectOptions().add(item); } } // sort all select options - for (String aKey : result.keySet()) { - Collections.sort(result.get(aKey), new SelectItemComparator()); + for (String aKey : attributes.keySet()) { + List<SelectItem> selectOptions = attributes.get(aKey).getSelectOptions(); + if (selectOptions != null) { + Collections.sort(selectOptions, new SelectItemComparator()); + } } - - return result; } /** @@ -209,28 +207,28 @@ /** * {@inheritDoc} */ - public boolean containsKey(Object key) { + public boolean containsKey(String key) { return attributes.containsKey(key); } /** * {@inheritDoc} */ - public boolean containsValue(Object value) { + public boolean containsValue(String value) { return attributes.containsKey(value); } /** * {@inheritDoc} */ - public Set<java.util.Map.Entry<String, Object>> entrySet() { + public Set<Map.Entry<String, Attribute>> entrySet() { return attributes.entrySet(); } /** * {@inheritDoc} */ - public Object get(Object key) { + public Attribute get(String key) { return attributes.get(key); } @@ -251,22 +249,22 @@ /** * {@inheritDoc} */ - public Object put(String key, Object value) { + public Attribute put(String key, Attribute value) { return attributes.put(key, value); } /** * {@inheritDoc} */ - public void putAll(Map<? extends String, ? extends Object> m) { + public void putAll(Map<? extends String, ? extends Attribute> m) { attributes.putAll(m); } /** * {@inheritDoc} */ - public Object remove(Object key) { - return attributes.remove(key); + public Attribute remove(Object key) { + return attributes.remove((String) key); } /** @@ -279,7 +277,7 @@ /** * {@inheritDoc} */ - public Collection<Object> values() { + public Collection<Attribute> values() { return attributes.values(); } @@ -319,30 +317,6 @@ } /** - * Setter for help. - * - * @param attribute - * name of an attribute - * @param help - * description of an attribute - */ - public void setHelp(String attribute, String help) { - helpMap.put(attribute, help); - } - - /** - * Getter for help. - * - * @param attribute - * name of an attribute whose help will be retrieved - * @return description of an attribute - */ - public String getHelp(String attribute) { - String help = helpMap.get(attribute); - return help; - } - - /** * Determines whether given object represents an EL expression, e.g. #{bean.property}. * * @param value @@ -358,29 +332,6 @@ } /** - * Associates the specified value with the specified key in the map with attributes' types. - * If the map previously contained a mapping for the key, the old value is replaced - * by the specified value. (A map m is said to contain a mapping for a key k - * if and only if m.containsKey(k) would return true.) - * - * @param key key with which the specified value is to be associated - * @param value value to be associated with the specified key - * @return the previous value associated with key, or null if there was no - * mapping for key. (A null return can also indicate that the map previously - * associated null with key, if the implementation supports null values.) - * @throws UnsupportedOperationException - if the put operation is not supported by this map - * @throws ClassCastException - if the class of the specified key or value prevents - * it from being stored in this map - * @throws NullPointerException - if the specified key or value is null and this map does not permit null keys or values - * @throws IllegalArgumentException - if some property of the specified key - * or value prevents it from being stored in this map - */ - public Object putAttributeClass(String key, Class<?> value) { - - return attributesTypes.put(key, value); - } - - /** * An action for tested JSF component. Can be modified dynamically. * * @return outcome of an action or null if no navigation should be performed @@ -388,8 +339,13 @@ public String action() { ELContext elContext = FacesContext.getCurrentInstance().getELContext(); MethodExpression method = null; - String outcome = (String) attributes.get("action"); + if (attributes.get("action") == null) { + return null; + } + + String outcome = (String) attributes.get("action").getValue(); + if (outcome == null) { return null; } @@ -421,8 +377,13 @@ public void actionListener(ActionEvent event) { ELContext elContext = FacesContext.getCurrentInstance().getELContext(); MethodExpression method = null; - String listener = (String) attributes.get("actionListener"); + if (attributes.get("actionListener") == null) { + return; + } + + String listener = (String) attributes.get("actionListener").getValue(); + if (listener == null) { return; } @@ -468,18 +429,6 @@ } /** - * Decides whether given attribute is a boolean. If true, an checkbox should be rendered on a page. - * - * @param attributeName - * name of a component attribute - * @return true if attribute is of type boolean, otherwise false - */ - public boolean isBoolean(String attributeName) { - Class<?> clazz = attributesTypes.get(attributeName); - return (clazz == boolean.class || clazz == Boolean.class); - } - - /** * Decides if there are any select options for given attribute. If true, radio buttons should be rendered on a page. * * @param attributeName @@ -487,17 +436,28 @@ * @return true if select options were defined, false otherwise */ public boolean hasSelectOptions(String attributeName) { - return attributesSelectOptions.containsKey(attributeName); + List<SelectItem> options = attributes.get(attributeName).getSelectOptions(); + return options != null && options.size() != 0; } - /** - * Getter for select options of given attribute. - * - * @param attributeName - * name of a component attribute - * @return list of select items for given attribute - */ - public List<SelectItem> getSelectOptions(String attributeName) { - return attributesSelectOptions.get(attributeName); + public boolean containsKey(Object key) { + return attributes.containsKey((String) key); } + + public boolean containsValue(Object value) { + return attributes.containsValue((Attribute) value); + } + + public Attribute get(Object key) { + return attributes.get((String) key); + } + + public void setAttribute(String name, Object value) { + Attribute attr = attributes.get(name); + if (attr == null) { + attr = new Attribute(name); + } + attr.setValue(value); + attributes.put(name, attr); + } } Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JAjaxBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JAjaxBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JAjaxBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -64,9 +64,9 @@ attributes = Attributes.getBehaviorAttributes(AjaxBehavior.class, getClass()); // the 'event' attribute for behavior tag must be a literal attributes.remove("event"); - attributes.put("render", "output"); - attributes.put("execute", "@form"); - + attributes.get("render").setValue("output"); + attributes.get("execute").setValue("@form"); + cars = new ArrayList<String>(); cars.add("Ferrari"); cars.add("Lexus"); Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandButtonBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandButtonBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandButtonBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -24,11 +24,13 @@ import java.io.Serializable; + import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; import javax.faces.event.ActionEvent; import org.richfaces.component.UICommandButton; +import org.richfaces.testapp.Attribute; import org.richfaces.testapp.Attributes; import org.slf4j.Logger; @@ -62,14 +64,19 @@ attributes = Attributes.getUIComponentAttributes(UICommandButton.class, getClass()); - attributes.put("value", "command button"); - attributes.put("rendered", "true"); - attributes.put("disabled", "false"); - attributes.putAttributeClass("disabled", Boolean.class); - attributes.put("action", "first6CharsAction"); - attributes.put("actionListener", "toUpperCaseActionListener"); - attributes.put("render", "output1 output2 output3"); + attributes.setAttribute("value", "command button"); + attributes.setAttribute("rendered", true); + attributes.setAttribute("action", "first6CharsAction"); + attributes.setAttribute("actionListener", "toUpperCaseActionListener"); + attributes.setAttribute("render", "output1 output2 output3"); + Attribute attr = attributes.get("disabled"); + if (attr == null) { + attr = new Attribute("disabled"); + } + attr.setType(Boolean.class); + attributes.put("disabled", attr); + } /** Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JCommandLinkBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -62,13 +62,13 @@ attributes = Attributes.getUIComponentAttributes(UICommandLink.class, getClass()); - attributes.put("value", "command link"); - attributes.put("rendered", "true"); - attributes.put("disabled", "false"); - attributes.putAttributeClass("disabled", Boolean.class); - attributes.put("action", "first6CharsAction"); - attributes.put("actionListener", "toUpperCaseActionListener"); - attributes.put("render", "output1 output2 output3"); + attributes.setAttribute("value", "command link"); + attributes.setAttribute("rendered", "true"); + attributes.setAttribute("disabled", "false"); + attributes.get("disabled").setType(Boolean.class); + attributes.setAttribute("action", "first6CharsAction"); + attributes.setAttribute("actionListener", "toUpperCaseActionListener"); + attributes.setAttribute("render", "output1 output2 output3"); } Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JLogBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JLogBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JLogBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -58,8 +58,9 @@ name = "John"; attributes = Attributes.getUIComponentAttributes(UIAjaxLog.class, getClass()); - attributes.put("rendered", true); - attributes.put("level", "debug"); + + attributes.setAttribute("rendered", true); + attributes.setAttribute("level", "debug"); } /** Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JMediaOutputBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JMediaOutputBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JMediaOutputBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -65,8 +65,8 @@ logger.info("initializing bean " + getClass().getName()); attributes = Attributes.getUIComponentAttributes(UIMediaOutput.class, getClass()); - attributes.put("session", true); - attributes.put("rendered", true); + attributes.setAttribute("session", true); + attributes.setAttribute("rendered", true); attributes.remove("createContent"); attributes.remove("element"); attributes.remove("value"); Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JOutputPanelBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JOutputPanelBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JOutputPanelBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -56,10 +56,10 @@ logger.debug("initializing bean " + getClass().getName()); attributes = Attributes.getUIComponentAttributes(UIOutputPanel.class, getClass()); - attributes.put("ajaxRendered", true); - attributes.put("layout", "block"); - attributes.put("rendered", true); - attributes.put("styleClass", ""); + attributes.setAttribute("ajaxRendered", true); + attributes.setAttribute("layout", "block"); + attributes.setAttribute("rendered", true); + attributes.setAttribute("styleClass", ""); } /** Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JParamBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JParamBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JParamBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -59,9 +59,9 @@ logger.info("initializing bean " + getClass().getName()); attributes = Attributes.getUIComponentAttributes(UIActionParameter.class, getClass()); - attributes.put("name", "param"); - attributes.put("noEscape", true); - attributes.put("value", "screen.width"); + attributes.setAttribute("name", "param"); + attributes.setAttribute("noEscape", true); + attributes.setAttribute("value", "screen.width"); } /** Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPollBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPollBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPollBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -58,10 +58,10 @@ logger.debug("initializing bean " + getClass().getName()); attributes = Attributes.getUIComponentAttributes(UIPoll.class, getClass()); - attributes.put("rendered", true); - attributes.put("interval", 5000); - attributes.put("action", "increaseCounterAction"); - attributes.put("actionListener", "increaseCounterActionListener"); + attributes.setAttribute("rendered", true); + attributes.setAttribute("interval", 5000); + attributes.setAttribute("action", "increaseCounterAction"); + attributes.setAttribute("actionListener", "increaseCounterActionListener"); } /** Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPushBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPushBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/A4JPushBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -74,11 +74,11 @@ logger.debug("initializing bean " + getClass().getName()); attributes = Attributes.getUIComponentAttributes(UIPush.class, getClass()); - attributes.put("interval", 1000); - attributes.put("action", "increaseCounterAction"); - attributes.put("actionListener", "increaseCounterActionListener"); - attributes.put("rendered", true); - attributes.put("enabled", true); + attributes.setAttribute("interval", 1000); + attributes.setAttribute("action", "increaseCounterAction"); + attributes.setAttribute("actionListener", "increaseCounterActionListener"); + attributes.setAttribute("rendered", true); + attributes.setAttribute("enabled", true); // will be set on page and cannot be changed attributes.remove("eventProducer"); Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/CommandButtonBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/CommandButtonBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/CommandButtonBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -62,11 +62,11 @@ attributes = Attributes.getUIComponentAttributes(HtmlCommandButton.class, getClass()); - attributes.put("value", "command button"); - attributes.put("rendered", "true"); - attributes.put("render", "output1 output2 output3"); - attributes.put("action", "first6CharsAction"); - attributes.put("actionListener", "toUpperCaseActionListener"); + attributes.setAttribute("value", "command button"); + attributes.setAttribute("rendered", "true"); + attributes.setAttribute("render", "output1 output2 output3"); + attributes.setAttribute("action", "first6CharsAction"); + attributes.setAttribute("actionListener", "toUpperCaseActionListener"); } /** Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -72,7 +72,7 @@ @PostConstruct public void init() { logger = LoggerFactory.getLogger(RichBean.class); - skins = createSkinList(); + createSkinList(); createComponentsMap(); component = "none"; @@ -106,8 +106,8 @@ components.put("richExtendedDataTable", "Rich Extended Data Table"); } - private List<String> createSkinList() { - List<String> skins = new ArrayList<String>(); + private void createSkinList() { + skins = new ArrayList<String>(); skins.add("blueSky"); skins.add("classic"); skins.add("deepMarine"); @@ -115,7 +115,6 @@ skins.add("japanCherry"); skins.add("ruby"); skins.add("wine"); - return skins; } /** Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataScrollerBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataScrollerBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataScrollerBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -59,13 +59,13 @@ attributes = Attributes.getUIComponentAttributes(UIDataScroller.class, getClass()); - attributes.put("boundaryControls", "show"); - attributes.put("fastControls", "show"); - attributes.put("fastStep", 1); - attributes.put("lastPageMode", "short"); - attributes.put("maxPages", 10); - attributes.put("rendered", true); - attributes.put("render", "richDataTable"); + attributes.setAttribute("boundaryControls", "show"); + attributes.setAttribute("fastControls", "show"); + attributes.setAttribute("fastStep", 1); + attributes.setAttribute("lastPageMode", "short"); + attributes.setAttribute("maxPages", 10); + attributes.setAttribute("rendered", true); + attributes.setAttribute("render", "richDataTable"); // FIXME doesn't work: could not find dataTable for datascroller scroller1 attributes.remove("for"); Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataTableBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataTableBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichDataTableBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -77,9 +77,10 @@ logger.debug("initializing bean " + getClass().getName()); attributes = Attributes.getUIComponentAttributes(UIDataTable.class, getClass()); - attributes.put("rendered", true); - attributes.put("rows", 10); + attributes.setAttribute("rendered", true); + attributes.setAttribute("rows", 10); + // TODO these must be tested in other way attributes.remove("componentState"); attributes.remove("rowKeyVar"); Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichExtendedDataTableBean.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichExtendedDataTableBean.java 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/bean/RichExtendedDataTableBean.java 2010-07-10 19:34:28 UTC (rev 17851) @@ -77,10 +77,11 @@ logger.debug("initializing bean " + getClass().getName()); attributes = Attributes.getUIComponentAttributes(UIExtendedDataTable.class, getClass()); - attributes.put("rendered", true); - attributes.put("rows", 30); - attributes.put("styleClass", "extended-data-table"); - attributes.put("style", null); + + attributes.setAttribute("rendered", true); + attributes.setAttribute("rows", 30); + attributes.setAttribute("styleClass", "extended-data-table"); + attributes.setAttribute("style", null); // TODO these must be tested in other way attributes.remove("componentState"); Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hCommandButton.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hCommandButton.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hCommandButton.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -20,21 +20,21 @@ <ui:define name="component"> <h:inputText id="input" value="#{a4jAjaxBean.input}"/> <h:commandButton id="commandButton" value="Submit" > - <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="click" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:commandButton> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hCommandLink.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hCommandLink.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hCommandLink.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -20,21 +20,21 @@ <ui:define name="component"> <h:inputText id="input" value="#{a4jAjaxBean.input}"/> <h:commandLink id="commandLink" value="Submit"> - <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="click" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:commandLink> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hGraphicImage.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -19,21 +19,21 @@ <ui:define name="component"> <h:graphicImage id="image" library="images" name="richfaces.jpg"> - <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="click" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:graphicImage> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputSecret.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputSecret.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputSecret.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -19,21 +19,21 @@ <ui:define name="component"> <h:inputSecret id="input" value="#{a4jAjaxBean.input}"> - <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="keyup" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:inputSecret> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputText.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputText.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputText.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -19,21 +19,21 @@ <ui:define name="component"> <h:inputText id="input" value="#{a4jAjaxBean.input}"> - <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="keyup" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:inputText> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hInputTextarea.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -19,21 +19,21 @@ <ui:define name="component"> <h:inputTextarea id="input" value="#{a4jAjaxBean.input}"> - <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="keyup" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:inputTextarea> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -19,21 +19,21 @@ <ui:define name="component"> <h:selectBooleanCheckbox id="selectBooleanCheckbox" value="#{a4jAjaxBean.boolVal}"> - <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="change" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:selectBooleanCheckbox> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -25,21 +25,21 @@ <f:selectItem itemValue="Lexus" itemLabel="Lexus"/> <f:selectItem itemValue="BMW" itemLabel="BMW"/> - <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="change" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:selectManyCheckbox> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyListbox.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -25,21 +25,21 @@ <f:selectItem itemValue="Lexus"/> <f:selectItem itemValue="BMW" itemLabel="BMW"/> - <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="change" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:selectManyListbox> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectManyMenu.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -25,21 +25,21 @@ <f:selectItem itemValue="Lexus" itemLabel="Lexus"/> <f:selectItem itemValue="BMW" itemLabel="BMW"/> - <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="change" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:selectManyMenu> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneListbox.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -24,21 +24,21 @@ <f:selectItem itemValue="Ferrari"/> <f:selectItem itemValue="Lexus"/> - <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="change" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:selectOneListbox> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneMenu.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -25,21 +25,21 @@ <f:selectItem itemValue="Lexus" itemLabel="Lexus"/> <f:selectItem itemValue="BMW" itemLabel="BMW"/> - <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="change" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:selectOneMenu> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -25,21 +25,21 @@ <f:selectItem itemValue="Lexus" itemLabel="Lexus"/> <f:selectItem itemValue="BMW" itemLabel="BMW"/> - <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates']}" - data="#{a4jAjaxBean.attributes['data']}" - disabled="#{a4jAjaxBean.attributes['disabled']}" + <a4j:ajax id="a4jAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}" + data="#{a4jAjaxBean.attributes['data'].value}" + disabled="#{a4jAjaxBean.attributes['disabled'].value}" event="change" - execute="#{a4jAjaxBean.attributes['execute']}" - immediate="#{a4jAjaxBean.attributes['immediate']}" - limitRender="#{a4jAjaxBean.attributes['limitRender']}" - onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jAjaxBean.attributes['onbegin']}" - oncomplete="#{a4jAjaxBean.attributes['oncomplete']}" - onerror="#{a4jAjaxBean.attributes['onerror']}" - onevent="#{a4jAjaxBean.attributes['onevent']}" - queueId="#{a4jAjaxBean.attributes['queueId']}" - render="#{a4jAjaxBean.attributes['render']}" - status="#{a4jAjaxBean.attributes['status']}" + execute="#{a4jAjaxBean.attributes['execute'].value}" + immediate="#{a4jAjaxBean.attributes['immediate'].value}" + limitRender="#{a4jAjaxBean.attributes['limitRender'].value}" + onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jAjaxBean.attributes['onbegin'].value}" + oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}" + onerror="#{a4jAjaxBean.attributes['onerror'].value}" + onevent="#{a4jAjaxBean.attributes['onevent'].value}" + queueId="#{a4jAjaxBean.attributes['queueId'].value}" + render="#{a4jAjaxBean.attributes['render'].value}" + status="#{a4jAjaxBean.attributes['status'].value}" /> </h:selectOneRadio> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jCommandButton/simple.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -26,25 +26,25 @@ <a4j:commandButton id="a4jCommandButton" action="#{a4jButtonBean.attributes.action}" actionListener="#{a4jButtonBean.attributes.actionListener}" - bypassUpdates="#{a4jButtonBean.attributes['bypassUpdates']}" - disabled="#{a4jButtonBean.attributes['disabled']}" - immediate="#{a4jButtonBean.attributes['immediate']}" - limitRender="#{a4jButtonBean.attributes['limitRender']}" - onclick="#{a4jButtonBean.attributes['onclick']}" - ondblclick="#{a4jButtonBean.attributes['ondblclick']}" - onkeydown="#{a4jButtonBean.attributes['onkeydown']}" - onkeypress="#{a4jButtonBean.attributes['onkeypress']}" - onkeyup="#{a4jButtonBean.attributes['onkeyup']}" - onmousedown="#{a4jButtonBean.attributes['onmousedown']}" - onmousemove="#{a4jButtonBean.attributes['onmousemove']}" - onmouseout="#{a4jButtonBean.attributes['onmouseout']}" - onmouseover="#{a4jButtonBean.attributes['onmouseover']}" - onmouseup="#{a4jButtonBean.attributes['onmouseup']}" - render="#{a4jButtonBean.attributes['render']}" - rendered="#{a4jButtonBean.attributes['rendered']}" - style="#{a4jButtonBean.attributes['style']}" - styleClass="#{a4jButtonBean.attributes['styleClass']}" - value="#{a4jButtonBean.attributes['value']}" + bypassUpdates="#{a4jButtonBean.attributes['bypassUpdates'].value}" + disabled="#{a4jButtonBean.attributes['disabled'].value}" + immediate="#{a4jButtonBean.attributes['immediate'].value}" + limitRender="#{a4jButtonBean.attributes['limitRender'].value}" + onclick="#{a4jButtonBean.attributes['onclick'].value}" + ondblclick="#{a4jButtonBean.attributes['ondblclick'].value}" + onkeydown="#{a4jButtonBean.attributes['onkeydown'].value}" + onkeypress="#{a4jButtonBean.attributes['onkeypress'].value}" + onkeyup="#{a4jButtonBean.attributes['onkeyup'].value}" + onmousedown="#{a4jButtonBean.attributes['onmousedown'].value}" + onmousemove="#{a4jButtonBean.attributes['onmousemove'].value}" + onmouseout="#{a4jButtonBean.attributes['onmouseout'].value}" + onmouseover="#{a4jButtonBean.attributes['onmouseover'].value}" + onmouseup="#{a4jButtonBean.attributes['onmouseup'].value}" + render="#{a4jButtonBean.attributes['render'].value}" + rendered="#{a4jButtonBean.attributes['rendered'].value}" + style="#{a4jButtonBean.attributes['style'].value}" + styleClass="#{a4jButtonBean.attributes['styleClass'].value}" + value="#{a4jButtonBean.attributes['value'].value}" execute="@form" /> </h:panelGrid> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jCommandLink/simple.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -26,25 +26,25 @@ <a4j:commandLink id="a4jCommandLink" action="#{a4jLinkBean.attributes.action}" actionListener="#{a4jLinkBean.attributes.actionListener}" - bypassUpdates="#{a4jLinkBean.attributes['bypassUpdates']}" - disabled="#{a4jLinkBean.attributes['disabled']}" - immediate="#{a4jLinkBean.attributes['immediate']}" - limitRender="#{a4jLinkBean.attributes['limitRender']}" - onclick="#{a4jLinkBean.attributes['onclick']}" - ondblclick="#{a4jLinkBean.attributes['ondblclick']}" - onkeydown="#{a4jLinkBean.attributes['onkeydown']}" - onkeypress="#{a4jLinkBean.attributes['onkeypress']}" - onkeyup="#{a4jLinkBean.attributes['onkeyup']}" - onmousedown="#{a4jLinkBean.attributes['onmousedown']}" - onmousemove="#{a4jLinkBean.attributes['onmousemove']}" - onmouseout="#{a4jLinkBean.attributes['onmouseout']}" - onmouseover="#{a4jLinkBean.attributes['onmouseover']}" - onmouseup="#{a4jLinkBean.attributes['onmouseup']}" - render="#{a4jLinkBean.attributes['render']}" - rendered="#{a4jLinkBean.attributes['rendered']}" - style="#{a4jLinkBean.attributes['style']}" - styleClass="#{a4jLinkBean.attributes['styleClass']}" - value="#{a4jLinkBean.attributes['value']}" + bypassUpdates="#{a4jLinkBean.attributes['bypassUpdates'].value}" + disabled="#{a4jLinkBean.attributes['disabled'].value}" + immediate="#{a4jLinkBean.attributes['immediate'].value}" + limitRender="#{a4jLinkBean.attributes['limitRender'].value}" + onclick="#{a4jLinkBean.attributes['onclick'].value}" + ondblclick="#{a4jLinkBean.attributes['ondblclick'].value}" + onkeydown="#{a4jLinkBean.attributes['onkeydown'].value}" + onkeypress="#{a4jLinkBean.attributes['onkeypress'].value}" + onkeyup="#{a4jLinkBean.attributes['onkeyup'].value}" + onmousedown="#{a4jLinkBean.attributes['onmousedown'].value}" + onmousemove="#{a4jLinkBean.attributes['onmousemove'].value}" + onmouseout="#{a4jLinkBean.attributes['onmouseout'].value}" + onmouseover="#{a4jLinkBean.attributes['onmouseover'].value}" + onmouseup="#{a4jLinkBean.attributes['onmouseup'].value}" + render="#{a4jLinkBean.attributes['render'].value}" + rendered="#{a4jLinkBean.attributes['rendered'].value}" + style="#{a4jLinkBean.attributes['style'].value}" + styleClass="#{a4jLinkBean.attributes['styleClass'].value}" + value="#{a4jLinkBean.attributes['value'].value}" execute="@form" /> </h:panelGrid> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jLog/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jLog/simple.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jLog/simple.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -36,8 +36,8 @@ <br/><br/> - <a4j:log id="log" rendered="#{a4jLogBean.attributes['rendered']}" level="#{a4jLogBean.attributes['level']}" - style="#{a4jLogBean.attributes['style']}" styleClass="#{a4jLogBean.attributes['styleClass']}"/> + <a4j:log id="log" rendered="#{a4jLogBean.attributes['rendered'].value}" level="#{a4jLogBean.attributes['level'].value}" + style="#{a4jLogBean.attributes['style'].value}" styleClass="#{a4jLogBean.attributes['styleClass'].value}"/> </ui:define> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/image.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/image.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jMediaOutput/image.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -19,59 +19,59 @@ <ui:define name="component"> <a4j:mediaOutput id="mediaOutput" - accesskey="#{a4jMediaOutputBean.attributes['accesskey']}" - align="#{a4jMediaOutputBean.attributes['align']}" - archive="#{a4jMediaOutputBean.attributes['archive']}" - border="#{a4jMediaOutputBean.attributes['border']}" - cacheable="#{a4jMediaOutputBean.attributes['cacheable']}" - charset="#{a4jMediaOutputBean.attributes['charset']}" - classid="#{a4jMediaOutputBean.attributes['classid']}" - codebase="#{a4jMediaOutputBean.attributes['codebase']}" - codetype="#{a4jMediaOutputBean.attributes['codetype']}" - converter="#{a4jMediaOutputBean.attributes['converter']}" - coords="#{a4jMediaOutputBean.attributes['coords']}" + accesskey="#{a4jMediaOutputBean.attributes['accesskey'].value}" + align="#{a4jMediaOutputBean.attributes['align'].value}" + archive="#{a4jMediaOutputBean.attributes['archive'].value}" + border="#{a4jMediaOutputBean.attributes['border'].value}" + cacheable="#{a4jMediaOutputBean.attributes['cacheable'].value}" + charset="#{a4jMediaOutputBean.attributes['charset'].value}" + classid="#{a4jMediaOutputBean.attributes['classid'].value}" + codebase="#{a4jMediaOutputBean.attributes['codebase'].value}" + codetype="#{a4jMediaOutputBean.attributes['codetype'].value}" + converter="#{a4jMediaOutputBean.attributes['converter'].value}" + coords="#{a4jMediaOutputBean.attributes['coords'].value}" createContent="#{a4jMediaOutputBean.paint}" - createContentExpression="#{a4jMediaOutputBean.attributes['createContentExpression']}" - declare="#{a4jMediaOutputBean.attributes['declare']}" - dir="#{a4jMediaOutputBean.attributes['dir']}" + createContentExpression="#{a4jMediaOutputBean.attributes['createContentExpression'].value}" + declare="#{a4jMediaOutputBean.attributes['declare'].value}" + dir="#{a4jMediaOutputBean.attributes['dir'].value}" element="img" - expires="#{a4jMediaOutputBean.attributes['expires']}" - hreflang="#{a4jMediaOutputBean.attributes['hreflang']}" - hspace="#{a4jMediaOutputBean.attributes['hspace']}" - ismap="#{a4jMediaOutputBean.attributes['ismap']}" - lang="#{a4jMediaOutputBean.attributes['lang']}" - lastmodified="#{a4jMediaOutputBean.attributes['lastmodified']}" - localValue="#{a4jMediaOutputBean.attributes['localValue']}" + expires="#{a4jMediaOutputBean.attributes['expires'].value}" + hreflang="#{a4jMediaOutputBean.attributes['hreflang'].value}" + hspace="#{a4jMediaOutputBean.attributes['hspace'].value}" + ismap="#{a4jMediaOutputBean.attributes['ismap'].value}" + lang="#{a4jMediaOutputBean.attributes['lang'].value}" + lastmodified="#{a4jMediaOutputBean.attributes['lastmodified'].value}" + localValue="#{a4jMediaOutputBean.attributes['localValue'].value}" mimeType="image/jpeg" - onblur="#{a4jMediaOutputBean.attributes['onblur']}" - onclick="#{a4jMediaOutputBean.attributes['onclick']}" - ondblclick="#{a4jMediaOutputBean.attributes['ondblclick']}" - onfocus="#{a4jMediaOutputBean.attributes['onfocus']}" - onkeydown="#{a4jMediaOutputBean.attributes['onkeydown']}" - onkeypress="#{a4jMediaOutputBean.attributes['onkeypress']}" - onkeyup="#{a4jMediaOutputBean.attributes['onkeyup']}" - onmousedown="#{a4jMediaOutputBean.attributes['onmousedown']}" - onmousemove="#{a4jMediaOutputBean.attributes['onmousemove']}" - onmouseout="#{a4jMediaOutputBean.attributes['onmouseout']}" - onmouseover="#{a4jMediaOutputBean.attributes['onmouseover']}" - onmouseup="#{a4jMediaOutputBean.attributes['onmouseup']}" - rel="#{a4jMediaOutputBean.attributes['rel']}" - rendered="#{a4jMediaOutputBean.attributes['rendered']}" - resource="#{a4jMediaOutputBean.attributes['resource']}" - rev="#{a4jMediaOutputBean.attributes['rev']}" - session="#{a4jMediaOutputBean.attributes['session']}" - shape="#{a4jMediaOutputBean.attributes['shape']}" - standby="#{a4jMediaOutputBean.attributes['standby']}" - style="#{a4jMediaOutputBean.attributes['style']}" - styleClass="#{a4jMediaOutputBean.attributes['styleClass']}" - tabindex="#{a4jMediaOutputBean.attributes['tabindex']}" - target="#{a4jMediaOutputBean.attributes['target']}" - title="#{a4jMediaOutputBean.attributes['title']}" - type="#{a4jMediaOutputBean.attributes['type']}" - urlAttribute="#{a4jMediaOutputBean.attributes['urlAttribute']}" - usermap="#{a4jMediaOutputBean.attributes['usermap']}" + onblur="#{a4jMediaOutputBean.attributes['onblur'].value}" + onclick="#{a4jMediaOutputBean.attributes['onclick'].value}" + ondblclick="#{a4jMediaOutputBean.attributes['ondblclick'].value}" + onfocus="#{a4jMediaOutputBean.attributes['onfocus'].value}" + onkeydown="#{a4jMediaOutputBean.attributes['onkeydown'].value}" + onkeypress="#{a4jMediaOutputBean.attributes['onkeypress'].value}" + onkeyup="#{a4jMediaOutputBean.attributes['onkeyup'].value}" + onmousedown="#{a4jMediaOutputBean.attributes['onmousedown'].value}" + onmousemove="#{a4jMediaOutputBean.attributes['onmousemove'].value}" + onmouseout="#{a4jMediaOutputBean.attributes['onmouseout'].value}" + onmouseover="#{a4jMediaOutputBean.attributes['onmouseover'].value}" + onmouseup="#{a4jMediaOutputBean.attributes['onmouseup'].value}" + rel="#{a4jMediaOutputBean.attributes['rel'].value}" + rendered="#{a4jMediaOutputBean.attributes['rendered'].value}" + resource="#{a4jMediaOutputBean.attributes['resource'].value}" + rev="#{a4jMediaOutputBean.attributes['rev'].value}" + session="#{a4jMediaOutputBean.attributes['session'].value}" + shape="#{a4jMediaOutputBean.attributes['shape'].value}" + standby="#{a4jMediaOutputBean.attributes['standby'].value}" + style="#{a4jMediaOutputBean.attributes['style'].value}" + styleClass="#{a4jMediaOutputBean.attributes['styleClass'].value}" + tabindex="#{a4jMediaOutputBean.attributes['tabindex'].value}" + target="#{a4jMediaOutputBean.attributes['target'].value}" + title="#{a4jMediaOutputBean.attributes['title'].value}" + type="#{a4jMediaOutputBean.attributes['type'].value}" + urlAttribute="#{a4jMediaOutputBean.attributes['urlAttribute'].value}" + usermap="#{a4jMediaOutputBean.attributes['usermap'].value}" value="#{mediaData}" - vspace="#{a4jMediaOutputBean.attributes['vspace']}" + vspace="#{a4jMediaOutputBean.attributes['vspace'].value}" /> </ui:define> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jOutputPanel/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jOutputPanel/simple.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jOutputPanel/simple.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -48,25 +48,25 @@ <legend>a4j:outputPanel</legend> <a4j:outputPanel id="outputPanel" - ajaxRendered="#{a4jOutputPanelBean.attributes['ajaxRendered']}" - dir="#{a4jOutputPanelBean.attributes['dir']}" - keepTransient="#{a4jOutputPanelBean.attributes['keepTransient']}" - lang="#{a4jOutputPanelBean.attributes['lang']}" - layout="#{a4jOutputPanelBean.attributes['layout']}" - onclick="#{a4jOutputPanelBean.attributes['onclick']}" - ondblclick="#{a4jOutputPanelBean.attributes['ondblclick']}" - onkeydown="#{a4jOutputPanelBean.attributes['onkeydown']}" - onkeypress="#{a4jOutputPanelBean.attributes['onkeypress']}" - onkeyup="#{a4jOutputPanelBean.attributes['onkeyup']}" - onmousedown="#{a4jOutputPanelBean.attributes['onmousedown']}" - onmousemove="#{a4jOutputPanelBean.attributes['onmousemove']}" - onmouseout="#{a4jOutputPanelBean.attributes['onmouseout']}" - onmouseover="#{a4jOutputPanelBean.attributes['onmouseover']}" - onmouseup="#{a4jOutputPanelBean.attributes['onmouseup']}" - rendered="#{a4jOutputPanelBean.attributes['rendered']}" - style="#{a4jOutputPanelBean.attributes['style']}" - styleClass="#{a4jOutputPanelBean.attributes['styleClass']}" - title="#{a4jOutputPanelBean.attributes['title']}" + ajaxRendered="#{a4jOutputPanelBean.attributes['ajaxRendered'].value}" + dir="#{a4jOutputPanelBean.attributes['dir'].value}" + keepTransient="#{a4jOutputPanelBean.attributes['keepTransient'].value}" + lang="#{a4jOutputPanelBean.attributes['lang'].value}" + layout="#{a4jOutputPanelBean.attributes['layout'].value}" + onclick="#{a4jOutputPanelBean.attributes['onclick'].value}" + ondblclick="#{a4jOutputPanelBean.attributes['ondblclick'].value}" + onkeydown="#{a4jOutputPanelBean.attributes['onkeydown'].value}" + onkeypress="#{a4jOutputPanelBean.attributes['onkeypress'].value}" + onkeyup="#{a4jOutputPanelBean.attributes['onkeyup'].value}" + onmousedown="#{a4jOutputPanelBean.attributes['onmousedown'].value}" + onmousemove="#{a4jOutputPanelBean.attributes['onmousemove'].value}" + onmouseout="#{a4jOutputPanelBean.attributes['onmouseout'].value}" + onmouseover="#{a4jOutputPanelBean.attributes['onmouseover'].value}" + onmouseup="#{a4jOutputPanelBean.attributes['onmouseup'].value}" + rendered="#{a4jOutputPanelBean.attributes['rendered'].value}" + style="#{a4jOutputPanelBean.attributes['style'].value}" + styleClass="#{a4jOutputPanelBean.attributes['styleClass'].value}" + title="#{a4jOutputPanelBean.attributes['title'].value}" #{a4jOutputPanelBean.counter} </a4j:outputPanel> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jParam/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jParam/simple.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jParam/simple.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -46,13 +46,13 @@ <a4j:param id="a4jParam" actionListener="#{a4jParamBean.attributes.actionListener}" assignTo="#{a4jParamBean.parameter}" - assignToBinding="#{a4jParamBean.attributes['assignToBinding']}" - converter="#{a4jParamBean.attributes['converter']}" - disable="#{a4jParamBean.attributes['disable']}" - name="#{a4jParamBean.attributes['name']}" - noEscape="#{a4jParamBean.attributes['noEscape']}" - rendered="#{a4jParamBean.attributes['rendered']}" - value="#{a4jParamBean.attributes['value']}" + assignToBinding="#{a4jParamBean.attributes['assignToBinding'].value}" + converter="#{a4jParamBean.attributes['converter'].value}" + disable="#{a4jParamBean.attributes['disable'].value}" + name="#{a4jParamBean.attributes['name'].value}" + noEscape="#{a4jParamBean.attributes['noEscape'].value}" + rendered="#{a4jParamBean.attributes['rendered'].value}" + value="#{a4jParamBean.attributes['value'].value}" /> </a4j:commandButton> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jPoll/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jPoll/simple.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jPoll/simple.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -22,16 +22,16 @@ <a4j:poll id="poll" action="#{a4jPollBean.attributes.action}" actionListener="#{a4jPollBean.attributes.actionListener}" - bypassUpdates="#{a4jPollBean.attributes['bypassUpdates']}" - enabled="#{a4jPollBean.attributes['enabled']}" - immediate="#{a4jPollBean.attributes['immediate']}" - interval="#{a4jPollBean.attributes['interval']}" - onbeforedomupdate="#{a4jPollBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jPollBean.attributes['onbegin']}" - oncomplete="#{a4jPollBean.attributes['oncomplete']}" - ontimer="#{a4jPollBean.attributes['ontimer']}" - rendered="#{a4jPollBean.attributes['rendered']}" - value="#{a4jPollBean.attributes['value']}" + bypassUpdates="#{a4jPollBean.attributes['bypassUpdates'].value}" + enabled="#{a4jPollBean.attributes['enabled'].value}" + immediate="#{a4jPollBean.attributes['immediate'].value}" + interval="#{a4jPollBean.attributes['interval'].value}" + onbeforedomupdate="#{a4jPollBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jPollBean.attributes['onbegin'].value}" + oncomplete="#{a4jPollBean.attributes['oncomplete'].value}" + ontimer="#{a4jPollBean.attributes['ontimer'].value}" + rendered="#{a4jPollBean.attributes['rendered'].value}" + value="#{a4jPollBean.attributes['value'].value}" <a4j:ajax event="timer" render="time" /> </a4j:poll> Modified: root/tests/metamer/trunk/src/main/webapp/components/a4jPush/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/a4jPush/simple.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/a4jPush/simple.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -26,18 +26,18 @@ <a4j:push id="push" action="#{a4jPushBean.attributes.action}" actionListener="#{a4jPushBean.attributes.actionListener}" - bypassUpdates="#{a4jPushBean.attributes['bypassUpdates']}" - enabled="#{a4jPushBean.attributes['enabled']}" + bypassUpdates="#{a4jPushBean.attributes['bypassUpdates'].value}" + enabled="#{a4jPushBean.attributes['enabled'].value}" eventProducer="#{a4jPushBean.setListener}" - hasActiveBehavior="#{a4jPushBean.attributes['hasActiveBehavior']}" - immediate="#{a4jPushBean.attributes['immediate']}" - interval="#{a4jPushBean.attributes['interval']}" - onbeforedomupdate="#{a4jPushBean.attributes['onbeforedomupdate']}" - onbegin="#{a4jPushBean.attributes['onbegin']}" - oncomplete="#{a4jPushBean.attributes['oncomplete']}" - ondataavailable="#{a4jPushBean.attributes['ondataavailable']}" - rendered="#{a4jPushBean.attributes['rendered']}" - value="#{a4jPushBean.attributes['value']}" + hasActiveBehavior="#{a4jPushBean.attributes['hasActiveBehavior'].value}" + immediate="#{a4jPushBean.attributes['immediate'].value}" + interval="#{a4jPushBean.attributes['interval'].value}" + onbeforedomupdate="#{a4jPushBean.attributes['onbeforedomupdate'].value}" + onbegin="#{a4jPushBean.attributes['onbegin'].value}" + oncomplete="#{a4jPushBean.attributes['oncomplete'].value}" + ondataavailable="#{a4jPushBean.attributes['ondataavailable'].value}" + rendered="#{a4jPushBean.attributes['rendered'].value}" + value="#{a4jPushBean.attributes['value'].value}" <a4j:ajax render="outputDate, outputCounter" /> <f:param name="testParam" value="testValue" /> Modified: root/tests/metamer/trunk/src/main/webapp/components/commandButton/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/commandButton/simple.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/commandButton/simple.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -26,23 +26,23 @@ <h:commandButton id="commandButton" action="#{buttonBean.attributes.action}" actionListener="#{buttonBean.attributes.actionListener}" - disabled="#{buttonBean.attributes['disabled']}" - immediate="#{buttonBean.attributes['immediate']}" - onclick="#{buttonBean.attributes['onclick']}" - ondblclick="#{buttonBean.attributes['ondblclick']}" - onkeydown="#{buttonBean.attributes['onkeydown']}" - onkeypress="#{buttonBean.attributes['onkeypress']}" - onkeyup="#{buttonBean.attributes['onkeyup']}" - onmousedown="#{buttonBean.attributes['onmousedown']}" - onmousemove="#{buttonBean.attributes['onmousemove']}" - onmouseout="#{buttonBean.attributes['onmouseout']}" - onmouseover="#{buttonBean.attributes['onmouseover']}" - onmouseup="#{buttonBean.attributes['onmouseup']}" - render="#{buttonBean.attributes['render']}" - rendered="#{buttonBean.attributes['rendered']}" - style="#{buttonBean.attributes['style']}" - styleClass="#{buttonBean.attributes['styleClass']}" - value="#{buttonBean.attributes['value']}" + disabled="#{buttonBean.attributes['disabled'].value}" + immediate="#{buttonBean.attributes['immediate'].value}" + onclick="#{buttonBean.attributes['onclick'].value}" + ondblclick="#{buttonBean.attributes['ondblclick'].value}" + onkeydown="#{buttonBean.attributes['onkeydown'].value}" + onkeypress="#{buttonBean.attributes['onkeypress'].value}" + onkeyup="#{buttonBean.attributes['onkeyup'].value}" + onmousedown="#{buttonBean.attributes['onmousedown'].value}" + onmousemove="#{buttonBean.attributes['onmousemove'].value}" + onmouseout="#{buttonBean.attributes['onmouseout'].value}" + onmouseover="#{buttonBean.attributes['onmouseover'].value}" + onmouseup="#{buttonBean.attributes['onmouseup'].value}" + render="#{buttonBean.attributes['render'].value}" + rendered="#{buttonBean.attributes['rendered'].value}" + style="#{buttonBean.attributes['style'].value}" + styleClass="#{buttonBean.attributes['styleClass'].value}" + value="#{buttonBean.attributes['value'].value}" execute="@form" /> </h:panelGrid> Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataScroller/simple.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -45,25 +45,25 @@ </h:selectBooleanCheckbox> <br/><br/> <rich:dataScroller id="scroller1" - boundaryControls="#{richDataScrollerBean.attributes['boundaryControls']}" - dataTable="#{richDataScrollerBean.attributes['dataTable']}" - fastControls="#{richDataScrollerBean.attributes['fastControls']}" - fastForward="#{richDataScrollerBean.attributes['fastForward']}" - fastRewind="#{richDataScrollerBean.attributes['fastRewind']}" - fastStep="#{richDataScrollerBean.attributes['fastStep']}" - first="#{richDataScrollerBean.attributes['first']}" + boundaryControls="#{richDataScrollerBean.attributes['boundaryControls'].value}" + dataTable="#{richDataScrollerBean.attributes['dataTable'].value}" + fastControls="#{richDataScrollerBean.attributes['fastControls'].value}" + fastForward="#{richDataScrollerBean.attributes['fastForward'].value}" + fastRewind="#{richDataScrollerBean.attributes['fastRewind'].value}" + fastStep="#{richDataScrollerBean.attributes['fastStep'].value}" + first="#{richDataScrollerBean.attributes['first'].value}" for="richDataTable" - iterationState="#{richDataScrollerBean.attributes['iterationState']}" - last="#{richDataScrollerBean.attributes['last']}" - lastPageMode="#{richDataScrollerBean.attributes['lastPageMode']}" - localPageSet="#{richDataScrollerBean.attributes['localPageSet']}" - maxPages="#{richDataScrollerBean.attributes['maxPages']}" + iterationState="#{richDataScrollerBean.attributes['iterationState'].value}" + last="#{richDataScrollerBean.attributes['last'].value}" + lastPageMode="#{richDataScrollerBean.attributes['lastPageMode'].value}" + localPageSet="#{richDataScrollerBean.attributes['localPageSet'].value}" + maxPages="#{richDataScrollerBean.attributes['maxPages'].value}" page="#{richDataScrollerBean.page}" - pageCount="#{richDataScrollerBean.attributes['pageCount']}" - rendered="#{richDataScrollerBean.attributes['rendered']}" - render="#{richDataScrollerBean.attributes['render']}" - rowCount="#{richDataScrollerBean.attributes['rowCount']}" - scrollerListeners="#{richDataScrollerBean.attributes['scrollerListeners']}" + pageCount="#{richDataScrollerBean.attributes['pageCount'].value}" + rendered="#{richDataScrollerBean.attributes['rendered'].value}" + render="#{richDataScrollerBean.attributes['render'].value}" + rowCount="#{richDataScrollerBean.attributes['rowCount'].value}" + scrollerListeners="#{richDataScrollerBean.attributes['scrollerListeners'].value}" /> </ui:define> Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components1.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -49,25 +49,25 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" - filterVar="#{richDataTableBean.attributes['filterVar']}" - filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" - first="#{richDataTableBean.attributes['first']}" - iterationState="#{richDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richDataTableBean.attributes['rendered']}" - rowAvailable="#{richDataTableBean.attributes['rowAvailable']}" - rowCount="#{richDataTableBean.attributes['rowCount']}" - rowData="#{richDataTableBean.attributes['rowData']}" - rowIndex="#{richDataTableBean.attributes['rowIndex']}" - rowKey="#{richDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}" - rows="#{richDataTableBean.attributes['rows']}" - sortMode="#{richDataTableBean.attributes['sortMode']}" - sortPriority="#{richDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richDataTableBean.attributes['sortingListeners']}" + filterVar="#{richDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}" + first="#{richDataTableBean.attributes['first'].value}" + iterationState="#{richDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richDataTableBean.attributes['rowCount'].value}" + rowData="#{richDataTableBean.attributes['rowData'].value}" + rowIndex="#{richDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richDataTableBean.attributes['rows'].value}" + sortMode="#{richDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}" value="#{richDataTableBean.state ? model.employees : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/components2.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -49,25 +49,25 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" - filterVar="#{richDataTableBean.attributes['filterVar']}" - filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" - first="#{richDataTableBean.attributes['first']}" - iterationState="#{richDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richDataTableBean.attributes['rendered']}" - rowAvailable="#{richDataTableBean.attributes['rowAvailable']}" - rowCount="#{richDataTableBean.attributes['rowCount']}" - rowData="#{richDataTableBean.attributes['rowData']}" - rowIndex="#{richDataTableBean.attributes['rowIndex']}" - rowKey="#{richDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}" - rows="#{richDataTableBean.attributes['rows']}" - sortMode="#{richDataTableBean.attributes['sortMode']}" - sortPriority="#{richDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richDataTableBean.attributes['sortingListeners']}" + filterVar="#{richDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}" + first="#{richDataTableBean.attributes['first'].value}" + iterationState="#{richDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richDataTableBean.attributes['rowCount'].value}" + rowData="#{richDataTableBean.attributes['rowData'].value}" + rowIndex="#{richDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richDataTableBean.attributes['rows'].value}" + sortMode="#{richDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}" value="#{richDataTableBean.state ? model.employees : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/filtering.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/filtering.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/filtering.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -49,25 +49,25 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" - filterVar="#{richDataTableBean.attributes['filterVar']}" - filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" - first="#{richDataTableBean.attributes['first']}" - iterationState="#{richDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richDataTableBean.attributes['rendered']}" - rowAvailable="#{richDataTableBean.attributes['rowAvailable']}" - rowCount="#{richDataTableBean.attributes['rowCount']}" - rowData="#{richDataTableBean.attributes['rowData']}" - rowIndex="#{richDataTableBean.attributes['rowIndex']}" - rowKey="#{richDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}" - rows="#{richDataTableBean.attributes['rows']}" - sortMode="#{richDataTableBean.attributes['sortMode']}" - sortPriority="#{richDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richDataTableBean.attributes['sortingListeners']}" + filterVar="#{richDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}" + first="#{richDataTableBean.attributes['first'].value}" + iterationState="#{richDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richDataTableBean.attributes['rowCount'].value}" + rowData="#{richDataTableBean.attributes['rowData'].value}" + rowIndex="#{richDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richDataTableBean.attributes['rows'].value}" + sortMode="#{richDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}" value="#{richDataTableBean.state ? model.employees : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/scroller.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -49,25 +49,25 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" - filterVar="#{richDataTableBean.attributes['filterVar']}" - filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" - first="#{richDataTableBean.attributes['first']}" - iterationState="#{richDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richDataTableBean.attributes['rendered']}" - rowAvailable="#{richDataTableBean.attributes['rowAvailable']}" - rowCount="#{richDataTableBean.attributes['rowCount']}" - rowData="#{richDataTableBean.attributes['rowData']}" - rowIndex="#{richDataTableBean.attributes['rowIndex']}" - rowKey="#{richDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}" - rows="#{richDataTableBean.attributes['rows']}" - sortMode="#{richDataTableBean.attributes['sortMode']}" - sortPriority="#{richDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richDataTableBean.attributes['sortingListeners']}" + filterVar="#{richDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}" + first="#{richDataTableBean.attributes['first'].value}" + iterationState="#{richDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richDataTableBean.attributes['rowCount'].value}" + rowData="#{richDataTableBean.attributes['rowData'].value}" + rowIndex="#{richDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richDataTableBean.attributes['rows'].value}" + sortMode="#{richDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}" value="#{richDataTableBean.state ? model.capitals : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/simple.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -48,25 +48,25 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" - filterVar="#{richDataTableBean.attributes['filterVar']}" - filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" - first="#{richDataTableBean.attributes['first']}" - iterationState="#{richDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richDataTableBean.attributes['rendered']}" - rowAvailable="#{richDataTableBean.attributes['rowAvailable']}" - rowCount="#{richDataTableBean.attributes['rowCount']}" - rowData="#{richDataTableBean.attributes['rowData']}" - rowIndex="#{richDataTableBean.attributes['rowIndex']}" - rowKey="#{richDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}" - rows="#{richDataTableBean.attributes['rows']}" - sortMode="#{richDataTableBean.attributes['sortMode']}" - sortPriority="#{richDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richDataTableBean.attributes['sortingListeners']}" + filterVar="#{richDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}" + first="#{richDataTableBean.attributes['first'].value}" + iterationState="#{richDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richDataTableBean.attributes['rowCount'].value}" + rowData="#{richDataTableBean.attributes['rowData'].value}" + rowIndex="#{richDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richDataTableBean.attributes['rows'].value}" + sortMode="#{richDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}" value="#{richDataTableBean.state ? model.capitals : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/components/richDataTable/sorting.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richDataTable/sorting.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richDataTable/sorting.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -49,25 +49,25 @@ <ui:define name="component"> <rich:dataTable id="richDataTable" - filterVar="#{richDataTableBean.attributes['filterVar']}" - filteringListeners="#{richDataTableBean.attributes['filteringListeners']}" - first="#{richDataTableBean.attributes['first']}" - iterationState="#{richDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richDataTableBean.attributes['rendered']}" - rowAvailable="#{richDataTableBean.attributes['rowAvailable']}" - rowCount="#{richDataTableBean.attributes['rowCount']}" - rowData="#{richDataTableBean.attributes['rowData']}" - rowIndex="#{richDataTableBean.attributes['rowIndex']}" - rowKey="#{richDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter']}" - rows="#{richDataTableBean.attributes['rows']}" - sortMode="#{richDataTableBean.attributes['sortMode']}" - sortPriority="#{richDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richDataTableBean.attributes['sortingListeners']}" + filterVar="#{richDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richDataTableBean.attributes['filteringListeners'].value}" + first="#{richDataTableBean.attributes['first'].value}" + iterationState="#{richDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richDataTableBean.attributes['rowCount'].value}" + rowData="#{richDataTableBean.attributes['rowData'].value}" + rowIndex="#{richDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richDataTableBean.attributes['rows'].value}" + sortMode="#{richDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richDataTableBean.attributes['sortingListeners'].value}" value="#{richDataTableBean.state ? model.capitals : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -49,25 +49,25 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" - first="#{richExtendedDataTableBean.attributes['first']}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richExtendedDataTableBean.attributes['rendered']}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" - rowData="#{richExtendedDataTableBean.attributes['rowData']}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" - rows="#{richExtendedDataTableBean.attributes['rows']}" - sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" - sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" + filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" + first="#{richExtendedDataTableBean.attributes['first'].value}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}" + rowData="#{richExtendedDataTableBean.attributes['rowData'].value}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richExtendedDataTableBean.attributes['rows'].value}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" value="#{richExtendedDataTableBean.state ? model.employees : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -49,25 +49,25 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" - first="#{richExtendedDataTableBean.attributes['first']}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richExtendedDataTableBean.attributes['rendered']}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" - rowData="#{richExtendedDataTableBean.attributes['rowData']}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" - rows="#{richExtendedDataTableBean.attributes['rows']}" - sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" - sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" + filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" + first="#{richExtendedDataTableBean.attributes['first'].value}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}" + rowData="#{richExtendedDataTableBean.attributes['rowData'].value}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richExtendedDataTableBean.attributes['rows'].value}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" value="#{richExtendedDataTableBean.state ? model.employees : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/filtering.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -49,25 +49,25 @@ <ui:define name="component"> <rich:extendedDataTable id="richDataTable" - filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" - first="#{richExtendedDataTableBean.attributes['first']}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richExtendedDataTableBean.attributes['rendered']}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" - rowData="#{richExtendedDataTableBean.attributes['rowData']}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" - rows="#{richExtendedDataTableBean.attributes['rows']}" - sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" - sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" + filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" + first="#{richExtendedDataTableBean.attributes['first'].value}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}" + rowData="#{richExtendedDataTableBean.attributes['rowData'].value}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richExtendedDataTableBean.attributes['rows'].value}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" value="#{richExtendedDataTableBean.state ? model.employees : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -49,25 +49,25 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" - first="#{richExtendedDataTableBean.attributes['first']}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richExtendedDataTableBean.attributes['rendered']}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" - rowData="#{richExtendedDataTableBean.attributes['rowData']}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" - rows="#{richExtendedDataTableBean.attributes['rows']}" - sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" - sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" + filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" + first="#{richExtendedDataTableBean.attributes['first'].value}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}" + rowData="#{richExtendedDataTableBean.attributes['rowData'].value}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richExtendedDataTableBean.attributes['rows'].value}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" value="#{richExtendedDataTableBean.state ? model.capitals : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -48,29 +48,29 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" - clientFirst="#{richExtendedDataTableBean.attributes['clientFirst']}" - clientRows="#{richExtendedDataTableBean.attributes['clientRows']}" - filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" - first="#{richExtendedDataTableBean.attributes['first']}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richExtendedDataTableBean.attributes['rendered']}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" - rowData="#{richExtendedDataTableBean.attributes['rowData']}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" - rows="#{richExtendedDataTableBean.attributes['rows']}" - sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" - sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" - style="#{richExtendedDataTableBean.attributes['style']}" - styleClass="#{richExtendedDataTableBean.attributes['styleClass']}" + clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}" + clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}" + filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" + first="#{richExtendedDataTableBean.attributes['first'].value}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}" + rowData="#{richExtendedDataTableBean.attributes['rowData'].value}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richExtendedDataTableBean.attributes['rows'].value}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" + style="#{richExtendedDataTableBean.attributes['style'].value}" + styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" value="#{richExtendedDataTableBean.state ? model.capitals : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/sorting.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/sorting.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/components/richExtendedDataTable/sorting.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -49,25 +49,25 @@ <ui:define name="component"> <rich:extendedDataTable id="table" - filterVar="#{richExtendedDataTableBean.attributes['filterVar']}" - filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners']}" - first="#{richExtendedDataTableBean.attributes['first']}" - iterationState="#{richExtendedDataTableBean.attributes['iterationState']}" - iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar']}" - keepSaved="#{richExtendedDataTableBean.attributes['keepSaved']}" - noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel']}" - relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex']}" - rendered="#{richExtendedDataTableBean.attributes['rendered']}" - rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable']}" - rowCount="#{richExtendedDataTableBean.attributes['rowCount']}" - rowData="#{richExtendedDataTableBean.attributes['rowData']}" - rowIndex="#{richExtendedDataTableBean.attributes['rowIndex']}" - rowKey="#{richExtendedDataTableBean.attributes['rowKey']}" - rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter']}" - rows="#{richExtendedDataTableBean.attributes['rows']}" - sortMode="#{richExtendedDataTableBean.attributes['sortMode']}" - sortPriority="#{richExtendedDataTableBean.attributes['sortPriority']}" - sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners']}" + filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" + filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" + first="#{richExtendedDataTableBean.attributes['first'].value}" + iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" + iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" + keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" + noDataLabel="#{richExtendedDataTableBean.attributes['noDataLabel'].value}" + relativeRowIndex="#{richExtendedDataTableBean.attributes['relativeRowIndex'].value}" + rendered="#{richExtendedDataTableBean.attributes['rendered'].value}" + rowAvailable="#{richExtendedDataTableBean.attributes['rowAvailable'].value}" + rowCount="#{richExtendedDataTableBean.attributes['rowCount'].value}" + rowData="#{richExtendedDataTableBean.attributes['rowData'].value}" + rowIndex="#{richExtendedDataTableBean.attributes['rowIndex'].value}" + rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" + rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" + rows="#{richExtendedDataTableBean.attributes['rows'].value}" + sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" + sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" + sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" value="#{richExtendedDataTableBean.state ? model.capitals : null}" var="record" Modified: root/tests/metamer/trunk/src/main/webapp/resources/testapp/attributes.xhtml =================================================================== --- root/tests/metamer/trunk/src/main/webapp/resources/testapp/attributes.xhtml 2010-07-10 19:30:05 UTC (rev 17850) +++ root/tests/metamer/trunk/src/main/webapp/resources/testapp/attributes.xhtml 2010-07-10 19:34:28 UTC (rev 17851) @@ -1,7 +1,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:composite="http://java.sun.com/jsf/composite"> + xmlns:composite="http://java.sun.com/jsf/composite" + xmlns:ui="http://java.sun.com/jsf/facelets"> <h:body> <composite:interface> @@ -19,28 +20,28 @@ <h:panelGrid id="#{cc.attrs.id}" columns="#{cc.attrs.columns * 2}" styleClass="attributes" columnClasses="attributes-first-column, attributes-second-column, attributes-first-column, attributes-second-column"> <c:forEach items="#{cc.attrs.value}" var="entry"> - <h:panelGroup layout="block"> <h:outputLabel id="#{entry.key}Label" value="#{entry.key}" style="margin-right: 5px;" /> - <h:graphicImage value="/resources/images/help.png" title="#{cc.attrs.value.getHelp(entry.key)}" - rendered="#{cc.attrs.value.getHelp(entry.key) != null}" height="28px;" - style="vertical-align: middle;" styleClass="attribute-help" /> + <h:graphicImage value="/resources/images/help.png" title="#{entry.value.help}" + rendered="#{entry.value.help != null}" height="28px;" + style="vertical-align: middle;" styleClass="attribute-help" > + </h:graphicImage> </h:panelGroup> <c:choose> - <c:when test="#{cc.attrs.value.isBoolean(entry.key)}"> - <h:selectBooleanCheckbox id="#{entry.key}Input" value="#{cc.attrs.value[entry.key]}" onchange="submit()" /> + <c:when test="#{entry.value.boolean}"> + <h:selectBooleanCheckbox id="#{entry.key}Input" value="#{entry.value.value}" onchange="submit()" /> </c:when> - <c:when test="#{cc.attrs.value.hasSelectOptions(entry.key)}"> - <h:selectOneRadio id="#{entry.key}Input" value="#{cc.attrs.value[entry.key]}" onchange="submit()" + <c:when test="#{entry.value.selectOptions != null}"> + <h:selectOneRadio id="#{entry.key}Input" value="#{entry.value.value}" onchange="submit()" layout="pageDirection"> - <f:selectItems value="#{cc.attrs.value.getSelectOptions(entry.key)}" /> + <f:selectItems value="#{entry.value.selectOptions}" /> </h:selectOneRadio> </c:when> <c:otherwise> - <h:inputText id="#{entry.key}Input" value="#{cc.attrs.value[entry.key]}" style="width: 200px;" onchange="submit()" /> + <h:inputText id="#{entry.key}Input" value="#{entry.value.value}" style="width: 200px;" onchange="submit()" /> </c:otherwise> </c:choose>