You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2008/03/17 05:05:58 UTC
svn commit: r637714 - in /myfaces/trinidad/branches/ar_tabindex:
trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
trinidad-impl/src/main/java/org/apache/myfac...
Author: arobinson74
Date: Sun Mar 16 21:05:55 2008
New Revision: 637714
URL: http://svn.apache.org/viewvc?rev=637714&view=rev
Log:
Added support to color palette (should determine if this is
really useful or not)
Added tabindex to inputColor's palette anchor tag
Modified:
myfaces/trinidad/branches/ar_tabindex/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.java
Modified: myfaces/trinidad/branches/ar_tabindex/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_tabindex/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=637714&r1=637713&r2=637714&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_tabindex/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/trinidad/branches/ar_tabindex/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml Sun Mar 16 21:05:55 2008
@@ -3062,4 +3062,10 @@
<managed-bean-scope>request</managed-bean-scope>
<!--oracle-jdev-comment:managed-bean-jsp-link:1demos/testRelativePartialTriggers.jspx-->
</managed-bean>
+
+ <managed-bean>
+ <managed-bean-name>tabIndexBean</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.trinidaddemo.TabIndexBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
</faces-config>
Modified: myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java?rev=637714&r1=637713&r2=637714&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java (original)
+++ myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java Sun Mar 16 21:05:55 2008
@@ -468,6 +468,7 @@
if (editable)
{
writer.startElement("a", component);
+ renderTabIndex(context, arc, bean);
writer.writeAttribute("onclick",
getLaunchOnclick(context, arc, component, bean),
null);
Modified: myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java?rev=637714&r1=637713&r2=637714&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java (original)
+++ myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java Sun Mar 16 21:05:55 2008
@@ -1095,12 +1095,19 @@
protected Integer getTabIndex(FacesBean bean)
{
- if (_tabIndexKey == null)
+ PropertyKey key = _tabIndexKey;
+
+ if (key == null)
{
- return null;
+ // the key is not always initialized for delegate renderers
+ key = bean.getType().findKey("tabIndex");
+ if (key == null)
+ {
+ return null;
+ }
}
- Number n = (Number)bean.getProperty(_tabIndexKey);
+ Number n = (Number)bean.getProperty(key);
if (n == null)
{
Modified: myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java?rev=637714&r1=637713&r2=637714&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java (original)
+++ myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java Sun Mar 16 21:05:55 2008
@@ -80,6 +80,7 @@
public static final AttributeKey FIELD_WIDTH_ATTR = new AttributeKey("fieldWidth");
public static final AttributeKey MARGIN_WIDTH_ATTR = new AttributeKey("marginWidth");
public static final AttributeKey MARGIN_HEIGHT_ATTR = new AttributeKey("marginHeight");
+ public static final AttributeKey TAB_INDEX_ATTR = new AttributeKey("tabIndex");
/** TYPE: URL or String */
public static final AttributeKey IMAGE_ATTR = new AttributeKey("image");
Modified: myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.java?rev=637714&r1=637713&r2=637714&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.java (original)
+++ myfaces/trinidad/branches/ar_tabindex/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.java Sun Mar 16 21:05:55 2008
@@ -72,16 +72,17 @@
int width = getWidth(context, node);
int height = getHeight(context, node);
+ int tabIndex = getTabIndex(context, node);
if (colorData != null && !colorData.isEmpty())
{
- _renderColorPalette(context, node, colorData, width, height);
+ _renderColorPalette(context, node, colorData, width, height, tabIndex);
}
if (customColorData != null && !customColorData.isEmpty())
{
renderSpacer(context, -1, 8);
- _renderColorPalette(context, node, customColorData, width, 0);
+ _renderColorPalette(context, node, customColorData, width, 0, tabIndex);
}
}
@@ -90,7 +91,8 @@
UINode node,
List<Color> colorData,
int width,
- int height) throws IOException
+ int height,
+ Integer tabIndex) throws IOException
{
int colorCount = colorData.size();
if (colorCount > 0)
@@ -257,6 +259,10 @@
if (hasOnColorSelect)
{
writer.startElement("a", null);
+ if (tabIndex != null)
+ {
+ writer.writeAttribute("tabindex", tabIndex, null);
+ }
if (onCellClick != null)
{
onCellClick.setLength(onCellClickLength);
@@ -331,6 +337,14 @@
UINode node)
{
return "span";
+ }
+
+ protected Integer getTabIndex(
+ UIXRenderingContext context,
+ UINode node)
+ {
+ int val = getIntAttributeValue(context, node, TAB_INDEX_ATTR, Integer.MIN_VALUE);
+ return val == Integer.MIN_VALUE ? null : val;
}
protected int getWidth(