January 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r21065 - in trunk: core/api/src/main/java/org/richfaces/context and 15 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2011-01-18 19:38:15 -0500 (Tue, 18 Jan 2011) New Revision: 21065 Added: trunk/core/api/src/main/java/org/richfaces/util/FastJoiner.java trunk/core/api/src/test/java/org/richfaces/util/FastJoinerTest.java Modified: trunk/core/api/src/main/java/org/richfaces/application/push/TopicKey.java trunk/core/api/src/main/java/org/richfaces/context/ExtendedVisitContext.java trunk/core/impl/src/main/java/org/richfaces/renderkit/html/ResourceLibraryRenderer.java trunk/core/impl/src/main/java/org/richfaces/resource/ExternalStaticResource.java trunk/core/impl/src/main/java/org/richfaces/resource/ResourceLibraryFactoryImpl.java trunk/core/impl/src/main/java/org/richfaces/util/Util.java trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeNodeParser.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java trunk/ui/common/ui/src/main/java/org/richfaces/component/util/Strings.java trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RendererBase.java trunk/ui/iteration/api/src/main/java/org/richfaces/component/Row.java trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/DeclarativeModelKeyConverter.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableBaseRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/RowHolder.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeNodeRendererBase.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeRenderingContext.java trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java Log: https://issues.jboss.org/browse/RF-10239 https://issues.jboss.org/browse/RF-10187 Performance optimization: - getClientId() replaced with getClientId(FacesCoontext) - Joiner replaced with FastJoiner Fix: - Removed redundant 'static' modifier from RendererBase#concatClasses & RendererBase#concatStyles Modified: trunk/core/api/src/main/java/org/richfaces/application/push/TopicKey.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/application/push/TopicKey.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/core/api/src/main/java/org/richfaces/application/push/TopicKey.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -24,8 +24,9 @@ import java.io.Serializable; import java.util.regex.Pattern; +import org.richfaces.util.FastJoiner; + import com.google.common.base.Function; -import com.google.common.base.Joiner; /** * @author Nick Belaevski @@ -51,7 +52,7 @@ private static final Pattern NAME_PATTERN = Pattern.compile("[a-zA-Z0-9_]+"); - private static final Joiner AT_JOINER = Joiner.on(SUBCHANNEL_SEPARATOR).skipNulls(); + private static final FastJoiner AT_JOINER = FastJoiner.on(SUBCHANNEL_SEPARATOR); private final String topicName; Modified: trunk/core/api/src/main/java/org/richfaces/context/ExtendedVisitContext.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/context/ExtendedVisitContext.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/core/api/src/main/java/org/richfaces/context/ExtendedVisitContext.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -31,9 +31,8 @@ import javax.faces.context.FacesContext; import org.richfaces.component.MetaComponentResolver; +import org.richfaces.util.FastJoiner; -import com.google.common.base.Joiner; - /** * @author Nick Belaevski * @@ -42,7 +41,7 @@ public static final String META_COMPONENT_ID = "org.richfaces.MetaComponentId"; - private static final Joiner META_COMPONENT_SEPARATOR_JOINER = Joiner.on(MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR).skipNulls(); + private static final FastJoiner META_COMPONENT_SEPARATOR_JOINER = FastJoiner.on(MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR); private final FacesContext facesContext; Added: trunk/core/api/src/main/java/org/richfaces/util/FastJoiner.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/util/FastJoiner.java (rev 0) +++ trunk/core/api/src/main/java/org/richfaces/util/FastJoiner.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -0,0 +1,91 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.util; + +/** + * @author Nick Belaevski + * + */ +public final class FastJoiner { + + private String separator; + + private FastJoiner(String separator) { + super(); + this.separator = separator; + } + + private String maskNullString(String s) { + if (s != null) { + return s; + } + + return ""; + } + + public String join(String s1, String s2) { + if (s1 == null) { + return maskNullString(s2); + } else if (s2 == null) { + return maskNullString(s1); + } + + StringBuilder sb = new StringBuilder(s1.length() + separator.length() + s2.length()); + + sb.append(s1); + sb.append(separator); + sb.append(s2); + + return sb.toString(); + } + + public String join(String... strings) { + StringBuilder sb = new StringBuilder(); + + boolean first = true; + + for (String s : strings) { + if (s == null) { + continue; + } + + if (first) { + first = false; + } else { + sb.append(separator); + } + + sb.append(s); + } + + return sb.toString(); + } + + public static FastJoiner on(String sep) { + return new FastJoiner(sep); + } + + public static FastJoiner on(char c) { + return new FastJoiner(String.valueOf(c)); + } + +} Added: trunk/core/api/src/test/java/org/richfaces/util/FastJoinerTest.java =================================================================== --- trunk/core/api/src/test/java/org/richfaces/util/FastJoinerTest.java (rev 0) +++ trunk/core/api/src/test/java/org/richfaces/util/FastJoinerTest.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -0,0 +1,135 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.util; + +import static org.junit.Assert.assertEquals; +import static org.richfaces.util.FastJoiner.on; + +import org.junit.Test; + +import com.google.common.base.Joiner; + + +/** + * @author Nick Belaevski + * + */ +public class FastJoinerTest { + + private static final int PERFORMANCE_TEST_STEPS = 100000; + + @Test + public void testDotCharJoin() throws Exception { + FastJoiner joiner = on('.'); + assertEquals("", joiner.join(null, null)); + + assertEquals("test", joiner.join("test", null)); + assertEquals("test.", joiner.join("test", "")); + + assertEquals("another test", joiner.join(null, "another test")); + assertEquals(".another test", joiner.join("", "another test")); + + assertEquals("join.them", joiner.join("join", "them")); + } + + @Test + public void testDotCharVarargsJoin() throws Exception { + FastJoiner joiner = on('.'); + + assertEquals("", joiner.join(null, null, null)); + + assertEquals("test", joiner.join("test", null, null)); + assertEquals("test", joiner.join(null, "test", null)); + assertEquals("test", joiner.join(null, null, "test")); + + assertEquals("test..abc", joiner.join("test", "", "abc")); + assertEquals("test..abc", joiner.join(null, "test", "", "abc")); + + assertEquals(".test.abc", joiner.join("", "test", "abc")); + assertEquals(".test.abc", joiner.join(null, "", "test", "abc")); + + assertEquals("join.them.all", joiner.join("join", "them", "all")); + } + + @Test + public void testXYStringJoin() throws Exception { + FastJoiner joiner = on("-xy+"); + + assertEquals("", joiner.join(null, null)); + + assertEquals("test", joiner.join("test", null)); + assertEquals("test-xy+", joiner.join("test", "")); + + assertEquals("another test", joiner.join(null, "another test")); + assertEquals("-xy+another test", joiner.join("", "another test")); + + assertEquals("join-xy+them", joiner.join("join", "them")); + } + + @Test + public void testEmptyStringJoin() throws Exception { + FastJoiner joiner = on(""); + + assertEquals("", joiner.join(null, null)); + + assertEquals("test", joiner.join("test", null)); + assertEquals("test", joiner.join("test", "")); + + assertEquals("another test", joiner.join(null, "another test")); + assertEquals("another test", joiner.join("", "another test")); + + assertEquals("jointhem", joiner.join("join", "them")); + } + + @Test + public void testEmptyStringVarargsJoin() throws Exception { + FastJoiner joiner = on(""); + + assertEquals("", joiner.join(null, null, null)); + + assertEquals("test", joiner.join(null, "test", null, null)); + assertEquals("test", joiner.join("test", null, null)); + assertEquals("test", joiner.join("test", "", null)); + assertEquals("test", joiner.join("", "test", null)); + assertEquals("test", joiner.join(null, "", "test", null)); + + assertEquals("jointhemall", joiner.join("join", "them", "all")); + } + + @Test + public void testGuavaJoinerPerformance() throws Exception { + Joiner joiner = Joiner.on("-separator-").skipNulls(); + + for (int i = 0; i < PERFORMANCE_TEST_STEPS; i++) { + joiner.join("big:table:id:string", "cell:id"); + } + } + + @Test + public void testFastJoinerPerformance() throws Exception { + FastJoiner joiner = FastJoiner.on("-separator-"); + + for (int i = 0; i < PERFORMANCE_TEST_STEPS; i++) { + joiner.join("big:table:id:string", "cell:id"); + } + } +} Modified: trunk/core/impl/src/main/java/org/richfaces/renderkit/html/ResourceLibraryRenderer.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/renderkit/html/ResourceLibraryRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/core/impl/src/main/java/org/richfaces/renderkit/html/ResourceLibraryRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -33,9 +33,8 @@ import org.richfaces.resource.ResourceKey; import org.richfaces.resource.ResourceLibrary; import org.richfaces.resource.ResourceLibraryFactory; +import org.richfaces.util.FastJoiner; -import com.google.common.base.Joiner; - /** * @author Nick Belaevski * @@ -48,7 +47,7 @@ private static final Logger LOGGER = RichfacesLogger.RENDERKIT.getLogger(); - private static final Joiner COLON_JOINER = Joiner.on(':').skipNulls(); + private static final FastJoiner COLON_JOINER = FastJoiner.on(':'); public ResourceLibraryRenderer() { super(); Modified: trunk/core/impl/src/main/java/org/richfaces/resource/ExternalStaticResource.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/resource/ExternalStaticResource.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/core/impl/src/main/java/org/richfaces/resource/ExternalStaticResource.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -33,9 +33,8 @@ import org.richfaces.application.CoreConfiguration; import org.richfaces.skin.SkinFactory; +import org.richfaces.util.FastJoiner; -import com.google.common.base.Joiner; - /** * @author Nick Belaevski * @@ -44,7 +43,7 @@ public static final String STATIC_RESOURCE_LOCATION_VARIABLE = "resourceLocation"; - private static final Joiner RESOURCE_PATH_JOINER = Joiner.on('/').skipNulls(); + private static final FastJoiner RESOURCE_PATH_JOINER = FastJoiner.on('/'); private String location; Modified: trunk/core/impl/src/main/java/org/richfaces/resource/ResourceLibraryFactoryImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/resource/ResourceLibraryFactoryImpl.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/core/impl/src/main/java/org/richfaces/resource/ResourceLibraryFactoryImpl.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -25,10 +25,10 @@ import org.richfaces.log.Logger; import org.richfaces.log.RichfacesLogger; +import org.richfaces.util.FastJoiner; import org.richfaces.util.PropertiesUtil; import com.google.common.base.Function; -import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.Iterables; import com.google.common.collect.MapMaker; @@ -41,7 +41,7 @@ private static final Logger LOGGER = RichfacesLogger.RESOURCE.getLogger(); - private static final Joiner SLASH_JOINER = Joiner.on('/').skipNulls(); + private static final FastJoiner SLASH_JOINER = FastJoiner.on('/'); private static final Splitter COMA_SPLITTER = Splitter.on(',').omitEmptyStrings().trimResults(); Modified: trunk/core/impl/src/main/java/org/richfaces/util/Util.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/util/Util.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/core/impl/src/main/java/org/richfaces/util/Util.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -86,7 +86,6 @@ import org.richfaces.log.RichfacesLogger; import org.richfaces.resource.StateHolderResource; -import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.base.Strings; @@ -116,7 +115,7 @@ public static final char SEPARATOR_CHAR = UINamingContainer.getSeparatorChar(FacesContext.getCurrentInstance()); - public static final Joiner SEPARATOR_CHAR_JOINER = Joiner.on(SEPARATOR_CHAR).skipNulls(); + public static final FastJoiner SEPARATOR_CHAR_JOINER = FastJoiner.on(SEPARATOR_CHAR); public static final Splitter SEPARATOR_CHAR_SPLITTER = Splitter.on(SEPARATOR_CHAR); Modified: trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java =================================================================== --- trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -71,7 +71,7 @@ public void processSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException { FacesContext facesContext = FacesContext.getCurrentInstance(); - facesContext.addMessage(getTree(event).getBaseClientId(facesContext), createEventMessage(event, fromExpression)); + facesContext.addMessage(getTree(event).getClientId(facesContext), createEventMessage(event, fromExpression)); } } @@ -90,7 +90,7 @@ public void processToggle(TreeToggleEvent event) throws AbortProcessingException { FacesContext facesContext = FacesContext.getCurrentInstance(); - facesContext.addMessage(getTree(event).getBaseClientId(facesContext), createEventMessage(event, fromExpression)); + facesContext.addMessage(getTree(event).getClientId(facesContext), createEventMessage(event, fromExpression)); } } Modified: trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeNodeParser.java =================================================================== --- trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeNodeParser.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeNodeParser.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -30,6 +30,7 @@ import javax.swing.tree.TreeNode; import org.richfaces.model.SwingTreeNodeImpl; +import org.richfaces.util.FastJoiner; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; @@ -38,7 +39,6 @@ import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; -import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.io.Closeables; @@ -48,7 +48,7 @@ */ public class TreeNodeParser implements ContentHandler { - private static final Joiner JOINER = Joiner.on("").skipNulls(); + private static final FastJoiner JOINER = FastJoiner.on(""); private XMLReader reader; Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -78,7 +78,7 @@ public void encodeEnd(FacesContext context) throws IOException { ResponseWriter writer = context.getResponseWriter(); writer.startElement("div", null); - writer.writeAttribute("id", this.getClientId(), null); + writer.writeAttribute("id", this.getClientId(context), null); writer.writeAttribute("class", this.getStyleClass(), null); writer.writeAttribute("style", this.getStyle(), null); writer.startElement("pre", null); Modified: trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -22,6 +22,8 @@ package org.richfaces.component; +import static org.richfaces.component.util.Strings.NamingContainerDataHolder.SEPARATOR_CHAR_JOINER; + import java.io.IOException; import java.io.Serializable; import java.text.MessageFormat; @@ -61,7 +63,6 @@ import javax.faces.event.PostValidateEvent; import javax.faces.event.PreRenderComponentEvent; import javax.faces.event.PreValidateEvent; -import javax.faces.render.Renderer; import org.ajax4jsf.component.IterationStateHolder; import org.ajax4jsf.model.DataComponentState; @@ -236,7 +237,7 @@ private Object rowKey = null; - private String clientId; + private String containerClientId; private Object originalVarValue; @@ -374,7 +375,7 @@ getExtendedDataModel().setRowKey(rowKey); - this.clientId = null; + this.containerClientId = null; boolean rowSelected = (rowKey != null) && isRowAvailable(); @@ -739,62 +740,47 @@ return Boolean.TRUE.equals(value); } + private String getRowKeyAsString(FacesContext facesContext, Object rowKey) { + assert rowKey != null; + + Converter rowKeyConverter = getRowKeyConverter(); + if (rowKeyConverter == null) { + // Create default converter for a row key. + rowKeyConverter = facesContext.getApplication().createConverter(rowKey.getClass()); + + // Store converter for a invokeOnComponents call. + if (rowKeyConverter != null) { + // TODO - review + setRowKeyConverter(rowKeyConverter); + } + } + + if (rowKeyConverter != null) { + return rowKeyConverter.getAsString(facesContext, this, rowKey); + } else { + return rowKey.toString(); + } + } + @Override - public String getClientId(FacesContext facesContext) { + public String getContainerClientId(FacesContext facesContext) { if (facesContext == null) { throw new NullPointerException("context"); } - if (null == clientId) { - StringBuilder id = new StringBuilder(super.getClientId(facesContext)); + if (null == containerClientId) { + containerClientId = super.getContainerClientId(facesContext); + Object rowKey = getRowKey(); - + if (rowKey != null) { - - // Use converter to get String representation ot the row key. - Converter rowKeyConverter = getRowKeyConverter(); - - if (null == rowKeyConverter) { - - // Create default converter for a row key. - rowKeyConverter = facesContext.getApplication().createConverter(rowKey.getClass()); - - // Store converter for a invokeOnComponents call. - if (null != rowKeyConverter) { - // TODO - review - setRowKeyConverter(rowKeyConverter); - } - } - - String rowKeyString; - - if (null != rowKeyConverter) { - - // Temporary set clientId, to avoid infinite calls from converter. - clientId = id.toString(); - rowKeyString = rowKeyConverter.getAsString(facesContext, this, rowKey); - } else { - rowKeyString = rowKey.toString(); - } - - id.append(UINamingContainer.getSeparatorChar(facesContext)).append(rowKeyString); - } - - Renderer renderer = getRenderer(facesContext); - - if (null != renderer) { - clientId = renderer.convertClientId(facesContext, id.toString()); - } else { - clientId = id.toString(); - } + String rowKeyString = getRowKeyAsString(facesContext, rowKey); + containerClientId = SEPARATOR_CHAR_JOINER.join(containerClientId, rowKeyString); + } } - return clientId; + return containerClientId; } - - public String getBaseClientId(FacesContext context) { - return super.getClientId(context); - } /** * Save current state of data variable. @@ -968,7 +954,7 @@ @Override public void setId(String id) { super.setId(id); - this.clientId = null; + this.containerClientId = null; } /* Modified: trunk/ui/common/ui/src/main/java/org/richfaces/component/util/Strings.java =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/component/util/Strings.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/common/ui/src/main/java/org/richfaces/component/util/Strings.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -25,7 +25,13 @@ import java.util.NoSuchElementException; +import javax.faces.component.UINamingContainer; +import javax.faces.context.FacesContext; + +import org.richfaces.util.FastJoiner; + import com.google.common.base.Joiner; +import com.google.common.base.Splitter; /** @@ -37,6 +43,18 @@ public static final Joiner DOT_JOINER = Joiner.on('.'); + public static final class NamingContainerDataHolder { + + public static final char SEPARATOR_CHAR = UINamingContainer.getSeparatorChar(FacesContext.getCurrentInstance()); + + public static final FastJoiner SEPARATOR_CHAR_JOINER = FastJoiner.on(SEPARATOR_CHAR); + + public static final Splitter SEPARATOR_CHAR_SPLITTER = Splitter.on(SEPARATOR_CHAR); + + private NamingContainerDataHolder() {} + + } + private Strings() { // this is utility class with static methods only. Modified: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RendererBase.java =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RendererBase.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RendererBase.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -280,11 +280,11 @@ } } - public static String concatClasses(Object... objects) { + public String concatClasses(Object... objects) { return HtmlUtil.concatClasses(objects); } - public static String concatStyles(Object... objects) { + public String concatStyles(Object... objects) { return HtmlUtil.concatStyles(objects); } } Modified: trunk/ui/iteration/api/src/main/java/org/richfaces/component/Row.java =================================================================== --- trunk/ui/iteration/api/src/main/java/org/richfaces/component/Row.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/api/src/main/java/org/richfaces/component/Row.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -22,12 +22,13 @@ package org.richfaces.component; -import org.ajax4jsf.model.DataVisitor; +import java.util.Iterator; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import java.util.Iterator; +import org.ajax4jsf.model.DataVisitor; + /** * Marker interface for table columns, rendered as entire row. * @@ -42,8 +43,6 @@ public void setRowKey(FacesContext context, Object rowKey); - public String getClientId(FacesContext context); - public void walk(FacesContext context, DataVisitor visitor, Object argument); } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/DeclarativeModelKeyConverter.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/DeclarativeModelKeyConverter.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/convert/DeclarativeModelKeyConverter.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -21,21 +21,20 @@ */ package org.richfaces.convert; +import static org.richfaces.component.util.Strings.NamingContainerDataHolder.SEPARATOR_CHAR_JOINER; +import static org.richfaces.component.util.Strings.NamingContainerDataHolder.SEPARATOR_CHAR_SPLITTER; import static org.richfaces.convert.TreeConverterUtil.escape; import static org.richfaces.convert.TreeConverterUtil.unescape; import java.util.Iterator; import javax.faces.component.UIComponent; -import javax.faces.component.UINamingContainer; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import org.richfaces.model.DeclarativeModelKey; -import com.google.common.base.Joiner; -import com.google.common.base.Splitter; import com.google.common.base.Strings; /** @@ -44,22 +43,6 @@ */ public class DeclarativeModelKeyConverter implements Converter { - private static final class StaticHolder { - - static final Joiner JOINER; - - static final Splitter SPLITTER; - - static { - char separatorChar = UINamingContainer.getSeparatorChar(FacesContext.getCurrentInstance()); - JOINER = Joiner.on(separatorChar); - SPLITTER = Splitter.on(separatorChar); - } - - private StaticHolder() {} - - } - private Converter delegateConverter; public DeclarativeModelKeyConverter(Converter delegateConverter) { @@ -74,7 +57,7 @@ String s = unescape(value); - Iterator<String> split = StaticHolder.SPLITTER.split(s).iterator(); + Iterator<String> split = SEPARATOR_CHAR_SPLITTER.split(s).iterator(); String modelId = (String) split.next(); Object modelKey = delegateConverter.getAsObject(context, component, split.next()); @@ -94,7 +77,7 @@ DeclarativeModelKey declarativeModelKey = (DeclarativeModelKey) value; String convertedModelKey = delegateConverter.getAsString(context, component, declarativeModelKey.getModelKey()); - String keyString = StaticHolder.JOINER.join(declarativeModelKey.getModelId(), convertedModelKey); + String keyString = SEPARATOR_CHAR_JOINER.join(declarativeModelKey.getModelId(), convertedModelKey); return escape(keyString); } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableBaseRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableBaseRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableBaseRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -42,8 +42,6 @@ public static final String ROW_CLASS_KEY = "rowClass"; - public static final String CELL_ELEMENT_KEY = "cellElement"; - public static final String BREAK_ROW_BEFORE = "breakRowBefore"; public static final String COLUMN_CLASS = "userColumnClass"; @@ -91,8 +89,7 @@ } public void encodeColumnStart(ResponseWriter writer, FacesContext context, String parentId, UIComponent component) throws IOException { - String element = getCellElement(context, parentId); - writer.startElement(element, component); + writer.startElement(HtmlConstants.TD_ELEM, component); getUtils().encodeId(context, component); String cellClass = getCellClass(context, parentId); cellClass = concatClasses(cellClass, component.getAttributes().get(COLUMN_CLASS)); @@ -114,7 +111,7 @@ } public void encodeColumnEnd(ResponseWriter writer, FacesContext context, String parentId) throws IOException { - writer.endElement(getCellElement(context, parentId)); + writer.endElement(HtmlConstants.TD_ELEM); } public void encodeFirstRowStart(ResponseWriter writer, FacesContext context, String parentId, int currentRow, UIComponent component) throws IOException { @@ -149,8 +146,8 @@ return get(context, id + CELL_CLASS_KEY); } - protected String getCellElement(FacesContext context, String id) { - return get(context, id + CELL_ELEMENT_KEY); + protected String getFacetElement(FacesContext context, String id, String facetName) { + return HtmlConstants.TD_ELEM; } protected void saveRowStyles(FacesContext context, String id, String firstRowClass, String rowClass, String cellClass) { Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -133,9 +133,7 @@ encodeTableStructure(writer, context, dataTable); - setupTableStartElement(context, dataTable); encodeHeaderFacet(writer, context, dataTable, false); - setupTableStartElement(context, dataTable, HtmlConstants.TD_ELEM); encodeFooterFacet(writer, context, dataTable, false); dataTable.setRowKey(context, key); dataTable.restoreOrigValue(context); @@ -146,8 +144,6 @@ int rowCount = dataTableBase.getRowCount(); - put(facesContext, dataTableBase.getClientId(facesContext) + CELL_ELEMENT_KEY, HtmlConstants.TD_ELEM); - Object key = dataTableBase.getRowKey(); dataTableBase.captureOrigValue(facesContext); dataTableBase.setRowKey(facesContext, null); @@ -212,7 +208,7 @@ public void encodeTableStart(ResponseWriter writer, FacesContext context, UIDataTableBase component) throws IOException { writer.startElement(HtmlConstants.TABLE_ELEMENT, component); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(), null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context), null); String styleClass = getTableSkinClass(); encodeStyleClass(writer, context, component, HtmlConstants.STYLE_CLASS_ATTR, styleClass); } @@ -241,7 +237,7 @@ throws IOException { writer.startElement(HtmlConstants.TBODY_ELEMENT, dataTableBase); - String clientId = (dataTableBase.getRelativeRowIndex() < 0) ? dataTableBase.getClientId(facesContext) : dataTableBase.getRelativeClientId(facesContext); + String clientId = (dataTableBase.getRelativeRowIndex() < 0) ? dataTableBase.getContainerClientId(facesContext) : dataTableBase.getRelativeClientId(facesContext); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId + ":tb", null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, getTableBodySkinClass(), null); @@ -261,9 +257,10 @@ if ((footer != null && footer.isRendered()) || columnFacetPresent) { boolean partialUpdateEncoded = false; + String clientId = dataTable.getClientId(facesContext); boolean encodeTfoot = containsThead(); if (encodeTfoot) { - String footerClientId = dataTable.getClientId(facesContext) + ":tf"; + String footerClientId = clientId + ":tf"; if (encodePartialUpdate) { partialUpdateEncoded = true; @@ -276,7 +273,6 @@ } int columns = getColumnsCount(dataTable); - String id = dataTable.getClientId(facesContext); boolean encodePartialUpdateForChildren = (encodePartialUpdate && !partialUpdateEncoded); @@ -291,9 +287,9 @@ cellClass = mergeStyleClasses("columnFooterCellClass", cellClass, dataTable); firstClass = mergeStyleClasses("firstColumnFooterClass", firstClass, dataTable); - saveRowStyles(facesContext,id, firstClass, rowClass, cellClass); + saveRowStyles(facesContext, clientId, firstClass, rowClass, cellClass); - String targetId = id + ":cf"; + String targetId = clientId + ":cf"; if (encodePartialUpdateForChildren) { partialStart(facesContext, targetId); @@ -321,8 +317,8 @@ cellClass = mergeStyleClasses("footerCellClass", cellClass, dataTable); firstClass = mergeStyleClasses("footerFirstClass", firstClass, dataTable); // TODO nick - rename method "encodeTableHeaderFacet" - saveRowStyles(facesContext, id, firstClass, rowClass, cellClass); - encodeTableFacet(facesContext, writer, id, columns, footer, UIDataTableBase.FOOTER, rowClass, cellClass, + saveRowStyles(facesContext, clientId, firstClass, rowClass, cellClass); + encodeTableFacet(facesContext, writer, clientId, columns, footer, UIDataTableBase.FOOTER, rowClass, cellClass, encodePartialUpdateForChildren); } @@ -359,8 +355,9 @@ if ((header != null && header.isRendered()) || isEncodeHeaders) { boolean partialUpdateEncoded = false; + String clientId = dataTable.getClientId(facesContext); if (encodeThead) { - String headerClientId = dataTable.getClientId(facesContext) + ":th"; + String headerClientId = clientId + ":th"; if (encodePartialUpdate) { partialUpdateEncoded = true; @@ -373,7 +370,6 @@ } int columns = getColumnsCount(dataTable); - String id = dataTable.getClientId(facesContext); boolean encodePartialUpdateForChildren = (encodePartialUpdate && !partialUpdateEncoded); @@ -386,9 +382,9 @@ rowClass = mergeStyleClasses("headerClass", rowClass, dataTable); cellClass = mergeStyleClasses("headerCellClass", cellClass, dataTable); firstClass = mergeStyleClasses("headerFirstClass", firstClass, dataTable); - saveRowStyles(facesContext, id, firstClass, rowClass, cellClass); + saveRowStyles(facesContext, clientId, firstClass, rowClass, cellClass); - encodeTableFacet(facesContext, writer, id, columns, header, UIDataTableBase.HEADER, rowClass, cellClass, + encodeTableFacet(facesContext, writer, clientId, columns, header, UIDataTableBase.HEADER, rowClass, cellClass, encodePartialUpdateForChildren); } @@ -401,9 +397,9 @@ rowClass = mergeStyleClasses("columnHeaderClass", rowClass, dataTable); cellClass = mergeStyleClasses("columnHeaderCellClass", cellClass, dataTable); firstClass = mergeStyleClasses("columnHeaderFirstClass", firstClass, dataTable); - saveRowStyles(facesContext, id, firstClass, rowClass, cellClass); + saveRowStyles(facesContext, clientId, firstClass, rowClass, cellClass); - String targetId = id + ":ch"; + String targetId = clientId + ":ch"; if (encodePartialUpdateForChildren) { partialStart(facesContext, targetId); @@ -436,7 +432,7 @@ protected void encodeColumnFacet(FacesContext context, ResponseWriter writer, UIDataTableBase dataTableBase, String facetName, int colCount, String cellClass) throws IOException { int tColCount = 0; String id = dataTableBase.getClientId(context); - String element = getCellElement(context, id); + String element = getFacetElement(context, id, facetName); Iterator<UIComponent> headers = dataTableBase.columns(); @@ -484,7 +480,7 @@ UIComponent footer, String facetName, String rowClass, String cellClass, boolean encodePartialUpdate) throws IOException { boolean isColumnGroup = (footer instanceof Row); - String element = getCellElement(facesContext, id); + String element = getFacetElement(facesContext, id, facetName); boolean partialUpdateEncoded = false; @@ -574,12 +570,6 @@ public abstract String getNoDataCellClass(); - protected abstract void setupTableStartElement(FacesContext context, UIComponent component); - - protected void setupTableStartElement(FacesContext context, UIComponent component, String elementName) { - put(context, component.getClientId(context) + CELL_ELEMENT_KEY, elementName); - } - public void encodeMetaComponent(FacesContext context, UIComponent component, String metaComponentId) throws IOException { @@ -587,13 +577,10 @@ if (UIDataTableBase.HEADER.equals(metaComponentId)) { - setupTableStartElement(context, component); encodeHeaderFacet(context.getResponseWriter(), context, table, true); } else if (UIDataTableBase.FOOTER.equals(metaComponentId)) { - setupTableStartElement(context, component, HtmlConstants.TD_ELEM); encodeFooterFacet(context.getResponseWriter(), context, table, true); } else if(UIDataTableBase.BODY.equals(metaComponentId)) { - setupTableStartElement(context, component, HtmlConstants.TD_ELEM); encodeTableRows(context.getResponseWriter(), context, table, true); } else { throw new IllegalArgumentException("Unsupported metaComponentIdentifier: " + metaComponentId); Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -38,8 +38,8 @@ import org.ajax4jsf.javascript.JSFunction; import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractDataTable; import org.richfaces.component.AbstractCollapsibleSubTable; +import org.richfaces.component.AbstractDataTable; import org.richfaces.component.Row; import org.richfaces.component.UIDataTableBase; import org.richfaces.event.ToggleEvent; @@ -72,7 +72,7 @@ public void begin(ResponseWriter writer, FacesContext context, UIComponent component, Object[] params) throws IOException { AbstractCollapsibleSubTable subTable = (AbstractCollapsibleSubTable)component; writer.startElement(HtmlConstants.TR_ELEMENT, subTable); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, subTable.getClientId(context) + HIDDEN_CONTAINER_ID, null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, subTable.getContainerClientId(context) + HIDDEN_CONTAINER_ID, null); writer.writeAttribute(HtmlConstants.STYLE_ATTRIBUTE, DISPLAY_NONE, null); writer.startElement(HtmlConstants.TD_ELEM, subTable); } @@ -146,7 +146,7 @@ cellClass = mergeStyleClasses("cellClass", cellClass, subTable); firstClass = mergeStyleClasses("firstRowClass", firstClass, subTable); - saveRowStyles(context, subTable.getClientId(context), firstClass, rowClass, cellClass); + saveRowStyles(context, subTable.getContainerClientId(context), firstClass, rowClass, cellClass); } @Override @@ -169,14 +169,13 @@ AbstractCollapsibleSubTable subTable = (AbstractCollapsibleSubTable)dataTableBase; encodeTableBodyStart(writer, facesContext, subTable); encodeSubTableDomElement(writer, facesContext, subTable); - setupTableStartElement(facesContext, subTable); encodeHeaderFacet(writer, facesContext, subTable, false); } private void encodeSubTableDomElement(ResponseWriter writer, FacesContext facesContext, AbstractCollapsibleSubTable subTable) throws IOException{ writer.startElement(HtmlConstants.TR_ELEMENT, subTable); writer.writeAttribute(HtmlConstants.STYLE_ATTRIBUTE, DISPLAY_NONE, null); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, subTable.getClientId(facesContext), null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, subTable.getContainerClientId(facesContext), null); writer.startElement(HtmlConstants.TD_ELEM, subTable); writer.endElement(HtmlConstants.TD_ELEM); writer.endElement(HtmlConstants.TR_ELEMENT); @@ -387,7 +386,6 @@ public void encodeMetaComponent(FacesContext facesContext, UIComponent component, String metaComponentId) throws IOException { AbstractCollapsibleSubTable subTable = (AbstractCollapsibleSubTable)component; - setupTableStartElement(facesContext, subTable); if(AbstractCollapsibleSubTable.BODY.equals(metaComponentId)) { ResponseWriter writer = facesContext.getResponseWriter(); @@ -406,10 +404,6 @@ return new CollapsibleSubTableHiddenEncodeStrategy(); } - protected void setupTableStartElement(FacesContext context, UIComponent component) { - setupTableStartElement(context, component, HtmlConstants.TD_ELEM); - } - protected UIDataTableBase findParent(AbstractCollapsibleSubTable subTable) { UIComponent parent = subTable.getParent(); Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -71,6 +71,7 @@ @Override protected void doDecode(FacesContext context, UIComponent component) { + //TODO - review context.getPartialViewContext().getRenderIds().add(component.getClientId(context)); } @@ -109,7 +110,7 @@ writer.writeAttribute(HtmlConstants.STYLE_ATTRIBUTE, DISPLAY_NONE, null); } - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, control.getClientId() + ":" + state, null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, control.getClientId(context) + ":" + state, null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, styleClass, null); writer.writeAttribute(HtmlConstants.STYLE_ATTRIBUTE, style, null); Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ColumnGroupRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -73,7 +73,7 @@ } RowHolder rowHolder = new RowHolder(context, (AbstractColumnGroup)component); - rowHolder.setParentClientId(parent.getClientId()); + rowHolder.setParentClientId(parent.getClientId(context)); return rowHolder; } } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -36,8 +36,8 @@ import org.ajax4jsf.javascript.JSFunction; import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractCollapsibleSubTable; import org.richfaces.component.AbstractDataTable; -import org.richfaces.component.AbstractCollapsibleSubTable; import org.richfaces.component.Row; import org.richfaces.component.UIDataTableBase; import org.richfaces.component.util.HtmlUtil; @@ -60,7 +60,7 @@ AbstractDataTable dataTable = (AbstractDataTable)component; writer.startElement(HtmlConstants.TBODY_ELEMENT, dataTable); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, dataTable.getClientId(context) + HIDDEN_CONTAINER_ID, null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, dataTable.getContainerClientId(context) + HIDDEN_CONTAINER_ID, null); writer.writeAttribute(HtmlConstants.STYLE_ATTRIBUTE, "display: none", null); writer.startElement(HtmlConstants.TR_ELEMENT, dataTable); writer.startElement(HtmlConstants.TD_ELEM, dataTable); @@ -124,7 +124,7 @@ public void encodeBeforeRows(ResponseWriter writer, FacesContext facesContext,UIDataTableBase dataTableBase, boolean encodeParentTBody, boolean partialUpdate) throws IOException { if(encodeParentTBody) { if(partialUpdate) { - partialStart(facesContext, dataTableBase.getClientId(facesContext) +":tb"); + partialStart(facesContext, dataTableBase.getContainerClientId(facesContext) +":tb"); } encodeTableBodyStart(writer, facesContext, dataTableBase); } @@ -394,8 +394,9 @@ return "rf-dt-b"; } - protected void setupTableStartElement(FacesContext context, UIComponent component) { - setupTableStartElement(context, component, HtmlConstants.TH_ELEM); + @Override + protected String getFacetElement(FacesContext context, String id, String facetName) { + return facetName.equals(UIDataTableBase.HEADER) ? HtmlConstants.TH_ELEM : HtmlConstants.TD_ELEM; } public EncodeStrategy getHiddenContainerStrategy(UIDataTableBase dataTableBase) { Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -304,6 +304,7 @@ writer.writeAttribute(HtmlConstants.CELLSPACING_ATTRIBUTE, "0", null); writer.startElement(HtmlConstants.TBODY_ELEMENT, table); writer.startElement(HtmlConstants.TR_ELEMENT, table); + String clientId = table.getClientId(context); for (state.startIterate(); state.hasNextPart();) { Part part = state.nextPart(); PartName partName = part.getName(); @@ -317,15 +318,15 @@ if (PartName.frozen.equals(partName)) { if ("header".equals(name)) { writer - .writeAttribute(HtmlConstants.ID_ATTRIBUTE, table.getClientId(context) + ":frozenHeader", null); + .writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId + ":frozenHeader", null); } } else { - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, table.getClientId(context) + ":" + name, null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId + ":" + name, null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-cnt" + ("footer".equals(name) ? " rf-edt-ftr-cnt" : ""), null); } - String tableId = table.getClientId(context) + ":cf" + name.charAt(0) + partName.getId(); + String tableId = clientId + ":cf" + name.charAt(0) + partName.getId(); EncoderVariance encoderVariance = state.getEncoderVariance(); encoderVariance.encodeStartUpdate(context, tableId); @@ -387,7 +388,8 @@ FacesContext context = state.getContext(); ResponseWriter writer = context.getResponseWriter(); UIDataTableBase table = state.getRow(); - String tableBodyId = table.getClientId(context) + ":b"; + String clientId = table.getClientId(context); + String tableBodyId = clientId + ":b"; EncoderVariance encoderVariance = state.getEncoderVariance(); encoderVariance.encodeStartUpdate(context, tableBodyId); writer.startElement(HtmlConstants.DIV_ELEM, table); @@ -419,16 +421,16 @@ writer.startElement(HtmlConstants.DIV_ELEM, table); PartName partName = state.nextPart().getName(); if (PartName.normal.equals(partName)) { - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, table.getClientId(context) + ":body", null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId + ":body", null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-cnt", null); } - String targetId = table.getClientId(context) + ":tbt" + partName.getId(); + String targetId = clientId + ":tbt" + partName.getId(); writer.startElement(HtmlConstants.TABLE_ELEMENT, table); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, targetId, null); writer.writeAttribute(HtmlConstants.CELLPADDING_ATTRIBUTE, "0", null); writer.writeAttribute(HtmlConstants.CELLSPACING_ATTRIBUTE, "0", null); writer.startElement(HtmlConstants.TBODY_ELEMENT, table); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, table.getClientId(context) + ":tb" + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId + ":tb" + partName.getId(), null); encodeRows(context, state); writer.endElement(HtmlConstants.TBODY_ELEMENT); @@ -508,6 +510,7 @@ table.captureOrigValue(context); table.setRowKey(context, null); final RendererState state = createRowHolder(context, table, null); + String clientId = table.getClientId(context); // TODO 1. Encode fixed children for (state.startIterate(); state.hasNextPart();) { String partId = state.nextPart().getName().getId(); @@ -516,7 +519,7 @@ public DataVisitResult process(FacesContext context, Object rowKey, Object argument) { UIDataTableBase dataTable = state.getRow(); dataTable.setRowKey(context, rowKey); - ids.add(dataTable.getClientId(context) + ":" + ids.add(dataTable.getContainerClientId(context) + ":" + state.getPart().getName().getId()); return DataVisitResult.CONTINUE; } @@ -526,7 +529,7 @@ UIDataTableBase dataTable = state.getRow(); dataTable.setRowKey(context, rowKey); HashMap<String, String> attributes = new HashMap<String, String>(1); - String id = dataTable.getClientId(context) + ":" + String id = dataTable.getContainerClientId(context) + ":" + state.getPart().getName().getId(); attributes.put("id", id); try { @@ -546,18 +549,18 @@ } //TODO nick - move this to external JavaScript file - writer.write("var richTBody = document.getElementById('" + component.getClientId(context) + ":tb" + writer.write("var richTBody = document.getElementById('" + clientId + ":tb" + partId + "');"); writer.write("var richRows = richTBody.rows;"); writer.write("for (var i = 0; i < " + difference + "; i++ ) richTBody.appendChild(richTBody.removeChild(richRows[0]));"); writer.endEval(); } - writer.startUpdate(component.getClientId(context) + ":si"); + writer.startUpdate(clientId + ":si"); encodeSelectionInput(writer, context, component); writer.endUpdate(); writer.startEval(); - writer.write("jQuery('#" + component.getClientId(context).replace(":", "\\\\:") + writer.write("jQuery('#" + ScriptUtils.escapeCSSMetachars(clientId) + "').triggerHandler('rich:onajaxcomplete', {first: " + table.getClientFirst() + "});"); writer.endEval(); table.setRowKey(context, key); @@ -579,18 +582,19 @@ if (UIDataTableBase.HEADER.equals(metaComponentId)) { encodeHeader(state); writer.startEval(); - writer.write("jQuery('#" + component.getClientId(context).replace(":", "\\\\:") + writer.write("jQuery('#" + ScriptUtils.escapeCSSMetachars(table.getClientId(context)) + "').triggerHandler('rich:onajaxcomplete', {reinitializeHeader: true});"); writer.endEval(); } else if (UIDataTableBase.FOOTER.equals(metaComponentId)) { encodeFooter(state); } else if (UIDataTableBase.BODY.equals(metaComponentId)) { encodeBody(state); - writer.startUpdate(component.getClientId(context) + ":si"); + String clientId = table.getClientId(context); + writer.startUpdate(clientId + ":si"); encodeSelectionInput(writer, context, component); writer.endUpdate(); writer.startEval(); - writer.write("jQuery('#" + component.getClientId(context).replace(":", "\\\\:") + writer.write("jQuery('#" + ScriptUtils.escapeCSSMetachars(clientId) + "').triggerHandler('rich:onajaxcomplete', {first: " + table.getClientFirst() + ", rowCount: " + getRowCount(component) + ", reinitializeBody: true});"); writer.endEval(); @@ -640,7 +644,8 @@ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { writer.startElement(HtmlConstants.TABLE_ELEMENT, component); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":r", null); + String clientId = component.getClientId(context); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId + ":r", null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rord", null); writer.writeAttribute(HtmlConstants.CELLPADDING_ATTRIBUTE, "0", null); writer.writeAttribute(HtmlConstants.CELLSPACING_ATTRIBUTE, "0", null); @@ -658,16 +663,16 @@ } writer.endElement(HtmlConstants.TABLE_ELEMENT); writer.startElement(HtmlConstants.DIV_ELEM, component); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":d", null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId + ":d", null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rsz-mkr", null); writer.endElement(HtmlConstants.DIV_ELEM); writer.startElement(HtmlConstants.DIV_ELEM, component); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":rm", null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId + ":rm", null); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-edt-rord-mkr", null); writer.endElement(HtmlConstants.DIV_ELEM); writer.startElement(HtmlConstants.INPUT_ELEM, component); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, component.getClientId(context) + ":wi", null); - writer.writeAttribute(HtmlConstants.NAME_ATTRIBUTE, component.getClientId(context) + ":wi", null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, clientId + ":wi", null); + writer.writeAttribute(HtmlConstants.NAME_ATTRIBUTE, clientId + ":wi", null); writer.writeAttribute(HtmlConstants.TYPE_ATTR, HtmlConstants.INPUT_TYPE_HIDDEN, null); writer.endElement(HtmlConstants.INPUT_ELEM); encodeSelectionInput(writer, context, component); @@ -683,7 +688,7 @@ addToScriptHash(options, "onselectionchange", RenderKitUtils.getAttributeAndBehaviorsValue(context, component, EVENT_ATTRIBUTES.get("onselectionchange")), null, ScriptHashVariableWrapper.eventHandler); StringBuilder builder = new StringBuilder("new RichFaces.ui.ExtendedDataTable('"); - builder.append(component.getClientId(context)).append("', ").append(getRowCount(component)) + builder.append(clientId).append("', ").append(getRowCount(component)) .append(", function(event, clientParams) {").append(ajaxFunction.toScript()).append(";}"); if (!options.isEmpty()) { builder.append(",").append(ScriptUtils.toScript(options)); @@ -788,7 +793,7 @@ Iterator<UIComponent> columns = null; Part part = state.getPart(); writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, - table.getClientId(facesContext) + ":" + part.getName().getId(), null); + table.getContainerClientId(facesContext) + ":" + part.getName().getId(), null); columns = part.getColumns().iterator(); int columnNumber = 0; while (columns.hasNext()) { @@ -819,11 +824,12 @@ protected void doDecode(FacesContext context, UIComponent component) { super.doDecode(context, component); Map<String, String> map = context.getExternalContext().getRequestParameterMap(); - updateWidthOfColumns(context, component, map.get(component.getClientId(context) + ":wi")); - if (map.get(component.getClientId(context)) != null) { + String clientId = component.getClientId(context); + updateWidthOfColumns(context, component, map.get(clientId + ":wi")); + if (map.get(clientId) != null) { updateColumnsOrder(context, component, map.get("rich:columnsOrder")); } - if (map.get(component.getClientId(context)) != null) { + if (map.get(clientId) != null) { updateClientFirst(context, component, map.get("rich:clientFirst")); } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -96,7 +96,7 @@ writer.startElement(HtmlConstants.LI_ELEMENT, sequence); if (rendererUtils.hasExplicitId(sequence)) { - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, sequence.getClientId(context), null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, sequence.getContainerClientId(context), null); } writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, @@ -129,7 +129,7 @@ writer.startElement(HtmlConstants.DT_ELEMENT, sequence); if (rendererUtils.hasExplicitId(sequence)) { - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, sequence.getClientId(context) + ".dt", null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, sequence.getContainerClientId(context) + ".dt", null); } writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, @@ -142,7 +142,7 @@ writer.startElement(HtmlConstants.DD_ELEMENT, sequence); if (rendererUtils.hasExplicitId(sequence)) { - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, sequence.getClientId(context), null); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, sequence.getContainerClientId(context), null); } writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, @@ -243,7 +243,7 @@ protected String getElementId(FacesContext facesContext, UIComponent component) { if (rendererUtils.hasExplicitId(component)) { - return component.getClientId(facesContext); + return component.getContainerClientId(facesContext); } return null; Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/RowHolder.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/RowHolder.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/RowHolder.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -22,6 +22,7 @@ package org.richfaces.renderkit; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import org.richfaces.component.Row; @@ -49,7 +50,7 @@ public RowHolder(FacesContext context, Row row, int processCell, boolean isRowStart) { super(context); this.row = row; - this.parentClientId = row.getClientId(context); + this.parentClientId = ((UIComponent) row).getClientId(context); } public boolean isEncodeParentTBody() { Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeNodeRendererBase.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeNodeRendererBase.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeNodeRendererBase.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -74,7 +74,7 @@ PartialViewContext pvc = context.getPartialViewContext(); if (pvc.isAjaxRequest() && map.get(component.getClientId(context) + TRIGGER_NODE_AJAX_UPDATE) != null) { - pvc.getRenderIds().add(treeNode.getClientId(context) + MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR + AbstractTreeNode.SUBTREE_META_COMPONENT_ID); + pvc.getRenderIds().add(component.getClientId(context) + MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR + AbstractTreeNode.SUBTREE_META_COMPONENT_ID); context.getAttributes().put(AJAX_TOGGLED_NODE_ATTRIBUTE, component.getClientId(context)); context.getAttributes().put(AJAX_TOGGLED_NODE_STATE_ATTRIBUTE, initialState ? TreeNodeState.expanded : TreeNodeState.collapsed); Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeRenderingContext.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeRenderingContext.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeRenderingContext.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -148,7 +148,7 @@ super(); this.context = context; this.tree = tree; - this.baseClientId = tree.getBaseClientId(context); + this.baseClientId = tree.getClientId(context); } public static TreeRenderingContext create(FacesContext context, AbstractTree tree) { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -29,7 +29,10 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.component.behavior.ClientBehavior; -import org.richfaces.cdk.annotations.*; +import org.richfaces.cdk.annotations.JsfBehavior; +import org.richfaces.cdk.annotations.JsfBehaviorRenderer; +import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; import org.richfaces.component.AbstractTogglePanel; import org.richfaces.renderkit.util.RendererUtils; @@ -89,7 +92,7 @@ } public String getPanelId(ClientBehaviorContext behaviorContext) throws FacesException { - return getPanel(behaviorContext.getComponent()).getClientId(); + return getPanel(behaviorContext.getComponent()).getClientId(behaviorContext.getFacesContext()); } public AbstractTogglePanel getPanel(UIComponent comp) throws FacesException { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -1,15 +1,18 @@ package org.richfaces.renderkit.html; -import org.richfaces.component.AbstractAccordionItem; -import org.richfaces.component.AbstractTogglePanelTitledItem; -import org.richfaces.renderkit.RendererBase; +import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM; +import static org.richfaces.renderkit.HtmlConstants.TD_ELEM; +import static org.richfaces.renderkit.html.DivPanelRenderer.attributeAsString; +import java.io.IOException; + import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import java.io.IOException; -import static org.richfaces.renderkit.HtmlConstants.*; -import static org.richfaces.renderkit.html.DivPanelRenderer.attributeAsString; +import org.richfaces.component.AbstractAccordionItem; +import org.richfaces.component.AbstractTogglePanelTitledItem; +import org.richfaces.component.util.HtmlUtil; class AccordionItemHeaderRenderer extends TableIconsRendererHelper<AbstractAccordionItem> { @@ -56,7 +59,7 @@ private static void encodeHeader(ResponseWriter writer, FacesContext context, AbstractTogglePanelTitledItem component, AbstractTogglePanelTitledItem.HeaderStates state) throws IOException { writer.startElement(DIV_ELEM, component); - writer.writeAttribute(CLASS_ATTRIBUTE, RendererBase.concatClasses("rf-ac-itm-lbl-" + state.abbreviation(), attributeAsString(component, state.headerClass())), null); + writer.writeAttribute(CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-ac-itm-lbl-" + state.abbreviation(), attributeAsString(component, state.headerClass())), null); writeFacetOrAttr(writer, context, component, "header", component.getHeaderFacet(state)); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -22,22 +22,26 @@ package org.richfaces.renderkit.html; -import org.ajax4jsf.javascript.JSObject; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractAccordionItem; -import org.richfaces.component.AbstractTogglePanelTitledItem; -import org.richfaces.renderkit.RenderKitUtils; +import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM; +import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.STYLE_ATTRIBUTE; +import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; +import java.io.IOException; +import java.util.Map; + import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import java.io.IOException; -import java.util.Map; -import static org.richfaces.renderkit.HtmlConstants.*; -import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; +import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractAccordionItem; +import org.richfaces.component.AbstractTogglePanelTitledItem; +import org.richfaces.renderkit.RenderKitUtils; /** * @@ -71,9 +75,9 @@ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { super.doEncodeBegin(writer, context, component); - encodeHeader(writer, context, (AbstractAccordionItem) component); + encodeHeader(context, (AbstractAccordionItem) component); - encodeContentBegin(component, writer); + encodeContentBegin(context, component); } @Override @@ -88,10 +92,11 @@ super.doEncodeEnd(writer, context, component); } - private void encodeContentBegin(UIComponent component, ResponseWriter writer) throws IOException { + private void encodeContentBegin(FacesContext context, UIComponent component) throws IOException { + ResponseWriter writer = context.getResponseWriter(); writer.startElement(DIV_ELEM, component); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-ac-itm-cnt", attributeAsString(component, "contentClass")), null); - writer.writeAttribute("id", component.getClientId() + ":content", null); + writer.writeAttribute("id", component.getClientId(context) + ":content", null); AbstractTogglePanelTitledItem item = (AbstractTogglePanelTitledItem) component; if (!item.isActive() || item.isDisabled()) { @@ -103,13 +108,14 @@ writer.endElement(DIV_ELEM); } - private void encodeHeader(ResponseWriter writer, FacesContext context, AbstractAccordionItem component) throws IOException { + private void encodeHeader(FacesContext context, AbstractAccordionItem component) throws IOException { + ResponseWriter writer = context.getResponseWriter(); writer.startElement(DIV_ELEM, component); String stateCssClass = "rf-ac-itm-hdr-" + (component.isDisabled() ? "dis" : (component.isActive() ? "act" : "inact")); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-ac-itm-hdr", stateCssClass, attributeAsString(component, "headerClass")), null); - writer.writeAttribute(ID_ATTRIBUTE, component.getClientId() + ":header", null); + writer.writeAttribute(ID_ATTRIBUTE, component.getClientId(context) + ":header", null); renderPassThroughAttributes(context, component, HEADER_ATTRIBUTES); headerRenderer.encodeHeader(writer, context, component); @@ -119,7 +125,7 @@ @Override protected JSObject getScriptObject(FacesContext context, UIComponent component) { - return new JSObject("RichFaces.ui.AccordionItem", component.getClientId(), + return new JSObject("RichFaces.ui.AccordionItem", component.getClientId(context), getScriptObjectOptions(context, component)); } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -22,17 +22,18 @@ package org.richfaces.renderkit.html; -import org.ajax4jsf.javascript.JSObject; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractAccordion; -import org.richfaces.component.util.HtmlUtil; +import java.util.Map; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import java.util.Map; +import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractAccordion; +import org.richfaces.component.util.HtmlUtil; + /** * @author akolonitsky */ @@ -67,7 +68,7 @@ @Override protected JSObject getScriptObject(FacesContext context, UIComponent component) { return new JSObject("RichFaces.ui.Accordion", - component.getClientId(), getScriptObjectOptions(context, component)); + component.getClientId(context), getScriptObjectOptions(context, component)); } @Override Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -22,21 +22,25 @@ package org.richfaces.renderkit.html; -import org.ajax4jsf.javascript.JSObject; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractCollapsiblePanel; -import org.richfaces.component.AbstractTogglePanel; +import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM; +import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.STYLE_ATTRIBUTE; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import static org.richfaces.renderkit.HtmlConstants.*; +import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractCollapsiblePanel; +import org.richfaces.component.AbstractTogglePanel; /** * @author akolonitsky @@ -110,7 +114,7 @@ context.getPartialViewContext().getRenderIds().add(clientId); //TODO nick - this should be done on encode, not on decode - addOnCompleteParam(context, newValue, panel.getClientId()); + addOnCompleteParam(context, newValue, panel.getClientId(context)); } } @@ -129,7 +133,7 @@ @Override protected JSObject getScriptObject(FacesContext context, UIComponent component) { return new JSObject("RichFaces.ui.CollapsiblePanel", - component.getClientId(), getScriptObjectOptions(context, component)); + component.getClientId(context), getScriptObjectOptions(context, component)); } @Override @@ -179,7 +183,7 @@ break; case ajax: - context.getResponseWriter().write(getPlaceHolder(panel.getClientId() + ":content")); + context.getResponseWriter().write(getPlaceHolder(panel.getClientId(context) + ":content")); break; case server: @@ -202,7 +206,7 @@ break; case ajax: - writer.write(getPlaceHolder(panel.getClientId() + ":empty")); + writer.write(getPlaceHolder(panel.getClientId(context) + ":empty")); break; case server: @@ -221,7 +225,7 @@ private void encodeContent(ResponseWriter writer, FacesContext context, UIComponent component, boolean visible) throws IOException { writer.startElement(DIV_ELEM, component); - writer.writeAttribute(ID_ATTRIBUTE, component.getClientId() + ":content", null); + writer.writeAttribute(ID_ATTRIBUTE, component.getClientId(context) + ":content", null); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-cp-b", attributeAsString(component, "bodyClass")), null); writer.writeAttribute(STYLE_ATTRIBUTE, concatStyles(styleElement("display", visible ? "block" : "none"), attributeAsString(component, "style")), null); @@ -233,7 +237,7 @@ private void encodeEmptyDiv(ResponseWriter writer, FacesContext context, UIComponent component, boolean visible) throws IOException { writer.startElement(DIV_ELEM, component); - writer.writeAttribute(ID_ATTRIBUTE, component.getClientId() + ":empty", null); + writer.writeAttribute(ID_ATTRIBUTE, component.getClientId(context) + ":empty", null); writer.writeAttribute(CLASS_ATTRIBUTE, "rf-cp-empty", null); writer.writeAttribute(STYLE_ATTRIBUTE, styleElement("display", visible ? "block" : "none"), null); writer.endElement(DIV_ELEM); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -86,7 +86,7 @@ for (AbstractMenuGroup group : groups) { if (group.isRendered() && !group.isDisabled()) { Map<String, Object> map = new HashMap<String, Object>(); - map.put("id", group.getClientId()); + map.put("id", group.getClientId(facesContext)); RenderKitUtils.addToScriptHash(map, "onhide", group.getOnhide(), null, ScriptHashVariableWrapper.eventHandler); RenderKitUtils.addToScriptHash(map, "onshow", group.getOnshow(), null, ScriptHashVariableWrapper.eventHandler); RenderKitUtils.addToScriptHash(map, "verticalOffset", group.getVerticalOffset(), "0"); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -1,13 +1,9 @@ package org.richfaces.renderkit.html; -import java.util.HashMap; -import java.util.Map; - import javax.faces.component.UIComponent; import javax.faces.component.UIForm; import javax.faces.context.FacesContext; -import org.ajax4jsf.javascript.JSFunction; import org.richfaces.component.AbstractDropDownMenu; import org.richfaces.component.AbstractMenuGroup; import org.richfaces.component.AbstractMenuItem; @@ -77,22 +73,6 @@ return null; } - private String getServerSubmitFunction(UIComponent component) { - UIComponent form = getUIForm(component); - if (component != null && form != null) { - Map<String, Object> param = new HashMap<String, Object>(); - param.put(component.getClientId(), component.getClientId()); - - JSFunction submitFunction = new JSFunction("RichFaces.submitForm"); - submitFunction.addParameter(form.getClientId()); - submitFunction.addParameter(param); - - return submitFunction.toScript(); - } - - return ""; - } - protected String getOnClickFunction(FacesContext facesContext, UIComponent component) { AbstractMenuItem menuItem = (AbstractMenuItem) component; Mode subminMode = resolveSubmitMode(menuItem); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -23,22 +23,30 @@ package org.richfaces.renderkit.html; -import org.ajax4jsf.javascript.JSObject; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractPanelMenuGroup; -import org.richfaces.component.AbstractPanelMenuItem; +import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM; +import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.INPUT_ELEM; +import static org.richfaces.renderkit.HtmlConstants.INPUT_TYPE_HIDDEN; +import static org.richfaces.renderkit.HtmlConstants.NAME_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.TYPE_ATTR; +import static org.richfaces.renderkit.HtmlConstants.VALUE_ATTRIBUTE; +import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption; +import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import static org.richfaces.renderkit.HtmlConstants.*; -import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption; -import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractPanelMenuGroup; +import org.richfaces.component.AbstractPanelMenuItem; + /** * @author akolonitsky * @since 2010-10-25 @@ -69,7 +77,7 @@ // Don't overwrite the value unless you have to! //TODO! nick - ":expanded" suffix is not necessary - String newValue = requestMap.get(component.getClientId() + ":expanded"); + String newValue = requestMap.get(component.getClientId(context) + ":expanded"); if (newValue != null) { menuGroup.setSubmittedExpanded(newValue); } @@ -143,7 +151,7 @@ @Override protected JSObject getScriptObject(FacesContext context, UIComponent component) { return new JSObject("RichFaces.ui.PanelMenuGroup", - component.getClientId(), getScriptObjectOptions(context, component)); + component.getClientId(context), getScriptObjectOptions(context, component)); } @Override Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -23,7 +23,10 @@ package org.richfaces.renderkit.html; -import static org.richfaces.renderkit.HtmlConstants.*; +import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.TBODY_ELEMENT; +import static org.richfaces.renderkit.HtmlConstants.TD_ELEM; +import static org.richfaces.renderkit.HtmlConstants.TR_ELEMENT; import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption; import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; @@ -140,7 +143,7 @@ @Override protected JSObject getScriptObject(FacesContext context, UIComponent component) { return new JSObject("RichFaces.ui.PanelMenuItem", - component.getClientId(), getScriptObjectOptions(context, component)); + component.getClientId(context), getScriptObjectOptions(context, component)); } @Override Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -23,25 +23,26 @@ package org.richfaces.renderkit.html; -import org.ajax4jsf.javascript.JSObject; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractPanelMenu; -import org.richfaces.component.AbstractPanelMenuItem; -import org.richfaces.context.ExtendedPartialViewContext; -import org.richfaces.renderkit.HtmlConstants; +import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; +import static org.richfaces.renderkit.html.TogglePanelRenderer.getValueRequestParamName; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import javax.faces.event.ActionEvent; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; -import static org.richfaces.renderkit.html.TogglePanelRenderer.getValueRequestParamName; +import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractPanelMenu; +import org.richfaces.component.AbstractPanelMenuItem; +import org.richfaces.context.ExtendedPartialViewContext; +import org.richfaces.renderkit.HtmlConstants; /** * @author akolonitsky @@ -117,7 +118,7 @@ @Override protected JSObject getScriptObject(FacesContext context, UIComponent component) { return new JSObject("RichFaces.ui.PanelMenu", - component.getClientId(), getScriptObjectOptions(context, component)); + component.getClientId(context), getScriptObjectOptions(context, component)); } @Override Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -22,6 +22,27 @@ package org.richfaces.renderkit.html; +import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.active; +import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.disabled; +import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.inactive; +import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM; +import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.STYLE_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.TBODY_ELEMENT; +import static org.richfaces.renderkit.HtmlConstants.TD_ELEM; +import static org.richfaces.renderkit.HtmlConstants.TR_ELEMENT; +import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; + +import java.io.IOException; +import java.util.Map; + +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + import org.ajax4jsf.javascript.JSObject; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractTabPanel; @@ -32,18 +53,6 @@ import org.richfaces.renderkit.HtmlConstants; import org.richfaces.renderkit.RenderKitUtils; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import java.io.IOException; -import java.util.Map; - -import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.*; -import static org.richfaces.renderkit.HtmlConstants.*; -import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; - /** * @author akolonitsky * @since 2010-08-24 @@ -141,7 +150,7 @@ writer.startElement(TD_ELEM, tab); - writer.writeAttribute(ID_ATTRIBUTE, tab.getClientId() + ":header:" + state.toString(), null); + writer.writeAttribute(ID_ATTRIBUTE, tab.getClientId(context) + ":header:" + state.toString(), null); renderPassThroughAttributes(context, tab, HEADER_ATTRIBUTES); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-tb-hdr rf-tb-hdr-" + state.abbreviation(), attributeAsString(tab, "headerClass"), attributeAsString(tab, state.headerClass())), null); @@ -202,7 +211,7 @@ @Override protected JSObject getScriptObject(FacesContext context, UIComponent component) { return new JSObject("RichFaces.ui.TabPanel", - component.getClientId(), getScriptObjectOptions(context, component)); + component.getClientId(context), getScriptObjectOptions(context, component)); } @Override Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -22,21 +22,25 @@ package org.richfaces.renderkit.html; -import org.ajax4jsf.javascript.JSObject; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractTogglePanelTitledItem; -import org.richfaces.component.AbstractTab; -import org.richfaces.renderkit.HtmlConstants; +import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.DIV_ELEM; +import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.STYLE_ATTRIBUTE; +import java.io.IOException; +import java.util.Map; + import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import java.io.IOException; -import java.util.Map; -import static org.richfaces.renderkit.HtmlConstants.*; +import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractTab; +import org.richfaces.component.AbstractTogglePanelTitledItem; +import org.richfaces.renderkit.HtmlConstants; /** * @author akolonitsky @@ -58,7 +62,7 @@ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { super.doEncodeBegin(writer, context, component); - encodeContentBegin(component, writer); + encodeContentBegin(context, component, writer); } @Override @@ -86,10 +90,10 @@ writer.endElement(HtmlConstants.SCRIPT_ELEM); } - private void encodeContentBegin(UIComponent component, ResponseWriter writer) throws IOException { + private void encodeContentBegin(FacesContext context, UIComponent component, ResponseWriter writer) throws IOException { writer.startElement(DIV_ELEM, component); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-tb-cnt", attributeAsString(component, "contentClass")), null); - writer.writeAttribute(ID_ATTRIBUTE, component.getClientId() + ":content", null); + writer.writeAttribute(ID_ATTRIBUTE, component.getClientId(context) + ":content", null); AbstractTogglePanelTitledItem item = (AbstractTogglePanelTitledItem) component; if (!item.isActive() || item.isDisabled()) { @@ -103,7 +107,7 @@ @Override protected JSObject getScriptObject(FacesContext context, UIComponent component) { - return new JSObject("RichFaces.ui.Tab", component.getClientId(), + return new JSObject("RichFaces.ui.Tab", component.getClientId(context), getScriptObjectOptions(context, component)); } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -22,20 +22,21 @@ package org.richfaces.renderkit.html; -import org.ajax4jsf.javascript.JSObject; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractTogglePanel; -import org.richfaces.component.AbstractTogglePanelItem; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; +import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractTogglePanel; +import org.richfaces.component.AbstractTogglePanelItem; + /** * @author akolonitsky * @since -4712-01-01 @@ -60,7 +61,7 @@ @Override protected JSObject getScriptObject(FacesContext context, UIComponent component) { - return new JSObject("RichFaces.ui.TogglePanelItem", component.getClientId(), + return new JSObject("RichFaces.ui.TogglePanelItem", component.getClientId(context), getScriptObjectOptions(context, component)); } @@ -70,7 +71,7 @@ Map<String, Object> options = new HashMap<String, Object>(); options.put("name", panelItem.getName()); - options.put("togglePanelId", panelItem.getParent().getClientId()); + options.put("togglePanelId", panelItem.getParent().getClientId(context)); options.put("switchMode", panelItem.getSwitchType()); AbstractTogglePanelItem item = (AbstractTogglePanelItem) component; Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -22,6 +22,16 @@ package org.richfaces.renderkit.html; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + import org.ajax4jsf.javascript.JSFunctionDefinition; import org.ajax4jsf.javascript.JSObject; import org.ajax4jsf.javascript.JSReference; @@ -36,15 +46,6 @@ import org.richfaces.renderkit.util.FormUtil; import org.richfaces.renderkit.util.HandlersChain; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - /** * @author akolonitsky */ @@ -85,7 +86,7 @@ context.getPartialViewContext().getRenderIds().add(panelItem.getClientId(context)); //TODO nick - this should be done on encode, not on decode - addOnCompleteParam(context, newValue, panel.getClientId()); + addOnCompleteParam(context, newValue, panel.getClientId(context)); } } } @@ -139,7 +140,7 @@ @Override protected JSObject getScriptObject(FacesContext context, UIComponent component) { return new JSObject("RichFaces.ui.TogglePanel", - component.getClientId(), getScriptObjectOptions(context, component)); + component.getClientId(context), getScriptObjectOptions(context, component)); } @Override Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-01-18 19:20:56 UTC (rev 21064) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-01-19 00:38:15 UTC (rev 21065) @@ -23,6 +23,23 @@ package org.richfaces.renderkit.html; +import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; +import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; +import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption; +import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.PartialResponseWriter; +import javax.faces.context.ResponseWriter; + import org.ajax4jsf.javascript.JSObject; import org.richfaces.TooltipMode; import org.richfaces.cdk.annotations.JsfRenderer; @@ -32,22 +49,6 @@ import org.richfaces.renderkit.MetaComponentRenderer; import org.richfaces.renderkit.util.RendererUtils; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.PartialResponseWriter; -import javax.faces.context.ResponseWriter; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; -import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; -import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption; -import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; - /** * @author amarkhel * @since 2010-10-24 @@ -85,7 +86,7 @@ context.getPartialViewContext().getRenderIds().add(tooltip.getContentClientId(context)); //TODO nick - this should be done on encode, not on decode - addOnCompleteParam(context, tooltip.getClientId()); + addOnCompleteParam(context, tooltip.getClientId(context)); } } @@ -154,7 +155,7 @@ @Override protected JSObject getScriptObject(FacesContext context, UIComponent component) { return new JSObject("RichFaces.ui.Tooltip", - component.getClientId(), getScriptObjectOptions(context, component)); + component.getClientId(context), getScriptObjectOptions(context, component)); } @Override

13 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r21064 - in trunk: core/api/src/main/java/org/richfaces/renderkit/util and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2011-01-18 14:20:56 -0500 (Tue, 18 Jan 2011) New Revision: 21064 Added: trunk/core/impl/src/main/java/org/richfaces/context/ClientIdWalker.java trunk/core/impl/src/main/java/org/richfaces/context/IdSplitIterator.java trunk/core/impl/src/main/java/org/richfaces/context/RowsFunctionContextCallback.java trunk/core/impl/src/test/java/org/richfaces/context/IdSplitIteratorTest.java Removed: trunk/core/api/src/main/java/org/richfaces/renderkit/util/IdSplitBuilder.java trunk/core/api/src/test/java/org/richfaces/renderkit/util/IdSplitBuilderTest.java trunk/core/impl/src/main/java/org/richfaces/context/ComponentMatcherNode.java trunk/core/impl/src/main/java/org/richfaces/context/IdTreeNode.java trunk/core/impl/src/test/java/org/richfaces/context/ComponentMatcherNodeTest.java Modified: trunk/core/api/src/main/java/org/richfaces/context/ExtendedVisitContext.java trunk/core/api/src/main/java/org/richfaces/renderkit/util/CoreAjaxRendererUtils.java trunk/core/impl/src/main/java/org/richfaces/context/BaseExtendedVisitContext.java trunk/core/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java trunk/core/impl/src/main/java/org/richfaces/context/IdParser.java trunk/core/impl/src/main/java/org/richfaces/util/Util.java trunk/core/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java trunk/core/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java trunk/core/impl/src/test/java/org/richfaces/context/IdParserTest.java trunk/ui/iteration/ui/src/test/java/org/richfaces/convert/TreeConverterUtilTest.java Log: https://issues.jboss.org/browse/RF-10110 Modified: trunk/core/api/src/main/java/org/richfaces/context/ExtendedVisitContext.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/context/ExtendedVisitContext.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/api/src/main/java/org/richfaces/context/ExtendedVisitContext.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -21,8 +21,6 @@ */ package org.richfaces.context; -import static org.richfaces.component.MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR; - import java.util.Collection; import java.util.Map; @@ -32,6 +30,10 @@ import javax.faces.component.visit.VisitResult; import javax.faces.context.FacesContext; +import org.richfaces.component.MetaComponentResolver; + +import com.google.common.base.Joiner; + /** * @author Nick Belaevski * @@ -40,6 +42,8 @@ public static final String META_COMPONENT_ID = "org.richfaces.MetaComponentId"; + private static final Joiner META_COMPONENT_SEPARATOR_JOINER = Joiner.on(MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR).skipNulls(); + private final FacesContext facesContext; private final ExtendedVisitContextMode visitMode; @@ -76,37 +80,13 @@ } public String buildExtendedClientId(UIComponent component) { - String extendedClientId = component.getClientId(facesContext); - String subComponentId = (String) facesContext.getAttributes().get(META_COMPONENT_ID); - if (subComponentId != null) { - StringBuilder sb = new StringBuilder(extendedClientId.length() + 1 /* separator length */ + - subComponentId.length()); - - sb.append(extendedClientId); - sb.append(META_COMPONENT_SEPARATOR_CHAR); - sb.append(subComponentId); - - extendedClientId = sb.toString(); - } - - return extendedClientId; + String metaComponentId = (String) facesContext.getAttributes().get(META_COMPONENT_ID); + return META_COMPONENT_SEPARATOR_JOINER.join(component.getClientId(facesContext), metaComponentId); } public String buildExtendedComponentId(UIComponent component) { - String componentId = component.getId(); - String subComponentId = (String) facesContext.getAttributes().get(META_COMPONENT_ID); - if (subComponentId != null) { - StringBuilder sb = new StringBuilder(componentId.length() + 1 /* separator length */ + - subComponentId.length()); - - sb.append(componentId); - sb.append(META_COMPONENT_SEPARATOR_CHAR); - sb.append(subComponentId); - - componentId = sb.toString(); - } - - return componentId; + String metaComponentId = (String) facesContext.getAttributes().get(META_COMPONENT_ID); + return META_COMPONENT_SEPARATOR_JOINER.join(component.getId(), metaComponentId); } @Override Modified: trunk/core/api/src/main/java/org/richfaces/renderkit/util/CoreAjaxRendererUtils.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/renderkit/util/CoreAjaxRendererUtils.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/api/src/main/java/org/richfaces/renderkit/util/CoreAjaxRendererUtils.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -165,15 +165,6 @@ } /** - * Split parameter string into array of strings. - * @param valuesSet - * @return - */ - public static String[] asIdsArray(String valuesSet) { - return IdSplitBuilder.split(valuesSet); - } - - /** * Get list of clientId's for given component * * @param uiComponent @@ -198,15 +189,15 @@ } public static Set<String> asSimpleSet(Object valueToSet) { - return asSet(valueToSet, false); + return asSet(valueToSet); } public static Set<String> asIdsSet(Object valueToSet) { - return asSet(valueToSet, true); + return asSet(valueToSet); } @SuppressWarnings("unchecked") - private static Set<String> asSet(Object valueToSet, boolean idsSet) { + private static Set<String> asSet(Object valueToSet) { if (null != valueToSet) { // Simplest case - set. @@ -220,12 +211,7 @@ String areasString = ((String) valueToSet).trim(); if (areasString.contains(",") || areasString.contains(" ")) { - String[] values; - if (idsSet) { - values = IdSplitBuilder.split(areasString); - } else { - values = ID_SPLIT_PATTERN.split(areasString); - } + String[] values = ID_SPLIT_PATTERN.split(areasString); Set<String> result = new LinkedHashSet<String>(values.length); for (String value : values) { Deleted: trunk/core/api/src/main/java/org/richfaces/renderkit/util/IdSplitBuilder.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/renderkit/util/IdSplitBuilder.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/api/src/main/java/org/richfaces/renderkit/util/IdSplitBuilder.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -1,150 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.renderkit.util; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author Nick Belaevski - */ -final class IdSplitBuilder { - - private static final int INITIAL_SPLIT_LIST_SIZE = 3; - - private enum State { - IN_ID (true) { - - @Override - public State getNextState(char c) { - if (c == '[') { - return State.IN_ID_INSIDE_BRACKETS; - } else if (isSeparator(c)) { - return State.OUTSIDE_ID; - } else { - return this; - } - } - }, - IN_ID_INSIDE_BRACKETS (true) { - - @Override - public State getNextState(char c) { - if (c == ']') { - return State.IN_ID; - } else { - return this; - } - } - }, - OUTSIDE_ID (false) { - - @Override - public State getNextState(char c) { - if (!isSeparator(c)) { - if (c == '[') { - return State.IN_ID_INSIDE_BRACKETS; - } else { - return State.IN_ID; - } - } - - return this; - } - }; - - private final boolean idSegment; - - private State(boolean idSegment) { - this.idSegment = idSegment; - } - - private static boolean isSeparator(char c) { - return c == ',' || Character.isWhitespace(c); - } - - public abstract State getNextState(char c); - - public boolean isIdSegment() { - return idSegment; - } - - public void processChar(IdSplitBuilder builder, char c, int charIdx) { - State nextState = getNextState(c); - - if (nextState.isIdSegment() ^ isIdSegment()) { - if (nextState.isIdSegment()) { - builder.setStartIndex(charIdx); - } else { - builder.flushBuilder(charIdx); - builder.setStartIndex(-1); - } - } - - builder.state = nextState; - } - } - - private int startIdx = -1; - - private String sourceString; - - private List<String> result = new ArrayList<String>(INITIAL_SPLIT_LIST_SIZE); - - private State state = State.OUTSIDE_ID; - - private IdSplitBuilder(String sourceString) { - super(); - this.sourceString = sourceString; - } - - private void setStartIndex(int idx) { - startIdx = idx; - } - - private void flushBuilder(int endIdx) { - if (startIdx >= 0 && endIdx > startIdx) { - String id = sourceString.substring(startIdx, endIdx); - result.add(id); - } - } - - private void build() { - int length = sourceString.length(); - for (int i = 0; i < length; i++) { - char c = sourceString.charAt(i); - state.processChar(this, c, i); - } - flushBuilder(length); - } - - private String[] getSplit() { - return result.toArray(new String[result.size()]); - } - - public static String[] split(String s) { - IdSplitBuilder splitBuilder = new IdSplitBuilder(s); - splitBuilder.build(); - return splitBuilder.getSplit(); - } - -} \ No newline at end of file Deleted: trunk/core/api/src/test/java/org/richfaces/renderkit/util/IdSplitBuilderTest.java =================================================================== --- trunk/core/api/src/test/java/org/richfaces/renderkit/util/IdSplitBuilderTest.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/api/src/test/java/org/richfaces/renderkit/util/IdSplitBuilderTest.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.renderkit.util; - -import static org.junit.Assert.assertArrayEquals; - -import org.junit.Test; -import org.richfaces.renderkit.util.IdSplitBuilder; - - -/** - * @author Nick Belaevski - * - */ -public class IdSplitBuilderTest { - - private static String[] asArray(String... strings) { - return strings; - } - - @Test - public void testEmptyString() throws Exception { - assertArrayEquals(asArray(), IdSplitBuilder.split("")); - assertArrayEquals(asArray(), IdSplitBuilder.split(" \r\t\n ")); - } - - @Test - public void testOneStrings() throws Exception { - assertArrayEquals(asArray("test"), IdSplitBuilder.split("test")); - assertArrayEquals(asArray("some:id"), IdSplitBuilder.split("some:id")); - assertArrayEquals(asArray("table:[1]"), IdSplitBuilder.split("table:[1]")); - assertArrayEquals(asArray("table:[1, 2]"), IdSplitBuilder.split("table:[1, 2]")); - assertArrayEquals(asArray("table:[1, 2]:nestedTable:[*]"), IdSplitBuilder.split("table:[1, 2]:nestedTable:[*]")); - assertArrayEquals(asArray("table:[1, 2]:[*]:group"), IdSplitBuilder.split("table:[1, 2]:[*]:group")); - assertArrayEquals(asArray("table:[1 2]:nestedTable:[*]"), IdSplitBuilder.split("table:[1 2]:nestedTable:[*]")); - assertArrayEquals(asArray("table:[1 2]:[*]:group"), IdSplitBuilder.split("table:[1 2]:[*]:group")); - } - - @Test - public void testTwoStrings() throws Exception { - assertArrayEquals(asArray("test", "abc"), IdSplitBuilder.split("test abc")); - assertArrayEquals(asArray("some:id", "form:table"), IdSplitBuilder.split("some:id form:table")); - assertArrayEquals(asArray("test", "abc"), IdSplitBuilder.split("test, abc")); - assertArrayEquals(asArray("some:id", "form:table"), IdSplitBuilder.split("some:id, form:table")); - - assertArrayEquals(asArray("test:[1 2 3]:abc", "form:[2]"), IdSplitBuilder.split("test:[1 2 3]:abc form:[2]")); - assertArrayEquals(asArray("[1 2]:some", "[3\t4]:id"), IdSplitBuilder.split(" [1 2]:some [3\t4]:id ")); - } - - @Test - public void testSeveralStrings() throws Exception { - assertArrayEquals(asArray("test", "abc", "def", "ghi"), IdSplitBuilder.split("test abc def ghi")); - assertArrayEquals(asArray("test:[1 2]abc", "def", "ghi"), IdSplitBuilder.split("test:[1 2]abc def ghi")); - assertArrayEquals(asArray("[1 2]abc", "[3, 4]def", "ghi[5 6 7]"), - IdSplitBuilder.split("[1 2]abc [3, 4]def ghi[5 6 7]")); - - assertArrayEquals( - asArray("test:[1 2]:abc", "table", "form:table:[ * ]:child", "extTable:[ 0, 3 ]:child:[1 8]:@header"), - IdSplitBuilder.split(" test:[1 2]:abc, table," + - " form:table:[ * ]:child, extTable:[ 0, 3 ]:child:[1 8]:@header" )); - } -} Modified: trunk/core/impl/src/main/java/org/richfaces/context/BaseExtendedVisitContext.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/context/BaseExtendedVisitContext.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/impl/src/main/java/org/richfaces/context/BaseExtendedVisitContext.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -21,38 +21,76 @@ */ package org.richfaces.context; +import static org.richfaces.component.MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR; +import static org.richfaces.util.Util.NamingContainerDataHolder.SEPARATOR_CHAR_JOINER; + import java.util.AbstractCollection; import java.util.Collection; import java.util.Collections; import java.util.EnumSet; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.List; -import java.util.Map; import java.util.Set; import javax.faces.component.NamingContainer; import javax.faces.component.UIComponent; -import javax.faces.component.UINamingContainer; import javax.faces.component.visit.VisitCallback; import javax.faces.component.visit.VisitContext; import javax.faces.component.visit.VisitHint; import javax.faces.component.visit.VisitResult; import javax.faces.context.FacesContext; -import org.richfaces.component.MetaComponentResolver; - +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.SetMultimap; +import com.google.common.collect.Sets; /** * @author Nick Belaevski * */ public class BaseExtendedVisitContext extends ExtendedVisitContext { - static final String ANY_WILDCARD = "*"; + protected static interface ClientIdVisitor { - private static final int SHORT_ID_IN_CLIENTID_SEGMENTS_NUMBER = 2; + public abstract void visitSubtreeId(String baseId, String clientId); + public abstract void visitDirectSubtreeId(String baseId, String shortId); + + public abstract void visitShortId(String shortId); + + } + + protected final ClientIdVisitor addNodeVisitor = new ClientIdVisitor() { + + public void visitSubtreeId(String baseId, String clientId) { + subtreeIds.put(baseId, clientId); + } + + public void visitDirectSubtreeId(String baseId, String shortId) { + directSubtreeIds.put(baseId, shortId); + } + + public void visitShortId(String shortId) { + shortIds.add(shortId); + } + }; + + protected final ClientIdVisitor removeNodeVisitor = new ClientIdVisitor() { + + public void visitSubtreeId(String baseId, String clientId) { + subtreeIds.remove(baseId, clientId); + } + + public void visitShortId(String shortId) { + //do nothing + } + + public void visitDirectSubtreeId(String baseId, String shortId) { + directSubtreeIds.remove(baseId, shortId); + } + }; + private final class CollectionProxy extends AbstractCollection<String> { private CollectionProxy() { @@ -60,17 +98,17 @@ @Override public boolean isEmpty() { - return directNodesMap.isEmpty(); + return clientIds.isEmpty(); } @Override public int size() { - return directNodesMap.size(); + return clientIds.size(); } @Override public Iterator<String> iterator() { - return new IteratorProxy(directNodesMap.keySet().iterator()); + return new IteratorProxy(clientIds.iterator()); } @Override @@ -106,8 +144,7 @@ public void remove() { if (current != null) { - ComponentMatcherNode node = directNodesMap.get(current); - removeNode(node); + removeNode(current, false); current = null; } @@ -116,86 +153,20 @@ } } - private interface NodeOperationCommand { - - public ComponentMatcherNode getNextNode(ComponentMatcherNode currentNode, String nodeId, boolean isPattern); - - public boolean processLastNode(ComponentMatcherNode lastNode, String fullId); - } - - private NodeOperationCommand addNodeOperation = new NodeOperationCommand() { - - public boolean processLastNode(ComponentMatcherNode lastNode, String fullId) { - if (!directNodesMap.containsKey(fullId)) { - directNodesMap.put(fullId, lastNode); - lastNode.markAdded(); - - ComponentMatcherNode n = lastNode; - int addedSegmentsCount = 0; - while (n != null && addedSegmentsCount < SHORT_ID_IN_CLIENTID_SEGMENTS_NUMBER) { - if (!n.isPatternNode() && !n.isMetaComponentNode()) { - String shortId = n.getSource(); - if (shortId != null) { - addedSegmentsCount++; - //TODO filter meta component ids - shortIds.add(shortId); - } - } - - n = n.getParentNode(); - } - - if (!lastNode.hasPatternNodeInChain()) { - lastNode.addSubtreeId(fullId); - } - - return true; - } - - return false; - } - - public ComponentMatcherNode getNextNode(ComponentMatcherNode currentNode, String nodeId, boolean isPattern) { - return currentNode.getOrCreateChild(nodeId, isPattern); - } - }; - - private NodeOperationCommand removeNodeOperation = new NodeOperationCommand() { - - public boolean processLastNode(ComponentMatcherNode lastNode, String fullId) { - ComponentMatcherNode node = directNodesMap.remove(fullId); - if (node != null) { - if (!node.hasPatternNodeInChain()) { - node.removeSubtreeId(fullId); - } - - removeNode(node); - - return true; - } - - return false; - } - - public ComponentMatcherNode getNextNode(ComponentMatcherNode currentNode, String nodeId, boolean isPattern) { - return currentNode.getChild(nodeId, isPattern); - } - }; - - private IdParser idParser; - // The client ids to visit private Collection<String> clientIds; private Collection<String> shortIds; + private SetMultimap<String, String> subtreeIds; + + private ListMultimap<String, String> directSubtreeIds; + // Our visit hints private Set<VisitHint> hints; - private ComponentMatcherNode rootNode; + private CollectionProxy proxiedClientIds; - private Map<String, ComponentMatcherNode> directNodesMap; - /** * Creates a PartialVisitorContext instance with the specified hints. * @@ -223,144 +194,53 @@ this.hints = Collections.unmodifiableSet(hintsEnumSet); } - private IdParser setupIdParser(String id) { - if (idParser == null) { - idParser = new IdParser(UINamingContainer.getSeparatorChar(getFacesContext()), - MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR); - } + protected void visitClientId(String clientId, ClientIdVisitor visitor) { + IdSplitIterator splitIterator = new IdSplitIterator(clientId); + + boolean isFirstIteration = true; + + while (splitIterator.hasNext()) { + String shortId = splitIterator.next(); + String subtreeId = splitIterator.getSubtreeId(); - idParser.setId(id); - - return idParser; - } - - private ComponentMatcherNode findMatchingNode(String clientId) { - ComponentMatcherNode node = rootNode; - - IdParser idParser = setupIdParser(clientId); - - while (node != null && idParser.findNext()) { - String componentId = idParser.getComponentId(); - String metadataComponentId = idParser.getMetadataComponentId(); - - if (metadataComponentId != null) { - node = node.getChild(componentId, false); - if (node != null) { - node = node.getChild(metadataComponentId, false); - } - } else { - node = node.getMatchedChild(componentId); + int metaSepIdx = shortId.indexOf(META_COMPONENT_SEPARATOR_CHAR); + + if (subtreeId != null) { + visitor.visitSubtreeId(subtreeId, clientId); + visitor.visitDirectSubtreeId(subtreeId, shortId); } - } - return node; - } - - private ComponentMatcherNode findAddedNode(String clientId) { - ComponentMatcherNode node = findMatchingNode(clientId); - - if (node != null && !node.isAdded()) { - node = null; - } - - return node; - } - - private void removeNode(ComponentMatcherNode nodeToRemove) { - nodeToRemove.markRemoved(); - - ComponentMatcherNode node = nodeToRemove; - while (node != null && !node.hasDirectChildren()) { - ComponentMatcherNode parentNode = node.getParentNode(); - if (parentNode != null) { - parentNode.removeChild(node); - node = parentNode; - } else { - break; + if (metaSepIdx >= 0) { + String componentId = shortId.substring(0, metaSepIdx); + + String extraBaseId = SEPARATOR_CHAR_JOINER.join(subtreeId, componentId); + visitor.visitDirectSubtreeId(extraBaseId, shortId); + visitor.visitSubtreeId(extraBaseId, clientId); } + + if (isFirstIteration) { + isFirstIteration = false; + visitor.visitShortId(shortId); + } } } + + private boolean addNode(String clientId) { + if (clientIds.add(clientId)) { + visitClientId(clientId, addNodeVisitor); - private boolean invokeNodeOperation(NodeOperationCommand command, ComponentMatcherNode currentNode, - IdTreeNode idTreeNode, StringBuilder sb) { - - String componentId = idTreeNode.getComponentId(); - String metadataComponentId = idTreeNode.getMetadataComponentId(); - - ComponentMatcherNode nextNode; - - if (metadataComponentId != null) { - nextNode = command.getNextNode(currentNode, componentId, false); - if (nextNode != null) { - nextNode = command.getNextNode(nextNode, metadataComponentId, false); - nextNode.setMetaComponentNode(true); - } - } else { - boolean isPattern = ANY_WILDCARD.equals(componentId); - nextNode = command.getNextNode(currentNode, componentId, isPattern); + return true; } - - boolean result = false; - - if (nextNode != null) { - final int bufferLength = sb.length(); - if (bufferLength != 0) { - //TODO replace with constant - sb.append(':'); - } - sb.append(componentId); - if (metadataComponentId != null) { - sb.append(metadataComponentId); - } - - List<IdTreeNode> idTreeChildNodes = idTreeNode.getChildNodes(); - if (idTreeChildNodes != null) { - final int newBufferLength = sb.length(); - - for (IdTreeNode idTreeChildNode : idTreeChildNodes) { - result |= invokeNodeOperation(command, nextNode, idTreeChildNode, sb); - - sb.setLength(newBufferLength); - } - } else { - result |= command.processLastNode(nextNode, sb.toString()); - } - - sb.setLength(bufferLength); - } - - return result; + + return false; } - private boolean invokeRootNodeOperation(NodeOperationCommand command, IdTreeNode idTreeNode) { - boolean result = false; - - List<IdTreeNode> idTreeChildNodes = idTreeNode.getChildNodes(); - if (idTreeChildNodes != null) { - StringBuilder sb = new StringBuilder(); - - for (IdTreeNode idTreeChildNode : idTreeChildNodes) { - result |= invokeNodeOperation(command, rootNode, idTreeChildNode, sb); - } + private void removeNode(String clientId, boolean removeFromClientIds) { + if (!removeFromClientIds || clientIds.remove(clientId)) { + visitClientId(clientId, removeNodeVisitor); } - - return result; } - private boolean addNode(String patternId) { - IdTreeNode idTreeNode = new IdTreeNode(); - idTreeNode.appendNodesFromParser(setupIdParser(patternId)); - - return invokeRootNodeOperation(addNodeOperation, idTreeNode); - } - - private boolean removeNode(String patternId) { - IdTreeNode idTreeNode = new IdTreeNode(); - idTreeNode.appendNodesFromParser(setupIdParser(patternId)); - - return invokeRootNodeOperation(removeNodeOperation, idTreeNode); - } - /** * @see VisitContext#getHints VisitContext.getHints */ @@ -378,13 +258,13 @@ // We just return our clientIds collection. This is // the modifiable (but proxied) collection of all of // the client ids to visit. - return clientIds; + return proxiedClientIds; } protected boolean hasImplicitSubtreeIdsToVisit(UIComponent component) { return false; } - + /** * @see VisitContext#getSubtreeIdsToVisit VisitContext.getSubtreeIdsToVisit() */ @@ -402,28 +282,13 @@ String clientId = buildExtendedClientId(component); - ComponentMatcherNode node = findMatchingNode(clientId); + Collection<String> result; - Collection<String> result = null; - - - if (node != null) { - if (node.hasKidPatternNodes()) { - result = VisitContext.ALL_IDS; - } else { - Collection<String> subtreeIds = node.getSubtreeIds(); - if (subtreeIds != null) { - result = Collections.unmodifiableCollection(subtreeIds); - } else { - //TODO nick - this code addresses the case of parent pattern nodes, and can be optimized - if (node.hasDirectIdChildren()) { - result = VisitContext.ALL_IDS; - } else { - result = Collections.emptySet(); - } - } - } + Set<String> ids = subtreeIds.get(clientId); + if (!ids.isEmpty()) { + result = Collections.unmodifiableCollection(ids); } else { + //returned collection should be non-modifiable result = Collections.emptySet(); } @@ -440,17 +305,9 @@ } String clientId = component.getClientId(getFacesContext()); - ComponentMatcherNode node = findMatchingNode(clientId); - if (node != null && node.hasDirectPatternChildren()) { - return VisitContext.ALL_IDS; - } + Set<String> result = new HashSet<String>(directSubtreeIds.get(clientId)); - Set<String> result = new HashSet<String>(); - if (node != null && node.hasDirectIdChildren()) { - result.addAll(node.getIdChildren().keySet()); - } - addDirectSubtreeIdsToVisitForImplicitComponents(component, result); if (result != null && !result.isEmpty()) { @@ -467,19 +324,19 @@ protected boolean shouldCompleteOnEmptyIds() { return true; } - + /** * @see VisitContext#invokeVisitCallback VisitContext.invokeVisitCallback() */ @Override public VisitResult invokeVisitCallback(UIComponent component, VisitCallback callback) { - if (shortIds.contains(component.getId())) { + if (shortIds.contains(buildExtendedComponentId(component))) { String clientId = buildExtendedClientId(component); - ComponentMatcherNode node = findAddedNode(clientId); - if (node != null) { + + if (clientIds.contains(clientId)) { VisitResult visitResult = callback.visit(this, component); - removeNode(clientId); + removeNode(clientId, true); if (clientIds.isEmpty() && shouldCompleteOnEmptyIds()) { return VisitResult.COMPLETE; @@ -494,11 +351,15 @@ // Called to initialize our various collections. private void initializeCollections(Collection<String> clientIds) { - this.rootNode = new ComponentMatcherNode(); - this.directNodesMap = new HashMap<String, ComponentMatcherNode>(); + this.subtreeIds = HashMultimap.create(); + this.directSubtreeIds = ArrayListMultimap.create(); + this.shortIds = new HashSet<String>(); - this.clientIds = new CollectionProxy(); - this.clientIds.addAll(clientIds); + + this.clientIds = Sets.newHashSet(); + + this.proxiedClientIds = new CollectionProxy(); + this.proxiedClientIds.addAll(clientIds); } public VisitContext createNamingContainerVisitContext(UIComponent component, Collection<String> directIds) { Added: trunk/core/impl/src/main/java/org/richfaces/context/ClientIdWalker.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/context/ClientIdWalker.java (rev 0) +++ trunk/core/impl/src/main/java/org/richfaces/context/ClientIdWalker.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -0,0 +1,106 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.context; + +import static org.richfaces.util.Util.NamingContainerDataHolder.SEPARATOR_CHAR_JOINER; + +import java.text.MessageFormat; +import java.util.Collection; +import java.util.Collections; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; + +import org.richfaces.context.IdParser.Node; + +import com.google.common.collect.Lists; + +class ClientIdWalker { + + private Node[] parsedId; + + private UIComponent functionTarget; + + private Collection<String> resolvedIds = Lists.newArrayList(); + + public ClientIdWalker(Node[] parsedId) { + super(); + this.parsedId = parsedId; + } + + private void walk(FacesContext facesContext, UIComponent component, String baseId, int nodeIdx) { + + boolean isLastNode = (nodeIdx == parsedId.length - 1); + + Node node = parsedId[nodeIdx]; + + Collection<String> directSubtreeIds; + UIComponent childComponent; + + if (node.getFunction() == null) { + directSubtreeIds = Collections.singleton(node.getImage()); + childComponent = component; + } else { + directSubtreeIds = evaluateFunction(facesContext, component, baseId, node); + //functionTarget is set inside evaluateFunction(...) call! + childComponent = functionTarget; + } + + for (String directSubtreeId : directSubtreeIds) { + String clientId = SEPARATOR_CHAR_JOINER.join(baseId, directSubtreeId); + + if (isLastNode) { + resolvedIds.add(clientId); + } else { + walk(facesContext, childComponent, clientId, nodeIdx + 1); + } + } + } + + private Collection<String> evaluateFunction(FacesContext facesContext, UIComponent component, String baseId, Node node) { + Collection<String> directSubtreeIds; + String function = node.getFunction(); + String image = node.getImage(); + + if (!"rows".equals(function)) { + throw new IllegalArgumentException(MessageFormat.format("Function {0} is not supported", function)); + } + + RowsFunctionContextCallback rowsFunctionCallback = new RowsFunctionContextCallback(image); + + if (!component.invokeOnComponent(facesContext, baseId, rowsFunctionCallback)) { + throw new IllegalStateException(MessageFormat.format("Failed to visit {0}", baseId)); + } + + functionTarget = rowsFunctionCallback.getComponent(); + directSubtreeIds = rowsFunctionCallback.getConvertedKeys(); + return directSubtreeIds; + } + + public void walk(FacesContext facesContext) { + walk(facesContext, facesContext.getViewRoot(), null, 0); + } + + public Collection<String> getResolvedIds() { + return resolvedIds; + } +} \ No newline at end of file Modified: trunk/core/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -22,6 +22,8 @@ package org.richfaces.context; import static org.richfaces.component.MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR; +import static org.richfaces.util.Util.NamingContainerDataHolder.SEPARATOR_CHAR; +import static org.richfaces.util.Util.NamingContainerDataHolder.SEPARATOR_CHAR_JOINER; import java.util.Collection; import java.util.HashMap; @@ -33,14 +35,15 @@ import javax.faces.component.NamingContainer; import javax.faces.component.UIComponent; -import javax.faces.component.UINamingContainer; import javax.faces.context.FacesContext; import org.richfaces.component.AjaxContainer; import org.richfaces.component.ComponentIterators; import org.richfaces.component.MetaComponentResolver; +import org.richfaces.context.IdParser.Node; import org.richfaces.renderkit.util.CoreRendererUtils; +import com.google.common.base.Strings; import com.google.common.collect.Iterators; /** @@ -65,10 +68,6 @@ private LinkedList<UIComponent> componentsStack = null; - private IdParser idParser; - - private char namingContainerSeparator; - private FacesContext facesContext; private ComponentIdResolverNode rootNode; @@ -81,8 +80,6 @@ this.resolvedIds = new HashSet<String>(); this.unresolvedIds = new HashSet<String>(); this.rootNode = new ComponentIdResolverNode(null, null); - this.namingContainerSeparator = UINamingContainer.getSeparatorChar(facesContext); - this.idParser = new IdParser(namingContainerSeparator, MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR); } private static boolean isNotEmpty(Collection<?> c) { @@ -166,43 +163,38 @@ } if (containerClientId != null && containerClientId.length() != 0) { - StringBuilder builder = new StringBuilder(containerClientId.length() + 1 /* separator */ + id.length()); - builder.append(containerClientId); - builder.append(namingContainerSeparator); - builder.append(id); - return builder.toString(); + return SEPARATOR_CHAR_JOINER.join(containerClientId, id); } else { return id; } } protected void addIdImmediately(String id) { - idParser.setId(id); + Node[] nodes = IdParser.parse(id); + + ComponentIdResolverNode resolverNode = rootNode; - ComponentIdResolverNode node = rootNode; - - while (idParser.findNext()) { - String componentId = idParser.getComponentId(); - - if (componentId.length() == 0) { + for (Node node : nodes) { + if (node.getFunction() != null) { continue; } - - if (BaseExtendedVisitContext.ANY_WILDCARD.equals(componentId)) { - continue; + + String image = node.getImage(); + + int metaSepIdx = image.indexOf(META_COMPONENT_SEPARATOR_CHAR); + if (metaSepIdx >= 0) { + image = image.substring(0, metaSepIdx); } - if (componentId.length() > 2 && componentId.charAt(0) == '[' && - componentId.charAt(componentId.length() - 1) == ']') { - + if (Strings.isNullOrEmpty(image)) { continue; } - - node = node.getOrCreateChild(componentId); + + resolverNode = resolverNode.getOrCreateChild(image); } - + unresolvedIds.add(id); - node.addFullId(id); + resolverNode.addFullId(id); } public void addId(String id) { @@ -238,7 +230,7 @@ } private boolean isAbsolute(String id) { - return id.charAt(0) == namingContainerSeparator; + return id.charAt(0) == SEPARATOR_CHAR; } private void buildInversedFilteredTreeRecursively(ComponentIdResolverNode directNode) { Deleted: trunk/core/impl/src/main/java/org/richfaces/context/ComponentMatcherNode.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/context/ComponentMatcherNode.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/impl/src/main/java/org/richfaces/context/ComponentMatcherNode.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -1,345 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.context; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -final class ComponentMatcherNode { - - private boolean added; - - private boolean patternNode; - - private boolean metaComponentNode = false; - - private String source; - - private boolean hasParentPatternNode; - - private int kidPatternNodesCounter = 0; - - private ComponentMatcherNode parentNode; - - private Map<String, ComponentMatcherNode> idChildren; - - private Map<String, ComponentMatcherNode> patternChildren; - - private Set<String> subtreeIds; - - private static boolean isEmpty(Collection<?> c) { - return c == null || c.isEmpty(); - } - - private static boolean isEmpty(Map<?, ?> m) { - return m == null || m.isEmpty(); - } - - void setParentNode(ComponentMatcherNode parentNode) { - this.parentNode = parentNode; - } - - void incrementKidPatternNodesCounter() { - if (kidPatternNodesCounter == 0 && !isPatternNode()) { - ComponentMatcherNode parentNode = getParentNode(); - if (parentNode != null) { - parentNode.incrementKidPatternNodesCounter(); - } - } - - kidPatternNodesCounter++; - } - - void decrementKidPatternNodesCounter() { - kidPatternNodesCounter--; - - if (kidPatternNodesCounter == 0 && !isPatternNode()) { - ComponentMatcherNode parentNode = getParentNode(); - if (parentNode != null) { - parentNode.decrementKidPatternNodesCounter(); - } - } - } - - void setHasParentPatternNode(boolean hasParentPatternNode) { - this.hasParentPatternNode = hasParentPatternNode; - - if (!isPatternNode()) { - if (idChildren != null) { - for (ComponentMatcherNode child : idChildren.values()) { - child.setHasParentPatternNode(hasParentPatternNode); - } - } - - if (patternChildren != null) { - for (ComponentMatcherNode child : patternChildren.values()) { - child.setHasParentPatternNode(hasParentPatternNode); - } - } - } - } - - boolean matches(String shortId) { - if (isPatternNode()) { - //TODO - modify when real patterns will be supported - return true; - } else { - return source.equals(shortId); - } - } - - Map<String, ComponentMatcherNode> getChildrenMap(boolean isPattern) { - return isPattern ? patternChildren : idChildren; - } - - Map<String, ComponentMatcherNode> getOrCreateChildrenMap(boolean isPattern) { - if (isPattern) { - if (patternChildren == null) { - patternChildren = new HashMap<String, ComponentMatcherNode>(1); - } - - return patternChildren; - } else { - if (idChildren == null) { - idChildren = new HashMap<String, ComponentMatcherNode>(); - } - - return idChildren; - } - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public ComponentMatcherNode getParentNode() { - return parentNode; - } - - public ComponentMatcherNode getMatchedChild(String shortId) { - ComponentMatcherNode node = null; - if (idChildren != null) { - node = idChildren.get(shortId); - } - - if (node == null && patternChildren != null) { - for (ComponentMatcherNode child : patternChildren.values()) { - if (child.matches(shortId)) { - node = child; - break; - } - } - } - - return node; - } - - public ComponentMatcherNode getChild(String key, boolean isPatternNode) { - Map<String, ComponentMatcherNode> childrenMap = getChildrenMap(isPatternNode); - if (childrenMap != null) { - return childrenMap.get(key); - } - - return null; - } - - public ComponentMatcherNode getOrCreateChild(String key, boolean isPatternNode) { - Map<String, ComponentMatcherNode> childrenMap = getOrCreateChildrenMap(isPatternNode); - ComponentMatcherNode childNode = childrenMap.get(key); - if (childNode == null) { - childNode = new ComponentMatcherNode(); - - childNode.setPatternNode(isPatternNode); - childNode.setSource(key); - - addChild(childNode); - } - - return childNode; - } - - public void addChild(ComponentMatcherNode child) { - child.setParentNode(this); - - Map<String, ComponentMatcherNode> childrenMap = getOrCreateChildrenMap(child.isPatternNode()); - - ComponentMatcherNode previousNode = childrenMap.get(child.getSource()); - if (previousNode != null) { - removeChild(previousNode); - } - - childrenMap.put(child.getSource(), child); - - if (child.isPatternNode() || child.hasKidPatternNodes()) { - incrementKidPatternNodesCounter(); - } - - if (hasPatternNodeInChain()) { - child.setHasParentPatternNode(true); - } - - addAllSubtreeIds(child.getSubtreeIds()); - } - - public void removeChild(ComponentMatcherNode child) { - Map<String, ComponentMatcherNode> childrenMap = getChildrenMap(child.isPatternNode()); - if (childrenMap != null) { - if (child.getParentNode() == this) { - child.setParentNode(null); - child.setHasParentPatternNode(false); - childrenMap.remove(child.getSource()); - - if (child.isPatternNode() || child.hasKidPatternNodes()) { - decrementKidPatternNodesCounter(); - } - - removeAllSubtreeIds(child.getSubtreeIds()); - } else { - //TODO - ? - } - } - } - - public boolean hasDirectChildren() { - return hasDirectIdChildren() || hasDirectPatternChildren(); - } - - public boolean hasDirectIdChildren() { - return !isEmpty(idChildren); - } - - public boolean hasDirectPatternChildren() { - return !isEmpty(patternChildren); - } - - public boolean hasKidPatternNodes() { - return kidPatternNodesCounter > 0; - } - - public void markAdded() { - added = true; - } - - public void markRemoved() { - added = false; - } - - public boolean isAdded() { - return added; - } - - public boolean hasParentPatternNode() { - return hasParentPatternNode; - } - - public boolean hasPatternNodeInChain() { - return isPatternNode() || hasParentPatternNode(); - } - - public Collection<String> getSubtreeIds() { - return subtreeIds; - } - - public boolean hasSubtreeIds() { - return !isEmpty(subtreeIds); - } - - public void addAllSubtreeIds(Collection<String> ids) { - if (ids != null) { - if (subtreeIds == null) { - subtreeIds = new HashSet<String>(); - } - - subtreeIds.addAll(ids); - - if (parentNode != null) { - parentNode.addAllSubtreeIds(ids); - } - } - } - - public void addSubtreeId(String subtreeId) { - if (subtreeIds == null) { - subtreeIds = new HashSet<String>(); - } - - subtreeIds.add(subtreeId); - - if (parentNode != null) { - parentNode.addSubtreeId(subtreeId); - } - } - - public void removeAllSubtreeIds(Collection<String> ids) { - if (ids != null) { - if (subtreeIds != null) { - subtreeIds.removeAll(ids); - } - - if (parentNode != null) { - parentNode.removeAllSubtreeIds(ids); - } - } - } - - public void removeSubtreeId(String subtreeId) { - if (subtreeIds != null) { - subtreeIds.remove(subtreeId); - } - - if (parentNode != null) { - parentNode.removeSubtreeId(subtreeId); - } - } - - public Map<String, ComponentMatcherNode> getIdChildren() { - return idChildren; - } - - public Map<String, ComponentMatcherNode> getPatternChildren() { - return patternChildren; - } - - public boolean isPatternNode() { - return patternNode; - } - - public void setPatternNode(boolean patternNode) { - this.patternNode = patternNode; - } - - public void setMetaComponentNode(boolean metaComponentNode) { - this.metaComponentNode = metaComponentNode; - } - - public boolean isMetaComponentNode() { - return metaComponentNode; - } -} Modified: trunk/core/impl/src/main/java/org/richfaces/context/IdParser.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/context/IdParser.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/impl/src/main/java/org/richfaces/context/IdParser.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -21,107 +21,132 @@ */ package org.richfaces.context; +import static org.richfaces.component.MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR; +import static org.richfaces.util.Util.NamingContainerDataHolder.SEPARATOR_CHAR_SPLITTER; +import java.util.List; + +import com.google.common.base.Objects; +import com.google.common.collect.Lists; + /** * Helper class for parsing ids. - * + * * @author Nick Belaevski */ final class IdParser { - private String id; + public static final class Node { - private String componentId; + private String image; - private String metadataComponentId; + private String function; - private int idx; + Node(String image) { + this(image, null); + } + + Node(String image, String function) { + super(); + this.image = image; + this.function = function; + } - private final char namingContainerSeparator; + public String getImage() { + return image; + } - private final char subComponentSeparator; + public String getFunction() { + return function; + } + + @Override + public String toString() { + return Objects.toStringHelper(this).add("image", image).add("function", function).toString(); + } - public IdParser(char namingContainerSeparator, char subComponentSeparator) { - super(); + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((function == null) ? 0 : function.hashCode()); + result = prime * result + ((image == null) ? 0 : image.hashCode()); + return result; + } - this.namingContainerSeparator = namingContainerSeparator; - this.subComponentSeparator = subComponentSeparator; + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + Node other = (Node) obj; + if (function == null) { + if (other.function != null) { + return false; + } + } else if (!function.equals(other.function)) { + return false; + } + if (image == null) { + if (other.image != null) { + return false; + } + } else if (!image.equals(other.image)) { + return false; + } + return true; + } } - private void reset() { - this.id = null; + private static final char FUNCTION_IMAGE_START_TOKEN = '('; + + private static final char FUNCTION_IMAGE_END_TOKEN = ')'; - this.componentId = null; - this.metadataComponentId = null; + private static final Node[] EMPTY_NODES_ARRAY = new Node[0]; - this.idx = 0; - } - - public void setId(String id) { - reset(); - this.id = id; - } - - public boolean findNext() { - componentId = null; - metadataComponentId = null; - - if (id == null) { - return false; + private IdParser() {} + + public static Node[] parse(String id) { + if (id.length() == 0) { + return EMPTY_NODES_ARRAY; } - - int idLength = id.length(); - - if (idx < idLength) { - boolean foundSeparator = false; - - for (int i = idx; i < idLength && !foundSeparator; i++) { - char c = id.charAt(i); - - if (c == subComponentSeparator) { - if (componentId == null) { - componentId = id.substring(idx, i); - idx = i; + + List<Node> result = Lists.newArrayList(); + + Iterable<String> split = SEPARATOR_CHAR_SPLITTER.split(id); + for (String s : split) { + if (s.charAt(0) == META_COMPONENT_SEPARATOR_CHAR) { + int startImageIdx = s.indexOf(FUNCTION_IMAGE_START_TOKEN); + + if (startImageIdx < 0) { + result.add(new Node(s)); + } else { + if (s.charAt(s.length() - 1) != FUNCTION_IMAGE_END_TOKEN) { + throw new IllegalArgumentException(id); } - } else if (c == namingContainerSeparator) { - String idSegment = id.substring(idx, i); - - if (componentId == null) { - componentId = idSegment; - } else { - metadataComponentId = idSegment; + + if (startImageIdx + 1 > s.length() - 1) { + throw new IllegalArgumentException(id); } - - idx = i + 1; - foundSeparator = true; + + String image = s.substring(startImageIdx + 1, s.length() - 1); + String functionName = s.substring(1, startImageIdx); + + result.add(new Node(image, functionName)); } + } else { + result.add(new Node(s)); } - - if (!foundSeparator) { - String idSegment = id.substring(idx, idLength); - - if (componentId == null) { - componentId = idSegment; - } else { - metadataComponentId = idSegment; - } - - idx = idLength; - } - - return true; - } else { - reset(); - return false; } + + return result.toArray(new Node[result.size()]); } - - public String getComponentId() { - return componentId; - } - - public String getMetadataComponentId() { - return metadataComponentId; - } - + + } \ No newline at end of file Added: trunk/core/impl/src/main/java/org/richfaces/context/IdSplitIterator.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/context/IdSplitIterator.java (rev 0) +++ trunk/core/impl/src/main/java/org/richfaces/context/IdSplitIterator.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.context; + +import static org.richfaces.util.Util.NamingContainerDataHolder.SEPARATOR_CHAR; + +import com.google.common.base.Strings; +import com.google.common.collect.AbstractIterator; + +final class IdSplitIterator extends AbstractIterator<String> { + + private String s; + + private String subtreeId; + + private int idx; + + public IdSplitIterator(String s) { + super(); + this.s = s; + this.idx = s.length(); + } + + @Override + protected String computeNext() { + int oldSepIdx = idx; + idx = s.lastIndexOf(SEPARATOR_CHAR, idx - 1); + + String result; + + if (idx >= 0) { + result = s.substring(idx + 1, oldSepIdx); + + subtreeId = s.substring(0, idx); + } else { + if (oldSepIdx < 0) { + oldSepIdx = 0; + } + result = s.substring(0, oldSepIdx); + + subtreeId = null; + } + + if (Strings.isNullOrEmpty(result)) { + endOfData(); + } + + return result; + } + + public String getSubtreeId() { + return subtreeId; + } + +} \ No newline at end of file Deleted: trunk/core/impl/src/main/java/org/richfaces/context/IdTreeNode.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/context/IdTreeNode.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/impl/src/main/java/org/richfaces/context/IdTreeNode.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -1,155 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.context; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.richfaces.renderkit.util.CoreAjaxRendererUtils; - -final class IdTreeNode { - - private static final char LIST_OPENING_CHAR = '['; - - private static final char LIST_CLOSING_CHAR = ']'; - - private String componentId; - - private String metadataComponentId; - - private List<IdTreeNode> childNodes; - - private IdTreeNode(String componentId, String metadataComponentId) { - this.componentId = componentId; - this.metadataComponentId = metadataComponentId; - } - - public IdTreeNode() { - this(null, null); - } - - private void setChildNodes(String[] componentIds) { - childNodes = new ArrayList<IdTreeNode>(componentIds.length); - for (String componentId : componentIds) { - childNodes.add(new IdTreeNode(componentId, null)); - } - } - - private void setChildNode(String componentId, String metadataComponentId) { - childNodes = Collections.singletonList(new IdTreeNode(componentId, metadataComponentId)); - } - - private void appendToStringBuilder(StringBuilder sb, int indentLevel) { - for (int i = 0; i < indentLevel; i++) { - sb.append(' '); - } - sb.append('+'); - - if (componentId != null) { - sb.append(componentId); - - if (metadataComponentId != null) { - sb.append('('); - sb.append(metadataComponentId); - sb.append(')'); - } - - } else { - sb.append("<empty>"); - } - - sb.append('\n'); - - if (childNodes != null) { - for (IdTreeNode childNode : childNodes) { - childNode.appendToStringBuilder(sb, indentLevel + 2); - } - } - } - - public void appendNodesFromParser(IdParser idParser) { - List<IdTreeNode> nodes = Collections.singletonList(this); - - while (idParser.findNext()) { - String componentId = idParser.getComponentId(); - String metadataComponentId = idParser.getMetadataComponentId(); - - int childNodesCount = 0; - - if (metadataComponentId != null) { - for (IdTreeNode node : nodes) { - node.setChildNode(componentId, metadataComponentId); - childNodesCount++; - } - } else { - if (componentId.length() > 2 && componentId.charAt(0) == LIST_OPENING_CHAR && - componentId.charAt(componentId.length() - 1) == LIST_CLOSING_CHAR) { - - String[] split = CoreAjaxRendererUtils.asIdsArray(componentId.substring(1, componentId.length() - 1)); - for (IdTreeNode node : nodes) { - node.setChildNodes(split); - childNodesCount += split.length; - } - } else { - for (IdTreeNode node : nodes) { - node.setChildNode(componentId, null); - childNodesCount++; - } - } - } - - List<IdTreeNode> newNodesList; - if (nodes.size() == 1) { - newNodesList = nodes.get(0).getChildNodes(); - } else { - newNodesList = new ArrayList<IdTreeNode>(childNodesCount); - for (IdTreeNode node : nodes) { - newNodesList.addAll(node.getChildNodes()); - } - } - - nodes = newNodesList; - } - } - - public List<IdTreeNode> getChildNodes() { - return childNodes; - } - - public String getComponentId() { - return componentId; - } - - public String getMetadataComponentId() { - return metadataComponentId; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - appendToStringBuilder(sb, 0); - - return sb.toString(); - } -} Added: trunk/core/impl/src/main/java/org/richfaces/context/RowsFunctionContextCallback.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/context/RowsFunctionContextCallback.java (rev 0) +++ trunk/core/impl/src/main/java/org/richfaces/context/RowsFunctionContextCallback.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.context; + +import java.util.Collection; + +import javax.faces.component.ContextCallback; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; + +import com.google.common.collect.Lists; + +final class RowsFunctionContextCallback implements ContextCallback { + + private final String image; + + private UIComponent component; + + private Collection<String> convertedKeys = Lists.newArrayList(); + + RowsFunctionContextCallback(String image) { + this.image = image; + } + + public void invokeContextCallback(FacesContext context, UIComponent target) { + component = target; + + Converter rowKeyConverter = (Converter) target.getAttributes().get("rowKeyConverter"); + + Collection<?> keys = (Collection<?>) context.getApplication().evaluateExpressionGet(context, "#{" + image + "}", Object.class); + + for (Object key : keys) { + String convertedKey; + + if (rowKeyConverter != null) { + convertedKey = rowKeyConverter.getAsString(context, target, key); + } else { + convertedKey = key.toString(); + } + + convertedKeys.add(convertedKey); + } + + } + + public UIComponent getComponent() { + return component; + } + + public Collection<String> getConvertedKeys() { + return convertedKeys; + } +} \ No newline at end of file Modified: trunk/core/impl/src/main/java/org/richfaces/util/Util.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/util/Util.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/impl/src/main/java/org/richfaces/util/Util.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -76,6 +76,7 @@ import javax.faces.FacesException; import javax.faces.application.ViewHandler; import javax.faces.component.StateHolder; +import javax.faces.component.UINamingContainer; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; @@ -85,6 +86,8 @@ import org.richfaces.log.RichfacesLogger; import org.richfaces.resource.StateHolderResource; +import com.google.common.base.Joiner; +import com.google.common.base.Splitter; import com.google.common.base.Strings; /** @@ -96,14 +99,6 @@ private static final Pattern RESOURCE_PARAMS_SPLIT_PATTERN = Pattern.compile("\\s*(\\s|,)\\s*"); private static final Pattern RESOURCE_PARAMS = Pattern.compile("\\{([^\\}]*)\\}\\s*$"); - private static final String DATA_BYTES_SEPARATOR = "/DATB/"; - private static final String DATA_SEPARATOR = "/DATA/"; - - // index of capturing group denoting version - private static final int DATA_SEPARATOR_DATA_GROUP_INDEX = 2; - - // index of capturing group denoting data type encoded - private static final int DATA_SEPARATOR_TYPE_GROUP_INDEX = 1; private static final Logger RESOURCE_LOGGER = RichfacesLogger.RESOURCE.getLogger(); /* HTTP Date format required by the HTTP/1.1 RFC */ @@ -111,14 +106,24 @@ // TODO codec have settings private static final Codec CODEC = new Codec(); - private static final String VERSION_SEPARATOR = "/VER"; - private static final Pattern DATA_SEPARATOR_PATTERN = Pattern.compile("/DAT(A|B)/([^/]*)"); private static final SimpleDateFormat RFC1123_DATE_FORMATTER; private static final String QUESTION_SIGN = "?"; private static final String EQUALS_SIGN = "="; private static final Pattern CHARSET_IN_CONTENT_TYPE_PATTERN = Pattern.compile(";\\s*charset\\s*=\\s*([^\\s;]+)", Pattern.CASE_INSENSITIVE); + public static final class NamingContainerDataHolder { + + public static final char SEPARATOR_CHAR = UINamingContainer.getSeparatorChar(FacesContext.getCurrentInstance()); + + public static final Joiner SEPARATOR_CHAR_JOINER = Joiner.on(SEPARATOR_CHAR).skipNulls(); + + public static final Splitter SEPARATOR_CHAR_SPLITTER = Splitter.on(SEPARATOR_CHAR); + + private NamingContainerDataHolder() {} + + } + static { SimpleDateFormat format = new SimpleDateFormat(RFC1123_DATE_PATTERN, Locale.US); @@ -286,105 +291,7 @@ return null; } - - public static String legacyEncodeResourceData(String resourceName, Object storeData, String resourceVersion) { - StringBuilder uri = new StringBuilder(); // ResourceServlet.DEFAULT_SERVLET_PATH).append("/"); - uri.append(resourceName); - - // append serialized data as Base-64 encoded request string. - if (storeData != null) { - String encodedData; - if (storeData instanceof byte[]) { - encodedData = encodeBytesData((byte[]) storeData); - - if (encodedData != null) { - uri.append(DATA_BYTES_SEPARATOR); - uri.append(encodedData); - } - - } else { - encodedData = encodeObjectData(storeData); - - if (encodedData != null) { - uri.append(DATA_SEPARATOR); - uri.append(encodedData); - } - } - } - - if ((resourceVersion != null) && (resourceVersion.length() != 0)) { - uri.append(VERSION_SEPARATOR); - uri.append(resourceVersion); - } - -// boolean isGlobal = !resource.isSessionAware(); -// String resourceURL = getFacesResourceURL(context, -// uri.toString(), false /*isGlobal*/);// context.getApplication().getViewHandler() -// .getResourceURL(context,uri.toString()); - // if (!isGlobal) { - // resourceURL = context.getExternalContext().encodeResourceURL( - // resourceURL); - // } -// if (log.isDebugEnabled()) { -// log.debug(Messages.getMessage(Messages.BUILD_RESOURCE_URI_INFO, -// resource.getKey(), resourceURL)); -// } - return uri.toString(); // context.getExternalContext().encodeResourceURL(resourceURL); - } - - public static String legacyDecodeResourceName(String resourceUri) { - String resourceName = resourceUri; - Matcher matcher = DATA_SEPARATOR_PATTERN.matcher(resourceName); - - if (matcher.find()) { - int data = matcher.start(); - - resourceName = resourceName.substring(0, data); - } else { - int idx = resourceName.indexOf(VERSION_SEPARATOR); - - if (idx > 0) { - resourceName = resourceName.substring(0, idx); - } - } - - return resourceName; - } - - public static String legacyDecodeResourceVersion(String resourceUri) { - int idx = resourceUri.indexOf(VERSION_SEPARATOR); - - if (idx > 0) { - return resourceUri.substring(idx + VERSION_SEPARATOR.length()); - } - - return null; - } - - public static Object legacyDecodeResourceData(String resourceUri) { - Object data = null; - Matcher matcher = DATA_SEPARATOR_PATTERN.matcher(resourceUri); - - if (!matcher.find()) { - return data; - } - - if (RESOURCE_LOGGER.isDebugEnabled()) { - RESOURCE_LOGGER.debug(Messages.getMessage(Messages.RESTORE_DATA_FROM_RESOURCE_URI_INFO, resourceUri, null)); - } - - String dataString = matcher.group(DATA_SEPARATOR_DATA_GROUP_INDEX); - - if ("B".equals(matcher.group(DATA_SEPARATOR_TYPE_GROUP_INDEX))) { - data = decodeBytesData(dataString); - } else { - data = decodeObjectData(dataString); - } - - return data; - } - public static String encodeJSFURL(FacesContext context, String url) { String mapping = Util.getMappingForRequest(context); String resourcePath = url; Modified: trunk/core/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java =================================================================== --- trunk/core/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -146,27 +146,25 @@ @Test public void testFindByWildcardId() throws Exception { ComponentIdResolver resolver = createComponentIdResolver(); - resolver.addId("table:*:input"); - resolver.addId("table:[*]:header"); - resolver.addId("table:[1 2]:column"); + resolver.addId("table:@rows(inputKeys):input"); resolver.resolve(evaluateComponentExpression("#{testBean.table}")); Set<String> resolvedIds = resolver.getResolvedIds(); - assertEquals(asSet("form:table:*:input", "form:table:[*]:header", "form:table:[1 2]:column"), resolvedIds); + assertEquals(asSet("form:table:@rows(inputKeys):input"), resolvedIds); } @Test public void testFindByMetaComponentId() throws Exception { ComponentIdResolver resolver = createComponentIdResolver(); resolver.addId("input@text"); - resolver.addId("table:[*]:header@head"); - resolver.addId("table:[*]:header@footer"); + resolver.addId("table:@rows(headerKeys):header@head"); + resolver.addId("table:@rows(footerKeys):header@footer"); resolver.resolve(viewRoot); Set<String> resolvedIds = resolver.getResolvedIds(); - assertEquals(asSet("form:table:[*]:header@footer", "form:table:[*]:header@head", "form:table:input@text"), resolvedIds); + assertEquals(asSet("form:table:@rows(footerKeys):header@footer", "form:table:@rows(headerKeys):header@head", "form:table:input@text"), resolvedIds); } @Test Deleted: trunk/core/impl/src/test/java/org/richfaces/context/ComponentMatcherNodeTest.java =================================================================== --- trunk/core/impl/src/test/java/org/richfaces/context/ComponentMatcherNodeTest.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/impl/src/test/java/org/richfaces/context/ComponentMatcherNodeTest.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -1,337 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.context; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - -import java.util.Map; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - - -/** - * @author Nick Belaevski - * - */ -public class ComponentMatcherNodeTest { - - private ComponentMatcherNode rootNode; - - @Before - public void setUp() throws Exception { - rootNode = new ComponentMatcherNode(); - } - - @After - public void tearDown() throws Exception { - rootNode = null; - } - - private ComponentMatcherNode createNode(String source, boolean isPattern) { - ComponentMatcherNode node = new ComponentMatcherNode(); - node.setSource(source); - node.setPatternNode(isPattern); - - return node; - } - - @Test - public void testIdChild() throws Exception { - ComponentMatcherNode idNode = createNode("table", false); - - assertNull(rootNode.getChild("table", false)); - assertNull(rootNode.getChild("table2", false)); - - rootNode.addChild(idNode); - - assertSame(rootNode, idNode.getParentNode()); - assertNotNull(rootNode.getIdChildren()); - assertTrue(rootNode.hasDirectIdChildren()); - assertTrue(rootNode.hasDirectChildren()); - assertFalse(rootNode.hasDirectPatternChildren()); - assertFalse(rootNode.hasKidPatternNodes()); - - assertSame(idNode, rootNode.getChild("table", false)); - assertSame(idNode, rootNode.getMatchedChild("table")); - - assertNull(rootNode.getChild("table2", false)); - assertNull(rootNode.getChild("xChild", false)); - assertNull(rootNode.getMatchedChild("xChild")); - - ComponentMatcherNode id2Node = createNode("table2", false); - rootNode.addChild(id2Node); - assertSame(idNode, rootNode.getChild("table", false)); - assertSame(id2Node, rootNode.getChild("table2", false)); - assertSame(id2Node, rootNode.getMatchedChild("table2")); - - rootNode.removeChild(idNode); - rootNode.removeChild(id2Node); - - assertNull(idNode.getParentNode()); - assertFalse(rootNode.hasDirectIdChildren()); - assertFalse(rootNode.hasDirectChildren()); - assertFalse(rootNode.hasDirectPatternChildren()); - assertFalse(rootNode.hasKidPatternNodes()); - - assertNull(rootNode.getChild("table", false)); - assertNull(rootNode.getMatchedChild("table")); - } - - @Test - public void testMarkAddedRemoved() throws Exception { - ComponentMatcherNode idNode = createNode("table", false); - ComponentMatcherNode patternNode = createNode("*", true); - - assertFalse(idNode.isAdded()); - assertFalse(patternNode.isAdded()); - - rootNode.addChild(idNode); - assertFalse(idNode.isAdded()); - assertFalse(rootNode.isAdded()); - - idNode.markAdded(); - assertSame(idNode, rootNode.getChild("table", false)); - assertTrue(idNode.isAdded()); - assertFalse(rootNode.isAdded()); - - idNode.markRemoved(); - assertSame(idNode, rootNode.getChild("table", false)); - assertFalse(idNode.isAdded()); - assertFalse(rootNode.isAdded()); - - rootNode.addChild(patternNode); - assertFalse(patternNode.isAdded()); - assertFalse(rootNode.isAdded()); - - patternNode.markAdded(); - assertSame(patternNode, rootNode.getChild("*", true)); - assertTrue(patternNode.isAdded()); - assertFalse(rootNode.isAdded()); - - patternNode.markRemoved(); - assertSame(patternNode, rootNode.getChild("*", true)); - assertFalse(patternNode.isAdded()); - assertFalse(rootNode.isAdded()); - } - - @Test - public void testPatternChild() throws Exception { - ComponentMatcherNode patternNode = createNode("*", true); - - assertNull(rootNode.getChild("*", true)); - - rootNode.addChild(patternNode); - - assertSame(rootNode, patternNode.getParentNode()); - assertNotNull(rootNode.getPatternChildren()); - assertFalse(rootNode.hasDirectIdChildren()); - assertTrue(rootNode.hasDirectChildren()); - assertTrue(rootNode.hasDirectPatternChildren()); - assertTrue(rootNode.hasKidPatternNodes()); - - assertSame(patternNode, rootNode.getChild("*", true)); - assertSame(patternNode, rootNode.getMatchedChild("anyId")); - assertSame(patternNode, rootNode.getMatchedChild("justAnotherId")); - - rootNode.removeChild(patternNode); - assertNull(patternNode.getParentNode()); - assertFalse(rootNode.hasDirectIdChildren()); - assertFalse(rootNode.hasDirectChildren()); - assertFalse(rootNode.hasDirectPatternChildren()); - assertFalse(rootNode.hasKidPatternNodes()); - - assertNull(rootNode.getChild("*", true)); - assertNull(rootNode.getMatchedChild("anyId")); - assertNull(rootNode.getMatchedChild("justAnotherId")); - } - - private boolean hasPatternParent(ComponentMatcherNode node) { - ComponentMatcherNode pNode = node; - while ((pNode = pNode.getParentNode()) != null) { - if (pNode.isPatternNode()) { - return true; - } - } - - return false; - } - - private boolean hasPatternKids(Map<String, ComponentMatcherNode> nodesMap) { - if (nodesMap == null) { - return false; - } - - for (ComponentMatcherNode node : nodesMap.values()) { - if (node.isPatternNode()) { - return true; - } - - if (hasPatternKids(node.getIdChildren())) { - return true; - } - - if (hasPatternKids(node.getPatternChildren())) { - return true; - } - } - - return false; - } - - private boolean hasPatternKids(ComponentMatcherNode node) { - if (hasPatternKids(node.getIdChildren())) { - return true; - } - - if (hasPatternKids(node.getPatternChildren())) { - return true; - } - - return false; - } - - private void verifyNodeChildren(Map<String, ComponentMatcherNode> nodesMap) { - if (nodesMap != null) { - for (ComponentMatcherNode childNode : nodesMap.values()) { - verifyNode(childNode); - } - } - } - - private void verifyNode(ComponentMatcherNode node) { - assertTrue(hasPatternParent(node) == node.hasParentPatternNode()); - assertTrue(hasPatternKids(node) == node.hasKidPatternNodes()); - - verifyNodeChildren(node.getIdChildren()); - verifyNodeChildren(node.getPatternChildren()); - } - - @Test - public void testAddChild() throws Exception { - verifyNode(rootNode); - - ComponentMatcherNode tableNode = createNode("table", false); - rootNode.addChild(tableNode); - verifyNode(rootNode); - assertSame(tableNode, rootNode.getChild("table", false)); - assertSame(tableNode, rootNode.getMatchedChild("table")); - - ComponentMatcherNode tablePatternNode = createNode("table-*", true); - rootNode.addChild(tablePatternNode); - verifyNode(rootNode); - assertSame(tablePatternNode, rootNode.getChild("table-*", true)); - assertSame(tablePatternNode, rootNode.getMatchedChild("anyChild")); - - ComponentMatcherNode rowNode = createNode("row", false); - tableNode.addChild(rowNode); - verifyNode(rootNode); - assertSame(rowNode, tableNode.getChild("row", false)); - assertSame(rowNode, tableNode.getMatchedChild("row")); - - ComponentMatcherNode cellPatternNode = createNode("cell-*", true); - rowNode.addChild(cellPatternNode); - verifyNode(rootNode); - assertSame(cellPatternNode, rowNode.getChild("cell-*", true)); - assertSame(cellPatternNode, rowNode.getMatchedChild("anyCell")); - - ComponentMatcherNode secondRowNode = createNode("row", false); - tablePatternNode.addChild(secondRowNode); - verifyNode(rootNode); - assertSame(secondRowNode, tablePatternNode.getChild("row", false)); - assertSame(secondRowNode, tablePatternNode.getMatchedChild("row")); - - ComponentMatcherNode secondCellPatternNode = createNode("cell-*", true); - secondRowNode.addChild(secondCellPatternNode); - verifyNode(rootNode); - assertSame(secondCellPatternNode, secondRowNode.getChild("cell-*", true)); - assertSame(secondCellPatternNode, secondRowNode.getMatchedChild("anyCell")); - } - - @Test - public void testRemoveChild() throws Exception { - ComponentMatcherNode tableNode = createNode("table", false); - rootNode.addChild(tableNode); - - ComponentMatcherNode tablePatternNode = createNode("table-*", true); - rootNode.addChild(tablePatternNode); - - ComponentMatcherNode rowNode = createNode("row", false); - tableNode.addChild(rowNode); - - ComponentMatcherNode cellPatternNode = createNode("cell-*", true); - rowNode.addChild(cellPatternNode); - - ComponentMatcherNode secondRowNode = createNode("row", false); - tablePatternNode.addChild(secondRowNode); - - ComponentMatcherNode secondCellPatternNode = createNode("cell-*", true); - secondRowNode.addChild(secondCellPatternNode); - - verifyNode(rootNode); - - assertSame(secondCellPatternNode, secondRowNode.getChild("cell-*", true)); - assertSame(secondCellPatternNode, secondRowNode.getMatchedChild("anyCell")); - secondRowNode.removeChild(secondCellPatternNode); - assertNull(secondRowNode.getChild("cell-*", true)); - assertNull(secondRowNode.getMatchedChild("anyCell")); - - verifyNode(rootNode); - - assertSame(rowNode, tableNode.getChild("row", false)); - assertSame(rowNode, tableNode.getMatchedChild("row")); - tableNode.removeChild(rowNode); - assertNull(tableNode.getChild("row", false)); - assertNull(tableNode.getMatchedChild("row")); - - verifyNode(rootNode); - - assertSame(secondRowNode, tablePatternNode.getChild("row", false)); - assertSame(secondRowNode, tablePatternNode.getMatchedChild("row")); - tablePatternNode.removeChild(secondRowNode); - assertNull(tablePatternNode.getChild("row", false)); - assertNull(tablePatternNode.getMatchedChild("row")); - - verifyNode(rootNode); - - assertSame(tablePatternNode, rootNode.getChild("table-*", true)); - assertSame(tablePatternNode, rootNode.getMatchedChild("anyChild")); - rootNode.removeChild(tablePatternNode); - assertNull(rootNode.getChild("table-*", true)); - assertNull(rootNode.getMatchedChild("anyChild")); - - verifyNode(rootNode); - - assertSame(tableNode, rootNode.getChild("table", false)); - assertSame(tableNode, rootNode.getMatchedChild("table")); - rootNode.removeChild(tableNode); - assertNull(rootNode.getChild("table", false)); - assertNull(rootNode.getMatchedChild("table")); - - verifyNode(rootNode); - } -} Modified: trunk/core/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java =================================================================== --- trunk/core/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -379,7 +379,7 @@ assertNotNull(iterator); assertFalse(iterator.hasNext()); - Set<String> idsToAdd = asSet("someIds", "thisIs:evenBetter", "id:*:x"); + Set<String> idsToAdd = asSet("someIds", "thisIs:evenBetter", "myForm:table:0:nestedText"); idsToVisit.addAll(idsToAdd); assertFalse(idsToVisit.isEmpty()); @@ -472,11 +472,11 @@ renderingContext.getIdsToVisit().add("myForm:table:theHeader"); renderingContext.getIdsToVisit().add("myForm:table:1:nestedOutput"); renderingContext.getIdsToVisit().add("myForm:table:0:nestedText"); - renderingContext.getIdsToVisit().add("myForm:table:0:nestedTable:1"); + renderingContext.getIdsToVisit().add("myForm:table:0:nestedTable:1:nestedTableText"); renderingContext.getIdsToVisit().add("myForm:table:0:nestedTable:nestedFooter"); Set<String> formClientIds = asSet("myForm:outerOutput", "myForm:table:0:nestedText", - "myForm:table:1:nestedOutput", "myForm:table:theHeader", "myForm:table:0:nestedTable:1", + "myForm:table:1:nestedOutput", "myForm:table:theHeader", "myForm:table:0:nestedTable:1:nestedTableText", "myForm:table:0:nestedTable:nestedFooter"); Set<String> formIds = asSet("table", "outerOutput"); @@ -485,7 +485,7 @@ assertEqualSets(formIds, renderingContext.getDirectSubtreeIdsToVisit(form)); Set<String> tableClientIds = asSet("myForm:table:0:nestedText", "myForm:table:1:nestedOutput", - "myForm:table:theHeader", "myForm:table:0:nestedTable:1", "myForm:table:0:nestedTable:nestedFooter"); + "myForm:table:theHeader", "myForm:table:0:nestedTable:1:nestedTableText", "myForm:table:0:nestedTable:nestedFooter"); Set<String> tableIds = asSet("0", "1", "theHeader"); assertEqualSets(tableClientIds, renderingContext.getSubtreeIdsToVisit(table)); @@ -493,7 +493,7 @@ table.setRowIndex(0); - Set<String> nestedTableClientIds = asSet("myForm:table:0:nestedTable:1", + Set<String> nestedTableClientIds = asSet("myForm:table:0:nestedTable:1:nestedTableText", "myForm:table:0:nestedTable:nestedFooter"); Set<String> nestedTableIds = asSet("nestedFooter", "1"); @@ -504,46 +504,6 @@ } @Test - public void testSubtreeIdsForWildcardIds() throws Exception { - createVisitContext(false); - renderingContext.getIdsToVisit().add("myForm:table:*:nestedText"); - renderingContext.getIdsToVisit().add("myForm:table:*:nestedTable:0"); - - assertSame(VisitContext.ALL_IDS, renderingContext.getSubtreeIdsToVisit(form)); - assertEqualSets(asSet("table", "outerOutput"), renderingContext.getDirectSubtreeIdsToVisit(form)); - - assertSame(VisitContext.ALL_IDS, renderingContext.getSubtreeIdsToVisit(table)); - assertSame(VisitContext.ALL_IDS, renderingContext.getDirectSubtreeIdsToVisit(table)); - } - - @Test - public void testSubtreeIdsForWildcardIdsWithLimitRender() throws Exception { - createVisitContext(true); - renderingContext.getIdsToVisit().add("myForm:table:*:nestedText"); - renderingContext.getIdsToVisit().add("myForm:table:*:nestedTable:0"); - - assertSame(VisitContext.ALL_IDS, renderingContext.getSubtreeIdsToVisit(form)); - assertEqualSets(asSet("table"), renderingContext.getDirectSubtreeIdsToVisit(form)); - - assertSame(VisitContext.ALL_IDS, renderingContext.getSubtreeIdsToVisit(table)); - assertSame(VisitContext.ALL_IDS, renderingContext.getDirectSubtreeIdsToVisit(table)); - } - - @Test - public void testSubtreeIdsForWildcardIds2WithLimitRender() throws Exception { - createVisitContext(true); - renderingContext.getIdsToVisit().add("myForm:table:*:nestedTable"); - - assertSame(VisitContext.ALL_IDS, renderingContext.getSubtreeIdsToVisit(form)); - assertEqualSets(asSet("table"), renderingContext.getDirectSubtreeIdsToVisit(form)); - - assertSame(VisitContext.ALL_IDS, renderingContext.getSubtreeIdsToVisit(table)); - assertSame(VisitContext.ALL_IDS, renderingContext.getDirectSubtreeIdsToVisit(table)); - - table.setRowIndex(-1); - } - - @Test public void testVisitCallbackForEmptyIds() throws Exception { createVisitContext(false); @@ -593,20 +553,10 @@ renderingContext.getIdsToVisit().add("myForm:table:1:nestedTable@footer"); boolean visitResult = viewRoot.visitTree(renderingContext, trackingVisitCallback); - assertTrue(visitResult); - + assertEquals(Arrays.asList("myForm:table:1:nestedTable@footer"), trackingVisitCallback.getVisitedIds()); - } - @Test - public void testVisitMetaComponentsWithWildcardsWithLimitRender() throws Exception { - createVisitContext(true); - renderingContext.getIdsToVisit().add("myForm:table:*:nestedTable@footer"); - - viewRoot.visitTree(renderingContext, trackingVisitCallback); - - assertEquals(Arrays.asList("myForm:table:0:nestedTable@footer", "myForm:table:1:nestedTable@footer"), - trackingVisitCallback.getVisitedIds()); + assertTrue(visitResult); } @Test @@ -636,7 +586,7 @@ public void testFormVisitContextWithLimitRender() throws Exception { createVisitContext(true); - renderingContext.getIdsToVisit().add("myForm:table:0"); + renderingContext.getIdsToVisit().add("myForm:table:0:nestedText"); Collection<String> formDirectIds = renderingContext.getDirectSubtreeIdsToVisit(form); assertNotSame(VisitContext.ALL_IDS, formDirectIds); @@ -685,7 +635,10 @@ public void testVisitMultiple() throws Exception { createVisitContext(true); - renderingContext.getIdsToVisit().add("myForm:table:[ 0, 1 ]:nestedTable:[ 1 ]:nestedTableText"); + String idFormat = "myForm:table:{0}:nestedTable:1:nestedTableText"; + + renderingContext.getIdsToVisit().add(MessageFormat.format(idFormat, 0)); + renderingContext.getIdsToVisit().add(MessageFormat.format(idFormat, 1)); boolean visitResult = viewRoot.visitTree(renderingContext, trackingVisitCallback); assertTrue(visitResult); @@ -697,20 +650,24 @@ public void testVisitMultipleWithPatternAndMetacomponent() throws Exception { createVisitContext(true); - renderingContext.getIdsToVisit().add("myForm:table:[ 0, 1 ]:nestedTable:*:nestedTableText"); - renderingContext.getIdsToVisit().add("myForm:table:[0]:nestedTable@footer"); + String idFormat = "myForm:table:{0}:nestedTable:{1}:nestedTableText"; + + renderingContext.getIdsToVisit().add(MessageFormat.format(idFormat, 0, 0)); + renderingContext.getIdsToVisit().add(MessageFormat.format(idFormat, 0, 1)); + renderingContext.getIdsToVisit().add(MessageFormat.format(idFormat, 1, 0)); + renderingContext.getIdsToVisit().add(MessageFormat.format(idFormat, 1, 1)); + renderingContext.getIdsToVisit().add("myForm:table:0:nestedTable@footer"); + viewRoot.visitTree(renderingContext, trackingVisitCallback); assertEquals(Arrays.asList( "myForm:table:0:nestedTable@footer", "myForm:table:0:nestedTable:0:nestedTableText", "myForm:table:0:nestedTable:1:nestedTableText", - "myForm:table:0:nestedTable:2:nestedTableText", "myForm:table:1:nestedTable:0:nestedTableText", - "myForm:table:1:nestedTable:1:nestedTableText", - "myForm:table:1:nestedTable:2:nestedTableText" + "myForm:table:1:nestedTable:1:nestedTableText" ), trackingVisitCallback.getVisitedIds()); } @@ -729,5 +686,17 @@ assertFalse(renderingContext.getIdsToVisit().contains("table")); assertFalse(renderingContext.getIdsToVisit().contains("myForm:table")); } + + @Test + public void testVisitForm() throws Exception { + createVisitContext(true); + + renderingContext.getIdsToVisit().add("myForm"); + + boolean result = facesContext.getViewRoot().visitTree(renderingContext, trackingVisitCallback); + + assertTrue(result); + assertEquals(Arrays.asList("myForm"), trackingVisitCallback.getVisitedIds()); + } } Modified: trunk/core/impl/src/test/java/org/richfaces/context/IdParserTest.java =================================================================== --- trunk/core/impl/src/test/java/org/richfaces/context/IdParserTest.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/core/impl/src/test/java/org/richfaces/context/IdParserTest.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * Copyright 2011, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -21,163 +21,76 @@ */ package org.richfaces.context; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.easymock.EasyMock.expect; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.fail; +import static org.richfaces.context.IdParser.parse; -import org.junit.After; +import java.util.HashMap; + +import javax.faces.context.FacesContext; + +import org.jboss.test.faces.mock.Environment; +import org.jboss.test.faces.mock.Mock; +import org.jboss.test.faces.mock.MockFacesEnvironment; +import org.jboss.test.faces.mock.MockTestRunner; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.richfaces.context.IdParser.Node; - /** * @author Nick Belaevski - * + * */ +(a)RunWith(MockTestRunner.class) public class IdParserTest { - private IdParser idParser; - + @Mock + @Environment({Environment.Feature.EXTERNAL_CONTEXT}) + private MockFacesEnvironment environment; + @Before public void setUp() throws Exception { - idParser = new IdParser(':', '@'); + environment.resetToNice(); + FacesContext facesContext = FacesContext.getCurrentInstance(); + expect(facesContext.getAttributes()).andStubReturn(new HashMap<Object, Object>()); + environment.replay(); } - - @After - public void tearDown() throws Exception { - idParser = null; - } - + @Test - public void testIncorrectIds() throws Exception { - idParser.setId(""); - - idParser.findNext(); - assertFalse(idParser.findNext()); - - idParser.setId(":test"); - - idParser.findNext(); - idParser.findNext(); - assertFalse(idParser.findNext()); - - idParser.setId("test:"); - - idParser.findNext(); - idParser.findNext(); - assertFalse(idParser.findNext()); - - idParser.setId("@head"); - - idParser.findNext(); - assertFalse(idParser.findNext()); - - idParser.setId("head@"); - - idParser.findNext(); - assertFalse(idParser.findNext()); - } - - @Test public void testSimpleId() throws Exception { - idParser.setId("simpleId"); - - assertTrue(idParser.findNext()); - assertEquals("simpleId", idParser.getComponentId()); - assertNull(idParser.getMetadataComponentId()); - - assertFalse(idParser.findNext()); + assertArrayEquals(new Node[0], parse("")); + assertArrayEquals(new Node[] { new Node("test") }, parse("test")); + assertArrayEquals(new Node[] { new Node("form"), new Node("table") }, parse("form:table")); } @Test - public void testSubComponentId() throws Exception { - idParser.setId("table@head"); - - assertTrue(idParser.findNext()); - assertEquals("@head", idParser.getMetadataComponentId()); - assertEquals("table", idParser.getComponentId()); - - assertFalse(idParser.findNext()); + public void testRowsFunction() throws Exception { + try { + parse("form:table:@rows("); + fail(); + } catch (IllegalArgumentException e) { + //ignore + } + + try { + parse("form:table:@rows(12"); + fail(); + } catch (IllegalArgumentException e) { + //ignore + } + + assertArrayEquals(new Node[] { new Node("form"), new Node("table"), new Node("", "rows"), new Node("@row") }, parse("form:table:@rows():@row")); + assertArrayEquals(new Node[] { new Node("form"), new Node("table"), new Node("12", "rows") }, parse("form:table:@rows(12)")); + assertArrayEquals(new Node[] { new Node("form"), new Node("table"), new Node("", "rows"), new Node("subtable") }, + parse("form:table:@rows():subtable")); + + assertArrayEquals(new Node[] { + new Node("form"), new Node("table"), new Node("12", "rows"), new Node("subtable"), + new Node("a", "rows"), new Node("cell") }, + parse("form:table:@rows(12):subtable:@rows(a):cell")); + } - - @Test - public void testSeries() throws Exception { - idParser.setId("form:table:0:nestedTable@body"); - - assertTrue(idParser.findNext()); - assertEquals("form", idParser.getComponentId()); - assertNull(idParser.getMetadataComponentId()); - - assertTrue(idParser.findNext()); - assertEquals("table", idParser.getComponentId()); - assertNull(idParser.getMetadataComponentId()); - - assertTrue(idParser.findNext()); - assertEquals("0", idParser.getComponentId()); - assertNull(idParser.getMetadataComponentId()); - - assertTrue(idParser.findNext()); - assertEquals("@body", idParser.getMetadataComponentId()); - assertEquals("nestedTable", idParser.getComponentId()); - - assertFalse(idParser.findNext()); - - idParser.setId("myBigTable@header"); - - assertTrue(idParser.findNext()); - assertEquals("@header", idParser.getMetadataComponentId()); - assertEquals("myBigTable", idParser.getComponentId()); - - assertFalse(idParser.findNext()); - - idParser.setId("tree:0-12-28:node@status:table:10:tab@label"); - - assertTrue(idParser.findNext()); - assertEquals("tree", idParser.getComponentId()); - assertNull(idParser.getMetadataComponentId()); - - assertTrue(idParser.findNext()); - assertEquals("0-12-28", idParser.getComponentId()); - assertNull(idParser.getMetadataComponentId()); - - assertTrue(idParser.findNext()); - assertEquals("@status", idParser.getMetadataComponentId()); - assertEquals("node", idParser.getComponentId()); - - assertTrue(idParser.findNext()); - assertEquals("table", idParser.getComponentId()); - assertNull(idParser.getMetadataComponentId()); - - assertTrue(idParser.findNext()); - assertEquals("10", idParser.getComponentId()); - assertNull(idParser.getMetadataComponentId()); - - assertTrue(idParser.findNext()); - assertEquals("@label", idParser.getMetadataComponentId()); - assertEquals("tab", idParser.getComponentId()); - - assertFalse(idParser.findNext()); - } - - @Test - public void testNestedSubcomponents() throws Exception { - //TODO - review this test - behavior is not clear for now - - idParser.setId("form:table@head@x-head:child"); - - assertTrue(idParser.findNext()); - assertEquals("form", idParser.getComponentId()); - assertNull(idParser.getMetadataComponentId()); - - assertTrue(idParser.findNext()); - assertEquals("@head@x-head", idParser.getMetadataComponentId()); - assertEquals("table", idParser.getComponentId()); - - assertTrue(idParser.findNext()); - assertEquals("child", idParser.getComponentId()); - assertNull(idParser.getMetadataComponentId()); - - assertFalse(idParser.findNext()); - } + } Added: trunk/core/impl/src/test/java/org/richfaces/context/IdSplitIteratorTest.java =================================================================== --- trunk/core/impl/src/test/java/org/richfaces/context/IdSplitIteratorTest.java (rev 0) +++ trunk/core/impl/src/test/java/org/richfaces/context/IdSplitIteratorTest.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -0,0 +1,157 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.context; + +import static org.easymock.EasyMock.expect; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.HashMap; +import java.util.NoSuchElementException; + +import javax.faces.context.FacesContext; + +import org.jboss.test.faces.mock.Environment; +import org.jboss.test.faces.mock.Mock; +import org.jboss.test.faces.mock.MockFacesEnvironment; +import org.jboss.test.faces.mock.MockTestRunner; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + + +/** + * @author Nick Belaevski + * + */ +(a)RunWith(MockTestRunner.class) +public class IdSplitIteratorTest { + + @Mock + @Environment({Environment.Feature.EXTERNAL_CONTEXT}) + private MockFacesEnvironment environment; + + @Before + public void setUp() throws Exception { + environment.resetToNice(); + FacesContext facesContext = FacesContext.getCurrentInstance(); + expect(facesContext.getAttributes()).andStubReturn(new HashMap<Object, Object>()); + environment.replay(); + } + + @Test + public void testEmptyString() throws Exception { + IdSplitIterator iterator = new IdSplitIterator(""); + + assertFalse(iterator.hasNext()); + + try { + iterator.next(); + fail(); + } catch (NoSuchElementException e) { + //ignore + } + + assertNull(iterator.getSubtreeId()); + } + + @Test + public void testSimpleString() throws Exception { + IdSplitIterator iterator = new IdSplitIterator("id"); + + assertTrue(iterator.hasNext()); + + assertEquals("id", iterator.next()); + assertNull(iterator.getSubtreeId()); + + assertFalse(iterator.hasNext()); + + try { + iterator.next(); + fail(); + } catch (NoSuchElementException e) { + //ignore + } + + assertNull(iterator.getSubtreeId()); + } + + @Test + public void testTwoSegmentsString() throws Exception { + IdSplitIterator iterator = new IdSplitIterator("form:table"); + + assertTrue(iterator.hasNext()); + + assertEquals("table", iterator.next()); + assertEquals("form", iterator.getSubtreeId()); + + assertTrue(iterator.hasNext()); + assertEquals("form", iterator.next()); + assertNull(iterator.getSubtreeId()); + + assertFalse(iterator.hasNext()); + } + + @Test + public void testThreeSegmentsString() throws Exception { + IdSplitIterator iterator = new IdSplitIterator("form:table:cell"); + + assertTrue(iterator.hasNext()); + + assertEquals("cell", iterator.next()); + assertEquals("form:table", iterator.getSubtreeId()); + + assertTrue(iterator.hasNext()); + + assertEquals("table", iterator.next()); + assertEquals("form", iterator.getSubtreeId()); + + assertTrue(iterator.hasNext()); + assertEquals("form", iterator.next()); + assertNull(iterator.getSubtreeId()); + + assertFalse(iterator.hasNext()); + } + + @Test + public void testBadStrings() throws Exception { + IdSplitIterator iterator; + + iterator = new IdSplitIterator(":"); + assertFalse(iterator.hasNext()); + + iterator = new IdSplitIterator("test:"); + assertFalse(iterator.hasNext()); + + iterator = new IdSplitIterator(":test"); + assertTrue(iterator.hasNext()); + assertEquals("test", iterator.next()); + assertEquals("", iterator.getSubtreeId()); + assertFalse(iterator.hasNext()); + + iterator = new IdSplitIterator("::"); + assertFalse(iterator.hasNext()); + } +} Modified: trunk/ui/iteration/ui/src/test/java/org/richfaces/convert/TreeConverterUtilTest.java =================================================================== --- trunk/ui/iteration/ui/src/test/java/org/richfaces/convert/TreeConverterUtilTest.java 2011-01-18 18:11:00 UTC (rev 21063) +++ trunk/ui/iteration/ui/src/test/java/org/richfaces/convert/TreeConverterUtilTest.java 2011-01-18 19:20:56 UTC (rev 21064) @@ -47,9 +47,6 @@ public class TreeConverterUtilTest { @Mock - private FacesContext context; - - @Mock @Environment({Environment.Feature.EXTERNAL_CONTEXT}) private MockFacesEnvironment environment;

13 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r21063 - trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2011-01-18 13:11:00 -0500 (Tue, 18 Jan 2011) New Revision: 21063 Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.ecss Log: RF-9691: bug with border in Tooltip is fixed Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.ecss 2011-01-18 17:43:39 UTC (rev 21062) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tooltip.ecss 2011-01-18 18:11:00 UTC (rev 21063) @@ -41,4 +41,5 @@ border-color : '#{richSkin.tipBorderColor}'; font-family: '#{richSkin.generalFamilyFont}'; font-size: '#{richSkin.generalSizeFont}'; + display: inline-block; } \ No newline at end of file

13 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r21062 - in trunk: ui/output/ui/src/main/java/org/richfaces/component and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2011-01-18 12:43:39 -0500 (Tue, 18 Jan 2011) New Revision: 21062 Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js Log: RF-10159: Panel Menu - @itemMode, @groupMode attributes has not effect RF-10174: PanelMenu: JS error on page unload Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-01-18 17:02:50 UTC (rev 21061) +++ trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-01-18 17:43:39 UTC (rev 21062) @@ -49,8 +49,8 @@ <pn:panelMenu id="panelMenu" expandSingle="true" - itemMode="ajax" - groupMode="ajax" + itemMode="server" + groupMode="server" activeItem="myFavariteIten" itemDisableIconLeft="disc" groupDisableIconLeft="disc" Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-18 17:02:50 UTC (rev 21061) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-18 17:43:39 UTC (rev 21062) @@ -23,6 +23,7 @@ package org.richfaces.component; +import org.richfaces.PanelMenuMode; import org.richfaces.cdk.annotations.*; import org.richfaces.event.ItemChangeEvent; import org.richfaces.event.PanelToggleEvent; @@ -154,12 +155,8 @@ @Attribute(defaultValue = "Boolean.FALSE") public abstract Boolean isSelectable(); -/* - @Override - public PanelMenuMode getMode() { - return (PanelMenuMode) getStateHelper().eval(UIPanelMenuItem.PropertyKeys.mode, getPanelMenu().getGroupMode()); - } -*/ + @Attribute(defaultValue = "getPanelMenu().getGroupMode()") + public abstract PanelMenuMode getMode(); @Attribute(defaultValue = "getPanelMenu().isExpandSingle()") public abstract boolean isExpandSingle(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2011-01-18 17:02:50 UTC (rev 21061) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2011-01-18 17:43:39 UTC (rev 21062) @@ -86,7 +86,7 @@ @Attribute(defaultValue = "Boolean.TRUE") public abstract Boolean isSelectable(); - @Attribute(defaultValue = "Boolean.FALSE") + @Attribute(defaultValue = "Boolean.FALSE", hidden = true) public abstract Boolean isUnselectable(); @Attribute(defaultValue = "getPanelMenu().getItemMode()") Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-01-18 17:02:50 UTC (rev 21061) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-01-18 17:43:39 UTC (rev 21062) @@ -313,7 +313,11 @@ }, destroy: function () { - delete this.__rfPanelMenu().getItems()[this.itemName]; + var panelMenu = this.__rfPanelMenu(); + if (panelMenu.getItems && panelMenu.getItems()[this.itemName]) { + delete panelMenu.getItems()[this.itemName]; + } + $super.destroy.call(this); } });

13 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r21061 - trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2011-01-18 12:02:50 -0500 (Tue, 18 Jan 2011) New Revision: 21061 Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js Log: RF-10180: CSS classes are refactored Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js 2011-01-18 16:41:01 UTC (rev 21060) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js 2011-01-18 17:02:50 UTC (rev 21061) @@ -7,7 +7,7 @@ var fn = function(e) { e.data.fn.call(e.data.component, e); - } + }; var data = {}; data.component = component; @@ -35,6 +35,14 @@ return eventData; }; + var addToggledClasses = function(el, event) { + if (event.type == 'mousedown' || event.type == 'mouseup') { + el.toggleClass('rf-ds-press'); + } else if(event.type == 'mouseover' || event.type == 'mouseout') { + el.toggleClass('rf-ds-hov'); + } + }; + richfaces.ui.DataScroller = function(id, submit, options) { $super.constructor.call(this, id); @@ -43,8 +51,6 @@ this.options = options; this.currentPage = options.currentPage; - var buttons = options.buttons; - var digitals = options.digitals; if (submit && typeof submit == 'function') { RichFaces.Event.bindById(id, this.getScrollEventName(), submit); @@ -52,40 +58,35 @@ var css = {}; - if (buttons) { + if (options.buttons) { - $(dataScrollerElement).delegate('.rf-ds-btn', 'mouseover mouseup mouseout mousedown', function(event) { - if (event.type == 'mousedown') { - $(this).addClass('rf-ds-hov'); + $(dataScrollerElement).delegate('.rf-ds-btn', 'mouseover mouseout mouseup mousedown', function(event) { + if ($(this).hasClass('rf-ds-dis')) { + $(this).removeClass('rf-ds-hov'); + $(this).removeClass('rf-ds-press'); } else { - $(this).removeClass('rf-ds-hov'); + addToggledClasses($(this), event); } }); - initButtons(buttons.left, css, this); - initButtons(buttons.right, css, this); + initButtons(options.buttons.left, css, this); + initButtons(options.buttons.right, css, this); } - if (digitals) { + if (options.digitals) { - $(dataScrollerElement).delegate('.rf-ds-nmb-btn', 'mouseover mouseup mouseout mousedown', function(event) { - if (event.type == 'mouseover' || event.type == 'mouseup') { - $(this).addClass('rf-ds-hov'); - } else if (event.type == 'mouseout') { - $(this).removeClass('rf-ds-hov'); - } else if (event.type == 'mousedown') { - $(this).toggleClass('rf-ds-press'); - } + $(dataScrollerElement).delegate('.rf-ds-nmb-btn', 'mouseover mouseout mouseup mousedown', function(event) { + addToggledClasses($(this), event); }); - initButtons(digitals, css, this); + initButtons(options.digitals, css, this); } }; richfaces.BaseComponent.extend(richfaces.ui.DataScroller); var $super = richfaces.ui.DataScroller.$super; - $.extend(richfaces.ui.DataScroller.prototype, (function (options) { + $.extend(richfaces.ui.DataScroller.prototype, (function () { var scrollEventName = "rich:datascroller:onscroll";

13 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r21060 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richPanel and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-01-18 11:41:01 -0500 (Tue, 18 Jan 2011) New Revision: 21060 Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanel/ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanel/TestRichPanel.java Log: https://issues.jboss.org/browse/RFPL-1048 * added 18 tests for rich:panel Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanel/TestRichPanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanel/TestRichPanel.java (rev 0) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanel/TestRichPanel.java 2011-01-18 16:41:01 UTC (rev 21060) @@ -0,0 +1,185 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.tests.metamer.ftest.richPanel; + +import static org.jboss.test.selenium.utils.URLUtils.buildUrl; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + +import java.net.URL; + +import org.jboss.test.selenium.dom.Event; +import org.jboss.test.selenium.locator.JQueryLocator; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; +import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.Use; +import org.testng.annotations.Test; + +/** + * Test case for page /faces/components/richPanel/simple.xhtml + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +public class TestRichPanel extends AbstractMetamerTest { + + private JQueryLocator[] panels = {pjq("div[id$=panelWithHeader]"), pjq("div[id$=panelWithoutHeader]")}; + private JQueryLocator[] headers = {pjq("div[id$=panelWithHeader] div.rf-p-hdr"), pjq("div[id$=panelWithoutHeader] div.rf-p-hdr")}; + private JQueryLocator[] bodies = {pjq("div[id$=panelWithHeader] div.rf-p-b"), pjq("div[id$=panelWithoutHeader] div.rf-p-b")}; + @Inject + @Use(empty = true) + private JQueryLocator panel; + + @Override + public URL getTestUrl() { + return buildUrl(contextPath, "faces/components/richPanel/simple.xhtml"); + } + + @Test + public void testInit() { + assertTrue(selenium.isElementPresent(panels[0]), "Panel with header should be present on the page."); + assertTrue(selenium.isVisible(panels[0]), "Panel with header should be present on the page."); + assertTrue(selenium.isElementPresent(panels[1]), "Panel without header should be present on the page."); + assertTrue(selenium.isVisible(panels[1]), "Panel without header should be present on the page."); + + assertTrue(selenium.isElementPresent(headers[0]), "The first panel should have a header."); + assertTrue(selenium.isVisible(headers[0]), "The first panel should have a header."); + assertFalse(selenium.isElementPresent(headers[1]), "The second panel should not have any header."); + + assertTrue(selenium.isElementPresent(bodies[0]), "The first panel should have a body."); + assertTrue(selenium.isVisible(bodies[0]), "The first panel should have a body."); + assertTrue(selenium.isElementPresent(bodies[1]), "The second panel should have a body."); + assertTrue(selenium.isVisible(bodies[1]), "The second panel should have a body."); + + assertEquals(selenium.getText(headers[0]), "header of panel", "Header of the first panel."); + assertTrue(selenium.getText(bodies[0]).startsWith("Lorem ipsum"), "First panel's body should start with \"Lorem ipsum\"."); + assertTrue(selenium.getText(bodies[1]).startsWith("Nulla ornare"), "Second panel's body should start with \"Nulla ornare\"."); + } + + @Test + @Use(field = "panel", value = "bodies") + public void testBodyClass() { + testStyleClass(panel, "bodyClass"); + } + + @Test + public void testHeader() { + selenium.type(pjq("input[type=text][id$=headerInput]"), "new header"); + selenium.waitForPageToLoad(); + + assertEquals(selenium.getText(headers[0]), "header of panel", "Header of the first panel should not change (facet defined)."); + assertEquals(selenium.getText(headers[1]), "new header", "Header of the second panel."); + } + + @Test + public void testHeaderClass() { + testStyleClass(headers[0], "headerClass"); + } + + @Test + @Use(field = "panel", value = "panels") + public void testOnclick() { + testFireEvent(Event.CLICK, panel); + } + + @Test + @Use(field = "panel", value = "panels") + public void testOndblclick() { + testFireEvent(Event.DBLCLICK, panel); + } + + @Test + @Use(field = "panel", value = "panels") + public void testOnkeydown() { + testFireEvent(Event.KEYDOWN, panel); + } + + @Test + @Use(field = "panel", value = "panels") + public void testOnkeypress() { + testFireEvent(Event.KEYPRESS, panel); + } + + @Test + @Use(field = "panel", value = "panels") + public void testOnkeyup() { + testFireEvent(Event.KEYUP, panel); + } + + @Test + @Use(field = "panel", value = "panels") + public void testOnmousedown() { + testFireEvent(Event.MOUSEDOWN, panel); + } + + @Test + @Use(field = "panel", value = "panels") + public void testOnmousemove() { + testFireEvent(Event.MOUSEMOVE, panel); + } + + @Test + @Use(field = "panel", value = "panels") + public void testOnmouseout() { + testFireEvent(Event.MOUSEOUT, panel); + } + + @Test + @Use(field = "panel", value = "panels") + public void testOnmouseover() { + testFireEvent(Event.MOUSEOVER, panel); + } + + @Test + @Use(field = "panel", value = "panels") + public void testOnmouseup() { + testFireEvent(Event.MOUSEUP, panel); + } + + @Test + public void testRendered() { + selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); + selenium.waitForPageToLoad(); + + assertFalse(selenium.isElementPresent(panels[0]), "First panel should not be rendered when rendered=false."); + assertFalse(selenium.isElementPresent(panels[0]), "Second panel should not be rendered when rendered=false."); + } + + @Test + @Use(field = "panel", value = "panels") + public void testStyle() { + testStyle(panel, "style"); + } + + @Test + @Use(field = "panel", value = "panels") + public void testStyleClass() { + testStyleClass(panel, "styleClass"); + } + + @Test + @Use(field = "panel", value = "panels") + public void testTitle() { + testTitle(panel); + } +} Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanel/TestRichPanel.java ___________________________________________________________________ Name: svn:keywords + Revision

13 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r21059 - trunk/ui/iteration/ui/src/main/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2011-01-18 11:24:30 -0500 (Tue, 18 Jan 2011) New Revision: 21059 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java Log: RF-10217 Collapsible Sub Table - attributes for classes present but has no effect Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java 2011-01-18 15:56:26 UTC (rev 21058) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java 2011-01-18 16:24:30 UTC (rev 21059) @@ -24,6 +24,7 @@ import javax.faces.component.UIComponent; +import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; @@ -49,7 +50,12 @@ public static final String CAPTION_FACET_NAME = "caption"; + @Attribute + public abstract String getCaptionClass(); + @Attribute + public abstract String getStyleClass(); + public UIComponent getCaption() { return getFacets().get(CAPTION_FACET_NAME); } Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-01-18 15:56:26 UTC (rev 21058) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-01-18 16:24:30 UTC (rev 21059) @@ -77,6 +77,12 @@ @Attribute public abstract int getFrozenColumns(); + @Attribute + public abstract String getCaptionClass(); + + @Attribute + public abstract String getStyleClass(); + @Attribute(events=@EventName(value="selectionchange", defaultEvent=true)) public abstract String getOnselectionchange(); Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2011-01-18 15:56:26 UTC (rev 21058) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2011-01-18 16:24:30 UTC (rev 21059) @@ -117,9 +117,6 @@ public abstract String getRowClass(); @Attribute - public abstract String getCaptionClass(); - - @Attribute public abstract String getHeaderClass(); @Attribute @@ -133,9 +130,6 @@ @Attribute public abstract String getStyle(); - - @Attribute - public abstract String getStyleClass(); @Attribute public abstract Collection<Object> getSelection();

13 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r21058 - in trunk/ui/output/ui/src/main/java/org/richfaces: renderkit/html and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2011-01-18 10:56:26 -0500 (Tue, 18 Jan 2011) New Revision: 21058 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java Log: RF-9641: rich:tooltip - @target is taking clientId, but component.id is expected Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2011-01-18 15:40:18 UTC (rev 21057) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2011-01-18 15:56:26 UTC (rev 21058) @@ -66,7 +66,7 @@ } public String getTarget() { - return (String) getStateHelper().eval(Properties.target, getParent().getClientId()); + return (String) getStateHelper().eval(Properties.target, getParent().getId()); } public void setTarget(String target) { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-01-18 15:40:18 UTC (rev 21057) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-01-18 15:56:26 UTC (rev 21058) @@ -30,6 +30,7 @@ import org.richfaces.context.ExtendedPartialViewContext; import org.richfaces.renderkit.HtmlConstants; import org.richfaces.renderkit.MetaComponentRenderer; +import org.richfaces.renderkit.util.RendererUtils; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; @@ -69,6 +70,8 @@ public static final String BEFORE_HIDE = "beforehide"; public static final String BEFORE_SHOW = "beforeshow"; + private static final RendererUtils RENDERER_UTILS = RendererUtils.getInstance(); + @Override protected void doDecode(FacesContext context, UIComponent component) { AbstractTooltip tooltip = (AbstractTooltip) component; @@ -171,7 +174,7 @@ options.put("showDelay", tooltip.getShowDelay()); options.put("showEvent", tooltip.getShowEvent()); options.put("followMouse", tooltip.isFollowMouse()); - options.put("target", tooltip.getTarget()); + options.put("target", RENDERER_UTILS.findComponentFor(component, tooltip.getTarget()).getClientId(context)); addEventOption(context, tooltip, options, HIDE); addEventOption(context, tooltip, options, SHOW);

13 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r21057 - in trunk/ui/output/ui/src/main: java/org/richfaces/renderkit/html and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2011-01-18 10:40:18 -0500 (Tue, 18 Jan 2011) New Revision: 21057 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js trunk/ui/output/ui/src/main/templates/popupPanel.template.xml Log: RF-10097 Inline default values: output components I Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java 2011-01-18 15:12:23 UTC (rev 21056) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPopupPanel.java 2011-01-18 15:40:18 UTC (rev 21057) @@ -53,16 +53,16 @@ @Attribute public abstract int getWidth(); - @Attribute + @Attribute(defaultValue = "0") public abstract int getMinHeight(); - @Attribute + @Attribute(defaultValue = "0") public abstract int getMinWidth(); - @Attribute + @Attribute(defaultValue = "0") public abstract int getMaxHeight(); - @Attribute + @Attribute(defaultValue = "0") public abstract int getMaxWidth(); @Attribute Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2011-01-18 15:40:18 UTC (rev 21057) @@ -113,18 +113,16 @@ } } - if (panel.getMinHeight() != -1) { - if (panel.getMinHeight() < SIZE) { - throw new FacesException("Attribbute minWidth should be greater then 10px"); - } - - } - - if (panel.getMinWidth() != -1) { + if (panel.getMinWidth() != 0) { if (panel.getMinWidth() < SIZE) { throw new FacesException("Attribbute minHeight should be greater then 10px"); } + } + if (panel.getMinHeight() != 0) { + if (panel.getMinHeight() < SIZE) { + throw new FacesException("Attribbute minWidth should be greater then 10px"); + } } } @@ -188,8 +186,6 @@ return result; } - - private Map<String, Object> prepareVisualOptions(Object value, AbstractPopupPanel panel) { if (null == value) { return new HashMap<String, Object>(); @@ -226,20 +222,4 @@ } return topProperty; } - - protected int getMaxWidthOrDefault(UIComponent component) { - int maxWidth = ((AbstractPopupPanel) component).getMaxWidth(); - if (maxWidth == 0) { - maxWidth = Integer.MAX_VALUE; - } - return maxWidth; - } - - protected int getMaxHeightOrDefault(UIComponent component) { - int maxHeight = ((AbstractPopupPanel) component).getMaxHeight(); - if (maxHeight == 0) { - maxHeight = Integer.MAX_VALUE; - } - return maxHeight; - } } Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2011-01-18 15:12:23 UTC (rev 21056) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2011-01-18 15:40:18 UTC (rev 21057) @@ -31,10 +31,10 @@ } var defaultOptions = { - width:-1, - height:-1, - minWidth:-1, - minHeight:-1, + width:0, + height:0, + minWidth:0, + minHeight:0, modal:true, moveable:true, resizeable: false, @@ -280,39 +280,35 @@ var eContentElt = this.getContentElement(); if (!this.options.autosized) { - if (options.width && options.width == -1) + if (options.width && options.width == 0) options.width = 300; - if (options.height && options.height == -1) + if (options.height && options.height == 0) options.height = 200; } - if (options.width && options.width != -1) { + if (options.width && options.width != 0) { if (this.currentMinWidth > options.width) { options.width = this.currentMinWidth; } - if (options.width > this.maxWidth) { + if (this.maxWidth && options.width > this.maxWidth) { options.width = this.maxWidth; } $(richfaces.getDomElement(eContentElt)).css('width', options.width + (/px/.test(options.width) ? '' : 'px')); this.shadowDiv.css('width', options.width + (/px/.test(options.width) ? '' : 'px')); this.scrollerDiv.css('width', options.width + (/px/.test(options.width) ? '' : 'px')); - - } - if (options.height && options.height != -1) { + if (options.height && options.height != 0) { if (this.currentMinHeight > options.height) { options.height = this.currentMinHeight; } - if (options.height > this.maxHeight) { + if (this.maxHeigh && options.height > this.maxHeight) { options.height = this.maxHeight; } $(richfaces.getDomElement(eContentElt)).css('height', options.height + (/px/.test(options.height) ? '' : 'px')); this.shadowDiv.css('height', options.height + (/px/.test(options.height) ? '' : 'px')); var headerHeight = $(richfaces.getDomElement(this.markerId +"_header"))[0] ? $(richfaces.getDomElement(this.markerId +"_header"))[0].clientHeight : 0; this.scrollerDiv.css('height', options.height - headerHeight + (/px/.test(options.height) ? '' : 'px')); - - } var eIframe; if (this.options.overlapEmbedObjects && !this.iframe) { Modified: trunk/ui/output/ui/src/main/templates/popupPanel.template.xml =================================================================== --- trunk/ui/output/ui/src/main/templates/popupPanel.template.xml 2011-01-18 15:12:23 UTC (rev 21056) +++ trunk/ui/output/ui/src/main/templates/popupPanel.template.xml 2011-01-18 15:40:18 UTC (rev 21057) @@ -75,9 +75,7 @@ <cdk:scriptObject name="options"> <cdk:scriptOption name="left" value="#{getLeftOrDefault(component)}"/> <cdk:scriptOption name="top" value="#{getTopOrDefault(component)}"/> - <cdk:scriptOption name="maxWidth" value="#{getMaxWidthOrDefault(component)}"/> - <cdk:scriptOption name="maxHeight" value="#{getMaxHeightOrDefault(component)}"/> - <cdk:scriptOption attributes="width height minWidth minHeight moveable followByScroll zindex shadowDepth shadowOpacity domElementAttachment show keepVisualState autosized resizeable modal overlapEmbedObjects visualOptions " /> + <cdk:scriptOption attributes="minHeight minWidth maxHeight maxWidth width height moveable followByScroll zindex shadowDepth shadowOpacity domElementAttachment show keepVisualState autosized resizeable modal overlapEmbedObjects visualOptions " /> <cdk:scriptOption attributes="onshow onhide onresize onmove onbeforeshow onbeforehide" wrapper="eventHandler"/> </cdk:scriptObject> @@ -89,7 +87,5 @@ </script> </div> - - </cc:implementation> </cdk:root> \ No newline at end of file

13 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r21056 - trunk/examples/output-demo/src/main/java/org/richfaces and 12 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2011-01-18 10:12:23 -0500 (Tue, 18 Jan 2011) New Revision: 21056 Added: trunk/ui/output/ui/src/main/config/ trunk/ui/output/ui/src/main/config/faces-config.xml trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java Removed: trunk/ui/output/ui/src/main/java/org/richfaces/component/UICollapsiblePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuGroup.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelTitledItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlCollapsiblePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlDivPanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenuGroup.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenuItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTabPanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelTitledItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTooltip.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuGroupTest.java trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuItemTest.java trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuTest.java trunk/ui/output/ui/src/test/java/org/richfaces/component/UITogglePanelTitledItemTest.java Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java trunk/examples/output-demo/src/main/java/org/richfaces/ModalPanel.java trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml trunk/examples/output-demo/src/main/webapp/examples/collapsiblePanel.xhtml trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml trunk/examples/output-demo/src/main/webapp/examples/tooltip.xhtml trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDivPanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DivPanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/view/facelets/html/PanelMenuTagHandler.java trunk/ui/output/ui/src/test/java/org/richfaces/component/AbstractAccordionTest.java trunk/ui/output/ui/src/test/java/org/richfaces/component/UICollapsiblePanelTest.java trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xhtml Log: RF-9309: Move panels to CDK Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java 2011-01-18 14:48:02 UTC (rev 21055) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -26,8 +26,9 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; -import org.richfaces.component.html.HtmlAccordion; +import org.richfaces.component.UIAccordion; + import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +55,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlAccordion.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIAccordion.class, getClass()); attributes.setAttribute("activeItem", "item1"); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java 2011-01-18 14:48:02 UTC (rev 21055) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionItemBean.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -26,8 +26,9 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; -import org.richfaces.component.html.HtmlAccordionItem; +import org.richfaces.component.AbstractAccordionItem; + import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +55,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlAccordionItem.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(AbstractAccordionItem.class, getClass()); attributes.setAttribute("header", "Item 1"); attributes.setAttribute("name", "item1"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java 2011-01-18 14:48:02 UTC (rev 21055) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -27,7 +27,7 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; -import org.richfaces.component.html.HtmlTab; +import org.richfaces.component.AbstractTab; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(HtmlTab.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(AbstractTab.class, getClass()); attributes.setAttribute("header", "tab1 header"); attributes.setAttribute("name", "tab1"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2011-01-18 14:48:02 UTC (rev 21055) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -21,17 +21,16 @@ *******************************************************************************/ package org.richfaces.tests.metamer.bean; -import java.io.Serializable; +import org.richfaces.component.UITabPanel; +import org.richfaces.tests.metamer.Attributes; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; +import java.io.Serializable; -import org.richfaces.component.html.HtmlTabPanel; -import org.richfaces.tests.metamer.Attributes; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Managed bean for rich:tabPanel. * @@ -54,7 +53,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromClass(HtmlTabPanel.class, getClass()); + attributes = Attributes.getComponentAttributesFromClass(UITabPanel.class, getClass()); attributes.setAttribute("activeItem", "tab1"); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java 2011-01-18 14:48:02 UTC (rev 21055) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -27,7 +27,7 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; -import org.richfaces.component.html.HtmlTogglePanel; +import org.richfaces.component.UITogglePanel; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlTogglePanel.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UITogglePanel.class, getClass()); attributes.setAttribute("activeItem", "item1"); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java 2011-01-18 14:48:02 UTC (rev 21055) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelItemBean.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -27,7 +27,7 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; -import org.richfaces.component.html.HtmlTogglePanelItem; +import org.richfaces.component.UITogglePanelItem; import org.richfaces.tests.metamer.Attributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +54,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getComponentAttributesFromFacesConfig(HtmlTogglePanelItem.class, getClass()); + attributes = Attributes.getComponentAttributesFromFacesConfig(UITogglePanelItem.class, getClass()); attributes.setAttribute("name", "item1"); attributes.setAttribute("rendered", true); Modified: trunk/examples/output-demo/src/main/java/org/richfaces/ModalPanel.java =================================================================== --- trunk/examples/output-demo/src/main/java/org/richfaces/ModalPanel.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/java/org/richfaces/ModalPanel.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -202,6 +202,10 @@ this.domElementAttachment = domElementAttachment; } + public void itemChangeEventListener() { + + } + public void itemChangeEventListener(ItemChangeEvent event) { System.out.println("item was changed from '" + event.getOldItem() + "' to '" + event.getNewItem() + "'"); } Modified: trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn"> + xmlns:pn="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/examples/collapsiblePanel.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/collapsiblePanel.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/webapp/examples/collapsiblePanel.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn"> + xmlns:pn="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -26,7 +26,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn"> + xmlns:pn="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn"> + xmlns:pn="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -3,8 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" - xmlns:ou="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -23,38 +22,38 @@ </pn:togglePanel> <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name1" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" /> name1 </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name2" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" /> name2 </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name3" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" /> name3 </h:outputLink> <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@first" event="click"/> + <pn:toggleControl targetPanel="panel" targetItem="@first" event="click"/> |< first </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@prev" event="click"/> + <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click"/> <- prev </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@next" event="click"/> + <pn:toggleControl targetPanel="panel" targetItem="@next" event="click"/> next -> </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@last" event="click"/> + <pn:toggleControl targetPanel="panel" targetItem="@last" event="click"/> last >| </h:outputLink> </h:form> Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -3,8 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" - xmlns:ou="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -21,38 +20,38 @@ </pn:togglePanel> <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name1" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" /> name1 </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name2" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" /> name2 </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name3" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" /> name3 </h:outputLink> <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@first" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="@first" event="click" /> |< first </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@prev" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click" /> <- prev </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@next" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="@next" event="click" /> next -> </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@last" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="@last" event="click" /> last >| </h:outputLink> </h:form> Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -3,8 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" - xmlns:ou="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -22,43 +21,43 @@ </pn:togglePanel> <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name1" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" /> name1 client </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name2" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" /> name2 ajax </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name3" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" /> name3 server </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name4" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name4" event="click" /> name4 client disabled </h:outputLink> <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@first" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="@first" event="click" /> |< first </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@prev" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click" /> <- prev </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@next" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="@next" event="click" /> next -> </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@last" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="@last" event="click" /> last >| </h:outputLink> </h:form> Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -3,8 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" - xmlns:ou="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -22,38 +21,38 @@ </pn:togglePanel> <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name1" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" /> name1 </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name2" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" /> name2 </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="name3" event="click" /> + <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" /> name3 </h:outputLink> <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@first" event="click"/> + <pn:toggleControl targetPanel="panel" targetItem="@first" event="click"/> |< first </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@prev" event="click"/> + <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click"/> <- prev </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@next" event="click"/> + <pn:toggleControl targetPanel="panel" targetItem="@next" event="click"/> next -> </h:outputLink> | <h:outputLink> - <ou:toggleControl targetPanel="panel" targetItem="@last" event="click"/> + <pn:toggleControl targetPanel="panel" targetItem="@last" event="click"/> last >| </h:outputLink> </h:form> Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -3,8 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" - xmlns:ou="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -24,12 +23,12 @@ </pn:togglePanel> <h:outputLink> - <ou:toggleControl targetPanel="my_id" targetItem="name2" event="click" /> + <pn:toggleControl targetPanel="my_id" targetItem="name2" event="click" /> Click me :) it is toggle control </h:outputLink> <h:outputLink> - <ou:toggleControl targetPanel="my_id" targetItem="name1" event="click" /> + <pn:toggleControl targetPanel="my_id" targetItem="name1" event="click" /> Click me :) it another toggle control </h:outputLink> Modified: trunk/examples/output-demo/src/main/webapp/examples/tooltip.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/tooltip.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/webapp/examples/tooltip.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -27,7 +27,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" + xmlns:pn="http://richfaces.org/output" xmlns:rich="http://richfaces.org/output" xmlns:a4j="http://richfaces.org/a4j"> Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -27,7 +27,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn"> + xmlns:pn="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> Added: trunk/ui/output/ui/src/main/config/faces-config.xml =================================================================== --- trunk/ui/output/ui/src/main/config/faces-config.xml (rev 0) +++ trunk/ui/output/ui/src/main/config/faces-config.xml 2011-01-18 15:12:23 UTC (rev 21056) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" + xmlns:cdk="http://jboss.org/schema/richfaces/cdk/extensions" + version="2.0"> + + <faces-config-extension> + <cdk:faces-event> + <cdk:event-class>org.richfaces.event.ItemChangeEvent</cdk:event-class> + <cdk:listener-class>org.richfaces.event.ItemChangeListener</cdk:listener-class> + <cdk:source-class>org.richfaces.event.ItemChangeSource</cdk:source-class> + <cdk:tag> + <cdk:tag-name>itemChangeListener</cdk:tag-name> + <cdk:tag-type>Facelets</cdk:tag-type> + <cdk:handler-class>org.richfaces.view.facelets.html.ItemChangeListenerHandler</cdk:handler-class> + <cdk:generate>false</cdk:generate> + </cdk:tag> + </cdk:faces-event> + + <cdk:faces-event> + <cdk:event-class>org.richfaces.event.PanelToggleEvent</cdk:event-class> + <cdk:listener-class>org.richfaces.event.PanelToggleListener</cdk:listener-class> + <cdk:source-class>org.richfaces.event.PanelToggleSource</cdk:source-class> + <cdk:tag> + <cdk:tag-name>panelToggleListener</cdk:tag-name> + <cdk:tag-type>Facelets</cdk:tag-type> + <cdk:handler-class>org.richfaces.view.facelets.html.PanelToggleListenerHandler</cdk:handler-class> + <cdk:generate>false</cdk:generate> + </cdk:tag> + </cdk:faces-event> + </faces-config-extension> + +</faces-config> Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -23,19 +23,22 @@ package org.richfaces.component; +import org.richfaces.cdk.annotations.*; /** * @author akolonitsky * @since 2010-08-05 */ -public class AbstractAccordion extends UITogglePanel { +@JsfComponent(tag = @Tag(type = TagType.Facelets, handler = "org.richfaces.view.facelets.html.TogglePanelTagHandler"), + renderer = @JsfRenderer(type = "org.richfaces.AccordionRenderer")) +public abstract class AbstractAccordion extends AbstractTogglePanel { public static final String COMPONENT_TYPE = "org.richfaces.Accordion"; public static final String COMPONENT_FAMILY = "org.richfaces.Accordion"; protected AbstractAccordion() { - setRendererType("org.richfaces.Accordion"); + setRendererType("org.richfaces.AccordionRenderer"); } @Override @@ -51,4 +54,88 @@ } return res; } + + // ------------------------------------------------ Html Attributes + + @Attribute + public abstract String getItemLeftIconActive(); + + @Attribute + public abstract String getItemLeftIconInactive(); + + @Attribute + public abstract String getItemLeftIconDisabled(); + + @Attribute + public abstract String getItemRightIconActive(); + + @Attribute + public abstract String getItemRightIconInactive(); + + @Attribute + public abstract String getItemRightIconDisabled(); + + @Attribute + public abstract String getWidth(); + + @Attribute + public abstract String getHeight(); + + @Attribute + public abstract String getItemHeaderClassActive(); + + @Attribute + public abstract String getItemHeaderClassDisabled(); + + @Attribute + public abstract String getItemHeaderClassInactive(); + + @Attribute + public abstract String getItemContentClass(); + + @Attribute + public abstract String getItemHeaderClass(); + + @Attribute(events = @EventName("itemchange")) + public abstract String getOnitemchange(); + + @Attribute(events = @EventName("beforeitemchange")) + public abstract String getOnbeforeitemchange(); + + @Attribute + public abstract String getLang(); + + @Attribute + public abstract String getTitle(); + + @Attribute + public abstract String getStyle(); + + @Attribute + public abstract String getStyleClass(); + + @Attribute + public abstract String getDir(); + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); + } Copied: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java (from rev 20980, trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordionItem.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -0,0 +1,214 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.component; + +import org.richfaces.cdk.annotations.*; +import org.richfaces.component.behavior.ToggleControl; + +import javax.faces.component.behavior.ClientBehaviorHolder; + +/** + * @author akolonitsky + * @since 2010-08-13 + */ +@JsfComponent(tag = @Tag(type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.AccordionItemRenderer")) +public abstract class AbstractAccordionItem extends AbstractTogglePanelTitledItem implements ClientBehaviorHolder { + + public static final String COMPONENT_TYPE = "org.richfaces.AccordionItem"; + + public static final String COMPONENT_FAMILY = "org.richfaces.AccordionItem"; + + enum Properties { + contentClass, leftIconActive, leftIconInactive, leftIconDisabled, rightIconActive, rightIconDisabled, rightIconInactive, headerClassActive, headerClassDisabled, headerClassInactive, headerClass; + } + + public AbstractAccordionItem() { + setRendererType("org.richfaces.AccordionItemRenderer"); + } + + public AbstractAccordion getAccordion() { + return (AbstractAccordion) ToggleControl.getEnclosedPanel(this); + } + + @Attribute(defaultValue = "getAccordion().getItemLeftIconActive()", generate = false) + public String getLeftIconActive() { + return (String) getStateHelper().eval(Properties.leftIconActive, getAccordion().getItemLeftIconActive()); + } + + public void setLeftIconActive(String leftIconActive) { + getStateHelper().put(Properties.leftIconActive, leftIconActive); + } + + @Attribute(defaultValue = "getAccordion().getItemLeftIconDisabled()", generate = false) + public String getLeftIconDisabled() { + return (String) getStateHelper().eval(Properties.leftIconDisabled, getAccordion().getItemLeftIconDisabled()); + } + + public void setLeftIconDisabled(String leftIconDisabled) { + getStateHelper().put(Properties.leftIconDisabled, leftIconDisabled); + } + + + @Attribute(defaultValue = "getAccordion().getItemLeftIconInactive()", generate = false) + public String getLeftIconInactive() { + return (String) getStateHelper().eval(Properties.leftIconInactive, getAccordion().getItemLeftIconInactive()); + } + + public void setLeftIconInactive(String leftIconInactive) { + getStateHelper().put(Properties.leftIconInactive, leftIconInactive); + } + + @Attribute(defaultValue = "getAccordion().getItemRightIconActive()", generate = false) + public String getRightIconActive() { + return (String) getStateHelper().eval(Properties.rightIconActive, getAccordion().getItemRightIconActive()); + } + + public void setRightIconActive(String rightIconActive) { + getStateHelper().put(Properties.rightIconActive, rightIconActive); + } + + @Attribute(defaultValue = "getAccordion().getItemRightIconDisabled()", generate = false) + public String getRightIconDisabled() { + return (String) getStateHelper().eval(Properties.rightIconDisabled, getAccordion().getItemRightIconDisabled()); + } + + public void setRightIconDisabled(String rightIconDisabled) { + getStateHelper().put(Properties.rightIconDisabled, rightIconDisabled); + } + + @Attribute(defaultValue = "getAccordion().getItemRightIconInactive()", generate = false) + public String getRightIconInactive() { + return (String) getStateHelper().eval(Properties.rightIconInactive, getAccordion().getItemRightIconInactive()); + } + + public void setRightIconInactive(String rightIconInactive) { + getStateHelper().put(Properties.rightIconInactive, rightIconInactive); + } + + @Attribute(defaultValue = "getAccordion().getItemHeaderClassActive()", generate = false) + public String getHeaderClassActive() { + return (String) getStateHelper().eval(Properties.headerClassActive, getAccordion().getItemHeaderClassActive()); + } + + public void setHeaderClassActive(String headerClassActive) { + getStateHelper().put(Properties.headerClassActive, headerClassActive); + } + + @Attribute(defaultValue = "getAccordion().getItemHeaderClassDisabled()", generate = false) + public String getHeaderClassDisabled() { + return (String) getStateHelper().eval(Properties.headerClassDisabled, getAccordion().getItemHeaderClassDisabled()); + } + + public void setHeaderClassDisabled(String headerClassDisabled) { + getStateHelper().put(Properties.headerClassDisabled, headerClassDisabled); + } + + @Attribute(defaultValue = "getAccordion().getItemHeaderClassInactive()", generate = false) + public String getHeaderClassInactive() { + return (String) getStateHelper().eval(Properties.headerClassInactive, getAccordion().getItemHeaderClassInactive()); + } + + public void setHeaderClassInactive(String headerClassInactive) { + getStateHelper().put(Properties.headerClassInactive, headerClassInactive); + } + + @Attribute(defaultValue = "getAccordion().getItemHeaderClass()") + public String getHeaderClass() { + return (String) getStateHelper().eval(Properties.headerClass, getAccordion().getItemHeaderClass()); + } + + public void setHeaderClass(String headerClass) { + getStateHelper().put(Properties.headerClass, headerClass); + } + + @Attribute + public abstract String getHeaderStyle(); + + @Attribute(defaultValue = "getAccordion().getItemContentClass()") + public String getContentClass() { + return (String) getStateHelper().eval(Properties.contentClass, getAccordion().getItemContentClass()); + } + + public void setContentClass(String contentClass) { + getStateHelper().put(Properties.contentClass, contentClass); + } + + @Attribute(events = @EventName("headerclick")) + public abstract String getOnheaderclick(); + + @Attribute(events = @EventName("headerdblclick")) + public abstract String getOnheaderdblclick(); + + @Attribute(events = @EventName("headermousedown")) + public abstract String getOnheadermousedown(); + + @Attribute(events = @EventName("headermousemove")) + public abstract String getOnheadermousemove(); + + @Attribute(events = @EventName("headermouseup")) + public abstract String getOnheadermouseup(); + + @Attribute(events = @EventName("enter")) + public abstract String getOnenter(); + + @Attribute(events = @EventName("leave")) + public abstract String getOnleave(); + + @Attribute + public abstract String getLang(); + + @Attribute + public abstract String getTitle(); + + @Attribute + public abstract String getStyle(); + + @Attribute + public abstract String getStyleClass(); + + @Attribute + public abstract String getDir(); + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); + +} + Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -22,6 +22,7 @@ package org.richfaces.component; +import org.richfaces.cdk.annotations.*; import org.richfaces.event.PanelToggleEvent; import org.richfaces.event.PanelToggleListener; import org.richfaces.event.PanelToggleSource; @@ -35,7 +36,9 @@ * @author akolonitsky * @since 2010-08-27 */ -public abstract class AbstractCollapsiblePanel extends UITogglePanel implements PanelToggleSource { +@JsfComponent(tag = @Tag(type = TagType.Facelets, handler = "org.richfaces.view.facelets.html.CollapsiblePanelTagHandler"), + renderer = @JsfRenderer(type = "org.richfaces.CollapsiblePanelRenderer")) +public abstract class AbstractCollapsiblePanel extends AbstractTogglePanel implements PanelToggleSource { public static final String COMPONENT_TYPE = "org.richfaces.CollapsiblePanel"; @@ -57,7 +60,7 @@ } protected AbstractCollapsiblePanel() { - setRendererType("org.richfaces.CollapsiblePanel"); + setRendererType("org.richfaces.CollapsiblePanelRenderer"); } @Override @@ -90,10 +93,6 @@ setActiveItem(String.valueOf(isExpanded)); } - public abstract String getHeader(); - - public abstract MethodExpression getPanelToggleListener(); - @Override public void queueEvent(FacesEvent facesEvent) { PanelToggleEvent event = null; @@ -106,6 +105,85 @@ super.queueEvent(event != null ? event : facesEvent); } + // ------------------------------------------------ Component Attributes + + @Attribute + public abstract String getHeader(); + + @Attribute + public abstract MethodExpression getPanelToggleListener(); + + // ------------------------------------------------ Html Attributes + + @Attribute + public abstract String getLeftCollapsedIcon(); + + @Attribute + public abstract String getLeftExpandedIcon(); + + @Attribute + public abstract String getRightCollapsedIcon(); + + @Attribute + public abstract String getRightExpandedIcon(); + + @Attribute + public abstract String getBodyClass(); + + @Attribute + public abstract String getHeaderClass(); + + @Attribute + public abstract String getHeaderControlClass(); + + @Attribute + public abstract String getOncomplete(); + + @Attribute + public abstract String getOnbeforedomupdate(); + + @Attribute(events = @EventName("switch")) + public abstract String getOnswitch(); + + @Attribute(events = @EventName("beforeswitch")) + public abstract String getOnbeforeswitch(); + + @Attribute + public abstract String getLang(); + + @Attribute + public abstract String getTitle(); + + @Attribute + public abstract String getStyle(); + + @Attribute + public abstract String getStyleClass(); + + @Attribute + public abstract String getDir(); + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); + // ------------------------------------------------ Event Processing Methods public void addPanelToggleListener(PanelToggleListener listener) { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDivPanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDivPanel.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractDivPanel.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -22,6 +22,9 @@ package org.richfaces.component; +import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.EventName; + import javax.faces.component.UIOutput; /** @@ -36,11 +39,49 @@ public static final String COMPONENT_FAMILY = "org.richfaces.DivPanel"; protected AbstractDivPanel() { - setRendererType("org.richfaces.DivPanel"); + setRendererType("org.richfaces.DivPanelRenderer"); } @Override public String getFamily() { return COMPONENT_FAMILY; } + + // ------------------------------------------------ Html Attributes + + @Attribute + public abstract String getLang(); + + @Attribute + public abstract String getTitle(); + + @Attribute + public abstract String getStyle(); + + @Attribute + public abstract String getStyleClass(); + + @Attribute + public abstract String getDir(); + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -23,6 +23,14 @@ package org.richfaces.component; +import org.richfaces.PanelMenuMode; +import org.richfaces.cdk.annotations.*; +import org.richfaces.event.ItemChangeEvent; +import org.richfaces.event.ItemChangeListener; +import org.richfaces.event.ItemChangeSource; +import org.richfaces.renderkit.util.PanelIcons; + +import javax.el.MethodExpression; import javax.el.ValueExpression; import javax.faces.component.UIComponent; import javax.faces.component.UIOutput; @@ -31,15 +39,14 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; -import org.richfaces.PanelMenuMode; -import org.richfaces.event.ItemChangeEvent; -import org.richfaces.event.ItemChangeListener; -import org.richfaces.event.ItemChangeSource; - /** * @author akolonitsky * @since 2010-10-25 */ +@JsfComponent( + tag = @Tag(type = TagType.Facelets, handler = "org.richfaces.view.facelets.html.PanelMenuTagHandler"), + renderer = @JsfRenderer(type = "org.richfaces.PanelMenuRenderer") +) public abstract class AbstractPanelMenu extends UIOutput implements ItemChangeSource { public static final String COMPONENT_TYPE = "org.richfaces.PanelMenu"; @@ -53,7 +60,7 @@ } protected AbstractPanelMenu() { - setRendererType("org.richfaces.PanelMenu"); + setRendererType("org.richfaces.PanelMenuRenderer"); } @Override @@ -161,34 +168,291 @@ return COMPONENT_FAMILY; } + + // ------------------------------------------------ Component Attributes + + @Attribute public abstract boolean isDisabled(); + @Attribute(defaultValue = "click") public abstract String getExpandEvent(); + @Attribute(defaultValue = "click") public abstract String getCollapseEvent(); + @Attribute(defaultValue = "PanelMenuMode.client") public abstract PanelMenuMode getGroupMode(); + @Attribute(defaultValue = "true") public abstract boolean isExpandSingle(); + @Attribute(defaultValue = "PanelMenuMode.DEFAULT") public abstract PanelMenuMode getItemMode(); + @Attribute(defaultValue = "true") public abstract boolean isBubbleSelection(); - public abstract String getItemChangeListener(); + @Attribute + public abstract MethodExpression getItemChangeListener(); + @Attribute public abstract boolean isBypassUpdates(); + @Attribute public abstract boolean isLimitRender(); + @Attribute public abstract Object getData(); + @Attribute public abstract String getStatus(); + @Attribute public abstract Object getExecute(); + @Attribute public abstract Object getRender(); + // ------------------------------------------------ Html Attributes + enum Properties { + itemIconRight, itemDisableIconLeft, itemDisableIconRight, topItemIconLeft, topItemIconRight, topItemDisableIconLeft, topItemDisableIconRight, groupExpandIconLeft, groupExpandIconRight, groupCollapseIconLeft, groupCollapseIconRight, groupDisableIconLeft, groupDisableIconRight, topGroupExpandIconLeft, topGroupExpandIconRight, topGroupCollapseIconLeft, topGroupCollapseIconRight, topGroupDisableIconLeft, topGroupDisableIconRight, itemIconLeft + + } + + @Attribute + public abstract String getStyle(); + + @Attribute + public abstract String getStyleClass(); + + @Attribute + public abstract String getWidth(); + + @Attribute + public abstract String getItemClass(); + + @Attribute + public abstract String getItemDisableClass(); + + @Attribute(generate = false) + public String getItemIconLeft() { + return (String) getStateHelper().eval(Properties.itemIconLeft, PanelIcons.DEFAULT.toString()); + } + + public void setItemIconLeft(String itemIconLeft) { + getStateHelper().put(Properties.itemIconLeft, itemIconLeft); + } + + @Attribute(generate = false) + public String getItemIconRight() { + return (String) getStateHelper().eval(Properties.itemIconRight, PanelIcons.DEFAULT.toString()); + } + + public void setItemIconRight(String itemIconRight) { + getStateHelper().put(Properties.itemIconRight, itemIconRight); + } + + @Attribute(generate = false) + public String getItemDisableIconLeft() { + return (String) getStateHelper().eval(Properties.itemDisableIconLeft, PanelIcons.DEFAULT.toString()); + } + + public void setItemDisableIconLeft(String itemDisableIconLeft) { + getStateHelper().put(Properties.itemDisableIconLeft, itemDisableIconLeft); + } + + @Attribute(generate = false) + public String getItemDisableIconRight() { + return (String) getStateHelper().eval(Properties.itemDisableIconRight, PanelIcons.DEFAULT.toString()); + } + + public void setItemDisableIconRight(String itemDisableIconRight) { + getStateHelper().put(Properties.itemDisableIconRight, itemDisableIconRight); + } + + @Attribute + public abstract String getTopItemClass(); + + @Attribute + public abstract String getTopItemDisableClass(); + + @Attribute(generate = false) + public String getTopItemIconLeft() { + return (String) getStateHelper().eval(Properties.topItemIconLeft, PanelIcons.DEFAULT.toString()); + } + + public void setTopItemIconLeft(String topItemIconLeft) { + getStateHelper().put(Properties.topItemIconLeft, topItemIconLeft); + } + + @Attribute(generate = false) + public String getTopItemIconRight() { + return (String) getStateHelper().eval(Properties.topItemIconRight, PanelIcons.DEFAULT.toString()); + } + + public void setTopItemIconRight(String topItemIconRight) { + getStateHelper().put(Properties.topItemIconRight, topItemIconRight); + } + + @Attribute(generate = false) + public String getTopItemDisableIconLeft() { + return (String) getStateHelper().eval(Properties.topItemDisableIconLeft, PanelIcons.DEFAULT.toString()); + } + + public void setTopItemDisableIconLeft(String topItemDisableIconLeft) { + getStateHelper().put(Properties.topItemDisableIconLeft, topItemDisableIconLeft); + } + + @Attribute(generate = false) + public String getTopItemDisableIconRight() { + return (String) getStateHelper().eval(Properties.topItemDisableIconRight, PanelIcons.DEFAULT.toString()); + } + + public void setTopItemDisableIconRight(String topItemDisableIconRight) { + getStateHelper().put(Properties.topItemDisableIconRight, topItemDisableIconRight); + } + + @Attribute + public abstract String getGroupClass(); + + @Attribute + public abstract String getGroupDisableClass(); + + @Attribute(generate = false) + public String getGroupExpandIconLeft() { + return (String) getStateHelper().eval(Properties.groupExpandIconLeft, PanelIcons.DEFAULT.toString()); + } + + public void setGroupExpandIconLeft(String groupExpandIconLeft) { + getStateHelper().put(Properties.groupExpandIconLeft, groupExpandIconLeft); + } + + @Attribute(generate = false) + public String getGroupExpandIconRight() { + return (String) getStateHelper().eval(Properties.groupExpandIconRight, PanelIcons.DEFAULT.toString()); + } + + public void setGroupExpandIconRight(String groupExpandIconRight) { + getStateHelper().put(Properties.groupExpandIconRight, groupExpandIconRight); + } + + @Attribute(generate = false) + public String getGroupCollapseIconLeft() { + return (String) getStateHelper().eval(Properties.groupCollapseIconLeft, PanelIcons.DEFAULT.toString()); + } + + public void setGroupCollapseIconLeft(String groupCollapseIconLeft) { + getStateHelper().put(Properties.groupCollapseIconLeft, groupCollapseIconLeft); + } + + @Attribute(generate = false) + public String getGroupCollapseIconRight() { + return (String) getStateHelper().eval(Properties.groupCollapseIconRight, PanelIcons.DEFAULT.toString()); + } + + public void setGroupCollapseIconRight(String groupCollapseIconRight) { + getStateHelper().put(Properties.groupCollapseIconRight, groupCollapseIconRight); + } + + @Attribute(generate = false) + public String getGroupDisableIconLeft() { + return (String) getStateHelper().eval(Properties.groupDisableIconLeft, PanelIcons.DEFAULT.toString()); + } + + public void setGroupDisableIconLeft(String groupDisableIconLeft) { + getStateHelper().put(Properties.groupDisableIconLeft, groupDisableIconLeft); + } + + @Attribute(generate = false) + public String getGroupDisableIconRight() { + return (String) getStateHelper().eval(Properties.groupDisableIconRight, PanelIcons.DEFAULT.toString()); + } + + public void setGroupDisableIconRight(String groupDisableIconRight) { + getStateHelper().put(Properties.groupDisableIconRight, groupDisableIconRight); + } + + @Attribute + public abstract String getTopGroupClass(); + + @Attribute + public abstract String getTopGroupDisableClass(); + + @Attribute(generate = false) + public String getTopGroupExpandIconLeft() { + return (String) getStateHelper().eval(Properties.topGroupExpandIconLeft, PanelIcons.DEFAULT.toString()); + } + + public void setTopGroupExpandIconLeft(String topGroupExpandIconLeft) { + getStateHelper().put(Properties.topGroupExpandIconLeft, topGroupExpandIconLeft); + } + + @Attribute(generate = false) + public String getTopGroupExpandIconRight() { + return (String) getStateHelper().eval(Properties.topGroupExpandIconRight, PanelIcons.DEFAULT.toString()); + } + + public void setTopGroupExpandIconRight(String topGroupExpandIconRight) { + getStateHelper().put(Properties.topGroupExpandIconRight, topGroupExpandIconRight); + } + + @Attribute(generate = false) + public String getTopGroupCollapseIconLeft() { + return (String) getStateHelper().eval(Properties.topGroupCollapseIconLeft, PanelIcons.DEFAULT.toString()); + } + + public void setTopGroupCollapseIconLeft(String topGroupCollapseIconLeft) { + getStateHelper().put(Properties.topGroupCollapseIconLeft, topGroupCollapseIconLeft); + } + + @Attribute(generate = false) + public String getTopGroupCollapseIconRight() { + return (String) getStateHelper().eval(Properties.topGroupCollapseIconRight, PanelIcons.DEFAULT.toString()); + } + + public void setTopGroupCollapseIconRight(String topGroupCollapseIconRight) { + getStateHelper().put(Properties.topGroupCollapseIconRight, topGroupCollapseIconRight); + } + + @Attribute(generate = false) + public String getTopGroupDisableIconLeft() { + return (String) getStateHelper().eval(Properties.topGroupDisableIconLeft, PanelIcons.DEFAULT.toString()); + } + + public void setTopGroupDisableIconLeft(String topGroupDisableIconLeft) { + getStateHelper().put(Properties.topGroupDisableIconLeft, topGroupDisableIconLeft); + } + + @Attribute(generate = false) + public String getTopGroupDisableIconRight() { + return (String) getStateHelper().eval(Properties.topGroupDisableIconRight, PanelIcons.DEFAULT.toString()); + } + + public void setTopGroupDisableIconRight(String topGroupDisableIconRight) { + getStateHelper().put(Properties.topGroupDisableIconRight, topGroupDisableIconRight); + } + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); + public AbstractPanelMenuItem getItem(String itemName) { if (itemName == null) { throw new IllegalArgumentException("Icon name can't be null"); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuGroup.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -23,20 +23,22 @@ package org.richfaces.component; +import org.richfaces.cdk.annotations.*; +import org.richfaces.event.ItemChangeEvent; +import org.richfaces.event.PanelToggleEvent; + import javax.el.MethodExpression; import javax.el.ValueExpression; import javax.faces.context.FacesContext; import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; -import org.richfaces.event.ItemChangeEvent; -import org.richfaces.event.PanelToggleEvent; - /** * @author akolonitsky * @since 2010-10-25 */ -public abstract class AbstractPanelMenuGroup extends UIPanelMenuItem { +@JsfComponent(tag = @Tag(type = TagType.Facelets)) +public abstract class AbstractPanelMenuGroup extends AbstractPanelMenuItem { public static final String COMPONENT_TYPE = "org.richfaces.PanelMenuGroup"; @@ -44,11 +46,11 @@ private Boolean submittedExpanded; private enum PropertyKeys { - immediate + selectable, immediate } protected AbstractPanelMenuGroup() { - setRendererType("org.richfaces.PanelMenuGroup"); + setRendererType("org.richfaces.PanelMenuGroupRenderer"); } @Override @@ -147,13 +149,180 @@ getStateHelper().put(PropertyKeys.immediate, immediate); } + // ------------------------------------------------ Component Attributes + + @Attribute(defaultValue = "Boolean.FALSE") + public abstract Boolean isSelectable(); + +/* + @Override + public PanelMenuMode getMode() { + return (PanelMenuMode) getStateHelper().eval(UIPanelMenuItem.PropertyKeys.mode, getPanelMenu().getGroupMode()); + } +*/ + + @Attribute(defaultValue = "getPanelMenu().isExpandSingle()") public abstract boolean isExpandSingle(); + @Attribute(defaultValue = "click") public abstract String getCollapseEvent(); + @Attribute(defaultValue = "click") public abstract String getExpandEvent(); + @Attribute(defaultValue = "getPanelMenu().isBubbleSelection()") public abstract boolean isBubbleSelection(); + @Attribute public abstract MethodExpression getChangeExpandListener(); + + // ------------------------------------------------ Html Attributes + + enum Properties { + iconLeftDisabled, iconLeftExpanded, iconRightCollapsed, iconRightDisabled, iconRightExpanded, disabledClass, styleClass, iconLeftCollapsed + + } + + @Attribute(generate = false) + public String getIconLeftCollapsed() { + return (String) getStateHelper().eval(Properties.iconLeftCollapsed, + isTopItem() ? getPanelMenu().getTopGroupCollapseIconLeft() : getPanelMenu().getGroupCollapseIconLeft()); + } + + public void setIconLeftCollapsed(String iconLeftCollapsed) { + getStateHelper().put(Properties.iconLeftCollapsed, iconLeftCollapsed); + } + + + @Attribute(generate = false) + public String getIconLeftDisabled() { + return (String) getStateHelper().eval(Properties.iconLeftDisabled, + isTopItem() ? getPanelMenu().getTopGroupDisableIconLeft() : getPanelMenu().getGroupDisableIconLeft()); + } + + public void setIconLeftDisabled(String iconLeftDisabled) { + getStateHelper().put(Properties.iconLeftDisabled, iconLeftDisabled); + } + + @Attribute(generate = false) + public String getIconLeftExpanded() { + return (String) getStateHelper().eval(Properties.iconLeftExpanded, + isTopItem() ? getPanelMenu().getTopGroupExpandIconLeft() : getPanelMenu().getGroupExpandIconLeft()); + } + + public void setIconLeftExpanded(String iconLeftExpanded) { + getStateHelper().put(Properties.iconLeftExpanded, iconLeftExpanded); + } + + @Attribute(generate = false) + public String getIconRightCollapsed() { + return (String) getStateHelper().eval(Properties.iconRightCollapsed, + isTopItem() ? getPanelMenu().getTopGroupCollapseIconRight() : getPanelMenu().getGroupCollapseIconRight()); + } + + public void setIconRightCollapsed(String iconRightCollapsed) { + getStateHelper().put(Properties.iconRightCollapsed, iconRightCollapsed); + } + + @Attribute(generate = false) + public String getIconRightDisabled() { + return (String) getStateHelper().eval(Properties.iconRightDisabled, + isTopItem() ? getPanelMenu().getTopGroupDisableIconRight() : getPanelMenu().getGroupDisableIconRight()); + } + + public void setIconRightDisabled(String iconRightDisabled) { + getStateHelper().put(Properties.iconRightDisabled, iconRightDisabled); + } + + @Attribute(generate = false) + public String getIconRightExpanded() { + return (String) getStateHelper().eval(Properties.iconRightExpanded, + isTopItem() ? getPanelMenu().getTopGroupExpandIconRight() : getPanelMenu().getGroupExpandIconRight()); + } + + public void setIconRightExpanded(String iconRightExpanded) { + getStateHelper().put(Properties.iconRightExpanded, iconRightExpanded); + } + + @Attribute(events = @EventName("collapse")) + public abstract String getOncollapse(); + + @Attribute(events = @EventName("expand")) + public abstract String getOnexpand(); + + @Attribute(events = @EventName("switch")) + public abstract String getOnswitch(); + + @Attribute(events = @EventName("beforecollapse")) + public abstract String getOnbeforecollapse(); + + @Attribute(events = @EventName("beforeexpand")) + public abstract String getOnbeforeexpand(); + + @Attribute(events = @EventName("beforeswitch")) + public abstract String getOnbeforeswitch(); + + @Attribute(generate = false) + public String getDisabledClass() { + return (String) getStateHelper().eval(Properties.disabledClass, + isTopItem() ? getPanelMenu().getTopGroupDisableClass() : getPanelMenu().getGroupDisableClass()); + } + + public void setDisabledClass(String disabledClass) { + getStateHelper().put(Properties.disabledClass, disabledClass); + } + + public abstract String getHoverClass(); + + public abstract String getIconLeftClass(); + + public abstract String getIconRightClass(); + + public abstract String getStyle(); + + @Attribute(generate = false) + public String getStyleClass() { + return (String) getStateHelper().eval(Properties.styleClass, + isTopItem() ? getPanelMenu().getTopGroupClass() : getPanelMenu().getGroupClass()); + } + + public void setStyleClass(String styleClass) { + getStateHelper().put(Properties.styleClass, styleClass); + } + + @Attribute(events = @EventName("beforedomupdate")) + public abstract String getOnbeforedomupdate(); + + @Attribute(events = @EventName("complete")) + public abstract String getOncomplete(); + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); + + @Attribute(events = @EventName("unselect")) + public abstract String getOnunselect(); + + @Attribute(events = @EventName("select")) + public abstract String getOnselect(); + + @Attribute(events = @EventName("beforeselect")) + public abstract String getOnbeforeselect(); } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -24,6 +24,7 @@ package org.richfaces.component; import org.richfaces.PanelMenuMode; +import org.richfaces.cdk.annotations.*; import javax.faces.component.UIComponent; @@ -31,6 +32,7 @@ * @author akolonitsky * @since 2010-10-25 */ +@JsfComponent(tag = @Tag(type = TagType.Facelets)) public abstract class AbstractPanelMenuItem extends AbstractActionComponent { public static final String COMPONENT_TYPE = "org.richfaces.PanelMenuItem"; @@ -38,7 +40,7 @@ public static final String COMPONENT_FAMILY = "org.richfaces.PanelMenuItem"; protected AbstractPanelMenuItem() { - setRendererType("org.richfaces.PanelMenuItem"); + setRendererType("org.richfaces.PanelMenuItemRenderer"); } public boolean isTopItem() { @@ -79,21 +81,158 @@ return COMPONENT_FAMILY; } + // ------------------------------------------------ Component Attributes + + @Attribute(defaultValue = "Boolean.TRUE") + public abstract Boolean isSelectable(); + + @Attribute(defaultValue = "Boolean.FALSE") + public abstract Boolean isUnselectable(); + + @Attribute(defaultValue = "getPanelMenu().getItemMode()") public abstract PanelMenuMode getMode(); + @Attribute(generate = false) + public String getName() { + return (String) getStateHelper().eval(Properties.name, getId()); + } + + public void setName(String name) { + getStateHelper().put(Properties.name, name); + } + + @Attribute public abstract String getLabel(); - public abstract String getName(); - + @Attribute public abstract boolean isDisabled(); + @Attribute public abstract boolean isLimitRender(); + @Attribute public abstract Object getData(); + @Attribute public abstract String getStatus(); + @Attribute public abstract Object getExecute(); + @Attribute public abstract Object getRender(); + + // ------------------------------------------------ Html Attributes + enum Properties { + iconLeft, iconLeftDisabled, iconRight, iconRightDisabled, styleClass, disabledClass, name + + } + + @Attribute(generate = false) + public String getDisabledClass() { + return (String) getStateHelper().eval(Properties.disabledClass, + isTopItem() ? getPanelMenu().getTopItemDisableClass() : getPanelMenu().getItemDisableClass()); + } + + public void setDisabledClass(String disabledClass) { + getStateHelper().put(Properties.disabledClass, disabledClass); + } + + @Attribute + public abstract String getHoverClass(); + + @Attribute(generate = false) + public String getIconLeft() { + return (String) getStateHelper().eval(Properties.iconLeft, + isTopItem() ? getPanelMenu().getTopItemIconLeft() : getPanelMenu().getItemIconLeft()); + } + + public void setIconLeft(String iconLeft) { + getStateHelper().put(Properties.iconLeft, iconLeft); + } + + @Attribute + public abstract String getIconLeftClass(); + + @Attribute(generate = false) + public String getIconLeftDisabled() { + return (String) getStateHelper().eval(Properties.iconLeftDisabled, + isTopItem() ? getPanelMenu().getTopItemDisableIconLeft() : getPanelMenu().getItemDisableIconLeft()); + } + + public void setIconLeftDisabled(String iconLeftDisabled) { + getStateHelper().put(Properties.iconLeftDisabled, iconLeftDisabled); + } + + @Attribute(generate = false) + public String getIconRight() { + return (String) getStateHelper().eval(Properties.iconRight, + isTopItem() ? getPanelMenu().getTopItemIconRight() : getPanelMenu().getItemIconRight()); + } + + public void setIconRight(String iconRight) { + getStateHelper().put(Properties.iconRight, iconRight); + } + + @Attribute + public abstract String getIconRightClass(); + + @Attribute(generate = false) + public String getIconRightDisabled() { + return (String) getStateHelper().eval(Properties.iconRightDisabled, + isTopItem() ? getPanelMenu().getTopItemDisableIconRight() : getPanelMenu().getItemDisableIconRight()); + } + + public void setIconRightDisabled(String iconRightDisabled) { + getStateHelper().put(Properties.iconRightDisabled, iconRightDisabled); + } + + @Attribute + public abstract String getStyle(); + + @Attribute(generate = false) + public String getStyleClass() { + return (String) getStateHelper().eval(Properties.styleClass, + isTopItem() ? getPanelMenu().getTopItemClass() : getPanelMenu().getItemClass()); + } + + public void setStyleClass(String styleClass) { + getStateHelper().put(Properties.styleClass, styleClass); + } + + @Attribute(events = @EventName("beforedomupdate")) + public abstract String getOnbeforedomupdate(); + + @Attribute(events = @EventName("complete")) + public abstract String getOncomplete(); + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); + + @Attribute(events = @EventName("unselect")) + public abstract String getOnunselect(); + + @Attribute(events = @EventName("select")) + public abstract String getOnselect(); + + @Attribute(events = @EventName("beforeselect")) + public abstract String getOnbeforeselect(); } Copied: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java (from rev 20980, trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java) =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTab.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -0,0 +1,187 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.component; + +import org.richfaces.cdk.annotations.*; + +import javax.faces.component.behavior.ClientBehaviorHolder; + +/** + * @author akolonitsky + * @since 2010-10-19 + */ +@JsfComponent(tag = @Tag(type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.TabRenderer")) +public abstract class AbstractTab extends AbstractTogglePanelTitledItem implements ClientBehaviorHolder { + + public static final String COMPONENT_TYPE = "org.richfaces.Tab"; + + public static final String COMPONENT_FAMILY = "org.richfaces.Tab"; + + public AbstractTab() { + setRendererType("org.richfaces.TabRenderer"); + } + + public AbstractTabPanel getTabPanel() { + return (AbstractTabPanel) this.getParent(); + } + + // ------------------------------------------------ Html Attributes + enum Properties { + headerClassDisabled, headerClassInactive, headerClass, contentClass, headerClassActive + + } + + @Attribute(generate = false) + public String getHeaderClassActive() { + String value = (String) getStateHelper().eval(Properties.headerClassActive); + if (value != null) { + return value; + } + + return getTabPanel().getTabHeaderClassActive(); + } + + public void setHeaderClassActive(String headerClassActive) { + getStateHelper().put(Properties.headerClassActive, headerClassActive); + } + + + @Attribute(generate = false) + public String getHeaderClassDisabled() { + String value = (String) getStateHelper().eval(Properties.headerClassDisabled); + if (value != null) { + return value; + } + + return getTabPanel().getTabHeaderClassDisabled(); + } + + public void setHeaderClassDisabled(String headerClassDisabled) { + getStateHelper().put(Properties.headerClassDisabled, headerClassDisabled); + } + + @Attribute(generate = false) + public String getHeaderClassInactive() { + String value = (String) getStateHelper().eval(Properties.headerClassInactive); + if (value != null) { + return value; + } + + return getTabPanel().getTabHeaderClassInactive(); + } + + public void setHeaderClassInactive(String headerClassInactive) { + getStateHelper().put(Properties.headerClassInactive, headerClassInactive); + } + + @Attribute(generate = false) + public String getHeaderClass() { + String value = (String) getStateHelper().eval(Properties.headerClass); + if (value != null) { + return value; + } + + return getTabPanel().getTabHeaderClass(); + } + + public void setHeaderClass(String headerClass) { + getStateHelper().put(Properties.headerClass, headerClass); + } + + + @Attribute + public abstract String getHeaderStyle(); + + @Attribute(generate = false) + public String getContentClass() { + String value = (String) getStateHelper().eval(Properties.contentClass); + if (value != null) { + return value; + } + + return getTabPanel().getTabContentClass(); + } + + public void setContentClass(String contentClass) { + getStateHelper().put(Properties.contentClass, contentClass); + } + + @Attribute(events = @EventName("headerclick")) + public abstract String getOnheaderclick(); + + @Attribute(events = @EventName("headerdblclick")) + public abstract String getOnheaderdblclick(); + + @Attribute(events = @EventName("headermousedown")) + public abstract String getOnheadermousedown(); + + @Attribute(events = @EventName("headermousemove")) + public abstract String getOnheadermousemove(); + + @Attribute(events = @EventName("headermouseup")) + public abstract String getOnheadermouseup(); + + @Attribute(events = @EventName("enter")) + public abstract String getOnenter(); + + @Attribute(events = @EventName("leave")) + public abstract String getOnleave(); + + @Attribute + public abstract String getLang(); + + @Attribute + public abstract String getTitle(); + + @Attribute + public abstract String getStyle(); + + @Attribute + public abstract String getStyleClass(); + + @Attribute + public abstract String getDir(); + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); + +} + Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -23,19 +23,24 @@ package org.richfaces.component; +import org.richfaces.HeaderAlignment; +import org.richfaces.HeaderPosition; +import org.richfaces.cdk.annotations.*; /** * @author akolonitsky * @since 2010-08-24 */ -public abstract class AbstractTabPanel extends UITogglePanel { +@JsfComponent(tag = @Tag(type = TagType.Facelets, handler = "org.richfaces.view.facelets.html.TogglePanelTagHandler"), + renderer = @JsfRenderer(type = "org.richfaces.TabPanelRenderer")) +public abstract class AbstractTabPanel extends AbstractTogglePanel { public static final String COMPONENT_TYPE = "org.richfaces.TabPanel"; public static final String COMPONENT_FAMILY = "org.richfaces.TabPanel"; protected AbstractTabPanel() { - setRendererType("org.richfaces.TabPanel"); + setRendererType("org.richfaces.TabPanelRenderer"); } @Override @@ -51,4 +56,69 @@ } return res; } + + // ------------------------------------------------ Html Attributes + + @Attribute + public abstract HeaderPosition getHeaderPosition(); + + @Attribute + public abstract HeaderAlignment getHeaderAlignment(); + + @Attribute + public abstract String getTabHeaderClassActive(); + + @Attribute + public abstract String getTabHeaderClassDisabled(); + + @Attribute + public abstract String getTabHeaderClassInactive(); + + @Attribute + public abstract String getTabContentClass(); + + @Attribute + public abstract String getTabHeaderClass(); + + @Attribute(events = @EventName("itemchange")) + public abstract String getOnitemchange(); + + @Attribute(events = @EventName("beforeitemchange")) + public abstract String getOnbeforeitemchange(); + + @Attribute + public abstract String getLang(); + + @Attribute + public abstract String getTitle(); + + @Attribute + public abstract String getStyle(); + + @Attribute + public abstract String getStyleClass(); + + @Attribute + public abstract String getDir(); + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -46,6 +46,7 @@ import org.richfaces.application.MessageFactory; import org.richfaces.application.ServiceTracker; import org.richfaces.appplication.FacesMessages; +import org.richfaces.cdk.annotations.*; import org.richfaces.component.util.MessageUtil; import org.richfaces.event.ItemChangeEvent; import org.richfaces.event.ItemChangeListener; @@ -55,6 +56,8 @@ * @author akolonitsky * @version 1.0 */ +@JsfComponent(tag = @Tag(type = TagType.Facelets, handler = "org.richfaces.view.facelets.html.TogglePanelTagHandler"), + renderer = @JsfRenderer(type = "org.richfaces.TogglePanelRenderer")) public abstract class AbstractTogglePanel extends AbstractDivPanel implements ItemChangeSource { public static final String COMPONENT_TYPE = "org.richfaces.TogglePanel"; @@ -79,7 +82,7 @@ } protected AbstractTogglePanel() { - setRendererType("org.richfaces.TogglePanel"); + setRendererType("org.richfaces.TogglePanelRenderer"); } @@ -588,25 +591,78 @@ } } + @Attribute(defaultValue = "SwitchType.DEFAULT") public abstract SwitchType getSwitchType(); + @Attribute public abstract boolean isBypassUpdates(); + @Attribute public abstract boolean isLimitRender(); + @Attribute public abstract boolean isCycledSwitching(); + @Attribute public abstract Object getData(); + @Attribute public abstract String getStatus(); + @Attribute public abstract Object getExecute(); + @Attribute public abstract Object getRender(); + @Attribute public abstract MethodExpression getItemChangeListener(); + // ------------------------------------------------ Html Attributes + + @Attribute(events = @EventName("itemchange")) + public abstract String getOnitemchange(); + + @Attribute(events = @EventName("beforeitemchange")) + public abstract String getOnbeforeitemchange(); + + @Attribute + public abstract String getLang(); + + @Attribute + public abstract String getTitle(); + + @Attribute + public abstract String getStyle(); + + @Attribute + public abstract String getStyleClass(); + + @Attribute + public abstract String getDir(); + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); + // ------------------------------------------------ Event Processing Methods public void addItemChangeListener(ItemChangeListener listener) { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelItem.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -22,6 +22,7 @@ package org.richfaces.component; +import org.richfaces.cdk.annotations.*; import org.richfaces.renderkit.html.TogglePanelItemRenderer; import javax.faces.component.UIComponent; @@ -34,16 +35,19 @@ /** * @author akolonitsky * @version 1.0 - * @since -4712-01-01 */ +@JsfComponent( + tag = @Tag(type = TagType.Facelets), + renderer = @JsfRenderer(type = "org.richfaces.TogglePanelItemRenderer")) public abstract class AbstractTogglePanelItem extends AbstractDivPanel { public static final String COMPONENT_TYPE = "org.richfaces.TogglePanelItem"; public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanelItem"; + private static final String NAME = "name"; protected AbstractTogglePanelItem() { - setRendererType("org.richfaces.TogglePanelItem"); + setRendererType("org.richfaces.TogglePanelItemRenderer"); } @Override @@ -118,10 +122,65 @@ attrs.put("style", "display:none; " + style); } - public abstract String getName(); + // ------------------------------------------------ Component Attributes + @Attribute(defaultValue = "getId()", generate = false) + public String getName() { + return (String) getStateHelper().eval(NAME, getId()); + } + + public void setName(String name) { + getStateHelper().put(NAME, name); + } + + @Attribute(defaultValue = "getParent().getSwitchType()") public abstract SwitchType getSwitchType(); + // ------------------------------------------------ Html Attributes + + @Attribute(events = @EventName("enter")) + public abstract String getOnenter(); + + @Attribute(events = @EventName("leave")) + public abstract String getOnleave(); + + @Attribute + public abstract String getLang(); + + @Attribute + public abstract String getTitle(); + + @Attribute + public abstract String getStyle(); + + @Attribute + public abstract String getStyleClass(); + + @Attribute + public abstract String getDir(); + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); + + public String toString() { return "TogglePanelItem {name: " + getName() + ", switchType: " + getSwitchType() + '}'; } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -22,11 +22,13 @@ package org.richfaces.component; +import org.richfaces.cdk.annotations.*; import org.richfaces.renderkit.html.DivPanelRenderer; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import java.io.IOException; +import java.util.Properties; import static org.richfaces.renderkit.html.DivPanelRenderer.capitalize; @@ -34,7 +36,7 @@ * @author akolonitsky * @since 2010-08-05 */ -public abstract class AbstractTogglePanelTitledItem extends UITogglePanelItem { +public abstract class AbstractTogglePanelTitledItem extends AbstractTogglePanelItem { public static final String COMPONENT_TYPE = "org.richfaces.TogglePanelTitledItem"; @@ -60,25 +62,12 @@ } } - protected AbstractTogglePanelTitledItem() { - setRendererType("org.richfaces.TogglePanelTitledItem"); - } - @Override public String getFamily() { return COMPONENT_FAMILY; } - public abstract boolean isDisabled(); - - public abstract String getHeader(); - @Override - public String getName() { - return (String) getStateHelper().eval(PropertyKeys.name, getId()); - } - - @Override public void encodeAll(FacesContext context) throws IOException { if (!isRendered()) { return; @@ -113,4 +102,98 @@ } return headerFacet; } + + // ------------------------------------------------ Component Attributes + enum Properties { + header + } + + @Attribute + public abstract boolean isDisabled(); + + @Attribute(generate = false) + public String getHeader() { + return (String) getStateHelper().eval(Properties.header, getName()); + } + + public void setHeader(String header) { + getStateHelper().put(Properties.header, header); + } + // ------------------------------------------------ Html Attributes + + @Attribute + public abstract String getHeaderClassActive(); + + @Attribute + public abstract String getHeaderClassDisabled(); + + @Attribute + public abstract String getHeaderClassInactive(); + + @Attribute + public abstract String getHeaderClass(); + + @Attribute + public abstract String getHeaderStyle(); + + @Attribute + public abstract String getContentClass(); + + @Attribute(events = @EventName("headerclick")) + public abstract String getOnheaderclick(); + + @Attribute(events = @EventName("headerdblclick")) + public abstract String getOnheaderdblclick(); + + @Attribute(events = @EventName("headermousedown")) + public abstract String getOnheadermousedown(); + + @Attribute(events = @EventName("headermousemove")) + public abstract String getOnheadermousemove() ; + + @Attribute(events = @EventName("headermouseup")) + public abstract String getOnheadermouseup(); + + @Attribute(events = @EventName("enter")) + public abstract String getOnenter(); + + @Attribute(events = @EventName("leave")) + public abstract String getOnleave(); + + @Attribute + public abstract String getLang(); + + @Attribute + public abstract String getTitle(); + + @Attribute + public abstract String getStyle(); + + @Attribute + public abstract String getStyleClass(); + + @Attribute + public abstract String getDir(); + + @Attribute(events = @EventName("click")) + public abstract String getOnclick(); + + @Attribute(events = @EventName("dblclick")) + public abstract String getOndblclick(); + + @Attribute(events = @EventName("mousedown")) + public abstract String getOnmousedown(); + + @Attribute(events = @EventName("mousemove")) + public abstract String getOnmousemove(); + + @Attribute(events = @EventName("mouseout")) + public abstract String getOnmouseout(); + + @Attribute(events = @EventName("mouseover")) + public abstract String getOnmouseover(); + + @Attribute(events = @EventName("mouseup")) + public abstract String getOnmouseup(); + } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -32,6 +32,7 @@ import org.richfaces.TooltipLayout; import org.richfaces.TooltipMode; +import org.richfaces.cdk.annotations.*; import org.richfaces.context.ExtendedVisitContext; import org.richfaces.context.ExtendedVisitContextMode; import org.richfaces.renderkit.MetaComponentRenderer; @@ -40,6 +41,8 @@ * @author amarkhel * @since 2010-10-24 */ +@JsfComponent(tag = @Tag(type = TagType.Facelets), + renderer = @JsfRenderer(type = "org.richfaces.TooltipRenderer")) public abstract class AbstractTooltip extends AbstractDivPanel implements MetaComponentResolver, MetaComponentEncoder { public static final String COMPONENT_TYPE = "org.richfaces.Tooltip"; @@ -49,7 +52,7 @@ public static final String CONTENT_META_COMPONENT_ID = "content"; protected AbstractTooltip() { - setRendererType("org.richfaces.Tooltip"); + setRendererType("org.richfaces.TooltipRenderer"); } @Override @@ -57,46 +60,106 @@ return COMPONENT_FAMILY; } - public abstract String getTarget(); + // ------------------------------------------------ Component Attributes + enum Properties { + target + } + public String getTarget() { + return (String) getStateHelper().eval(Properties.target, getParent().getClientId()); + } + + public void setTarget(String target) { + getStateHelper().put(Properties.target, target); + } + +/* + @Attribute public abstract String getValue(); +*/ + @Attribute(defaultValue = "TooltipLayout.DEFAULT") public abstract TooltipLayout getLayout(); + @Attribute(defaultValue = "true") public abstract boolean isAttached(); + @Attribute(defaultValue = "Positioning.DEFAULT") + public abstract Positioning getJointPoint(); + + @Attribute(defaultValue = "Positioning.DEFAULT") public abstract Positioning getDirection(); + @Attribute public abstract boolean isDisabled(); + @Attribute(defaultValue = "true") public abstract boolean isFollowMouse(); + @Attribute(defaultValue = "0") public abstract int getHideDelay(); + @Attribute(defaultValue = "mouseleave") public abstract String getHideEvent(); + @Attribute(defaultValue = "10") public abstract int getHorizontalOffset(); + @Attribute(defaultValue = "TooltipMode.DEFAULT") public abstract TooltipMode getMode(); + @Attribute(defaultValue = "0") public abstract int getShowDelay(); + @Attribute(defaultValue = "mouseenter") public abstract String getShowEvent(); + @Attribute(defaultValue = "10") public abstract int getVerticalOffset(); + @Attribute public abstract boolean isBypassUpdates(); + @Attribute public abstract boolean isLimitRender(); + @Attribute public abstract Object getData(); + @Attribute public abstract String getStatus(); + @Attribute public abstract Object getExecute(); + @Attribute public abstract Object getRender(); + // ------------------------------------------------ Html Attributes + + @Attribute + public abstract String getStyle(); + + @Attribute + public abstract String getStyleClass(); + + @Attribute + public abstract int getZindex(); + + @Attribute(events = @EventName("hide")) + public abstract String getOnhide(); + + @Attribute(events = @EventName("show")) + public abstract String getOnshow(); + + @Attribute(events = @EventName("beforehide")) + public abstract String getOnbeforehide(); + + @Attribute(events = @EventName("beforeshow")) + public abstract String getOnbeforeshow(); + + // ------------------------------------------------ Html Attributes End + @Override public void encodeAll(FacesContext context) throws IOException { if (context == null) { Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/UICollapsiblePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UICollapsiblePanel.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UICollapsiblePanel.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - -import javax.el.MethodExpression; - -/** - * @author akolonitsky - * @since 2010-08-27 - */ -public class UICollapsiblePanel extends AbstractCollapsiblePanel { - - public enum PropertyKeys { - header, - toggleListener - } - - public String getHeader() { - return (String) getStateHelper().eval(PropertyKeys.header); - } - - public void setHeader(String header) { - getStateHelper().put(PropertyKeys.header, header); - } - - public MethodExpression getPanelToggleListener() { - return (MethodExpression) getStateHelper().get(PropertyKeys.toggleListener); - } - - public void setPanelToggleListener(MethodExpression panelToggleListener) { - getStateHelper().put(PropertyKeys.toggleListener, panelToggleListener); - } -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,165 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - -import org.richfaces.PanelMenuMode; - -/** - * @author akolonitsky - * @since 2010-11-29 - */ -public class UIPanelMenu extends AbstractPanelMenu { - - public enum PropertyKeys { - disabled, - expandEvent, - collapseEvent, - groupMode, - expandSingle, - itemMode, - bubbleSelection, - activeItem, - itemChangeListener, - bypassUpdates, - limitRender, - data, - status, - execute, - render - } - - public boolean isDisabled() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disabled))); - } - - public void setDisabled(boolean disabled) { - getStateHelper().put(PropertyKeys.disabled, disabled); - } - - public String getExpandEvent() { - return (String) getStateHelper().eval(PropertyKeys.expandEvent, "click"); - } - - public void setExpandEvent(String expandEvent) { - getStateHelper().put(PropertyKeys.expandEvent, expandEvent); - } - - public String getCollapseEvent() { - return (String) getStateHelper().eval(PropertyKeys.collapseEvent, "click"); - } - - public void setCollapseEvent(String collapseEvent) { - getStateHelper().put(PropertyKeys.collapseEvent, collapseEvent); - } - - public PanelMenuMode getGroupMode() { - return (PanelMenuMode) getStateHelper().eval(PropertyKeys.groupMode, PanelMenuMode.client); - } - - public void setGroupMode(PanelMenuMode groupMode) { - getStateHelper().put(PropertyKeys.groupMode, groupMode); - } - - public boolean isExpandSingle() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.expandSingle, true))); - } - - public void setExpandSingle(boolean expandSingle) { - getStateHelper().put(PropertyKeys.expandSingle, expandSingle); - } - - public PanelMenuMode getItemMode() { - return (PanelMenuMode) getStateHelper().eval(PropertyKeys.itemMode, PanelMenuMode.DEFAULT); - } - - public void setItemMode(PanelMenuMode itemMode) { - getStateHelper().put(PropertyKeys.itemMode, itemMode); - } - - public boolean isBubbleSelection() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.bubbleSelection, true))); - } - - public void setBubbleSelection(boolean bubbleSelection) { - getStateHelper().put(PropertyKeys.bubbleSelection, bubbleSelection); - } - - public String getItemChangeListener() { - return (String) getStateHelper().eval(PropertyKeys.itemChangeListener); - } - - public void setItemChangeListener(String itemChangeListener) { - getStateHelper().put(PropertyKeys.itemChangeListener, itemChangeListener); - } - - public boolean isBypassUpdates() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.bypassUpdates))); - } - - public void setBypassUpdates(boolean bypassUpdates) { - getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates); - } - - public boolean isLimitRender() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender))); - } - - public void setLimitRender(boolean limitRender) { - getStateHelper().put(PropertyKeys.limitRender, limitRender); - } - - public Object getData() { - return getStateHelper().eval(PropertyKeys.data); - } - - public void setData(Object data) { - getStateHelper().put(PropertyKeys.data, data); - } - - public String getStatus() { - return (String) getStateHelper().eval(PropertyKeys.status); - } - - public void setStatus(String status) { - getStateHelper().put(PropertyKeys.status, status); - } - - public Object getExecute() { - return getStateHelper().eval(PropertyKeys.execute); - } - - public void setExecute(Object execute) { - getStateHelper().put(PropertyKeys.execute, execute); - } - - public Object getRender() { - return getStateHelper().eval(PropertyKeys.render); - } - - public void setRender(Object render) { - getStateHelper().put(PropertyKeys.render, render); - } - - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuGroup.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuGroup.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuGroup.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,101 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - -import org.richfaces.PanelMenuMode; - -import javax.el.MethodExpression; - -/** - * @author akolonitsky - * @since 2010-10-25 - */ -public class UIPanelMenuGroup extends AbstractPanelMenuGroup { - - public enum PropertyKeys { - expanded, - expandSingle, - collapseEvent, - expandEvent, - bubbleSelection, - changeExpandListener - } - - @Override - public Boolean isSelectable() { - return (Boolean) getStateHelper().eval(UIPanelMenuItem.PropertyKeys.selectable, Boolean.FALSE); - } - - @Override - public PanelMenuMode getMode() { - return (PanelMenuMode) getStateHelper().eval(UIPanelMenuItem.PropertyKeys.mode, getPanelMenu().getGroupMode()); - } - - @Override - public void setMode(PanelMenuMode mode) { - super.setMode(mode); - } - - public boolean isExpandSingle() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.expandSingle, getPanelMenu().isExpandSingle()))); - } - - public void setExpandSingle(boolean expandSingle) { - getStateHelper().put(PropertyKeys.expandSingle, expandSingle); - } - - public String getCollapseEvent() { - return (String) getStateHelper().eval(PropertyKeys.collapseEvent, "click"); - } - - public void setCollapseEvent(String collapseEvent) { - getStateHelper().put(PropertyKeys.collapseEvent, collapseEvent); - } - - public String getExpandEvent() { - return (String) getStateHelper().eval(PropertyKeys.expandEvent, "click"); - } - - public void setExpandEvent(String expandEvent) { - getStateHelper().put(PropertyKeys.expandEvent, expandEvent); - } - - public boolean isBubbleSelection() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.bubbleSelection, getPanelMenu().isBubbleSelection()))); - } - - public void setBubbleSelection(boolean bubbleSelection) { - getStateHelper().put(PropertyKeys.bubbleSelection, bubbleSelection); - } - - public MethodExpression getChangeExpandListener() { - return (MethodExpression) getStateHelper().get(PropertyKeys.changeExpandListener); - } - - public void setChangeExpandListener(MethodExpression changeExpandListener) { - getStateHelper().put(PropertyKeys.changeExpandListener, changeExpandListener); - } - - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,147 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - -import org.richfaces.PanelMenuMode; - -/** - * @author akolonitsky - * @since 2010-11-29 - */ -public class UIPanelMenuItem extends AbstractPanelMenuItem { - - public enum PropertyKeys { - selectable, - unselectable, - - mode, - label, - name, - disabled, - bypassUpdates, - limitRender, - data, - status, - execute, - render - } - - public Boolean isSelectable() { - return (Boolean) getStateHelper().eval(PropertyKeys.selectable, Boolean.TRUE); - } - - public void setSelectable(Boolean selectable) { - getStateHelper().put(PropertyKeys.selectable, selectable); - } - - public Boolean isUnselectable() { - return (Boolean) getStateHelper().eval(PropertyKeys.unselectable, Boolean.FALSE); - } - - public void setUnselectable(Boolean unselectable) { - getStateHelper().put(PropertyKeys.unselectable, unselectable); - } - - public PanelMenuMode getMode() { - return (PanelMenuMode) getStateHelper().eval(PropertyKeys.mode, getPanelMenu().getItemMode()); - } - - public void setMode(PanelMenuMode mode) { - getStateHelper().put(PropertyKeys.mode, mode); - } - - public String getLabel() { - return (String) getStateHelper().eval(PropertyKeys.label); - } - - public void setLabel(String label) { - getStateHelper().put(PropertyKeys.label, label); - } - - public String getName() { - return (String) getStateHelper().eval(PropertyKeys.name, getId()); - } - - public void setName(String name) { - getStateHelper().put(PropertyKeys.name, name); - } - - public boolean isDisabled() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disabled))); - } - - public void setDisabled(boolean disabled) { - getStateHelper().put(PropertyKeys.disabled, disabled); - } - - public boolean isBypassUpdates() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.bypassUpdates))); - } - - public void setBypassUpdates(boolean bypassUpdates) { - getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates); - } - - public boolean isLimitRender() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender))); - } - - public void setLimitRender(boolean limitRender) { - getStateHelper().put(PropertyKeys.limitRender, limitRender); - } - - public Object getData() { - return getStateHelper().eval(PropertyKeys.data); - } - - public void setData(Object data) { - getStateHelper().put(PropertyKeys.data, data); - } - - public String getStatus() { - return (String) getStateHelper().eval(PropertyKeys.status); - } - - public void setStatus(String status) { - getStateHelper().put(PropertyKeys.status, status); - } - - public Object getExecute() { - return getStateHelper().eval(PropertyKeys.execute); - } - - public void setExecute(Object execute) { - getStateHelper().put(PropertyKeys.execute, execute); - } - - public Object getRender() { - return getStateHelper().eval(PropertyKeys.render); - } - - public void setRender(Object render) { - getStateHelper().put(PropertyKeys.render, render); - } - - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,119 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - -import javax.el.MethodExpression; - -/** - * @author akolonitsky - * @since 2010-08-13 - */ -public class UITogglePanel extends AbstractTogglePanel { - - public enum PropertyKeys { - switchType, - bypassUpdates, - limitRender, - cycledSwitching, - data, - status, - execute, - render, - itemChangeListener - } - - public SwitchType getSwitchType() { - SwitchType type = (SwitchType) getStateHelper().eval(PropertyKeys.switchType, SwitchType.DEFAULT); - return type == null ? SwitchType.DEFAULT : type; - } - - public void setSwitchType(SwitchType switchType) { - getStateHelper().put(PropertyKeys.switchType, switchType); - } - - public boolean isBypassUpdates() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.bypassUpdates))); - } - - public void setBypassUpdates(boolean bypassUpdates) { - getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates); - } - - public boolean isLimitRender() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender))); - } - - public void setLimitRender(boolean limitRender) { - getStateHelper().put(PropertyKeys.limitRender, limitRender); - } - - public boolean isCycledSwitching() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.cycledSwitching, false))); - } - - public void setCycledSwitching(boolean cycledSwitching) { - getStateHelper().put(PropertyKeys.cycledSwitching, cycledSwitching); - } - - public Object getData() { - return getStateHelper().eval(PropertyKeys.data); - } - - public void setData(Object data) { - getStateHelper().put(PropertyKeys.data, data); - } - - public String getStatus() { - return (String) getStateHelper().eval(PropertyKeys.status); - } - - public void setStatus(String status) { - getStateHelper().put(PropertyKeys.status, status); - } - - public Object getExecute() { - return getStateHelper().eval(PropertyKeys.execute); - } - - public void setExecute(Object execute) { - getStateHelper().put(PropertyKeys.execute, execute); - } - - public Object getRender() { - return getStateHelper().eval(PropertyKeys.render); - } - - public void setRender(Object render) { - getStateHelper().put(PropertyKeys.render, render); - } - - public MethodExpression getItemChangeListener() { - return (MethodExpression) getStateHelper().get(PropertyKeys.itemChangeListener); - } - - public void setItemChangeListener(MethodExpression itemChangeListener) { - getStateHelper().put(PropertyKeys.itemChangeListener, itemChangeListener); - } - - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelItem.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelItem.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - - - -/** - * @author akolonitsky - * @since 2010-08-13 - */ -public class UITogglePanelItem extends AbstractTogglePanelItem { - - public enum PropertyKeys { - name, - switchType - } - - public String getName() { - return (String) getStateHelper().eval(PropertyKeys.name, getId()); - } - - public void setName(String name) { - getStateHelper().put(PropertyKeys.name, name); - } - - public SwitchType getSwitchType() { - SwitchType type = (SwitchType) getStateHelper().eval(PropertyKeys.switchType, getParent().getSwitchType()); - - return type == null ? SwitchType.DEFAULT : type; - } - - public void setSwitchType(SwitchType switchType) { - getStateHelper().put(PropertyKeys.switchType, switchType); - } -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelTitledItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelTitledItem.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelTitledItem.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - - - -/** - * @author akolonitsky - * @since 2010-08-13 - */ -public class UITogglePanelTitledItem extends AbstractTogglePanelTitledItem { - - public enum PropertyKeys { - disabled, - header - } - - public boolean isDisabled() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disabled))); - } - - public void setDisabled(boolean disabled) { - getStateHelper().put(PropertyKeys.disabled, disabled); - } - - public String getHeader() { - return (String) getStateHelper().eval(PropertyKeys.header, getName()); - } - - public void setHeader(String header) { - getStateHelper().put(PropertyKeys.header, header); - } - - -} Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,228 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - -import org.richfaces.TooltipLayout; -import org.richfaces.TooltipMode; - -/** - * @author amarkhel - * @since 2010-10-24 - */ -public class UITooltip extends AbstractTooltip { - - public enum PropertyKeys { - target, - value, - layout, - attached, - jointPoint, - direction, - disabled, - followMouse, - hideDelay, - hideEvent, - horizontalOffset, - mode, - showDelay, - showEvent, - verticalOffset, - bypassUpdates, - limitRender, - data, - status, - execute, - render - } - - public String getTarget() { - return (String) getStateHelper().eval(PropertyKeys.target, getParent().getClientId()); - } - - public void setTarget(String target) { - getStateHelper().put(PropertyKeys.target, target); - } - - public String getValue() { - return (String) getStateHelper().eval(PropertyKeys.value); - } - - public void setValue(String value) { - getStateHelper().put(PropertyKeys.value, value); - } - - public TooltipLayout getLayout() { - return (TooltipLayout) getStateHelper().eval(PropertyKeys.layout, TooltipLayout.DEFAULT); - } - - public void setLayout(TooltipLayout layout) { - getStateHelper().put(PropertyKeys.layout, layout); - } - - public boolean isAttached() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.attached, true))); - } - - public void setAttached(boolean attached) { - getStateHelper().put(PropertyKeys.attached, attached); - } - - public Positioning getJointPoint() { - return (Positioning) getStateHelper().eval(PropertyKeys.jointPoint, Positioning.DEFAULT); - } - - public void setJointPoint(Positioning jointPoint) { - getStateHelper().put(PropertyKeys.jointPoint, jointPoint); - } - - public Positioning getDirection() { - return (Positioning) getStateHelper().eval(PropertyKeys.direction, Positioning.DEFAULT); - } - - public void setDirection(Positioning direction) { - getStateHelper().put(PropertyKeys.direction, direction); - } - - public boolean isDisabled() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disabled))); - } - - public void setDisabled(boolean disabled) { - getStateHelper().put(PropertyKeys.disabled, disabled); - } - - public boolean isFollowMouse() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.followMouse, true))); - } - - public void setFollowMouse(boolean followMouse) { - getStateHelper().put(PropertyKeys.followMouse, followMouse); - } - - public int getHideDelay() { - return (Integer) getStateHelper().eval(PropertyKeys.hideDelay, 0); - } - - public void setHideDelay(int hideDelay) { - getStateHelper().put(PropertyKeys.hideDelay, hideDelay); - } - - public String getHideEvent() { - return (String) getStateHelper().eval(PropertyKeys.hideEvent, "mouseleave"); - } - - public void setHideEvent(String hideEvent) { - getStateHelper().put(PropertyKeys.hideEvent, hideEvent); - } - - public int getHorizontalOffset() { - return (Integer) getStateHelper().eval(PropertyKeys.horizontalOffset, 10); - } - - public void setHorizontalOffset(int horizontalOffset) { - getStateHelper().put(PropertyKeys.horizontalOffset, horizontalOffset); - } - - public TooltipMode getMode() { - return (TooltipMode) getStateHelper().eval(PropertyKeys.mode, TooltipMode.DEFAULT); - } - - public void setMode(TooltipMode mode) { - getStateHelper().put(PropertyKeys.mode, mode); - } - - public int getShowDelay() { - return (Integer) getStateHelper().eval(PropertyKeys.showDelay, 0); - } - - public void setShowDelay(int showDelay) { - getStateHelper().put(PropertyKeys.showDelay, showDelay); - } - - public String getShowEvent() { - return (String) getStateHelper().eval(PropertyKeys.showEvent, "mouseenter"); - } - - public void setShowEvent(String showEvent) { - getStateHelper().put(PropertyKeys.showEvent, showEvent); - } - - public int getVerticalOffset() { - return (Integer) getStateHelper().eval(PropertyKeys.verticalOffset, 10); - } - - public void setVerticalOffset(int verticalOffset) { - getStateHelper().put(PropertyKeys.verticalOffset, verticalOffset); - } - - public boolean isBypassUpdates() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.bypassUpdates))); - } - - public void setBypassUpdates(boolean bypassUpdates) { - getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates); - } - - public boolean isLimitRender() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender))); - } - - public void setLimitRender(boolean limitRender) { - getStateHelper().put(PropertyKeys.limitRender, limitRender); - } - - public Object getData() { - return getStateHelper().eval(PropertyKeys.data); - } - - public void setData(Object data) { - getStateHelper().put(PropertyKeys.data, data); - } - - public String getStatus() { - return (String) getStateHelper().eval(PropertyKeys.status); - } - - public void setStatus(String status) { - getStateHelper().put(PropertyKeys.status, status); - } - - public Object getExecute() { - return getStateHelper().eval(PropertyKeys.execute); - } - - public void setExecute(Object execute) { - getStateHelper().put(PropertyKeys.execute, execute); - } - - public Object getRender() { - return getStateHelper().eval(PropertyKeys.render); - } - - public void setRender(Object render) { - getStateHelper().put(PropertyKeys.render, render); - } - - -} Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -29,9 +29,7 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.component.behavior.ClientBehavior; -import org.richfaces.cdk.annotations.JsfBehavior; -import org.richfaces.cdk.annotations.Tag; -import org.richfaces.cdk.annotations.TagType; +import org.richfaces.cdk.annotations.*; import org.richfaces.component.AbstractTogglePanel; import org.richfaces.renderkit.util.RendererUtils; @@ -40,7 +38,11 @@ * */ -@JsfBehavior(id = "org.richfaces.component.behavior.ToggleControl", tag = @Tag(name = "toggleControl", handler = "org.richfaces.view.facelets.html.CustomBehaviorHandler", type = TagType.Facelets)) +@JsfBehavior( + id = "org.richfaces.component.behavior.ToggleControl", + tag = @Tag(name = "toggleControl", handler = "org.richfaces.view.facelets.html.CustomBehaviorHandler", type = TagType.Facelets), + renderer = @JsfBehaviorRenderer(type = "org.richfaces.component.behavior.ToggleControl") +) public class ToggleControl extends ClientBehavior { public static final String BEHAVIOR_ID = "org.richfaces.component.behavior.ToggleControl"; Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,318 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import org.richfaces.component.AbstractAccordion; -import javax.faces.component.behavior.ClientBehaviorHolder; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -/** - * @author akolonitsky - * @since 2010-08-13 - */ -public class HtmlAccordion extends AbstractAccordion implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.Accordion"; - - public static final String COMPONENT_FAMILY = "org.richfaces.Accordion"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "itemchange", - "beforeitemchange", - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup" - )); - - - public enum PropertyKeys { - itemLeftIconActive, - itemLeftIconInactive, - itemLeftIconDisabled, - itemRightIconActive, - itemRightIconInactive, - itemRightIconDisabled, - - itemHeaderClassActive, - itemHeaderClassDisabled, - itemHeaderClassInactive, - itemContentClass, - itemHeaderClass, - onitemchange, - onbeforeitemchange, - lang, - title, - style, - styleClass, - dir, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - width, - height, - onmouseover, - onmouseup - } - - public HtmlAccordion() { - setRendererType("org.richfaces.Accordion"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public String getItemLeftIconActive() { - return (String) getStateHelper().eval(PropertyKeys.itemLeftIconActive); - } - - public void setItemLeftIconActive(String itemLeftIconActive) { - getStateHelper().put(PropertyKeys.itemLeftIconActive, itemLeftIconActive); - } - - public String getItemLeftIconInactive() { - return (String) getStateHelper().eval(PropertyKeys.itemLeftIconInactive); - } - - public void setItemLeftIconInactive(String itemLeftIconInactive) { - getStateHelper().put(PropertyKeys.itemLeftIconInactive, itemLeftIconInactive); - } - - public String getItemLeftIconDisabled() { - return (String) getStateHelper().eval(PropertyKeys.itemLeftIconDisabled); - } - - public void setItemLeftIconDisabled(String itemLeftIconDisabled) { - getStateHelper().put(PropertyKeys.itemLeftIconDisabled, itemLeftIconDisabled); - } - - public String getItemRightIconActive() { - return (String) getStateHelper().eval(PropertyKeys.itemRightIconActive); - } - - public void setItemRightIconActive(String itemRightIconActive) { - getStateHelper().put(PropertyKeys.itemRightIconActive, itemRightIconActive); - } - - public String getItemRightIconInactive() { - return (String) getStateHelper().eval(PropertyKeys.itemRightIconInactive); - } - - public void setItemRightIconInactive(String itemRightIconInactive) { - getStateHelper().put(PropertyKeys.itemRightIconInactive, itemRightIconInactive); - } - - public String getItemRightIconDisabled() { - return (String) getStateHelper().eval(PropertyKeys.itemRightIconDisabled); - } - - public void setItemRightIconDisabled(String itemRightIconDisabled) { - getStateHelper().put(PropertyKeys.itemRightIconDisabled, itemRightIconDisabled); - } - - public String getWidth() { - return (String) getStateHelper().eval(PropertyKeys.width); - } - - public void setWidth(String width) { - getStateHelper().put(PropertyKeys.width, width); - } - - public String getHeight() { - return (String) getStateHelper().eval(PropertyKeys.height); - } - - public void setHeight(String height) { - getStateHelper().put(PropertyKeys.height, height); - } - - public String getItemHeaderClassActive() { - return (String) getStateHelper().eval(PropertyKeys.itemHeaderClassActive); - } - - public void setItemHeaderClassActive(String itemHeaderClassActive) { - getStateHelper().put(PropertyKeys.itemHeaderClassActive, itemHeaderClassActive); - } - - public String getItemHeaderClassDisabled() { - return (String) getStateHelper().eval(PropertyKeys.itemHeaderClassDisabled); - } - - public void setItemHeaderClassDisabled(String itemHeaderClassDisabled) { - getStateHelper().put(PropertyKeys.itemHeaderClassDisabled, itemHeaderClassDisabled); - } - - public String getItemHeaderClassInactive() { - return (String) getStateHelper().eval(PropertyKeys.itemHeaderClassInactive); - } - - public void setItemHeaderClassInactive(String itemHeaderClassInactive) { - getStateHelper().put(PropertyKeys.itemHeaderClassInactive, itemHeaderClassInactive); - } - - public String getItemContentClass() { - return (String) getStateHelper().eval(PropertyKeys.itemContentClass); - } - - public void setItemContentClass(String itemContentClass) { - getStateHelper().put(PropertyKeys.itemContentClass, itemContentClass); - } - - public String getItemHeaderClass() { - return (String) getStateHelper().eval(PropertyKeys.itemHeaderClass); - } - - public void setItemHeaderClass(String itemHeaderClass) { - getStateHelper().put(PropertyKeys.itemHeaderClass, itemHeaderClass); - } - - public String getOnitemchange() { - return (String) getStateHelper().eval(PropertyKeys.onitemchange); - } - - public void setOnitemchange(String onitemchange) { - getStateHelper().put(PropertyKeys.onitemchange, onitemchange); - } - - public String getOnbeforeitemchange() { - return (String) getStateHelper().eval(PropertyKeys.onbeforeitemchange); - } - - public void setOnbeforeitemchange(String onbeforeitemchange) { - getStateHelper().put(PropertyKeys.onbeforeitemchange, onbeforeitemchange); - } - - public String getLang() { - return (String) getStateHelper().eval(PropertyKeys.lang); - } - - public void setLang(String lang) { - getStateHelper().put(PropertyKeys.lang, lang); - } - - public String getTitle() { - return (String) getStateHelper().eval(PropertyKeys.title); - } - - public void setTitle(String title) { - getStateHelper().put(PropertyKeys.title, title); - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getDir() { - return (String) getStateHelper().eval(PropertyKeys.dir); - } - - public void setDir(String dir) { - getStateHelper().put(PropertyKeys.dir, dir); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,365 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -import javax.faces.component.behavior.ClientBehaviorHolder; - -import org.richfaces.component.UITogglePanelTitledItem; -import org.richfaces.component.behavior.ToggleControl; - -/** - * @author akolonitsky - * @since 2010-08-13 - */ -public class HtmlAccordionItem extends UITogglePanelTitledItem implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.AccordionItem"; - - public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanelTitledItem"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "headerclick", - "headerdblclick", - "headermousedown", - "headermousemove", - "headermouseup", - "enter", - "leave", - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup" - )); - - - public enum PropertyKeys { - leftIconActive, - leftIconInactive, - leftIconDisabled, - rightIconActive, - rightIconInactive, - rightIconDisabled, - - headerClassActive, - headerClassDisabled, - headerClassInactive, - headerClass, - headerStyle, - contentClass, - onheaderclick, - onheaderdblclick, - onheadermousedown, - onheadermousemove, - onheadermouseup, - onenter, - onleave, - lang, - title, - style, - styleClass, - dir, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup - } - - public HtmlAccordionItem() { - setRendererType("org.richfaces.AccordionItem"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public HtmlAccordion getAccordion() { - return (HtmlAccordion) ToggleControl.getEnclosedPanel(this); - } - - public String getLeftIconActive() { - return (String) getStateHelper().eval(PropertyKeys.leftIconActive, getAccordion().getItemLeftIconActive()); - } - - public void setLeftIconActive(String leftIconActive) { - getStateHelper().put(PropertyKeys.leftIconActive, leftIconActive); - } - - public String getLeftIconInactive() { - return (String) getStateHelper().eval(PropertyKeys.leftIconInactive, getAccordion().getItemLeftIconInactive()); - } - - public void setLeftIconInactive(String leftIconInactive) { - getStateHelper().put(PropertyKeys.leftIconInactive, leftIconInactive); - } - - public String getLeftIconDisabled() { - return (String) getStateHelper().eval(PropertyKeys.leftIconDisabled, getAccordion().getItemLeftIconDisabled()); - } - - public void setLeftIconDisabled(String leftIconDisabled) { - getStateHelper().put(PropertyKeys.leftIconDisabled, leftIconDisabled); - } - - public String getRightIconActive() { - return (String) getStateHelper().eval(PropertyKeys.rightIconActive, getAccordion().getItemRightIconActive()); - } - - public void setRightIconActive(String rightIconActive) { - getStateHelper().put(PropertyKeys.rightIconActive, rightIconActive); - } - - public String getRightIconInactive() { - return (String) getStateHelper().eval(PropertyKeys.rightIconInactive, getAccordion().getItemRightIconInactive()); - } - - public void setRightIconInactive(String rightIconInactive) { - getStateHelper().put(PropertyKeys.rightIconInactive, rightIconInactive); - } - - public String getRightIconDisabled() { - return (String) getStateHelper().eval(PropertyKeys.rightIconDisabled, getAccordion().getItemRightIconDisabled()); - } - - public void setRightIconDisabled(String rightIconDisabled) { - getStateHelper().put(PropertyKeys.rightIconDisabled, rightIconDisabled); - } - - public String getHeaderClassActive() { - return (String) getStateHelper().eval(PropertyKeys.headerClassActive, getAccordion().getItemHeaderClassActive()); - } - - public void setHeaderClassActive(String headerClassActive) { - getStateHelper().put(PropertyKeys.headerClassActive, headerClassActive); - } - - public String getHeaderClassDisabled() { - return (String) getStateHelper().eval(PropertyKeys.headerClassDisabled, getAccordion().getItemHeaderClassDisabled()); - } - - public void setHeaderClassDisabled(String headerClassDisabled) { - getStateHelper().put(PropertyKeys.headerClassDisabled, headerClassDisabled); - } - - public String getHeaderClassInactive() { - return (String) getStateHelper().eval(PropertyKeys.headerClassInactive, getAccordion().getItemHeaderClassInactive()); - } - - public void setHeaderClassInactive(String headerClassInactive) { - getStateHelper().put(PropertyKeys.headerClassInactive, headerClassInactive); - } - - public String getHeaderClass() { - return (String) getStateHelper().eval(PropertyKeys.headerClass, getAccordion().getItemHeaderClass()); - } - - public void setHeaderClass(String headerClass) { - getStateHelper().put(PropertyKeys.headerClass, headerClass); - } - - public String getHeaderStyle() { - return (String) getStateHelper().eval(PropertyKeys.headerStyle); - } - - public void setHeaderStyle(String headerStyle) { - getStateHelper().put(PropertyKeys.headerStyle, headerStyle); - } - - public String getContentClass() { - return (String) getStateHelper().eval(PropertyKeys.contentClass, getAccordion().getItemContentClass()); - } - - public void setContentClass(String contentClass) { - getStateHelper().put(PropertyKeys.contentClass, contentClass); - } - - public String getOnheaderclick() { - return (String) getStateHelper().eval(PropertyKeys.onheaderclick); - } - - public void setOnheaderclick(String onheaderclick) { - getStateHelper().put(PropertyKeys.onheaderclick, onheaderclick); - } - - public String getOnheaderdblclick() { - return (String) getStateHelper().eval(PropertyKeys.onheaderdblclick); - } - - public void setOnheaderdblclick(String onheaderdblclick) { - getStateHelper().put(PropertyKeys.onheaderdblclick, onheaderdblclick); - } - - public String getOnheadermousedown() { - return (String) getStateHelper().eval(PropertyKeys.onheadermousedown); - } - - public void setOnheadermousedown(String onheadermousedown) { - getStateHelper().put(PropertyKeys.onheadermousedown, onheadermousedown); - } - - public String getOnheadermousemove() { - return (String) getStateHelper().eval(PropertyKeys.onheadermousemove); - } - - public void setOnheadermousemove(String onheadermousemove) { - getStateHelper().put(PropertyKeys.onheadermousemove, onheadermousemove); - } - - public String getOnheadermouseup() { - return (String) getStateHelper().eval(PropertyKeys.onheadermouseup); - } - - public void setOnheadermouseup(String onheadermouseup) { - getStateHelper().put(PropertyKeys.onheadermouseup, onheadermouseup); - } - - public String getOnenter() { - return (String) getStateHelper().eval(PropertyKeys.onenter); - } - - public void setOnenter(String onenter) { - getStateHelper().put(PropertyKeys.onenter, onenter); - } - - public String getOnleave() { - return (String) getStateHelper().eval(PropertyKeys.onleave); - } - - public void setOnleave(String onleave) { - getStateHelper().put(PropertyKeys.onleave, onleave); - } - - public String getLang() { - return (String) getStateHelper().eval(PropertyKeys.lang); - } - - public void setLang(String lang) { - getStateHelper().put(PropertyKeys.lang, lang); - } - - public String getTitle() { - return (String) getStateHelper().eval(PropertyKeys.title); - } - - public void setTitle(String title) { - getStateHelper().put(PropertyKeys.title, title); - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getDir() { - return (String) getStateHelper().eval(PropertyKeys.dir); - } - - public void setDir(String dir) { - getStateHelper().put(PropertyKeys.dir, dir); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlCollapsiblePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlCollapsiblePanel.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlCollapsiblePanel.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,282 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import org.richfaces.component.UICollapsiblePanel; - -import javax.faces.component.behavior.ClientBehaviorHolder; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -/** - * @author akolonitsky - * @since 2010-08-27 - */ -public class HtmlCollapsiblePanel extends UICollapsiblePanel implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.CollapsiblePanel"; - - public static final String COMPONENT_FAMILY = "org.richfaces.CollapsiblePanel"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "switch", - "beforeswitch", - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup" - )); - - - public enum PropertyKeys { - leftCollapsedIcon, - leftExpandedIcon, - rightCollapsedIcon, - rightExpandedIcon, - - bodyClass, - headerClass, - headerControlClass, - oncomplete, - onbeforedomupdate, - onswitch, - onbeforeswitch, - lang, - title, - style, - styleClass, - dir, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup - } - - public HtmlCollapsiblePanel() { - setRendererType("org.richfaces.CollapsiblePanel"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public String getLeftCollapsedIcon() { - return (String) getStateHelper().eval(PropertyKeys.leftCollapsedIcon); - } - - public void setLeftCollapsedIcon(String leftCollapsedIcon) { - getStateHelper().put(PropertyKeys.leftCollapsedIcon, leftCollapsedIcon); - } - - public String getLeftExpandedIcon() { - return (String) getStateHelper().eval(PropertyKeys.leftExpandedIcon); - } - - public void setLeftExpandedIcon(String leftExpandedIcon) { - getStateHelper().put(PropertyKeys.leftExpandedIcon, leftExpandedIcon); - } - - public String getRightCollapsedIcon() { - return (String) getStateHelper().eval(PropertyKeys.rightCollapsedIcon); - } - - public void setRightCollapsedIcon(String rightCollapsedIcon) { - getStateHelper().put(PropertyKeys.rightCollapsedIcon, rightCollapsedIcon); - } - - public String getRightExpandedIcon() { - return (String) getStateHelper().eval(PropertyKeys.rightExpandedIcon); - } - - public void setRightExpandedIcon(String rightExpandedIcon) { - getStateHelper().put(PropertyKeys.rightExpandedIcon, rightExpandedIcon); - } - - public String getBodyClass() { - return (String) getStateHelper().eval(PropertyKeys.bodyClass); - } - - public void setBodyClass(String bodyClass) { - getStateHelper().put(PropertyKeys.bodyClass, bodyClass); - } - - public String getHeaderClass() { - return (String) getStateHelper().eval(PropertyKeys.headerClass); - } - - public void setHeaderClass(String headerClass) { - getStateHelper().put(PropertyKeys.headerClass, headerClass); - } - - public String getHeaderControlClass() { - return (String) getStateHelper().eval(PropertyKeys.headerControlClass); - } - - public void setHeaderControlClass(String headerControlClass) { - getStateHelper().put(PropertyKeys.headerControlClass, headerControlClass); - } - - public String getOncomplete() { - return (String) getStateHelper().eval(PropertyKeys.oncomplete); - } - - public void setOncomplete(String oncomplete) { - getStateHelper().put(PropertyKeys.oncomplete, oncomplete); - } - - public String getOnbeforedomupdate() { - return (String) getStateHelper().eval(PropertyKeys.onbeforedomupdate); - } - - public void setOnbeforedomupdate(String onbeforedomupdate) { - getStateHelper().put(PropertyKeys.onbeforedomupdate, onbeforedomupdate); - } - - public String getOnswitch() { - return (String) getStateHelper().eval(PropertyKeys.onswitch); - } - - public void setOnswitch(String onswitch) { - getStateHelper().put(PropertyKeys.onswitch, onswitch); - } - - public String getOnbeforeswitch() { - return (String) getStateHelper().eval(PropertyKeys.onbeforeswitch); - } - - public void setOnbeforeswitch(String onbeforeswitch) { - getStateHelper().put(PropertyKeys.onbeforeswitch, onbeforeswitch); - } - - public String getLang() { - return (String) getStateHelper().eval(PropertyKeys.lang); - } - - public void setLang(String lang) { - getStateHelper().put(PropertyKeys.lang, lang); - } - - public String getTitle() { - return (String) getStateHelper().eval(PropertyKeys.title); - } - - public void setTitle(String title) { - getStateHelper().put(PropertyKeys.title, title); - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getDir() { - return (String) getStateHelper().eval(PropertyKeys.dir); - } - - public void setDir(String dir) { - getStateHelper().put(PropertyKeys.dir, dir); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlDivPanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlDivPanel.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlDivPanel.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,180 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import org.richfaces.component.AbstractDivPanel; -import javax.faces.component.behavior.ClientBehaviorHolder; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -/** - * @author akolonitsky - * @since 2010-08-13 - */ -public class HtmlDivPanel extends AbstractDivPanel implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.DivPanel"; - - public static final String COMPONENT_FAMILY = "org.richfaces.DivPanel"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup" - )); - - - public enum PropertyKeys { - lang, - title, - style, - styleClass, - dir, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup - } - - public HtmlDivPanel() { - setRendererType("org.richfaces.DivPanel"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public String getLang() { - return (String) getStateHelper().eval(PropertyKeys.lang); - } - - public void setLang(String lang) { - getStateHelper().put(PropertyKeys.lang, lang); - } - - public String getTitle() { - return (String) getStateHelper().eval(PropertyKeys.title); - } - - public void setTitle(String title) { - getStateHelper().put(PropertyKeys.title, title); - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getDir() { - return (String) getStateHelper().eval(PropertyKeys.dir); - } - - public void setDir(String dir) { - getStateHelper().put(PropertyKeys.dir, dir); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenu.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenu.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,416 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import org.richfaces.component.UIPanelMenu; -import org.richfaces.renderkit.util.PanelIcons; - -import javax.faces.component.behavior.ClientBehaviorHolder; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -/** - * @author akolonitsky - * @since 2010-11-29 - */ -public class HtmlPanelMenu extends UIPanelMenu implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.PanelMenu"; - - public static final String COMPONENT_FAMILY = "org.richfaces.PanelMenu"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup" - )); - - - public enum PropertyKeys { - style, - styleClass, - width, - itemClass, - itemDisableClass, - itemIconLeft, - itemIconRight, - itemDisableIconLeft, - itemDisableIconRight, - topItemClass, - topItemDisableClass, - topItemIconLeft, - topItemIconRight, - topItemDisableIconLeft, - topItemDisableIconRight, - groupClass, - groupDisableClass, - groupExpandIconLeft, - groupExpandIconRight, - groupCollapseIconLeft, - groupCollapseIconRight, - groupDisableIconLeft, - groupDisableIconRight, - topGroupClass, - topGroupDisableClass, - topGroupExpandIconLeft, - topGroupExpandIconRight, - topGroupCollapseIconLeft, - topGroupCollapseIconRight, - topGroupDisableIconLeft, - topGroupDisableIconRight, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup - } - - public HtmlPanelMenu() { - setRendererType("org.richfaces.PanelMenu"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getWidth() { - return (String) getStateHelper().eval(PropertyKeys.width); - } - - public void setWidth(String width) { - getStateHelper().put(PropertyKeys.width, width); - } - - public String getItemClass() { - return (String) getStateHelper().eval(PropertyKeys.itemClass); - } - - public void setItemClass(String itemClass) { - getStateHelper().put(PropertyKeys.itemClass, itemClass); - } - - public String getItemDisableClass() { - return (String) getStateHelper().eval(PropertyKeys.itemDisableClass); - } - - public void setItemDisableClass(String itemDisableClass) { - getStateHelper().put(PropertyKeys.itemDisableClass, itemDisableClass); - } - - public String getItemIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.itemIconLeft, PanelIcons.DEFAULT.toString()); - } - - public void setItemIconLeft(String itemIconLeft) { - getStateHelper().put(PropertyKeys.itemIconLeft, itemIconLeft); - } - - public String getItemIconRight() { - return (String) getStateHelper().eval(PropertyKeys.itemIconRight, PanelIcons.DEFAULT.toString()); - } - - public void setItemIconRight(String itemIconRight) { - getStateHelper().put(PropertyKeys.itemIconRight, itemIconRight); - } - - public String getItemDisableIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.itemDisableIconLeft, PanelIcons.DEFAULT.toString()); - } - - public void setItemDisableIconLeft(String itemDisableIconLeft) { - getStateHelper().put(PropertyKeys.itemDisableIconLeft, itemDisableIconLeft); - } - - public String getItemDisableIconRight() { - return (String) getStateHelper().eval(PropertyKeys.itemDisableIconRight, PanelIcons.DEFAULT.toString()); - } - - public void setItemDisableIconRight(String itemDisableIconRight) { - getStateHelper().put(PropertyKeys.itemDisableIconRight, itemDisableIconRight); - } - - public String getTopItemClass() { - return (String) getStateHelper().eval(PropertyKeys.topItemClass); - } - - public void setTopItemClass(String topItemClass) { - getStateHelper().put(PropertyKeys.topItemClass, topItemClass); - } - - public String getTopItemDisableClass() { - return (String) getStateHelper().eval(PropertyKeys.topItemDisableClass); - } - - public void setTopItemDisableClass(String topItemDisableClass) { - getStateHelper().put(PropertyKeys.topItemDisableClass, topItemDisableClass); - } - - public String getTopItemIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.topItemIconLeft, PanelIcons.DEFAULT.toString()); - } - - public void setTopItemIconLeft(String topItemIconLeft) { - getStateHelper().put(PropertyKeys.topItemIconLeft, topItemIconLeft); - } - - public String getTopItemIconRight() { - return (String) getStateHelper().eval(PropertyKeys.topItemIconRight, PanelIcons.DEFAULT.toString()); - } - - public void setTopItemIconRight(String topItemIconRight) { - getStateHelper().put(PropertyKeys.topItemIconRight, topItemIconRight); - } - - public String getTopItemDisableIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.topItemDisableIconLeft, PanelIcons.DEFAULT.toString()); - } - - public void setTopItemDisableIconLeft(String topItemDisableIconLeft) { - getStateHelper().put(PropertyKeys.topItemDisableIconLeft, topItemDisableIconLeft); - } - - public String getTopItemDisableIconRight() { - return (String) getStateHelper().eval(PropertyKeys.topItemDisableIconRight, PanelIcons.DEFAULT.toString()); - } - - public void setTopItemDisableIconRight(String topItemDisableIconRight) { - getStateHelper().put(PropertyKeys.topItemDisableIconRight, topItemDisableIconRight); - } - - public String getGroupClass() { - return (String) getStateHelper().eval(PropertyKeys.groupClass); - } - - public void setGroupClass(String groupClass) { - getStateHelper().put(PropertyKeys.groupClass, groupClass); - } - - public String getGroupDisableClass() { - return (String) getStateHelper().eval(PropertyKeys.groupDisableClass); - } - - public void setGroupDisableClass(String groupDisableClass) { - getStateHelper().put(PropertyKeys.groupDisableClass, groupDisableClass); - } - - public String getGroupExpandIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.groupExpandIconLeft, PanelIcons.DEFAULT.toString()); - } - - public void setGroupExpandIconLeft(String groupExpandIconLeft) { - getStateHelper().put(PropertyKeys.groupExpandIconLeft, groupExpandIconLeft); - } - - public String getGroupExpandIconRight() { - return (String) getStateHelper().eval(PropertyKeys.groupExpandIconRight, PanelIcons.DEFAULT.toString()); - } - - public void setGroupExpandIconRight(String groupExpandIconRight) { - getStateHelper().put(PropertyKeys.groupExpandIconRight, groupExpandIconRight); - } - - public String getGroupCollapseIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.groupCollapseIconLeft, PanelIcons.DEFAULT.toString()); - } - - public void setGroupCollapseIconLeft(String groupCollapseIconLeft) { - getStateHelper().put(PropertyKeys.groupCollapseIconLeft, groupCollapseIconLeft); - } - - public String getGroupCollapseIconRight() { - return (String) getStateHelper().eval(PropertyKeys.groupCollapseIconRight, PanelIcons.DEFAULT.toString()); - } - - public void setGroupCollapseIconRight(String groupCollapseIconRight) { - getStateHelper().put(PropertyKeys.groupCollapseIconRight, groupCollapseIconRight); - } - - public String getGroupDisableIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.groupDisableIconLeft, PanelIcons.DEFAULT.toString()); - } - - public void setGroupDisableIconLeft(String groupDisableIconLeft) { - getStateHelper().put(PropertyKeys.groupDisableIconLeft, groupDisableIconLeft); - } - - public String getGroupDisableIconRight() { - return (String) getStateHelper().eval(PropertyKeys.groupDisableIconRight, PanelIcons.DEFAULT.toString()); - } - - public void setGroupDisableIconRight(String groupDisableIconRight) { - getStateHelper().put(PropertyKeys.groupDisableIconRight, groupDisableIconRight); - } - - public String getTopGroupClass() { - return (String) getStateHelper().eval(PropertyKeys.topGroupClass); - } - - public void setTopGroupClass(String topGroupClass) { - getStateHelper().put(PropertyKeys.topGroupClass, topGroupClass); - } - - public String getTopGroupDisableClass() { - return (String) getStateHelper().eval(PropertyKeys.topGroupDisableClass); - } - - public void setTopGroupDisableClass(String topGroupDisableClass) { - getStateHelper().put(PropertyKeys.topGroupDisableClass, topGroupDisableClass); - } - - public String getTopGroupExpandIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.topGroupExpandIconLeft, PanelIcons.DEFAULT.toString()); - } - - public void setTopGroupExpandIconLeft(String topGroupExpandIconLeft) { - getStateHelper().put(PropertyKeys.topGroupExpandIconLeft, topGroupExpandIconLeft); - } - - public String getTopGroupExpandIconRight() { - return (String) getStateHelper().eval(PropertyKeys.topGroupExpandIconRight, PanelIcons.DEFAULT.toString()); - } - - public void setTopGroupExpandIconRight(String topGroupExpandIconRight) { - getStateHelper().put(PropertyKeys.topGroupExpandIconRight, topGroupExpandIconRight); - } - - public String getTopGroupCollapseIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.topGroupCollapseIconLeft, PanelIcons.DEFAULT.toString()); - } - - public void setTopGroupCollapseIconLeft(String topGroupCollapseIconLeft) { - getStateHelper().put(PropertyKeys.topGroupCollapseIconLeft, topGroupCollapseIconLeft); - } - - public String getTopGroupCollapseIconRight() { - return (String) getStateHelper().eval(PropertyKeys.topGroupCollapseIconRight, PanelIcons.DEFAULT.toString()); - } - - public void setTopGroupCollapseIconRight(String topGroupCollapseIconRight) { - getStateHelper().put(PropertyKeys.topGroupCollapseIconRight, topGroupCollapseIconRight); - } - - public String getTopGroupDisableIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.topGroupDisableIconLeft, PanelIcons.DEFAULT.toString()); - } - - public void setTopGroupDisableIconLeft(String topGroupDisableIconLeft) { - getStateHelper().put(PropertyKeys.topGroupDisableIconLeft, topGroupDisableIconLeft); - } - - public String getTopGroupDisableIconRight() { - return (String) getStateHelper().eval(PropertyKeys.topGroupDisableIconRight, PanelIcons.DEFAULT.toString()); - } - - public void setTopGroupDisableIconRight(String topGroupDisableIconRight) { - getStateHelper().put(PropertyKeys.topGroupDisableIconRight, topGroupDisableIconRight); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenuGroup.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenuGroup.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenuGroup.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,370 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import org.richfaces.component.UIPanelMenuGroup; - -import javax.faces.component.behavior.ClientBehaviorHolder; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -/** - * @author akolonitsky - * @since 2010-11-29 - */ -public class HtmlPanelMenuGroup extends UIPanelMenuGroup implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.PanelMenuGroup"; - - public static final String COMPONENT_FAMILY = "org.richfaces.PanelMenuGroup"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "beforedomupdate", - "complete", - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup", - "unselect", - "select", - "beforeselect", - - "collapse", - "expand", - "switch", - "beforecollapse", - "beforeexpand", - "beforeswitch" - )); - - - public enum PropertyKeys { - iconLeftCollapsed, - iconLeftExpanded, - iconLeftDisabled, - - iconRightCollapsed, - iconRightExpanded, - iconRightDisabled, - - oncollapse, - onexpand, - onswitch, - onbeforecollapse, - onbeforeexpand, - onbeforeswitch, - - disabledClass, - hoverClass, - iconLeftClass, - iconRightClass, - style, - styleClass, - onbeforedomupdate, - oncomplete, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup, - onunselect, - onselect, - onbeforeselect - } - - public HtmlPanelMenuGroup() { - setRendererType("org.richfaces.PanelMenuGroup"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - @Override - public HtmlPanelMenu getPanelMenu() { - return (HtmlPanelMenu) super.getPanelMenu(); - } - - public String getIconLeftCollapsed() { - return (String) getStateHelper().eval(PropertyKeys.iconLeftCollapsed, - isTopItem() ? getPanelMenu().getTopGroupCollapseIconLeft() : getPanelMenu().getGroupCollapseIconLeft()); - } - - public void setIconLeftCollapsed(String iconLeftCollapsed) { - getStateHelper().put(PropertyKeys.iconLeftCollapsed, iconLeftCollapsed); - } - - public String getIconLeftExpanded() { - return (String) getStateHelper().eval(PropertyKeys.iconLeftExpanded, - isTopItem() ? getPanelMenu().getTopGroupExpandIconLeft() : getPanelMenu().getGroupExpandIconLeft()); - } - - public void setIconLeftExpanded(String iconLeftExpanded) { - getStateHelper().put(PropertyKeys.iconLeftExpanded, iconLeftExpanded); - } - - public String getIconLeftDisabled() { - return (String) getStateHelper().eval(PropertyKeys.iconLeftDisabled, - isTopItem() ? getPanelMenu().getTopGroupDisableIconLeft() : getPanelMenu().getGroupDisableIconLeft()); - } - - public void setIconLeftDisabled(String iconLeftDisabled) { - getStateHelper().put(PropertyKeys.iconLeftDisabled, iconLeftDisabled); - } - - public String getIconRightCollapsed() { - return (String) getStateHelper().eval(PropertyKeys.iconRightCollapsed, - isTopItem() ? getPanelMenu().getTopGroupCollapseIconRight() : getPanelMenu().getGroupCollapseIconRight()); - } - - public void setIconRightCollapsed(String iconRightCollapsed) { - getStateHelper().put(PropertyKeys.iconRightCollapsed, iconRightCollapsed); - } - - public String getIconRightExpanded() { - return (String) getStateHelper().eval(PropertyKeys.iconRightExpanded, - isTopItem() ? getPanelMenu().getTopGroupExpandIconRight() : getPanelMenu().getGroupExpandIconRight()); - } - - public void setIconRightExpanded(String iconRightExpanded) { - getStateHelper().put(PropertyKeys.iconRightExpanded, iconRightExpanded); - } - - public String getIconRightDisabled() { - return (String) getStateHelper().eval(PropertyKeys.iconRightDisabled, - isTopItem() ? getPanelMenu().getTopGroupDisableIconRight() : getPanelMenu().getGroupDisableIconRight()); - } - - public void setIconRightDisabled(String iconRightDisabled) { - getStateHelper().put(PropertyKeys.iconRightDisabled, iconRightDisabled); - } - - public String getOncollapse() { - return (String) getStateHelper().eval(PropertyKeys.oncollapse); - } - - public void setOncollapse(String oncollapse) { - getStateHelper().put(PropertyKeys.oncollapse, oncollapse); - } - - public String getOnexpand() { - return (String) getStateHelper().eval(PropertyKeys.onexpand); - } - - public void setOnexpand(String onexpand) { - getStateHelper().put(PropertyKeys.onexpand, onexpand); - } - - public String getOnswitch() { - return (String) getStateHelper().eval(PropertyKeys.onswitch); - } - - public void setOnswitch(String onswitch) { - getStateHelper().put(PropertyKeys.onswitch, onswitch); - } - - public String getOnbeforecollapse() { - return (String) getStateHelper().eval(PropertyKeys.onbeforecollapse); - } - - public void setOnbeforecollapse(String onbeforecollapse) { - getStateHelper().put(PropertyKeys.onbeforecollapse, onbeforecollapse); - } - - public String getOnbeforeexpand() { - return (String) getStateHelper().eval(PropertyKeys.onbeforeexpand); - } - - public void setOnbeforeexpand(String onbeforeexpand) { - getStateHelper().put(PropertyKeys.onbeforeexpand, onbeforeexpand); - } - - public String getOnbeforeswitch() { - return (String) getStateHelper().eval(PropertyKeys.onbeforeswitch); - } - - public void setOnbeforeswitch(String onbeforeswitch) { - getStateHelper().put(PropertyKeys.onbeforeswitch, onbeforeswitch); - } - - public String getDisabledClass() { - return (String) getStateHelper().eval(PropertyKeys.disabledClass, - isTopItem() ? getPanelMenu().getTopGroupDisableClass() : getPanelMenu().getGroupDisableClass()); - } - - public void setDisabledClass(String disabledClass) { - getStateHelper().put(PropertyKeys.disabledClass, disabledClass); - } - - public String getHoverClass() { - return (String) getStateHelper().eval(PropertyKeys.hoverClass); - } - - public void setHoverClass(String hoverClass) { - getStateHelper().put(PropertyKeys.hoverClass, hoverClass); - } - - public String getIconLeftClass() { - return (String) getStateHelper().eval(PropertyKeys.iconLeftClass); - } - - public void setIconLeftClass(String iconLeftClass) { - getStateHelper().put(PropertyKeys.iconLeftClass, iconLeftClass); - } - - public String getIconRightClass() { - return (String) getStateHelper().eval(PropertyKeys.iconRightClass); - } - - public void setIconRightClass(String iconRightClass) { - getStateHelper().put(PropertyKeys.iconRightClass, iconRightClass); - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass, - isTopItem() ? getPanelMenu().getTopGroupClass() : getPanelMenu().getGroupClass() ); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getOnbeforedomupdate() { - return (String) getStateHelper().eval(PropertyKeys.onbeforedomupdate); - } - - public void setOnbeforedomupdate(String onbeforedomupdate) { - getStateHelper().put(PropertyKeys.onbeforedomupdate, onbeforedomupdate); - } - - public String getOncomplete() { - return (String) getStateHelper().eval(PropertyKeys.oncomplete); - } - - public void setOncomplete(String oncomplete) { - getStateHelper().put(PropertyKeys.oncomplete, oncomplete); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - public String getOnunselect() { - return (String) getStateHelper().eval(PropertyKeys.onunselect); - } - - public void setOnunselect(String onunselect) { - getStateHelper().put(PropertyKeys.onunselect, onunselect); - } - - public String getOnselect() { - return (String) getStateHelper().eval(PropertyKeys.onselect); - } - - public void setOnselect(String onselect) { - getStateHelper().put(PropertyKeys.onselect, onselect); - } - - public String getOnbeforeselect() { - return (String) getStateHelper().eval(PropertyKeys.onbeforeselect); - } - - public void setOnbeforeselect(String onbeforeselect) { - getStateHelper().put(PropertyKeys.onbeforeselect, onbeforeselect); - } - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenuItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenuItem.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenuItem.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,287 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import org.richfaces.component.UIPanelMenuItem; - -import javax.faces.component.behavior.ClientBehaviorHolder; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -/** - * @author akolonitsky - * @since 2010-10-25 - */ -public class HtmlPanelMenuItem extends UIPanelMenuItem implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.PanelMenuItem"; - - public static final String COMPONENT_FAMILY = "org.richfaces.PanelMenuItem"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "beforedomupdate", - "complete", - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup", - "unselect", - "select", - "beforeselect" - )); - - - public enum PropertyKeys { - disabledClass, - hoverClass, - iconLeft, - iconLeftClass, - iconLeftDisabled, - iconRight, - iconRightClass, - iconRightDisabled, - style, - styleClass, - onbeforedomupdate, - oncomplete, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup, - onunselect, - onselect, - onbeforeselect - } - - public HtmlPanelMenuItem() { - setRendererType("org.richfaces.PanelMenuItem"); - } - - @Override - public HtmlPanelMenu getPanelMenu() { - return (HtmlPanelMenu) super.getPanelMenu(); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public String getDisabledClass() { - return (String) getStateHelper().eval(PropertyKeys.disabledClass, - isTopItem() ? getPanelMenu().getTopItemDisableClass() : getPanelMenu().getItemDisableClass()); - } - - public void setDisabledClass(String disabledClass) { - getStateHelper().put(PropertyKeys.disabledClass, disabledClass); - } - - public String getHoverClass() { - return (String) getStateHelper().eval(PropertyKeys.hoverClass); - } - - public void setHoverClass(String hoverClass) { - getStateHelper().put(PropertyKeys.hoverClass, hoverClass); - } - - public String getIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.iconLeft, - isTopItem() ? getPanelMenu().getTopItemIconLeft() : getPanelMenu().getItemIconLeft()); - } - - public void setIconLeft(String iconLeft) { - getStateHelper().put(PropertyKeys.iconLeft, iconLeft); - } - - public String getIconLeftClass() { - return (String) getStateHelper().eval(PropertyKeys.iconLeftClass); - } - - public void setIconLeftClass(String iconLeftClass) { - getStateHelper().put(PropertyKeys.iconLeftClass, iconLeftClass); - } - - public String getIconLeftDisabled() { - return (String) getStateHelper().eval(PropertyKeys.iconLeftDisabled, - isTopItem() ? getPanelMenu().getTopItemDisableIconLeft() : getPanelMenu().getItemDisableIconLeft()); - } - - public void setIconLeftDisabled(String iconLeftDisabled) { - getStateHelper().put(PropertyKeys.iconLeftDisabled, iconLeftDisabled); - } - - public String getIconRight() { - return (String) getStateHelper().eval(PropertyKeys.iconRight, - isTopItem() ? getPanelMenu().getTopItemIconRight() : getPanelMenu().getItemIconRight()); - } - - public void setIconRight(String iconRight) { - getStateHelper().put(PropertyKeys.iconRight, iconRight); - } - - public String getIconRightClass() { - return (String) getStateHelper().eval(PropertyKeys.iconRightClass); - } - - public void setIconRightClass(String iconRightClass) { - getStateHelper().put(PropertyKeys.iconRightClass, iconRightClass); - } - - public String getIconRightDisabled() { - return (String) getStateHelper().eval(PropertyKeys.iconRightDisabled, - isTopItem() ? getPanelMenu().getTopItemDisableIconRight() : getPanelMenu().getItemDisableIconRight()); - } - - public void setIconRightDisabled(String iconRightDisabled) { - getStateHelper().put(PropertyKeys.iconRightDisabled, iconRightDisabled); - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass, - isTopItem() ? getPanelMenu().getTopItemClass() : getPanelMenu().getItemClass() ); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getOnbeforedomupdate() { - return (String) getStateHelper().eval(PropertyKeys.onbeforedomupdate); - } - - public void setOnbeforedomupdate(String onbeforedomupdate) { - getStateHelper().put(PropertyKeys.onbeforedomupdate, onbeforedomupdate); - } - - public String getOncomplete() { - return (String) getStateHelper().eval(PropertyKeys.oncomplete); - } - - public void setOncomplete(String oncomplete) { - getStateHelper().put(PropertyKeys.oncomplete, oncomplete); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - public String getOnunselect() { - return (String) getStateHelper().eval(PropertyKeys.onunselect); - } - - public void setOnunselect(String onunselect) { - getStateHelper().put(PropertyKeys.onunselect, onunselect); - } - - public String getOnselect() { - return (String) getStateHelper().eval(PropertyKeys.onselect); - } - - public void setOnselect(String onselect) { - getStateHelper().put(PropertyKeys.onselect, onselect); - } - - public String getOnbeforeselect() { - return (String) getStateHelper().eval(PropertyKeys.onbeforeselect); - } - - public void setOnbeforeselect(String onbeforeselect) { - getStateHelper().put(PropertyKeys.onbeforeselect, onbeforeselect); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,308 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import org.richfaces.component.UITogglePanelTitledItem; -import javax.faces.component.behavior.ClientBehaviorHolder; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -/** - * @author akolonitsky - * @since 2010-10-19 - */ -public class HtmlTab extends UITogglePanelTitledItem implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.TogglePanelTitledItem"; - - public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanelTitledItem"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "headerclick", - "headerdblclick", - "headermousedown", - "headermousemove", - "headermouseup", - "enter", - "leave", - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup" - )); - - - public enum PropertyKeys { - headerClassActive, - headerClassDisabled, - headerClassInactive, - headerClass, - headerStyle, - contentClass, - onheaderclick, - onheaderdblclick, - onheadermousedown, - onheadermousemove, - onheadermouseup, - onenter, - onleave, - lang, - title, - style, - styleClass, - dir, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup - } - - public HtmlTab() { - setRendererType("org.richfaces.Tab"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public HtmlTabPanel getTabPanel() { - return (HtmlTabPanel) this.getParent(); - } - - public String getHeaderClassActive() { - return (String) getStateHelper().eval(PropertyKeys.headerClassActive, getTabPanel().getTabHeaderClassActive()); - } - - public void setHeaderClassActive(String headerClassActive) { - getStateHelper().put(PropertyKeys.headerClassActive, headerClassActive); - } - - public String getHeaderClassDisabled() { - return (String) getStateHelper().eval(PropertyKeys.headerClassDisabled, getTabPanel().getTabHeaderClassDisabled()); - } - - public void setHeaderClassDisabled(String headerClassDisabled) { - getStateHelper().put(PropertyKeys.headerClassDisabled, headerClassDisabled); - } - - public String getHeaderClassInactive() { - return (String) getStateHelper().eval(PropertyKeys.headerClassInactive, getTabPanel().getTabHeaderClassInactive()); - } - - public void setHeaderClassInactive(String headerClassInactive) { - getStateHelper().put(PropertyKeys.headerClassInactive, headerClassInactive); - } - - public String getHeaderClass() { - return (String) getStateHelper().eval(PropertyKeys.headerClass, getTabPanel().getTabHeaderClass()); - } - - public void setHeaderClass(String headerClass) { - getStateHelper().put(PropertyKeys.headerClass, headerClass); - } - - public String getHeaderStyle() { - return (String) getStateHelper().eval(PropertyKeys.headerStyle); - } - - public void setHeaderStyle(String headerStyle) { - getStateHelper().put(PropertyKeys.headerStyle, headerStyle); - } - - public String getContentClass() { - return (String) getStateHelper().eval(PropertyKeys.contentClass, getTabPanel().getTabContentClass()); - } - - public void setContentClass(String contentClass) { - getStateHelper().put(PropertyKeys.contentClass, contentClass); - } - - public String getOnheaderclick() { - return (String) getStateHelper().eval(PropertyKeys.onheaderclick); - } - - public void setOnheaderclick(String onheaderclick) { - getStateHelper().put(PropertyKeys.onheaderclick, onheaderclick); - } - - public String getOnheaderdblclick() { - return (String) getStateHelper().eval(PropertyKeys.onheaderdblclick); - } - - public void setOnheaderdblclick(String onheaderdblclick) { - getStateHelper().put(PropertyKeys.onheaderdblclick, onheaderdblclick); - } - - public String getOnheadermousedown() { - return (String) getStateHelper().eval(PropertyKeys.onheadermousedown); - } - - public void setOnheadermousedown(String onheadermousedown) { - getStateHelper().put(PropertyKeys.onheadermousedown, onheadermousedown); - } - - public String getOnheadermousemove() { - return (String) getStateHelper().eval(PropertyKeys.onheadermousemove); - } - - public void setOnheadermousemove(String onheadermousemove) { - getStateHelper().put(PropertyKeys.onheadermousemove, onheadermousemove); - } - - public String getOnheadermouseup() { - return (String) getStateHelper().eval(PropertyKeys.onheadermouseup); - } - - public void setOnheadermouseup(String onheadermouseup) { - getStateHelper().put(PropertyKeys.onheadermouseup, onheadermouseup); - } - - public String getOnenter() { - return (String) getStateHelper().eval(PropertyKeys.onenter); - } - - public void setOnenter(String onenter) { - getStateHelper().put(PropertyKeys.onenter, onenter); - } - - public String getOnleave() { - return (String) getStateHelper().eval(PropertyKeys.onleave); - } - - public void setOnleave(String onleave) { - getStateHelper().put(PropertyKeys.onleave, onleave); - } - - public String getLang() { - return (String) getStateHelper().eval(PropertyKeys.lang); - } - - public void setLang(String lang) { - getStateHelper().put(PropertyKeys.lang, lang); - } - - public String getTitle() { - return (String) getStateHelper().eval(PropertyKeys.title); - } - - public void setTitle(String title) { - getStateHelper().put(PropertyKeys.title, title); - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getDir() { - return (String) getStateHelper().eval(PropertyKeys.dir); - } - - public void setDir(String dir) { - getStateHelper().put(PropertyKeys.dir, dir); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTabPanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTabPanel.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTabPanel.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,265 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import org.richfaces.HeaderPosition; -import org.richfaces.HeaderAlignment; -import org.richfaces.component.AbstractTabPanel; -import javax.faces.component.behavior.ClientBehaviorHolder; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -/** - * @author akolonitsky - * @since 2010-08-27 - */ -public class HtmlTabPanel extends AbstractTabPanel implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.TabPanel"; - - public static final String COMPONENT_FAMILY = "org.richfaces.TabPanel"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "itemchange", - "beforeitemchange", - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup" - )); - - - public enum PropertyKeys { - headerPosition, - headerAlignment, - tabHeaderClassActive, - tabHeaderClassDisabled, - tabHeaderClassInactive, - tabContentClass, - tabHeaderClass, - onitemchange, - onbeforeitemchange, - lang, - title, - style, - styleClass, - dir, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup - } - - public HtmlTabPanel() { - setRendererType("org.richfaces.TabPanel"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public HeaderPosition getHeaderPosition() { - return (HeaderPosition) getStateHelper().eval(PropertyKeys.headerPosition); - } - - public void setHeaderPosition(HeaderPosition headerPosition) { - getStateHelper().put(PropertyKeys.headerPosition, headerPosition); - } - - public HeaderAlignment getHeaderAlignment() { - return (HeaderAlignment) getStateHelper().eval(PropertyKeys.headerAlignment); - } - - public void setHeaderAlignment(HeaderAlignment headerAlignment) { - getStateHelper().put(PropertyKeys.headerAlignment, headerAlignment); - } - - public String getTabHeaderClassActive() { - return (String) getStateHelper().eval(PropertyKeys.tabHeaderClassActive); - } - - public void setTabHeaderClassActive(String tabHeaderClassActive) { - getStateHelper().put(PropertyKeys.tabHeaderClassActive, tabHeaderClassActive); - } - - public String getTabHeaderClassDisabled() { - return (String) getStateHelper().eval(PropertyKeys.tabHeaderClassDisabled); - } - - public void setTabHeaderClassDisabled(String tabHeaderClassDisabled) { - getStateHelper().put(PropertyKeys.tabHeaderClassDisabled, tabHeaderClassDisabled); - } - - public String getTabHeaderClassInactive() { - return (String) getStateHelper().eval(PropertyKeys.tabHeaderClassInactive); - } - - public void setTabHeaderClassInactive(String tabHeaderClassInactive) { - getStateHelper().put(PropertyKeys.tabHeaderClassInactive, tabHeaderClassInactive); - } - - public String getTabContentClass() { - return (String) getStateHelper().eval(PropertyKeys.tabContentClass); - } - - public void setTabContentClass(String tabContentClass) { - getStateHelper().put(PropertyKeys.tabContentClass, tabContentClass); - } - - public String getTabHeaderClass() { - return (String) getStateHelper().eval(PropertyKeys.tabHeaderClass); - } - - public void setTabHeaderClass(String tabHeaderClass) { - getStateHelper().put(PropertyKeys.tabHeaderClass, tabHeaderClass); - } - - public String getOnitemchange() { - return (String) getStateHelper().eval(PropertyKeys.onitemchange); - } - - public void setOnitemchange(String onitemchange) { - getStateHelper().put(PropertyKeys.onitemchange, onitemchange); - } - - public String getOnbeforeitemchange() { - return (String) getStateHelper().eval(PropertyKeys.onbeforeitemchange); - } - - public void setOnbeforeitemchange(String onbeforeitemchange) { - getStateHelper().put(PropertyKeys.onbeforeitemchange, onbeforeitemchange); - } - - public String getLang() { - return (String) getStateHelper().eval(PropertyKeys.lang); - } - - public void setLang(String lang) { - getStateHelper().put(PropertyKeys.lang, lang); - } - - public String getTitle() { - return (String) getStateHelper().eval(PropertyKeys.title); - } - - public void setTitle(String title) { - getStateHelper().put(PropertyKeys.title, title); - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getDir() { - return (String) getStateHelper().eval(PropertyKeys.dir); - } - - public void setDir(String dir) { - getStateHelper().put(PropertyKeys.dir, dir); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanel.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanel.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,200 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import org.richfaces.component.UITogglePanel; -import javax.faces.component.behavior.ClientBehaviorHolder; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -/** - * @author akolonitsky - * @since 2010-08-13 - */ -public class HtmlTogglePanel extends UITogglePanel implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.TogglePanel"; - - public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanel"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "itemchange", - "beforeitemchange", - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup" - )); - - - public enum PropertyKeys { - onitemchange, - onbeforeitemchange, - lang, - title, - style, - styleClass, - dir, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup - } - - public HtmlTogglePanel() { - setRendererType("org.richfaces.TogglePanel"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public String getOnitemchange() { - return (String) getStateHelper().eval(PropertyKeys.onitemchange); - } - - public void setOnitemchange(String onitemchange) { - getStateHelper().put(PropertyKeys.onitemchange, onitemchange); - } - - public String getOnbeforeitemchange() { - return (String) getStateHelper().eval(PropertyKeys.onbeforeitemchange); - } - - public void setOnbeforeitemchange(String onbeforeitemchange) { - getStateHelper().put(PropertyKeys.onbeforeitemchange, onbeforeitemchange); - } - - public String getLang() { - return (String) getStateHelper().eval(PropertyKeys.lang); - } - - public void setLang(String lang) { - getStateHelper().put(PropertyKeys.lang, lang); - } - - public String getTitle() { - return (String) getStateHelper().eval(PropertyKeys.title); - } - - public void setTitle(String title) { - getStateHelper().put(PropertyKeys.title, title); - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getDir() { - return (String) getStateHelper().eval(PropertyKeys.dir); - } - - public void setDir(String dir) { - getStateHelper().put(PropertyKeys.dir, dir); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelItem.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelItem.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,200 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import org.richfaces.component.UITogglePanelItem; -import javax.faces.component.behavior.ClientBehaviorHolder; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -/** - * @author akolonitsky - * @since 2010-08-13 - */ -public class HtmlTogglePanelItem extends UITogglePanelItem implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.TogglePanelItem"; - - public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanelItem"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "enter", - "leave", - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup" - )); - - - public enum PropertyKeys { - onenter, - onleave, - lang, - title, - style, - styleClass, - dir, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup - } - - public HtmlTogglePanelItem() { - setRendererType("org.richfaces.TogglePanelItem"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public String getOnenter() { - return (String) getStateHelper().eval(PropertyKeys.onenter); - } - - public void setOnenter(String onenter) { - getStateHelper().put(PropertyKeys.onenter, onenter); - } - - public String getOnleave() { - return (String) getStateHelper().eval(PropertyKeys.onleave); - } - - public void setOnleave(String onleave) { - getStateHelper().put(PropertyKeys.onleave, onleave); - } - - public String getLang() { - return (String) getStateHelper().eval(PropertyKeys.lang); - } - - public void setLang(String lang) { - getStateHelper().put(PropertyKeys.lang, lang); - } - - public String getTitle() { - return (String) getStateHelper().eval(PropertyKeys.title); - } - - public void setTitle(String title) { - getStateHelper().put(PropertyKeys.title, title); - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getDir() { - return (String) getStateHelper().eval(PropertyKeys.dir); - } - - public void setDir(String dir) { - getStateHelper().put(PropertyKeys.dir, dir); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelTitledItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelTitledItem.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTogglePanelTitledItem.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,306 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -import javax.faces.component.behavior.ClientBehaviorHolder; - -import org.richfaces.component.UITogglePanelTitledItem; - -/** - * @author akolonitsky - * @since 2010-08-13 - */ -//TODO alex - what's the purpose of this class? -public class HtmlTogglePanelTitledItem extends UITogglePanelTitledItem implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.TogglePanelTitledItem"; - - public static final String COMPONENT_FAMILY = "org.richfaces.TogglePanelTitledItem"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "headerclick", - "headerdblclick", - "headermousedown", - "headermousemove", - "headermouseup", - "enter", - "leave", - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup" - )); - - - public enum PropertyKeys { - headerClassActive, - headerClassDisabled, - headerClassInactive, - headerClass, - headerStyle, - contentClass, - onheaderclick, - onheaderdblclick, - onheadermousedown, - onheadermousemove, - onheadermouseup, - onenter, - onleave, - lang, - title, - style, - styleClass, - dir, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup - } - - public HtmlTogglePanelTitledItem() { - setRendererType("org.richfaces.TogglePanelTitledItem"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public String getHeaderClassActive() { - return (String) getStateHelper().eval(PropertyKeys.headerClassActive); - } - - public void setHeaderClassActive(String headerClassActive) { - getStateHelper().put(PropertyKeys.headerClassActive, headerClassActive); - } - - public String getHeaderClassDisabled() { - return (String) getStateHelper().eval(PropertyKeys.headerClassDisabled); - } - - public void setHeaderClassDisabled(String headerClassDisabled) { - getStateHelper().put(PropertyKeys.headerClassDisabled, headerClassDisabled); - } - - public String getHeaderClassInactive() { - return (String) getStateHelper().eval(PropertyKeys.headerClassInactive); - } - - public void setHeaderClassInactive(String headerClassInactive) { - getStateHelper().put(PropertyKeys.headerClassInactive, headerClassInactive); - } - - public String getHeaderClass() { - return (String) getStateHelper().eval(PropertyKeys.headerClass); - } - - public void setHeaderClass(String headerClass) { - getStateHelper().put(PropertyKeys.headerClass, headerClass); - } - - public String getHeaderStyle() { - return (String) getStateHelper().eval(PropertyKeys.headerStyle); - } - - public void setHeaderStyle(String headerStyle) { - getStateHelper().put(PropertyKeys.headerStyle, headerStyle); - } - - public String getContentClass() { - return (String) getStateHelper().eval(PropertyKeys.contentClass); - } - - public void setContentClass(String contentClass) { - getStateHelper().put(PropertyKeys.contentClass, contentClass); - } - - public String getOnheaderclick() { - return (String) getStateHelper().eval(PropertyKeys.onheaderclick); - } - - public void setOnheaderclick(String onheaderclick) { - getStateHelper().put(PropertyKeys.onheaderclick, onheaderclick); - } - - public String getOnheaderdblclick() { - return (String) getStateHelper().eval(PropertyKeys.onheaderdblclick); - } - - public void setOnheaderdblclick(String onheaderdblclick) { - getStateHelper().put(PropertyKeys.onheaderdblclick, onheaderdblclick); - } - - public String getOnheadermousedown() { - return (String) getStateHelper().eval(PropertyKeys.onheadermousedown); - } - - public void setOnheadermousedown(String onheadermousedown) { - getStateHelper().put(PropertyKeys.onheadermousedown, onheadermousedown); - } - - public String getOnheadermousemove() { - return (String) getStateHelper().eval(PropertyKeys.onheadermousemove); - } - - public void setOnheadermousemove(String onheadermousemove) { - getStateHelper().put(PropertyKeys.onheadermousemove, onheadermousemove); - } - - public String getOnheadermouseup() { - return (String) getStateHelper().eval(PropertyKeys.onheadermouseup); - } - - public void setOnheadermouseup(String onheadermouseup) { - getStateHelper().put(PropertyKeys.onheadermouseup, onheadermouseup); - } - - public String getOnenter() { - return (String) getStateHelper().eval(PropertyKeys.onenter); - } - - public void setOnenter(String onenter) { - getStateHelper().put(PropertyKeys.onenter, onenter); - } - - public String getOnleave() { - return (String) getStateHelper().eval(PropertyKeys.onleave); - } - - public void setOnleave(String onleave) { - getStateHelper().put(PropertyKeys.onleave, onleave); - } - - public String getLang() { - return (String) getStateHelper().eval(PropertyKeys.lang); - } - - public void setLang(String lang) { - getStateHelper().put(PropertyKeys.lang, lang); - } - - public String getTitle() { - return (String) getStateHelper().eval(PropertyKeys.title); - } - - public void setTitle(String title) { - getStateHelper().put(PropertyKeys.title, title); - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public String getDir() { - return (String) getStateHelper().eval(PropertyKeys.dir); - } - - public void setDir(String dir) { - getStateHelper().put(PropertyKeys.dir, dir); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTooltip.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTooltip.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,203 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component.html; - -import org.richfaces.component.UITooltip; -import javax.faces.component.behavior.ClientBehaviorHolder; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; - -/** - * @author amarkhel - * @since 2010-10-24 - */ -public class HtmlTooltip extends UITooltip implements ClientBehaviorHolder { - - public static final String COMPONENT_TYPE = "org.richfaces.Tooltip"; - - public static final String COMPONENT_FAMILY = "org.richfaces.Tooltip"; - - private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList( - "click", - "dblclick", - "mousedown", - "mousemove", - "mouseout", - "mouseover", - "mouseup", - "hide", - "show", - "beforehide", - "beforeshow" - )); - - - public enum PropertyKeys { - style, - styleClass, - zindex, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup, - onhide, - onshow, - onbeforehide, - onbeforeshow - } - - public HtmlTooltip() { - setRendererType("org.richfaces.Tooltip"); - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - public String getStyle() { - return (String) getStateHelper().eval(PropertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(PropertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(PropertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(PropertyKeys.styleClass, styleClass); - } - - public int getZindex() { - return (Integer) getStateHelper().eval(PropertyKeys.zindex); - } - - public void setZindex(int zindex) { - getStateHelper().put(PropertyKeys.zindex, zindex); - } - - public String getOnclick() { - return (String) getStateHelper().eval(PropertyKeys.onclick); - } - - public void setOnclick(String onclick) { - getStateHelper().put(PropertyKeys.onclick, onclick); - } - - public String getOndblclick() { - return (String) getStateHelper().eval(PropertyKeys.ondblclick); - } - - public void setOndblclick(String ondblclick) { - getStateHelper().put(PropertyKeys.ondblclick, ondblclick); - } - - public String getOnmousedown() { - return (String) getStateHelper().eval(PropertyKeys.onmousedown); - } - - public void setOnmousedown(String onmousedown) { - getStateHelper().put(PropertyKeys.onmousedown, onmousedown); - } - - public String getOnmousemove() { - return (String) getStateHelper().eval(PropertyKeys.onmousemove); - } - - public void setOnmousemove(String onmousemove) { - getStateHelper().put(PropertyKeys.onmousemove, onmousemove); - } - - public String getOnmouseout() { - return (String) getStateHelper().eval(PropertyKeys.onmouseout); - } - - public void setOnmouseout(String onmouseout) { - getStateHelper().put(PropertyKeys.onmouseout, onmouseout); - } - - public String getOnmouseover() { - return (String) getStateHelper().eval(PropertyKeys.onmouseover); - } - - public void setOnmouseover(String onmouseover) { - getStateHelper().put(PropertyKeys.onmouseover, onmouseover); - } - - public String getOnmouseup() { - return (String) getStateHelper().eval(PropertyKeys.onmouseup); - } - - public void setOnmouseup(String onmouseup) { - getStateHelper().put(PropertyKeys.onmouseup, onmouseup); - } - - public String getOnhide() { - return (String) getStateHelper().eval(PropertyKeys.onhide); - } - - public void setOnhide(String onhide) { - getStateHelper().put(PropertyKeys.onhide, onhide); - } - - public String getOnshow() { - return (String) getStateHelper().eval(PropertyKeys.onshow); - } - - public void setOnshow(String onshow) { - getStateHelper().put(PropertyKeys.onshow, onshow); - } - - public String getOnbeforehide() { - return (String) getStateHelper().eval(PropertyKeys.onbeforehide); - } - - public void setOnbeforehide(String onbeforehide) { - getStateHelper().put(PropertyKeys.onbeforehide, onbeforehide); - } - - public String getOnbeforeshow() { - return (String) getStateHelper().eval(PropertyKeys.onbeforeshow); - } - - public void setOnbeforeshow(String onbeforeshow) { - getStateHelper().put(PropertyKeys.onbeforeshow, onbeforeshow); - } - - - - @Override - public Collection<String> getEventNames() { - return EVENT_NAMES; - } -} - Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,7 +1,7 @@ package org.richfaces.renderkit.html; +import org.richfaces.component.AbstractAccordionItem; import org.richfaces.component.AbstractTogglePanelTitledItem; -import org.richfaces.component.html.HtmlAccordionItem; import org.richfaces.renderkit.RendererBase; import javax.faces.context.FacesContext; @@ -11,20 +11,20 @@ import static org.richfaces.renderkit.HtmlConstants.*; import static org.richfaces.renderkit.html.DivPanelRenderer.attributeAsString; -class AccordionItemHeaderRenderer extends TableIconsRendererHelper<HtmlAccordionItem> { +class AccordionItemHeaderRenderer extends TableIconsRendererHelper<AbstractAccordionItem> { public AccordionItemHeaderRenderer() { super("header", "rf-ac-itm"); } - protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, HtmlAccordionItem panel) throws IOException { + protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, AbstractAccordionItem panel) throws IOException { String iconInactive = panel.isDisabled() ? panel.getLeftIconDisabled() : panel.getLeftIconInactive(); String iconActive = panel.isDisabled() ? panel.getLeftIconDisabled() : panel.getLeftIconActive(); encodeTdIcon(writer, context, cssClassPrefix + "-ico", iconInactive, iconActive); } - protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, HtmlAccordionItem panel) throws IOException { + protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, AbstractAccordionItem panel) throws IOException { String iconInactive = panel.isDisabled() ? panel.getRightIconDisabled() : panel.getRightIconInactive(); String iconActive = panel.isDisabled() ? panel.getRightIconDisabled() : panel.getRightIconActive(); @@ -44,7 +44,7 @@ } @Override - protected void encodeHeaderTextValue(ResponseWriter writer, FacesContext context, HtmlAccordionItem titledItem) throws IOException { + protected void encodeHeaderTextValue(ResponseWriter writer, FacesContext context, AbstractAccordionItem titledItem) throws IOException { if (titledItem.isDisabled()) { encodeHeader(writer, context, titledItem, AbstractTogglePanelTitledItem.HeaderStates.disabled); } else { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -23,9 +23,9 @@ package org.richfaces.renderkit.html; import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractAccordionItem; import org.richfaces.component.AbstractTogglePanelTitledItem; -import org.richfaces.component.html.HtmlAccordionItem; -import org.richfaces.component.html.HtmlAccordionItem.PropertyKeys; import org.richfaces.renderkit.RenderKitUtils; import javax.faces.application.ResourceDependencies; @@ -44,6 +44,7 @@ * @author akolonitsky * @since 2010-08-05 */ + @ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"), @ResourceDependency(name = "jquery.js"), @@ -53,23 +54,24 @@ @ResourceDependency(library = "org.richfaces", name = "togglePanelItem.js"), @ResourceDependency(library = "org.richfaces", name = "accordionItem.js") }) +@JsfRenderer(type = "org.richfaces.AccordionItemRenderer", family = AbstractAccordionItem.COMPONENT_FAMILY) public class AccordionItemRenderer extends TogglePanelItemRenderer { private static final RenderKitUtils.Attributes HEADER_ATTRIBUTES = RenderKitUtils.attributes() - .generic("style", PropertyKeys.headerStyle.toString()) - .generic("onclick", PropertyKeys.onheaderclick.toString(), "headerclick") - .generic("ondblclick", PropertyKeys.onheaderdblclick.toString(), "headerdblclick") - .generic("onmousedown", PropertyKeys.onheadermousedown.toString(), "headermousedown") - .generic("onmousemove", PropertyKeys.onheadermousemove.toString(), "headermousemove") - .generic("onmouseup", PropertyKeys.onheadermouseup.toString(), "headermouseup"); + .generic("style", "headerStyle") + .generic("onclick", "onheaderclick", "headerclick") + .generic("ondblclick", "onheaderdblclick", "headerdblclick") + .generic("onmousedown", "onheadermousedown", "headermousedown") + .generic("onmousemove", "onheadermousemove", "headermousemove") + .generic("onmouseup", "onheadermouseup", "headermouseup"); - private final TableIconsRendererHelper<HtmlAccordionItem> headerRenderer = new AccordionItemHeaderRenderer(); + private final TableIconsRendererHelper<AbstractAccordionItem> headerRenderer = new AccordionItemHeaderRenderer(); @Override protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { super.doEncodeBegin(writer, context, component); - encodeHeader(writer, context, (HtmlAccordionItem) component); + encodeHeader(writer, context, (AbstractAccordionItem) component); encodeContentBegin(component, writer); } @@ -101,11 +103,11 @@ writer.endElement(DIV_ELEM); } - private void encodeHeader(ResponseWriter writer, FacesContext context, HtmlAccordionItem component) throws IOException { + private void encodeHeader(ResponseWriter writer, FacesContext context, AbstractAccordionItem component) throws IOException { writer.startElement(DIV_ELEM, component); String stateCssClass = "rf-ac-itm-hdr-" + (component.isDisabled() ? "dis" : (component.isActive() ? "act" : "inact")); - writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-ac-itm-hdr", stateCssClass, attributeAsString(component, PropertyKeys.headerClass)), null); + writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-ac-itm-hdr", stateCssClass, attributeAsString(component, "headerClass")), null); writer.writeAttribute(ID_ATTRIBUTE, component.getClientId() + ":header", null); renderPassThroughAttributes(context, component, HEADER_ATTRIBUTES); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -23,6 +23,7 @@ package org.richfaces.renderkit.html; import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractAccordion; import org.richfaces.component.util.HtmlUtil; @@ -32,9 +33,6 @@ import javax.faces.context.FacesContext; import java.util.Map; -import static org.richfaces.component.html.HtmlAccordion.PropertyKeys.height; -import static org.richfaces.component.html.HtmlAccordion.PropertyKeys.width; - /** * @author akolonitsky */ @@ -47,11 +45,12 @@ @ResourceDependency(library = "org.richfaces", name = "icons.ecss"), @ResourceDependency(library = "org.richfaces", name = "togglePanel.js"), @ResourceDependency(library = "org.richfaces", name = "accordion.js") }) +@JsfRenderer(type = "org.richfaces.AccordionRenderer", family = AbstractAccordion.COMPONENT_FAMILY) public class AccordionRenderer extends TogglePanelRenderer { @Override protected String getStyle(UIComponent component) { - return HtmlUtil.concatStyles(attributeAsStyle(component, height), attributeAsStyle(component, width), + return HtmlUtil.concatStyles(attributeAsStyle(component, "height"), attributeAsStyle(component, "width"), super.getStyle(component)); } @@ -74,7 +73,7 @@ @Override protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) { Map<String, Object> options = super.getScriptObjectOptions(context, component); - options.put("isKeepHeight", attributeAsString(component, height).length() > 0); + options.put("isKeepHeight", attributeAsString(component, "height").length() > 0); return options; } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -23,9 +23,9 @@ package org.richfaces.renderkit.html; import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractCollapsiblePanel; import org.richfaces.component.AbstractTogglePanel; -import org.richfaces.component.html.HtmlCollapsiblePanel; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; @@ -54,26 +54,27 @@ @ResourceDependency(library = "org.richfaces", name = "collapsiblePanelItem.js"), @ResourceDependency(library = "org.richfaces", name = "icons.ecss"), @ResourceDependency(library = "org.richfaces", name = "collapsiblePanel.ecss") }) +@JsfRenderer(type = "org.richfaces.CollapsiblePanelRenderer", family = AbstractCollapsiblePanel.COMPONENT_FAMILY) public class CollapsiblePanelRenderer extends TogglePanelRenderer { public static final String SWITCH = "switch"; public static final String BEFORE_SWITCH = "beforeswitch"; - private final TableIconsRendererHelper<HtmlCollapsiblePanel> headerRenderer = new TableIconsRendererHelper<HtmlCollapsiblePanel>("header", "rf-cp") { + private final TableIconsRendererHelper<AbstractCollapsiblePanel> headerRenderer = new TableIconsRendererHelper<AbstractCollapsiblePanel>("header", "rf-cp") { - protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, HtmlCollapsiblePanel panel) throws IOException { + protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel panel) throws IOException { encodeTdIcon(writer, context, cssClassPrefix + "-ico", panel.getLeftCollapsedIcon(), panel.getLeftExpandedIcon()); } - protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, HtmlCollapsiblePanel panel) throws IOException { + protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel panel) throws IOException { //TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment? encodeTdIcon(writer, context, cssClassPrefix + "-exp-ico", panel.getRightCollapsedIcon(), panel.getRightExpandedIcon()); } @Override - protected void encodeHeaderTextValue(ResponseWriter writer, FacesContext context, HtmlCollapsiblePanel component) throws IOException { + protected void encodeHeaderTextValue(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel component) throws IOException { writer.startElement(DIV_ELEM, null); writer.writeAttribute(CLASS_ATTRIBUTE, cssClassPrefix + "-lbl-exp", null); writeFacetOrAttr(writer, context, component, text, text + "Expanded"); @@ -117,7 +118,7 @@ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { super.doEncodeBegin(writer, context, component); - encodeHeader(writer, context, (HtmlCollapsiblePanel) component); + encodeHeader(writer, context, (AbstractCollapsiblePanel) component); } @Override @@ -146,7 +147,7 @@ return options; } - private void encodeHeader(ResponseWriter writer, FacesContext context, HtmlCollapsiblePanel component) throws IOException { + private void encodeHeader(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel component) throws IOException { writer.startElement(DIV_ELEM, null); writer.writeAttribute(ID_ATTRIBUTE, component.getClientId(context) + ":header", null); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-cp-hdr", Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DivPanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DivPanelRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DivPanelRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -35,7 +35,6 @@ import java.io.IOException; import java.util.Map; -import static org.richfaces.component.html.HtmlDivPanel.PropertyKeys.*; import static org.richfaces.renderkit.RenderKitUtils.attributes; import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; @@ -46,20 +45,24 @@ public class DivPanelRenderer extends RendererBase { private static final RenderKitUtils.Attributes PASS_THROUGH_ATTRIBUTES = attributes( - lang, - onclick, - ondblclick, - onmousedown, - onmousemove, - onmouseout, - onmouseover, - onmouseup, - title, - dir + "lang", + "onclick", + "ondblclick", + "onmousedown", + "onmousemove", + "onmouseout", + "onmouseover", + "onmouseup", + "title", + "dir" ); protected static String attributeAsStyle(UIComponent comp, Enum attr) { - String value = attributeAsString(comp, attr.toString()); + return attributeAsStyle(comp, attr.toString()); + } + + protected static String attributeAsStyle(UIComponent comp, String attr) { + String value = attributeAsString(comp, attr); if (value.length() == 0) { return ""; } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,25 +1,25 @@ package org.richfaces.renderkit.html; -import org.richfaces.component.html.HtmlPanelMenuGroup; +import org.richfaces.component.AbstractPanelMenuGroup; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import java.io.IOException; -class PanelMenuGroupHeaderRenderer extends TableIconsRendererHelper<HtmlPanelMenuGroup> { +class PanelMenuGroupHeaderRenderer extends TableIconsRendererHelper<AbstractPanelMenuGroup> { PanelMenuGroupHeaderRenderer(String cssClassPrefix) { super("label", cssClassPrefix, "rf-pm-ico"); } - protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, HtmlPanelMenuGroup group) throws IOException { + protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group) throws IOException { String iconCollapsed = group.isDisabled() ? group.getIconLeftDisabled() : group.getIconLeftCollapsed(); String iconExpanded = group.isDisabled() ? group.getIconLeftDisabled() : group.getIconLeftExpanded(); encodeTdIcon(writer, context, cssClassPrefix + "-ico", iconCollapsed, iconExpanded); } - protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, HtmlPanelMenuGroup group) throws IOException { + protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup group) throws IOException { String iconCollapsed = group.isDisabled() ? group.getIconRightDisabled() : group.getIconRightCollapsed(); String iconExpanded = group.isDisabled() ? group.getIconRightDisabled() : group.getIconRightExpanded(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -24,9 +24,9 @@ package org.richfaces.renderkit.html; import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractPanelMenuGroup; import org.richfaces.component.AbstractPanelMenuItem; -import org.richfaces.component.html.HtmlPanelMenuGroup; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -43,6 +43,7 @@ * @author akolonitsky * @since 2010-10-25 */ +@JsfRenderer(type = "org.richfaces.PanelMenuGroupRenderer", family = AbstractPanelMenuGroup.COMPONENT_FAMILY) public class PanelMenuGroupRenderer extends DivPanelRenderer { public static final String COLLAPSE = "collapse"; @@ -56,8 +57,8 @@ //TODO nick - shouldn't this be rf-pm-gr-top? private static final String TOP_CSS_CLASS_PREFIX = "rf-pm-top-gr"; - private final TableIconsRendererHelper<HtmlPanelMenuGroup> headerRenderer = new PanelMenuGroupHeaderRenderer(CSS_CLASS_PREFIX); - private final TableIconsRendererHelper<HtmlPanelMenuGroup> topHeaderRenderer = new PanelMenuGroupHeaderRenderer(TOP_CSS_CLASS_PREFIX); + private final TableIconsRendererHelper<AbstractPanelMenuGroup> headerRenderer = new PanelMenuGroupHeaderRenderer(CSS_CLASS_PREFIX); + private final TableIconsRendererHelper<AbstractPanelMenuGroup> topHeaderRenderer = new PanelMenuGroupHeaderRenderer(TOP_CSS_CLASS_PREFIX); @Override protected void doDecode(FacesContext context, UIComponent component) { @@ -86,7 +87,7 @@ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { super.doEncodeBegin(writer, context, component); - HtmlPanelMenuGroup menuGroup = (HtmlPanelMenuGroup) component; + AbstractPanelMenuGroup menuGroup = (AbstractPanelMenuGroup) component; writer.startElement(INPUT_ELEM, component); @@ -102,7 +103,7 @@ encodeContentBegin(writer, context, menuGroup); } - private void encodeHeader(ResponseWriter writer, FacesContext context, HtmlPanelMenuGroup menuGroup) throws IOException { + private void encodeHeader(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup menuGroup) throws IOException { writer.startElement(DIV_ELEM, null); writer.writeAttribute(ID_ATTRIBUTE, menuGroup.getClientId(context) + ":hdr", null); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses(getCssClass(menuGroup, "-hdr"), @@ -117,7 +118,7 @@ return (item.isTopItem() ? TOP_CSS_CLASS_PREFIX : CSS_CLASS_PREFIX) + postfix; } - private void encodeContentBegin(ResponseWriter writer, FacesContext context, HtmlPanelMenuGroup menuGroup) throws IOException { + private void encodeContentBegin(ResponseWriter writer, FacesContext context, AbstractPanelMenuGroup menuGroup) throws IOException { writer.startElement(DIV_ELEM, null); writer.writeAttribute(ID_ATTRIBUTE, menuGroup.getClientId(context) + ":cnt", null); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses(getCssClass(menuGroup, "-cnt"), menuGroup.isExpanded() ? "rf-pm-exp" : "rf-pm-colps"), null); @@ -147,7 +148,7 @@ @Override protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) { - HtmlPanelMenuGroup panelMenuGroup = (HtmlPanelMenuGroup) component; + AbstractPanelMenuGroup panelMenuGroup = (AbstractPanelMenuGroup) component; Map<String, Object> options = new HashMap<String, Object>(); //TODO nick - non-default values should not be rendered Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -36,8 +36,8 @@ import javax.faces.context.ResponseWriter; import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractPanelMenuItem; -import org.richfaces.component.html.HtmlPanelMenuItem; import org.richfaces.renderkit.HtmlConstants; import org.richfaces.renderkit.RenderKitUtils; import org.richfaces.renderkit.util.PanelIcons; @@ -46,6 +46,7 @@ * @author akolonitsky * @since 2010-10-25 */ +@JsfRenderer(type = "org.richfaces.PanelMenuItemRenderer", family = AbstractPanelMenuItem.COMPONENT_FAMILY) public class PanelMenuItemRenderer extends DivPanelRenderer { public static final String UNSELECT = "unselect"; @@ -59,11 +60,11 @@ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { super.doEncodeBegin(writer, context, component); - HtmlPanelMenuItem menuItem = (HtmlPanelMenuItem) component; + AbstractPanelMenuItem menuItem = (AbstractPanelMenuItem) component; encodeHeaderGroupBegin(writer, context, menuItem, getCssClass(menuItem, "")); } - private void encodeHeaderGroupBegin(ResponseWriter writer, FacesContext context, HtmlPanelMenuItem menuItem, String classPrefix) throws IOException { + private void encodeHeaderGroupBegin(ResponseWriter writer, FacesContext context, AbstractPanelMenuItem menuItem, String classPrefix) throws IOException { writer.startElement("table", null); writer.writeAttribute(CLASS_ATTRIBUTE, classPrefix + "-gr", null); writer.startElement(TBODY_ELEMENT, null); @@ -80,7 +81,7 @@ } } - private void encodeHeaderGroupEnd(ResponseWriter writer, FacesContext context, HtmlPanelMenuItem menuItem, String classPrefix) throws IOException { + private void encodeHeaderGroupEnd(ResponseWriter writer, FacesContext context, AbstractPanelMenuItem menuItem, String classPrefix) throws IOException { writer.endElement(TD_ELEM); encodeHeaderGroupRightIcon(writer, context, menuItem, classPrefix); @@ -90,14 +91,14 @@ writer.endElement("table"); } - private void encodeHeaderGroupRightIcon(ResponseWriter writer, FacesContext context, HtmlPanelMenuItem menuItem, String classPrefix) throws IOException { + private void encodeHeaderGroupRightIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuItem menuItem, String classPrefix) throws IOException { String icon = menuItem.isDisabled() ? menuItem.getIconRightDisabled() : menuItem.getIconRight(); String cssClasses = concatClasses(classPrefix + "-exp-ico", menuItem.getIconLeftClass()); encodeTdIcon(writer, context, cssClasses, icon); } - private void encodeHeaderGroupLeftIcon(ResponseWriter writer, FacesContext context, HtmlPanelMenuItem menuItem, String classPrefix) throws IOException { + private void encodeHeaderGroupLeftIcon(ResponseWriter writer, FacesContext context, AbstractPanelMenuItem menuItem, String classPrefix) throws IOException { String icon = menuItem.isDisabled() ? menuItem.getIconLeftDisabled() : menuItem.getIconLeft(); String cssClasses = concatClasses(classPrefix + "-ico", menuItem.getIconLeftClass()); @@ -144,7 +145,7 @@ @Override protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) { - HtmlPanelMenuItem panelMenuItem = (HtmlPanelMenuItem) component; + AbstractPanelMenuItem panelMenuItem = (AbstractPanelMenuItem) component; Map<String, Object> options = new HashMap<String, Object>(); //TODO nick - ajax options should not be rendered in client mode @@ -164,7 +165,7 @@ @Override protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - HtmlPanelMenuItem menuItem = (HtmlPanelMenuItem) component; + AbstractPanelMenuItem menuItem = (AbstractPanelMenuItem) component; encodeHeaderGroupEnd(writer, context, menuItem, getCssClass(menuItem, "")); super.doEncodeEnd(writer, context, component); Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,146 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.renderkit.html; - -import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; -import static org.richfaces.renderkit.html.TogglePanelRenderer.getValueRequestParamName; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.event.ActionEvent; - -import org.ajax4jsf.javascript.JSObject; -import org.richfaces.component.AbstractPanelMenu; -import org.richfaces.component.AbstractPanelMenuItem; -import org.richfaces.component.html.HtmlPanelMenu; -import org.richfaces.context.ExtendedPartialViewContext; -import org.richfaces.renderkit.HtmlConstants; - -/** - * @author akolonitsky - * @since 2010-10-25 - */ -@ResourceDependencies( { // TODO review - @ResourceDependency(library = "org.richfaces", name = "ajax.reslib"), - @ResourceDependency(name = "richfaces-event.js"), - @ResourceDependency(name = "richfaces-base-component.js"), - @ResourceDependency(library = "org.richfaces", name = "panelMenu.js"), - @ResourceDependency(library = "org.richfaces", name = "panelMenuItem.js"), - @ResourceDependency(library = "org.richfaces", name = "panelMenuGroup.js"), - @ResourceDependency(library = "org.richfaces", name = "icons.ecss"), - @ResourceDependency(library = "org.richfaces", name = "panelMenu.ecss") }) -public class PanelMenuRenderer extends DivPanelRenderer { - - @Override - protected void doDecode(FacesContext context, UIComponent component) { - AbstractPanelMenu panelMenu = (AbstractPanelMenu) component; - - Map<String, String> requestMap = - context.getExternalContext().getRequestParameterMap(); - - // Don't overwrite the value unless you have to! - String newValue = requestMap.get(getValueRequestParamName(context, component)); - if (newValue != null) { - panelMenu.setSubmittedActiveItem(newValue); - } - - //TODO nick - I suggest to get this code moved to item renderer - String compClientId = component.getClientId(context); - if (requestMap.get(compClientId) != null) { - AbstractPanelMenuItem panelItem = panelMenu.getItem(newValue); - if (panelItem != null) { - new ActionEvent(panelItem).queue(); - - //TODO nick - why render item by default? - context.getPartialViewContext().getRenderIds().add(panelItem.getClientId(context)); - - //TODO nick - this should be done on encode, not on decode - addOnCompleteParam(context, panelItem.getClientId(context)); - } - } - } - - protected static void addOnCompleteParam(FacesContext context, String itemId) { - ExtendedPartialViewContext.getInstance(context).appendOncomplete(new StringBuilder() - .append("RichFaces.$('").append(itemId).append("').onCompleteHandler();").toString()); - } - - @Override - protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - super.doEncodeBegin(writer, context, component); - - AbstractPanelMenu panelMenu = (AbstractPanelMenu) component; - - writer.startElement(HtmlConstants.INPUT_ELEM, component); - writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, getValueRequestParamName(context, component), null); - writer.writeAttribute(HtmlConstants.NAME_ATTRIBUTE, getValueRequestParamName(context, component), null); - writer.writeAttribute(HtmlConstants.TYPE_ATTR, HtmlConstants.INPUT_TYPE_HIDDEN, null); - writer.writeAttribute(HtmlConstants.VALUE_ATTRIBUTE, panelMenu.getActiveItem(), null); - writer.endElement(HtmlConstants.INPUT_ELEM); - - writeJavaScript(writer, context, component); - } - - @Override - protected String getStyleClass(UIComponent component) { - return concatClasses("rf-pm", attributeAsString(component, "styleClass")); - } - - @Override - protected JSObject getScriptObject(FacesContext context, UIComponent component) { - return new JSObject("RichFaces.ui.PanelMenu", - component.getClientId(), getScriptObjectOptions(context, component)); - } - - @Override - protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) { - HtmlPanelMenu panelMenu = (HtmlPanelMenu) component; - - Map<String, Object> options = new HashMap<String, Object>(); - //TODO nick - only options with non-default values should be rendered - options.put("ajax", getAjaxOptions(context, panelMenu)); - options.put("disabled", panelMenu.isDisabled()); - options.put("expandSingle", panelMenu.isExpandSingle()); - - return options; - } - - @Override - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - writer.endElement(HtmlConstants.DIV_ELEM); - } - - @Override - protected Class<? extends UIComponent> getComponentClass() { - return AbstractPanelMenu.class; - } -} - Added: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -0,0 +1,146 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.renderkit.html; + +import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractPanelMenu; +import org.richfaces.component.AbstractPanelMenuItem; +import org.richfaces.context.ExtendedPartialViewContext; +import org.richfaces.renderkit.HtmlConstants; + +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import javax.faces.event.ActionEvent; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; +import static org.richfaces.renderkit.html.TogglePanelRenderer.getValueRequestParamName; + +/** + * @author akolonitsky + * @since 2010-10-25 + */ +@JsfRenderer(type = "org.richfaces.PanelMenuRenderer", family = AbstractPanelMenu.COMPONENT_FAMILY) +@ResourceDependencies( { // TODO review + @ResourceDependency(library = "org.richfaces", name = "ajax.reslib"), + @ResourceDependency(name = "richfaces-event.js"), + @ResourceDependency(name = "richfaces-base-component.js"), + @ResourceDependency(library = "org.richfaces", name = "panelMenu.js"), + @ResourceDependency(library = "org.richfaces", name = "panelMenuItem.js"), + @ResourceDependency(library = "org.richfaces", name = "panelMenuGroup.js"), + @ResourceDependency(library = "org.richfaces", name = "icons.ecss"), + @ResourceDependency(library = "org.richfaces", name = "panelMenu.ecss") }) +public class PanelMenuRenderer extends DivPanelRenderer { + + @Override + protected void doDecode(FacesContext context, UIComponent component) { + AbstractPanelMenu panelMenu = (AbstractPanelMenu) component; + + Map<String, String> requestMap = + context.getExternalContext().getRequestParameterMap(); + + // Don't overwrite the value unless you have to! + String newValue = requestMap.get(getValueRequestParamName(context, component)); + if (newValue != null) { + panelMenu.setSubmittedActiveItem(newValue); + } + + //TODO nick - I suggest to get this code moved to item renderer + String compClientId = component.getClientId(context); + if (requestMap.get(compClientId) != null) { + AbstractPanelMenuItem panelItem = panelMenu.getItem(newValue); + if (panelItem != null) { + new ActionEvent(panelItem).queue(); + + //TODO nick - why render item by default? + context.getPartialViewContext().getRenderIds().add(panelItem.getClientId(context)); + + //TODO nick - this should be done on encode, not on decode + addOnCompleteParam(context, panelItem.getClientId(context)); + } + } + } + + protected static void addOnCompleteParam(FacesContext context, String itemId) { + ExtendedPartialViewContext.getInstance(context).appendOncomplete(new StringBuilder() + .append("RichFaces.$('").append(itemId).append("').onCompleteHandler();").toString()); + } + + @Override + protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { + super.doEncodeBegin(writer, context, component); + + AbstractPanelMenu panelMenu = (AbstractPanelMenu) component; + + writer.startElement(HtmlConstants.INPUT_ELEM, component); + writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, getValueRequestParamName(context, component), null); + writer.writeAttribute(HtmlConstants.NAME_ATTRIBUTE, getValueRequestParamName(context, component), null); + writer.writeAttribute(HtmlConstants.TYPE_ATTR, HtmlConstants.INPUT_TYPE_HIDDEN, null); + writer.writeAttribute(HtmlConstants.VALUE_ATTRIBUTE, panelMenu.getActiveItem(), null); + writer.endElement(HtmlConstants.INPUT_ELEM); + + writeJavaScript(writer, context, component); + } + + @Override + protected String getStyleClass(UIComponent component) { + return concatClasses("rf-pm", attributeAsString(component, "styleClass")); + } + + @Override + protected JSObject getScriptObject(FacesContext context, UIComponent component) { + return new JSObject("RichFaces.ui.PanelMenu", + component.getClientId(), getScriptObjectOptions(context, component)); + } + + @Override + protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) { + AbstractPanelMenu panelMenu = (AbstractPanelMenu) component; + + Map<String, Object> options = new HashMap<String, Object>(); + //TODO nick - only options with non-default values should be rendered + options.put("ajax", getAjaxOptions(context, panelMenu)); + options.put("disabled", panelMenu.isDisabled()); + options.put("expandSingle", panelMenu.isExpandSingle()); + + return options; + } + + @Override + protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { + writer.endElement(HtmlConstants.DIV_ELEM); + } + + @Override + protected Class<? extends UIComponent> getComponentClass() { + return AbstractPanelMenu.class; + } +} + Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -22,32 +22,28 @@ package org.richfaces.renderkit.html; -import static org.richfaces.renderkit.HtmlConstants.*; -import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.active; -import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.disabled; -import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.inactive; -import static org.richfaces.component.html.HtmlAccordion.PropertyKeys.height; -import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; - -import java.io.IOException; -import java.util.Map; - -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractTabPanel; import org.richfaces.component.AbstractTogglePanel; import org.richfaces.component.AbstractTogglePanelItem; import org.richfaces.component.AbstractTogglePanelTitledItem; -import org.richfaces.component.html.HtmlTab; import org.richfaces.component.util.HtmlUtil; import org.richfaces.renderkit.HtmlConstants; import org.richfaces.renderkit.RenderKitUtils; +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.util.Map; + +import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.*; +import static org.richfaces.renderkit.HtmlConstants.*; +import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; + /** * @author akolonitsky * @since 2010-08-24 @@ -62,14 +58,15 @@ @ResourceDependency(library = "org.richfaces", name = "togglePanel.js"), @ResourceDependency(library = "org.richfaces", name = "tabPanel.js") }) +@JsfRenderer(type = "org.richfaces.TabPanelRenderer", family = AbstractTabPanel.COMPONENT_FAMILY) public class TabPanelRenderer extends TogglePanelRenderer { private static final RenderKitUtils.Attributes HEADER_ATTRIBUTES = RenderKitUtils.attributes() - .generic("onclick", HtmlTab.PropertyKeys.onheaderclick.toString(), "headerclick") - .generic("ondblclick", HtmlTab.PropertyKeys.onheaderdblclick.toString(), "headerdblclick") - .generic("onmousedown", HtmlTab.PropertyKeys.onheadermousedown.toString(), "headermousedown") - .generic("onmousemove", HtmlTab.PropertyKeys.onheadermousemove.toString(), "headermousemove") - .generic("onmouseup", HtmlTab.PropertyKeys.onheadermouseup.toString(), "headermouseup"); + .generic("onclick", "onheaderclick", "headerclick") + .generic("ondblclick", "onheaderdblclick", "headerdblclick") + .generic("onmousedown", "onheadermousedown", "headermousedown") + .generic("onmousemove", "onheadermousemove", "headermousemove") + .generic("onmouseup", "onheadermouseup", "headermouseup"); private static final String DIV = DIV_ELEM; private static final String STYLE = STYLE_ATTRIBUTE; @@ -147,8 +144,8 @@ writer.writeAttribute(ID_ATTRIBUTE, tab.getClientId() + ":header:" + state.toString(), null); renderPassThroughAttributes(context, tab, HEADER_ATTRIBUTES); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-tb-hdr rf-tb-hdr-" + state.abbreviation(), - attributeAsString(tab, HtmlTab.PropertyKeys.headerClass), attributeAsString(tab, state.headerClass())), null); - writer.writeAttribute(STYLE_ATTRIBUTE, concatStyles(isDisplay ? "" : "display : none", attributeAsString(tab, HtmlTab.PropertyKeys.headerStyle.toString())), null); + attributeAsString(tab, "headerClass"), attributeAsString(tab, state.headerClass())), null); + writer.writeAttribute(STYLE_ATTRIBUTE, concatStyles(isDisplay ? "" : "display : none", attributeAsString(tab, "headerStyle")), null); writer.startElement("span", tab); writer.writeAttribute(CLASS_ATTRIBUTE, "rf-tb-lbl", null); @@ -211,7 +208,7 @@ @Override protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) { Map<String, Object> options = super.getScriptObjectOptions(context, component); - options.put("isKeepHeight", attributeAsString(component, height).length() > 0); + options.put("isKeepHeight", attributeAsString(component, "height").length() > 0); return options; } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -23,8 +23,9 @@ package org.richfaces.renderkit.html; import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractTogglePanelTitledItem; -import org.richfaces.component.html.HtmlTab; +import org.richfaces.component.AbstractTab; import org.richfaces.renderkit.HtmlConstants; import javax.faces.application.ResourceDependencies; @@ -50,6 +51,7 @@ @ResourceDependency(library = "org.richfaces", name = "togglePanelItem.js"), @ResourceDependency(library = "org.richfaces", name = "tab.js") }) +@JsfRenderer(type = "org.richfaces.TabRenderer", family = AbstractTab.COMPONENT_FAMILY) public class TabRenderer extends TogglePanelItemRenderer { @Override @@ -108,9 +110,9 @@ @Override protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) { Map<String, Object> res = super.getScriptObjectOptions(context, component); - res.put("disabled", ((HtmlTab) component).isDisabled()); - res.put("enter", ((HtmlTab) component).getOnenter()); - res.put("leave", ((HtmlTab) component).getOnleave()); + res.put("disabled", ((AbstractTab) component).isDisabled()); + res.put("enter", ((AbstractTab) component).getOnenter()); + res.put("leave", ((AbstractTab) component).getOnleave()); return res; } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -22,14 +22,15 @@ package org.richfaces.renderkit.html; +import org.richfaces.cdk.annotations.JsfBehaviorRenderer; +import org.richfaces.component.behavior.ToggleControl; + import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.behavior.ClientBehavior; import javax.faces.component.behavior.ClientBehaviorContext; import javax.faces.render.ClientBehaviorRenderer; -import org.richfaces.component.behavior.ToggleControl; - /** * @author akolonitsky * @@ -37,6 +38,7 @@ @ResourceDependencies({ @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js") }) +@JsfBehaviorRenderer(type = "org.richfaces.component.behavior.ToggleControl") public class ToggleControlRenderer extends ClientBehaviorRenderer { @Override Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -23,6 +23,7 @@ package org.richfaces.renderkit.html; import org.ajax4jsf.javascript.JSObject; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractTogglePanel; import org.richfaces.component.AbstractTogglePanelItem; @@ -46,6 +47,7 @@ @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-base-component.js"), @ResourceDependency(library = "org.richfaces", name = "togglePanelItem.js") }) +@JsfRenderer(type = "org.richfaces.TogglePanelItemRenderer", family = AbstractTogglePanelItem.COMPONENT_FAMILY) public class TogglePanelItemRenderer extends DivPanelRenderer { private static final String LEAVE = "leave"; Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -25,6 +25,7 @@ import org.ajax4jsf.javascript.JSFunctionDefinition; import org.ajax4jsf.javascript.JSObject; import org.ajax4jsf.javascript.JSReference; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractTogglePanel; import org.richfaces.component.AbstractTogglePanelItem; import org.richfaces.component.util.HtmlUtil; @@ -54,6 +55,7 @@ @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-base-component.js"), @ResourceDependency(library = "org.richfaces", name = "togglePanel.js") }) +@JsfRenderer(type = "org.richfaces.TogglePanelRenderer", family = AbstractTogglePanel.COMPONENT_FAMILY) public class TogglePanelRenderer extends DivPanelRenderer { public static final String VALUE_POSTFIX = "-value"; Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -23,30 +23,29 @@ package org.richfaces.renderkit.html; -import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; -import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; -import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; -import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption; -import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; +import org.ajax4jsf.javascript.JSObject; +import org.richfaces.TooltipMode; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractTooltip; +import org.richfaces.context.ExtendedPartialViewContext; +import org.richfaces.renderkit.HtmlConstants; +import org.richfaces.renderkit.MetaComponentRenderer; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.PartialResponseWriter; import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; -import org.ajax4jsf.javascript.JSObject; -import org.richfaces.TooltipMode; -import org.richfaces.component.AbstractTooltip; -import org.richfaces.component.html.HtmlTooltip; -import org.richfaces.context.ExtendedPartialViewContext; -import org.richfaces.renderkit.HtmlConstants; -import org.richfaces.renderkit.MetaComponentRenderer; +import static org.richfaces.renderkit.HtmlConstants.CLASS_ATTRIBUTE; +import static org.richfaces.renderkit.HtmlConstants.ID_ATTRIBUTE; +import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes; +import static org.richfaces.renderkit.html.TogglePanelRenderer.addEventOption; +import static org.richfaces.renderkit.html.TogglePanelRenderer.getAjaxOptions; /** * @author amarkhel @@ -62,6 +61,7 @@ @ResourceDependency(library = "org.richfaces", name = "popup.js"), @ResourceDependency(library = "org.richfaces", name = "tooltip.js"), @ResourceDependency(library = "org.richfaces", name = "tooltip.ecss") }) +@JsfRenderer(type = "org.richfaces.TooltipRenderer", family = AbstractTooltip.COMPONENT_FAMILY) public class TooltipRenderer extends DivPanelRenderer implements MetaComponentRenderer { public static final String HIDE = "hide"; @@ -156,7 +156,7 @@ @Override protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) { - HtmlTooltip tooltip = (HtmlTooltip) component; + AbstractTooltip tooltip = (AbstractTooltip) component; Map<String, Object> options = new HashMap<String, Object>(); options.put("ajax", getAjaxOptions(context, tooltip)); @@ -181,7 +181,7 @@ return options; } - public Integer[] getOffset(HtmlTooltip tooltip) { + public Integer[] getOffset(AbstractTooltip tooltip) { return new Integer[] {tooltip.getHorizontalOffset(), tooltip.getVerticalOffset()}; } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/view/facelets/html/PanelMenuTagHandler.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/view/facelets/html/PanelMenuTagHandler.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/java/org/richfaces/view/facelets/html/PanelMenuTagHandler.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -54,7 +54,7 @@ return metaRuleset; } - private static class PanelMenuMetaRule extends MetaRule{ + private static class PanelMenuMetaRule extends MetaRule { @Override public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { Deleted: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,2264 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<faces-config version="2.0" metadata-complete="false" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:cdk="http://jboss.org/schema/richfaces/cdk/extensions" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <behavior> - <behavior-id>org.richfaces.component.behavior.ToggleControl</behavior-id> - <behavior-class>org.richfaces.component.behavior.ToggleControl</behavior-class> - <property> - <property-name>targetPanel</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>targetItem</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>event</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>disableDefault</property-name> - <property-class>java.lang.Boolean</property-class> - </property> - <property> - <property-name>for</property-name> - <property-class>java.lang.String</property-class> - </property> - </behavior> - - <component> - <component-type>org.richfaces.Toolbar</component-type> - <component-class>org.richfaces.component.UIToolbar</component-class> - <property> - <description> - A mutable Map of the attributes associated with - this component, keyed by attribute name. - </description> - <display-name>Attributes Map</display-name> - <icon/> - <property-name>attributes</property-name> - <property-class>java.util.Map</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description>The value binding expression used to wire up this - component to a component property of a JavaBean class</description> - <display-name></display-name> - <icon/> - <property-name>binding</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - The number of child components associated with - this component. - </description> - <display-name>Child Component Count</display-name> - <icon/> - <property-name>childCount</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - A mutable List of the child components associated with - this component. - </description> - <display-name>Child Component List</display-name> - <icon/> - <property-name>children</property-name> - <property-class>java.util.List</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - A mutable Map of the facets associated with - this component, keyed by facet name. - </description> - <display-name>Facets Map</display-name> - <icon/> - <property-name>facets</property-name> - <property-class>java.util.Map</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - The component family to which this component belongs. This property - is used to select an appropriate Renderer. - </description> - <display-name>Component Family</display-name> - <icon/> - <property-name>family</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - The component identifier for this component. This value must be - unique within the closest parent component that is a naming - container. - </description> - <display-name>Component Identifier</display-name> - <icon/> - <property-name>id</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - The parent component for this component. On the root component - in the component tree (which must be of type UIViewRoot), this - property is null. - </description> - <display-name>Parent Component</display-name> - <icon/> - <property-name>parent</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - Flag indicating whether or not this component should be rendered - (during Render Response Phase), or processed on any subsequent - form submit. The default value for this property is true. - </description> - <display-name>Rendered Flag</display-name> - <icon/> - <property-name>rendered</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - Identifier used (in conjunction with the "family" property) to - select an appropriate Renderer to encode and decode this component. - </description> - <display-name>Renderer Type</display-name> - <icon/> - <property-name>rendererType</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - Flag indicating whether or not this component takes responsibility - for rendering its own children. This decision is normally delegated - to the associated Renderer, if there is one. - </description> - <display-name>Renders Children</display-name> - <icon/> - <property-name>rendersChildren</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>width</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemmouseover</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemmouseover</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>itemClass</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>itemStyle</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemkeydown</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemkeydown</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemmousemove</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemmousemove</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemmousedown</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemmousedown</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>height</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemdblclick</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemdblclick</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemclick</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemclick</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemmouseout</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemmouseout</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemkeyup</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemkeyup</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>itemSeparator</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemmouseup</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemmouseup</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemkeypress</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemkeypress</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <component-extension> - <cdk:base-class>org.richfaces.component.AbstractToolbar</cdk:base-class> - <cdk:generate>true</cdk:generate> - <cdk:component-family>org.richfaces.Toolbar</cdk:component-family> - <cdk:renderer-type>org.richfaces.ToolbarRenderer</cdk:renderer-type> - <cdk:tag> - <cdk:generate>false</cdk:generate> - <cdk:tag-name>toolbar</cdk:tag-name> - <cdk:tag-type>Facelets</cdk:tag-type> - </cdk:tag> - </component-extension> - </component> - <component> - <component-type>org.richfaces.ToolbarGroup</component-type> - <component-class>org.richfaces.component.UIToolbarGroup</component-class> - <property> - <description> - A mutable Map of the attributes associated with - this component, keyed by attribute name. - </description> - <display-name>Attributes Map</display-name> - <icon/> - <property-name>attributes</property-name> - <property-class>java.util.Map</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description>The value binding expression used to wire up this - component to a component property of a JavaBean class</description> - <display-name></display-name> - <icon/> - <property-name>binding</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>itemClass</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>itemStyle</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - The number of child components associated with - this component. - </description> - <display-name>Child Component Count</display-name> - <icon/> - <property-name>childCount</property-name> - <property-class>int</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - A mutable List of the child components associated with - this component. - </description> - <display-name>Child Component List</display-name> - <icon/> - <property-name>children</property-name> - <property-class>java.util.List</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - A mutable Map of the facets associated with - this component, keyed by facet name. - </description> - <display-name>Facets Map</display-name> - <icon/> - <property-name>facets</property-name> - <property-class>java.util.Map</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - The component family to which this component belongs. This property - is used to select an appropriate Renderer. - </description> - <display-name>Component Family</display-name> - <icon/> - <property-name>family</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - The component identifier for this component. This value must be - unique within the closest parent component that is a naming - container. - </description> - <display-name>Component Identifier</display-name> - <icon/> - <property-name>id</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - The parent component for this component. On the root component - in the component tree (which must be of type UIViewRoot), this - property is null. - </description> - <display-name>Parent Component</display-name> - <icon/> - <property-name>parent</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - Flag indicating whether or not this component should be rendered - (during Render Response Phase), or processed on any subsequent - form submit. The default value for this property is true. - </description> - <display-name>Rendered Flag</display-name> - <icon/> - <property-name>rendered</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - Identifier used (in conjunction with the "family" property) to - select an appropriate Renderer to encode and decode this component. - </description> - <display-name>Renderer Type</display-name> - <icon/> - <property-name>rendererType</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <description> - Flag indicating whether or not this component takes responsibility - for rendering its own children. This decision is normally delegated - to the associated Renderer, if there is one. - </description> - <display-name>Renders Children</display-name> - <icon/> - <property-name>rendersChildren</property-name> - <property-class>boolean</property-class> - <property-extension> - <cdk:generate>false</cdk:generate> - <cdk:hidden>true</cdk:hidden> - <cdk:literal>true</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>true</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>location</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemmousedown</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemmousedown</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemdblclick</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemdblclick</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemclick</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemclick</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemmouseover</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemmouseover</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemmouseout</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemmouseout</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemkeyup</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemkeyup</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>itemSeparator</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemmouseup</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemmouseup</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemkeydown</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemkeydown</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemmousemove</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemmousemove</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <property> - <property-name>onitemkeypress</property-name> - <property-class>java.lang.String</property-class> - <property-extension> - <cdk:event-name default="false">itemkeypress</cdk:event-name> - <cdk:generate>true</cdk:generate> - <cdk:hidden>false</cdk:hidden> - <cdk:literal>false</cdk:literal> - <cdk:pass-through>false</cdk:pass-through> - <cdk:read-only>false</cdk:read-only> - <cdk:required>false</cdk:required> - </property-extension> - </property> - <component-extension> - <cdk:base-class>org.richfaces.component.AbstractToolbarGroup</cdk:base-class> - <cdk:generate>true</cdk:generate> - <cdk:component-family>org.richfaces.Toolbar</cdk:component-family> - <cdk:renderer-type>org.richfaces.ToolbarGroupRenderer</cdk:renderer-type> - <cdk:tag> - <cdk:generate>false</cdk:generate> - <cdk:tag-name>toolbarGroup</cdk:tag-name> - <cdk:tag-type>Facelets</cdk:tag-type> - </cdk:tag> - </component-extension> - </component> - - <component> - <component-type>org.richfaces.Tooltip</component-type> - <component-class>org.richfaces.component.html.HtmlTooltip</component-class> - <property> - <description></description> - <property-name>for_</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>value</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>layout</property-name> - <property-class>org.richfaces.TooltipLayout</property-class> - </property> - <property> - <description></description> - <property-name>attached</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>direction</property-name> - <property-class>org.richfaces.component.Positioning</property-class> - </property> - <property> - <description></description> - <property-name>disabled</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>followMouse</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>hideDelay</property-name> - <property-class>int</property-class> - </property> - <property> - <description></description> - <property-name>hideEvent</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>horizontalOffset</property-name> - <property-class>int</property-class> - </property> - <property> - <description></description> - <property-name>mode</property-name> - <property-class>org.richfaces.TooltipMode</property-class> - </property> - <property> - <description></description> - <property-name>showDelay</property-name> - <property-class>int</property-class> - </property> - <property> - <description></description> - <property-name>showEvent</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>verticalOffset</property-name> - <property-class>int</property-class> - </property> - <property> - <description></description> - <property-name>bypassUpdates</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>limitRender</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>data</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>status</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>execute</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>render</property-name> - <property-class>java.lang.Object</property-class> - </property> - - </component> - - <component> - <component-type>org.richfaces.CollapsiblePanel</component-type> - <component-class>org.richfaces.component.html.HtmlCollapsiblePanel</component-class> - <property> - <property-name>leftCollapsedIcon</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>leftExpandedIcon</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>rightExpandedIcon</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>rightCollapsedIcon</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>switchType</property-name> - <property-class>org.richfaces.component.SwitchType</property-class> - </property> - <property> - <description></description> - <property-name>expanded</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>header</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>bypassUpdates</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>limitRender</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>data</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>status</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>execute</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>render</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>toggleListener</property-name> - <property-class>javax.el.MethodExpression</property-class> - </property> - - </component> - <component> - <component-type>org.richfaces.TogglePanel</component-type> - <component-class>org.richfaces.component.html.HtmlTogglePanel</component-class> - <property> - <description></description> - <property-name>switchType</property-name> - <property-class>org.richfaces.component.SwitchType</property-class> - </property> - <property> - <description></description> - <property-name>activeItem</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>bypassUpdates</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>limitRender</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>cycledSwitching</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>data</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>status</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>execute</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>render</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>immediate</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>itemChangeListener</property-name> - <property-class>javax.el.MethodExpression</property-class> - </property> - <property> - <description>Long long text</description> - <property-name>id</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description>binding description</description> - <property-name>binding</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - </property> - <property> - <description>I don't know maybe some thing strange</description> - <property-name>rendered</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>onitemchange</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onbeforeitemchange</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>lang</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>title</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>style</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>styleClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>dir</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>ondblclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmousedown</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmousemove</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseout</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseover</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseup</property-name> - <property-class>java.lang.String</property-class> - </property> - - </component> - <component> - <component-type>org.richfaces.TogglePanelItem</component-type> - <component-class>org.richfaces.component.html.HtmlTogglePanelItem</component-class> - <property> - <description></description> - <property-name>name</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>switchType</property-name> - <property-class>org.richfaces.component.SwitchType</property-class> - </property> - <property> - <description>Long long text</description> - <property-name>id</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description>binding description</description> - <property-name>binding</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - </property> - <property> - <description>I don't know maybe some thing strange</description> - <property-name>rendered</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>onenter</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onleave</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>lang</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>title</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>style</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>styleClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>dir</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>ondblclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmousedown</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmousemove</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseout</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseover</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseup</property-name> - <property-class>java.lang.String</property-class> - </property> - - </component> - <component> - <component-type>org.richfaces.Accordion</component-type> - <component-class>org.richfaces.component.html.HtmlAccordion</component-class> - <property> - <description></description> - <property-name>switchType</property-name> - <property-class>org.richfaces.component.SwitchType</property-class> - </property> - <property> - <description></description> - <property-name>activeItem</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>bypassUpdates</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>limitRender</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>cycledSwitching</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>data</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>status</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>execute</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>render</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>immediate</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>itemChangeListener</property-name> - <property-class>javax.el.MethodExpression</property-class> - </property> - <property> - <description>Long long text</description> - <property-name>id</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description>binding description</description> - <property-name>binding</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - </property> - <property> - <description>I don't know maybe some thing strange</description> - <property-name>rendered</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>height</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>width</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>itemHeaderClassActive</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>itemHeaderClassDisabled</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>itemHeaderClassInactive</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>itemContentClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>itemHeaderClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onitemchange</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onbeforeitemchange</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>lang</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>title</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>style</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>styleClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>dir</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>ondblclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmousedown</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmousemove</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseout</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseover</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseup</property-name> - <property-class>java.lang.String</property-class> - </property> - - </component> - <component> - <component-type>org.richfaces.AccordionItem</component-type> - <component-class>org.richfaces.component.html.HtmlAccordionItem</component-class> - <property> - <description></description> - <property-name>disabled</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>label</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>name</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>switchType</property-name> - <property-class>org.richfaces.component.SwitchType</property-class> - </property> - <property> - <description>Long long text</description> - <property-name>id</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description>binding description</description> - <property-name>binding</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - </property> - <property> - <description>I don't know maybe some thing strange</description> - <property-name>rendered</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>headerClassActive</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>headerClassDisabled</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>headerClassInactive</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>headerClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>headerStyle</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>contentClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onheaderclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onheaderdblclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onheadermousedown</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onheadermousemove</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onheadermouseup</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onenter</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onleave</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>lang</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>title</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>style</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>styleClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>dir</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>ondblclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmousedown</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmousemove</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseout</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseover</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseup</property-name> - <property-class>java.lang.String</property-class> - </property> - </component> - <component> - <component-type>org.richfaces.TabPanel</component-type> - <component-class>org.richfaces.component.html.HtmlTabPanel</component-class> - <property> - <property-name>cycledSwitching</property-name> - <property-class>boolean</property-class> - </property> - <property> - <property-name>switchproperty-class</property-name> - <property-class>org.richfaces.component.SwitchType</property-class> - </property> - <property> - <property-name>activeItem</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>bypassUpdates</property-name> - <property-class>boolean</property-class> - </property> - <property> - <property-name>limitRender</property-name> - <property-class>boolean</property-class> - </property> - <property> - <property-name>data</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <property-name>status</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>execute</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <property-name>render</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <property-name>immediate</property-name> - <property-class>boolean</property-class> - </property> - <property> - <property-name>itemChangeListener</property-name> - <property-class>javax.el.MethodExpression</property-class> - </property> - <property> - <description>Long long text</description> - <property-name>id</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description>binding description</description> - <property-name>binding</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - </property> - <property> - <description>I don't know maybe some thing strange</description> - <property-name>rendered</property-name> - <property-class>boolean</property-class> - </property> - <property> - <property-name>width</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>height</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>tabClassActive</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>tabClassDisabled</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>tabClassInactive</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>tabContentClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>tabClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>onitemchange</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>onbeforeitemchange</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>lang</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>title</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>style</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>styleClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>dir</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>onclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>ondblclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>onmousedown</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>onmousemove</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>onmouseout</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>onmouseover</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>onmouseup</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>headerPosition</property-name> - <property-class>org.richfaces.HeaderPosition</property-class> - </property> - <property> - <property-name>headerAlignment</property-name> - <property-class>org.richfaces.HeaderAlignment</property-class> - </property> - <property> - <property-name>headerLayout</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>headerClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>headerSpacingClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>onbeforetabchange</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <property-name>ontabchange</property-name> - <property-class>java.lang.String</property-class> - </property> - </component> - <component> - <component-type>org.richfaces.TabPanelItem</component-type> - <component-class>org.richfaces.component.html.HtmlTab</component-class> - <property> - <description></description> - <property-name>disabled</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>label</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>name</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>switchType</property-name> - <property-class>org.richfaces.component.SwitchType</property-class> - </property> - <property> - <description>Long long text</description> - <property-name>id</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description>binding description</description> - <property-name>binding</property-name> - <property-class>javax.faces.component.UIComponent</property-class> - </property> - <property> - <description>I don't know maybe some thing strange</description> - <property-name>rendered</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>headerClassActive</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>headerClassDisabled</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>headerClassInactive</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>headerClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>headerStyle</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>contentClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onheaderclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onheaderdblclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onheadermousedown</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onheadermousemove</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onheadermouseup</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onenter</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onleave</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>lang</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>title</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>style</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>styleClass</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>dir</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>ondblclick</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmousedown</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmousemove</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseout</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseover</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>onmouseup</property-name> - <property-class>java.lang.String</property-class> - </property> - - </component> - - <component> - <component-type>org.richfaces.PanelMenuItem</component-type> - <component-class>org.richfaces.component.html.HtmlPanelMenuItem</component-class> - <property> - <property-name>action</property-name> - <property-class>javax.faces.el.MethodBinding</property-class> - </property> - <property> - <property-name>actionListener</property-name> - <property-class>javax.faces.el.MethodBinding</property-class> - </property> - <property> - <description></description> - <property-name>icon</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>mode</property-name> - <property-class>org.richfaces.PanelMenuMode</property-class> - </property> - <property> - <description></description> - <property-name>label</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>name</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>disabled</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>bypassUpdates</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>limitRender</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>data</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>status</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>execute</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>render</property-name> - <property-class>java.lang.Object</property-class> - </property> - - </component> - <component> - <component-type>org.richfaces.PanelMenuGroup</component-type> - <component-class>org.richfaces.component.html.HtmlPanelMenuGroup</component-class> - <property> - <property-name>action</property-name> - <property-class>javax.faces.el.MethodBinding</property-class> - </property> - <property> - <property-name>actionListener</property-name> - <property-class>javax.faces.el.MethodBinding</property-class> - </property> - <property> - <description></description> - <property-name>expanded</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>expandSingle</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>collapseEvent</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>expandEvent</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>bubbleSelection</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>iconLeftCollapsed</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>iconLeftExpanded</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>iconRightCollapsed</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>iconRightExpanded</property-name> - <property-class>java.lang.String</property-class> - </property> - </component> - <component> - <component-type>org.richfaces.PanelMenu</component-type> - <component-class>org.richfaces.component.html.HtmlPanelMenu</component-class> - - <property> - <description></description> - <property-name>disabled</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>expandEvent</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>collapseEvent</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>groupMode</property-name> - <property-class>org.richfaces.PanelMenuMode</property-class> - </property> - <property> - <description></description> - <property-name>expandSingle</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>itemMode</property-name> - <property-class>org.richfaces.PanelMenuMode</property-class> - </property> - <property> - <description></description> - <property-name>bubbleSelection</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>activeItem</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>itemChangeListener</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>bypassUpdates</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>limitRender</property-name> - <property-class>boolean</property-class> - </property> - <property> - <description></description> - <property-name>data</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>status</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>execute</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <description></description> - <property-name>render</property-name> - <property-class>java.lang.Object</property-class> - </property> - <property> - <property-name>immediate</property-name> - <property-class>boolean</property-class> - </property> - - </component> - - <render-kit> - <render-kit-id>HTML_BASIC</render-kit-id> - - <renderer> - <component-family>org.richfaces.Toolbar</component-family> - <renderer-type>org.richfaces.ToolbarRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.ToolbarRenderer</renderer-class> - <renderer-extension> - <cdk:renders-children>false</cdk:renders-children> - </renderer-extension> - </renderer> - <renderer> - <component-family>org.richfaces.Toolbar</component-family> - <renderer-type>org.richfaces.ToolbarGroupRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.ToolbarGroupRenderer</renderer-class> - <renderer-extension> - <cdk:renders-children>false</cdk:renders-children> - </renderer-extension> - </renderer> - <renderer> - <component-family>org.richfaces.Tooltip</component-family> - <renderer-type>org.richfaces.Tooltip</renderer-type> - <renderer-class>org.richfaces.renderkit.html.TooltipRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.CollapsiblePanel</component-family> - <renderer-type>org.richfaces.CollapsiblePanel</renderer-type> - <renderer-class>org.richfaces.renderkit.html.CollapsiblePanelRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.TogglePanel</component-family> - <renderer-type>org.richfaces.TogglePanel</renderer-type> - <renderer-class>org.richfaces.renderkit.html.TogglePanelRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.TogglePanelItem</component-family> - <renderer-type>org.richfaces.TogglePanelItem</renderer-type> - <renderer-class>org.richfaces.renderkit.html.TogglePanelItemRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.Accordion</component-family> - <renderer-type>org.richfaces.Accordion</renderer-type> - <renderer-class>org.richfaces.renderkit.html.AccordionRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.TogglePanelTitledItem</component-family> - <renderer-type>org.richfaces.AccordionItem</renderer-type> - <renderer-class>org.richfaces.renderkit.html.AccordionItemRenderer</renderer-class> - </renderer> - - <renderer> - <component-family>org.richfaces.Panel</component-family> - <renderer-type>org.richfaces.PanelRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.PanelRenderer</renderer-class> - <renderer-extension> - <cdk:renders-children>false</cdk:renders-children> - </renderer-extension> - </renderer> - <renderer> - <component-family>org.richfaces.PopupPanel</component-family> - <renderer-type>org.richfaces.PopupPanelRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.PopupPanelRenderer</renderer-class> - <renderer-extension> - <cdk:renders-children>false</cdk:renders-children> - </renderer-extension> - </renderer> - - <renderer> - <component-family>org.richfaces.TabPanel</component-family> - <renderer-type>org.richfaces.TabPanel</renderer-type> - <renderer-class>org.richfaces.renderkit.html.TabPanelRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.TogglePanelTitledItem</component-family> - <renderer-type>org.richfaces.Tab</renderer-type> - <renderer-class>org.richfaces.renderkit.html.TabRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.ProgressBar</component-family> - <renderer-type>org.richfaces.ProgressBarRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.ProgressBarRenderer</renderer-class> - <renderer-extension> - <cdk:renders-children>false</cdk:renders-children> - </renderer-extension> - </renderer> - - <renderer> - <component-family>org.richfaces.PanelMenuItem</component-family> - <renderer-type>org.richfaces.PanelMenuItem</renderer-type> - <renderer-class>org.richfaces.renderkit.html.PanelMenuItemRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.PanelMenuGroup</component-family> - <renderer-type>org.richfaces.PanelMenuGroup</renderer-type> - <renderer-class>org.richfaces.renderkit.html.PanelMenuGroupRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.PanelMenu</component-family> - <renderer-type>org.richfaces.PanelMenu</renderer-type> - <renderer-class>org.richfaces.renderkit.html.PanelMenuRenderer</renderer-class> - </renderer> - - <client-behavior-renderer> - <client-behavior-renderer-type>org.richfaces.component.behavior.ToggleControl</client-behavior-renderer-type> - <client-behavior-renderer-class>org.richfaces.renderkit.html.ToggleControlRenderer</client-behavior-renderer-class> - </client-behavior-renderer> - </render-kit> - - <faces-config-extension> - <cdk:taglib> - <cdk:shortName>output</cdk:shortName> - <cdk:uri>http://richfaces.org/output</cdk:uri> - </cdk:taglib> - </faces-config-extension> -</faces-config> Deleted: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,1769 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><facelet-taglib id="output" version="2.0" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"> - <namespace>http://richfaces.org/pn</namespace> - <tag> - <tag-name>toggleControl</tag-name> - <behavior> - <behavior-id>org.richfaces.component.behavior.ToggleControl</behavior-id> - <handler-class>org.richfaces.view.facelets.html.CustomBehaviorHandler</handler-class> - </behavior> - <attribute> - <name>targetPanel</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>targetItem</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>event</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>disableDefault</name> - <type>java.lang.Boolean</type> - </attribute> - <attribute> - <name>for</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>tabPanel</tag-name> - <component> - <component-type>org.richfaces.TabPanel</component-type> - <renderer-type>org.richfaces.TabPanel</renderer-type> - <handler-class>org.richfaces.view.facelets.html.TogglePanelTagHandler</handler-class> - </component> - <attribute> - <name>cycledSwitching</name> - <type>boolean</type> - </attribute> - <attribute> - <name>switchType</name> - <type>org.richfaces.component.SwitchType</type> - </attribute> - <attribute> - <name>activeItem</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>bypassUpdates</name> - <type>boolean</type> - </attribute> - <attribute> - <name>limitRender</name> - <type>boolean</type> - </attribute> - <attribute> - <name>data</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>status</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>execute</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>render</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>immediate</name> - <type>boolean</type> - </attribute> - <attribute> - <name>itemChangeListener</name> - <type>javax.el.MethodExpression</type> - </attribute> - <attribute> - <description>Long long text</description> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>binding description</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>I don't know maybe some thing strange</description> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>width</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>height</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>tabClassActive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>tabClassDisabled</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>tabClassInactive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>tabContentClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>tabClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemchange</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforeitemchange</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>title</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerPosition</name> - <type>org.richfaces.HeaderPosition</type> - </attribute> - <attribute> - <name>headerAlignment</name> - <type>org.richfaces.HeaderAlignment</type> - </attribute> - <attribute> - <name>headerLayout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerSpacingClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforetabchange</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ontabchange</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>tab</tag-name> - <component> - <component-type>org.richfaces.TabPanelItem</component-type> - <renderer-type>org.richfaces.Tab</renderer-type> - </component> - <attribute> - <name>disabled</name> - <type>boolean</type> - </attribute> - <attribute> - <name>header</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>name</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>switchType</name> - <type>org.richfaces.component.SwitchType</type> - </attribute> - <attribute> - <description>Long long text</description> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>binding description</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>I don't know maybe some thing strange</description> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>headerClassActive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerClassDisabled</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerClassInactive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerStyle</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>contentClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onheaderclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onheaderdblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onheadermousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onheadermousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onheadermouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onenter</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onleave</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>title</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>panelMenuItem</tag-name> - <component> - <component-type>org.richfaces.PanelMenuItem</component-type> - <renderer-type>org.richfaces.PanelMenuItem</renderer-type> - </component> - <attribute> - <description>MethodExpression representing the application action to invoke when this component is activated by the user. The expression must evaluate to a public method that takes no parameters, and returns an Object (the toString() of which is called to derive the logical outcome) which is passed to the NavigationHandler for this application.</description> - <display-name>Application Action</display-name> - <name>action</name> - <type>javax.faces.el.MethodBinding</type> - </attribute> - <attribute> - <description> MethodExpression representing an action listener method that will be notified when this component is activated by the user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of void, or to a public method that takes no arguments with a return type of void. In the latter case, the method has no way of easily knowing where the event came from, but this can be useful in cases where a notification is needed that "some action happened". </description> - <display-name>Action Listener</display-name> - <name>actionListener</name> - <type>javax.faces.el.MethodBinding</type> - </attribute> - <attribute> - <name>icon</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>mode</name> - <type>org.richfaces.PanelMenuMode</type> - </attribute> - <attribute> - <name>label</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>name</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>disabled</name> - <type>boolean</type> - </attribute> - <attribute> - <name>bypassUpdates</name> - <type>boolean</type> - </attribute> - <attribute> - <name>limitRender</name> - <type>boolean</type> - </attribute> - <attribute> - <name>data</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>status</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>execute</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>render</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>disabledClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>hoverClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>iconLeftClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>iconLeftDisabled</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>iconRightClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>iconRightDisabled</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforedomupdate</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>oncomplete</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onunselect</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onselect</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforeselect</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>panelMenuGroup</tag-name> - <component> - <component-type>org.richfaces.PanelMenuGroup</component-type> - <renderer-type>org.richfaces.PanelMenuGroup</renderer-type> - </component> - <attribute> - <description>MethodExpression representing the application action to invoke when this component is activated by the user. The expression must evaluate to a public method that takes no parameters, and returns an Object (the toString() of which is called to derive the logical outcome) which is passed to the NavigationHandler for this application.</description> - <display-name>Application Action</display-name> - <name>action</name> - <type>javax.faces.el.MethodBinding</type> - </attribute> - <attribute> - <description> MethodExpression representing an action listener method that will be notified when this component is activated by the user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of void, or to a public method that takes no arguments with a return type of void. In the latter case, the method has no way of easily knowing where the event came from, but this can be useful in cases where a notification is needed that "some action happened". </description> - <display-name>Action Listener</display-name> - <name>actionListener</name> - <type>javax.faces.el.MethodBinding</type> - </attribute> - <attribute> - <name>expanded</name> - <type>boolean</type> - </attribute> - <attribute> - <name>expandSingle</name> - <type>boolean</type> - </attribute> - <attribute> - <name>collapseEvent</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>expandEvent</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>bubbleSelection</name> - <type>boolean</type> - </attribute> - <attribute> - <name>iconLeftCollapsed</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>iconLeftExpanded</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>iconRightCollapsed</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>iconRightExpanded</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>icon</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>mode</name> - <type>org.richfaces.PanelMenuMode</type> - </attribute> - <attribute> - <name>label</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>name</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>disabled</name> - <type>boolean</type> - </attribute> - <attribute> - <name>bypassUpdates</name> - <type>boolean</type> - </attribute> - <attribute> - <name>limitRender</name> - <type>boolean</type> - </attribute> - <attribute> - <name>data</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>status</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>execute</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>render</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>oncollapse</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onexpand</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onswitch</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforecollapse</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforeexpand</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforeswitch</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>panelMenu</tag-name> - <component> - <component-type>org.richfaces.PanelMenu</component-type> - <renderer-type>org.richfaces.PanelMenu</renderer-type> - <handler-class>org.richfaces.view.facelets.html.PanelMenuTagHandler</handler-class> - </component> - <attribute> - <description>MethodExpression representing the application action to invoke when this component is activated by the user. The expression must evaluate to a public method that takes no parameters, and returns an Object (the toString() of which is called to derive the logical outcome) which is passed to the NavigationHandler for this application.</description> - <display-name>Application Action</display-name> - <name>action</name> - <type>javax.faces.el.MethodBinding</type> - </attribute> - <attribute> - <description> MethodExpression representing an action listener method that will be notified when this component is activated by the user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of void, or to a public method that takes no arguments with a return type of void. In the latter case, the method has no way of easily knowing where the event came from, but this can be useful in cases where a notification is needed that "some action happened". </description> - <display-name>Action Listener</display-name> - <name>actionListener</name> - <type>javax.faces.el.MethodBinding</type> - </attribute> - <attribute> - <name>disabled</name> - <type>boolean</type> - </attribute> - <attribute> - <name>expandEvent</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>collapseEvent</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>groupMode</name> - <type>org.richfaces.PanelMenuMode</type> - </attribute> - <attribute> - <name>expandSingle</name> - <type>boolean</type> - </attribute> - <attribute> - <name>itemMode</name> - <type>org.richfaces.PanelMenuMode</type> - </attribute> - <attribute> - <name>bubbleSelection</name> - <type>boolean</type> - </attribute> - <attribute> - <name>activeItem</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemChangeListener</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>bypassUpdates</name> - <type>boolean</type> - </attribute> - <attribute> - <name>limitRender</name> - <type>boolean</type> - </attribute> - <attribute> - <name>data</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>status</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>execute</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>render</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>width</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemDisableClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemIconLeft</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemIconRight</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemDisableIconLeft</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemDisableIconRight</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topItemClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topItemDisableClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topItemIconLeft</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topItemIconRight</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topItemDisableIconLeft</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topItemDisableIconRight</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>groupClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>groupDisableClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>groupExpandIconLeft</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>groupExpandIconRight</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>groupCollapseIconLeft</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>groupCollapseIconRight</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>groupDisableIconLeft</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>groupDisableIconRight</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topGroupClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topGroupDisableClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topGroupExpandIconLeft</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topGroupExpandIconRight</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topGroupCollapseIconLeft</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topGroupCollapseIconRight</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topGroupDisableIconLeft</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>topGroupDisableIconRight</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>immediate</name> - <type>boolean</type> - </attribute> - - </tag> - <tag> - <tag-name>tooltip</tag-name> - <component> - <component-type>org.richfaces.Tooltip</component-type> - <renderer-type>org.richfaces.Tooltip</renderer-type> - </component> - <attribute> - <name>for_</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>value</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>layout</name> - <type>org.richfaces.TooltipLayout</type> - </attribute> - <attribute> - <name>attached</name> - <type>boolean</type> - </attribute> - <attribute> - <name>direction</name> - <type>org.richfaces.component.Positioning</type> - </attribute> - <attribute> - <name>disabled</name> - <type>boolean</type> - </attribute> - <attribute> - <name>followMouse</name> - <type>boolean</type> - </attribute> - <attribute> - <name>hideDelay</name> - <type>int</type> - </attribute> - <attribute> - <name>hideEvent</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>horizontalOffset</name> - <type>int</type> - </attribute> - <attribute> - <name>mode</name> - <type>org.richfaces.TooltipMode</type> - </attribute> - <attribute> - <name>showDelay</name> - <type>int</type> - </attribute> - <attribute> - <name>showEvent</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>verticalOffset</name> - <type>int</type> - </attribute> - <attribute> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>bypassUpdates</name> - <type>boolean</type> - </attribute> - <attribute> - <name>limitRender</name> - <type>boolean</type> - </attribute> - <attribute> - <name>data</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>status</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>execute</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>render</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>zindex</name> - <type>int</type> - </attribute> - <attribute> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onhide</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onshow</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforehide</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforeshow</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>collapsiblePanel</tag-name> - <component> - <component-type>org.richfaces.CollapsiblePanel</component-type> - <renderer-type>org.richfaces.CollapsiblePanel</renderer-type> - <handler-class>org.richfaces.view.facelets.html.CollapsiblePanelTagHandler</handler-class> - </component> - <attribute> - <name>leftCollapsedIcon</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>leftExpandedIcon</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>rightExpandedIcon</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>rightCollapsedIcon</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>switchType</name> - <type>org.richfaces.component.SwitchType</type> - </attribute> - <attribute> - <name>expanded</name> - <type>boolean</type> - </attribute> - <attribute> - <name>header</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>bypassUpdates</name> - <type>boolean</type> - </attribute> - <attribute> - <name>limitRender</name> - <type>boolean</type> - </attribute> - <attribute> - <name>data</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>status</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>execute</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>render</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>immediate</name> - <type>boolean</type> - </attribute> - <attribute> - <name>toggleListener</name> - <type>javax.el.MethodExpression</type> - </attribute> - <attribute> - <name>bodyClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerControlClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>oncomplete</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforedomupdate</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onswitch</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforeswitch</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>title</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <description> - Register a PanelToggleListener instance on the UIComponent - associated with the closest parent UIComponent custom - action. - </description> - <tag-name>panelToggleListener</tag-name> - <handler-class>org.richfaces.view.facelets.html.PanelToggleListenerHandler</handler-class> - <attribute> - <description> - Fully qualified Java class name of a - PanelToggleListener to be created and registered. - </description> - <name>type</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description> - Value binding expression that evaluates to an object that - implements org.richfaces.event.PanelToggleListener. - </description> - <name>binding</name> - <required>false</required> - <type>org.richfaces.event.PanelToggleListener</type> - </attribute> - <attribute> - <description> - If present, this attribute refers - to the value of one of the exposed attached objects within the - composite component inside of which this tag is nested. - </description> - <name>for</name> - <required>false</required> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>togglePanel</tag-name> - <component> - <component-type>org.richfaces.TogglePanel</component-type> - <renderer-type>org.richfaces.TogglePanel</renderer-type> - <handler-class>org.richfaces.view.facelets.html.TogglePanelTagHandler</handler-class> - </component> - <attribute> - <name>cycledSwitching</name> - <type>boolean</type> - </attribute> - <attribute> - <name>switchType</name> - <type>org.richfaces.component.SwitchType</type> - </attribute> - <attribute> - <name>activeItem</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>bypassUpdates</name> - <type>boolean</type> - </attribute> - <attribute> - <name>limitRender</name> - <type>boolean</type> - </attribute> - <attribute> - <name>data</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>status</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>execute</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>render</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>immediate</name> - <type>boolean</type> - </attribute> - <attribute> - <name>itemChangeListener</name> - <type>javax.el.MethodExpression</type> - </attribute> - <attribute> - <description>Long long text</description> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>binding description</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>I don't know maybe some thing strange</description> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>onitemchange</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforeitemchange</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>title</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <description> - Register a ItemChangeListener instance on the UIComponent - associated with the closest parent UIComponent custom - action. - </description> - <tag-name>itemChangeListener</tag-name> - <handler-class>org.richfaces.view.facelets.html.ItemChangeListenerHandler</handler-class> - <attribute> - <description> - Fully qualified Java class name of a - ItemChangeListener to be created and registered. - </description> - <name>type</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description> - Value binding expression that evaluates to an object that - implements org.richfaces.event.ItemChangeListener. - </description> - <name>binding</name> - <required>false</required> - <type>org.richfaces.event.ItemChangeListener</type> - </attribute> - <attribute> - <description> - If present, this attribute refers - to the value of one of the exposed attached objects within the - composite component inside of which this tag is nested. - </description> - <name>for</name> - <required>false</required> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>togglePanelItem</tag-name> - <component> - <component-type>org.richfaces.TogglePanelItem</component-type> - <renderer-type>org.richfaces.TogglePanelItem</renderer-type> - </component> - <attribute> - <name>name</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>switchType</name> - <type>org.richfaces.component.SwitchType</type> - </attribute> - <attribute> - <description>Long long text</description> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>binding description</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>I don't know maybe some thing strange</description> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>onenter</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onleave</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>title</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>accordion</tag-name> - <component> - <component-type>org.richfaces.Accordion</component-type> - <renderer-type>org.richfaces.Accordion</renderer-type> - <handler-class>org.richfaces.view.facelets.html.TogglePanelTagHandler</handler-class> - </component> - <attribute> - <name>cycledSwitching</name> - <type>boolean</type> - </attribute> - <attribute> - <name>switchType</name> - <type>org.richfaces.component.SwitchType</type> - </attribute> - <attribute> - <name>activeItem</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>bypassUpdates</name> - <type>boolean</type> - </attribute> - <attribute> - <name>limitRender</name> - <type>boolean</type> - </attribute> - <attribute> - <name>data</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>status</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>execute</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>render</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <name>immediate</name> - <type>boolean</type> - </attribute> - <attribute> - <name>itemChangeListener</name> - <type>javax.el.MethodExpression</type> - </attribute> - <attribute> - <description>Long long text</description> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>binding description</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>I don't know maybe some thing strange</description> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>width</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>height</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemHeaderClassActive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemHeaderClassDisabled</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemHeaderClassInactive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemContentClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemHeaderClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemchange</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforeitemchange</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>title</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>accordionItem</tag-name> - <component> - <component-type>org.richfaces.AccordionItem</component-type> - <renderer-type>org.richfaces.AccordionItem</renderer-type> - </component> - <attribute> - <name>disabled</name> - <type>boolean</type> - </attribute> - <attribute> - <name>header</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>name</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>switchType</name> - <type>org.richfaces.component.SwitchType</type> - </attribute> - <attribute> - <description>Long long text</description> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>binding description</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>I don't know maybe some thing strange</description> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>headerClassActive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerClassDisabled</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerClassInactive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerStyle</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>contentClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onheaderclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onheaderdblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onheadermousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onheadermousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onheadermouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onenter</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onleave</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>title</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - </tag> -</facelet-taglib> Modified: trunk/ui/output/ui/src/test/java/org/richfaces/component/AbstractAccordionTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/component/AbstractAccordionTest.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/java/org/richfaces/component/AbstractAccordionTest.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -24,11 +24,14 @@ import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import javax.faces.component.UIComponent; import java.util.List; +import static org.easymock.EasyMock.*; + /** * @author akolonitsky * @since 2010-08-14 @@ -46,7 +49,7 @@ @Before public void setUp () { - accordion = new AbstractAccordion(); + accordion = new UIAccordion(); List<UIComponent> children = accordion.getChildren(); item1 = createItem(ITEM1); @@ -60,6 +63,7 @@ } @Test + @Ignore public void testDefaultActiveItem() { Assert.assertNotNull(accordion); Assert.assertEquals(ITEM1, accordion.getActiveItem()); @@ -69,8 +73,8 @@ } private static AbstractTogglePanelTitledItem createItem(String name) { - AbstractTogglePanelTitledItem item = new UITogglePanelTitledItem(); - item.setName(name); + AbstractTogglePanelTitledItem item = createNiceMock(AbstractTogglePanelTitledItem.class); //new AbstractTogglePanelTitledItem(); + expect(item.getName()).andReturn(name); return item; } Modified: trunk/ui/output/ui/src/test/java/org/richfaces/component/UICollapsiblePanelTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/component/UICollapsiblePanelTest.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/java/org/richfaces/component/UICollapsiblePanelTest.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -26,9 +26,6 @@ import org.junit.Before; import org.junit.Test; -import javax.faces.component.UIComponent; -import java.util.List; - /** * @author akolonitsky * @since 2010-08-27 Deleted: trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuGroupTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuGroupTest.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuGroupTest.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import javax.faces.component.UIComponent; -import java.util.List; - -/** - * @author akolonitsky - * @since 2010-10-25 - */ -public class UIPanelMenuGroupTest { - - private UIPanelMenuGroup panelMenuGroup; - - @Before - public void setUp () { - panelMenuGroup = new UIPanelMenuGroup(); - } - - @Test - public void testSomething() { - Assert.assertNotNull(panelMenuGroup); - } -} - Deleted: trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuItemTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuItemTest.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuItemTest.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import javax.faces.component.UIComponent; -import java.util.List; - -/** - * @author akolonitsky - * @since 2010-10-25 - */ -public class UIPanelMenuItemTest { - - private UIPanelMenuItem panelMenuItem; - - @Before - public void setUp () { - panelMenuItem = new UIPanelMenuItem(); - } - - @Test - public void testSomething() { - Assert.assertNotNull(panelMenuItem); - } -} - Deleted: trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuTest.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/java/org/richfaces/component/UIPanelMenuTest.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import javax.faces.component.UIComponent; -import java.util.List; - -/** - * @author akolonitsky - * @since 2010-10-25 - */ -public class UIPanelMenuTest { - - private UIPanelMenu panelMenu; - - @Before - public void setUp () { - panelMenu = new UIPanelMenu(); - } - - @Test - public void testSomething() { - Assert.assertNotNull(panelMenu); - } -} - Deleted: trunk/ui/output/ui/src/test/java/org/richfaces/component/UITogglePanelTitledItemTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/component/UITogglePanelTitledItemTest.java 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/java/org/richfaces/component/UITogglePanelTitledItemTest.java 2011-01-18 15:12:23 UTC (rev 21056) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright ${year}, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.component; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import javax.faces.component.UIComponent; -import java.util.List; - -/** - * @author akolonitsky - * @since 2010-08-24 - */ -public class UITogglePanelTitledItemTest { - - private UITogglePanelTitledItem togglePanelTitledItem; - - @Before - public void setUp () { - togglePanelTitledItem = new UITogglePanelTitledItem(); - } - - @Test - public void testSomething() { - Assert.assertNotNull(togglePanelTitledItem); - } -} - Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -28,8 +28,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" - xmlns:rich="http://richfaces.org/rich"> + xmlns:pn="http://richfaces.org/output" + > <h:head> <title>Richfaces MenuItem Test</title> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" + xmlns:pn="http://richfaces.org/output" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" + xmlns:pn="http://richfaces.org/output" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" + xmlns:pn="http://richfaces.org/output" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" + xmlns:pn="http://richfaces.org/output" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" + xmlns:pn="http://richfaces.org/output" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" + xmlns:pn="http://richfaces.org/output" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" + xmlns:pn="http://richfaces.org/output" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xhtml 2011-01-18 14:48:02 UTC (rev 21055) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xhtml 2011-01-18 15:12:23 UTC (rev 21056) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/pn" + xmlns:pn="http://richfaces.org/output" xmlns:rich="http://richfaces.org/rich"> <h:head>

13 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits January 2011