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 2009/12/10 18:46:47 UTC
svn commit: r889345 [17/17] - in
/myfaces/trinidad/branches/ar_clientBehaviors: ./ trinidad-api/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/o...
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java Thu Dec 10 17:46:13 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,26 +29,26 @@
import javax.faces.context.ResponseWriter;
import javax.faces.event.FacesEvent;
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.component.UIXCollection;
import org.apache.myfaces.trinidad.component.UIXTable;
import org.apache.myfaces.trinidad.component.UIXTree;
+import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.event.SelectionEvent;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.model.RowKeySet;
-
-import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.render.CoreRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
+
public class TableSelectManyRenderer extends TableSelectOneRenderer
{
public static final String UNSELECTED_KEY = "_us";
public static final String SELECTED_KEY = "_s";
public static final String SELECTED_MODE_KEY = "_sm";
- public TableSelectManyRenderer(FacesBean.Type type)
+ public TableSelectManyRenderer(
+ FacesBean.Type type)
{
super(type);
}
@@ -58,7 +58,9 @@
//
@SuppressWarnings("unchecked")
@Override
- public void decode(FacesContext context, UIComponent component)
+ public void decode(
+ FacesContext context,
+ UIComponent component)
{
UIXCollection table = (UIXCollection) component;
Object oldKey = table.getRowKey();
@@ -66,10 +68,10 @@
table.setRowIndex(-1);
String tableId = table.getClientId(context);
- Map<String, String[]> parameters =
+ Map<String, String[]> parameters =
context.getExternalContext().getRequestParameterValuesMap();
- String[] unselectedBoxes =
+ String[] unselectedBoxes =
parameters.get(tableId+NamingContainer.SEPARATOR_CHAR+UNSELECTED_KEY);
// check to see if there were any selection boxes in the request.
@@ -78,7 +80,7 @@
if ((unselectedBoxes == null) || (unselectedBoxes.length == 0))
return;
- String[] selectedBoxes =
+ String[] selectedBoxes =
parameters.get(tableId+NamingContainer.SEPARATOR_CHAR+SELECTED_KEY);
// must work with both table and hgrid:
@@ -121,13 +123,15 @@
table.setRowKey(oldKey);
}
- private void _setDeltas(UIXCollection table,
- String[] selectedBoxes, String[] unselectedBoxes,
- RowKeySet current,
- RowKeySet selectedDelta,
- RowKeySet unselectedDelta)
+ private void _setDeltas(
+ UIXCollection table,
+ String[] selectedBoxes,
+ String[] unselectedBoxes,
+ RowKeySet current,
+ RowKeySet selectedDelta,
+ RowKeySet unselectedDelta)
{
- Map<String, Boolean> deltas =
+ Map<String, Boolean> deltas =
new HashMap<String, Boolean>(unselectedBoxes.length);
for(int i=0; i< unselectedBoxes.length; i++)
{
@@ -171,7 +175,8 @@
}
@Override
- protected CoreRenderer createCellRenderer(FacesBean.Type type)
+ protected CoreRenderer createCellRenderer(
+ FacesBean.Type type)
{
return new Checkbox(type);
}
@@ -184,16 +189,17 @@
public static void renderScripts(
FacesContext context,
- RenderingContext arc,
+ RenderingContext rc,
TableRenderingContext trc,
- boolean autoSubmit) throws IOException
+ boolean autoSubmit
+ ) throws IOException
{
- if (arc.getProperties().put(_JS_RENDERED_KEY, Boolean.TRUE) == null)
+ if (rc.getProperties().put(_JS_RENDERED_KEY, Boolean.TRUE) == null)
{
ResponseWriter writer = context.getResponseWriter();
writer.startElement("script", null);
- renderScriptDeferAttribute(context, arc);
- renderScriptTypeAttribute(context, arc);
+ renderScriptDeferAttribute(context, rc);
+ renderScriptTypeAttribute(context, rc);
String jsCall =
TreeUtils.setupJSMultiSelectCollectionComponent(
@@ -209,19 +215,20 @@
// render hidden field for select mode. this field lets the server
// know that the user has selected "all" or "none", so that it can
// use that when repopulating the page or another record set.
- if (arc.getFormData() != null)
- arc.getFormData().addNeededValue(selectedModeName);
+ if (rc.getFormData() != null)
+ rc.getFormData().addNeededValue(selectedModeName);
}
@Override
protected void renderCellContent(
FacesContext context,
- RenderingContext arc,
+ RenderingContext rc,
TableRenderingContext tContext,
UIComponent component,
- FacesBean bean) throws IOException
+ FacesBean bean
+ ) throws IOException
{
- super.renderCellContent(context, arc, tContext, component, bean);
+ super.renderCellContent(context, rc, tContext, component, bean);
_renderUnsuccessfulField(context, tContext);
}
@@ -231,7 +238,8 @@
*/
private void _renderUnsuccessfulField(
FacesContext context,
- TableRenderingContext tContext) throws IOException
+ TableRenderingContext tContext
+ ) throws IOException
{
String unsuccessfulId = (tContext.getTableId() +
NamingContainer.SEPARATOR_CHAR +
@@ -244,12 +252,10 @@
value);
}
-
-
-
static private class Checkbox extends TableSelectOneRenderer.Radio
{
- public Checkbox(FacesBean.Type type)
+ public Checkbox(
+ FacesBean.Type type)
{
super(type);
}
@@ -257,7 +263,8 @@
@Override
protected void renderId(
FacesContext context,
- UIComponent component) throws IOException
+ UIComponent component
+ ) throws IOException
{
TableRenderingContext tContext =
TableRenderingContext.getCurrentInstance();
@@ -269,7 +276,7 @@
// =-=AEW Inefficient. We only need the "id" when there's
// a shortDescription (which is when we'll get a label)
- if (getShortDesc(getFacesBean(component)) != null)
+ if (getShortDesc(component, getFacesBean(component)) != null)
writer.writeAttribute("id", getClientId(context, component), null);
}
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java Thu Dec 10 17:46:13 2009
@@ -44,14 +44,15 @@
public class TableSelectOneRenderer extends XhtmlRenderer
{
-
- public TableSelectOneRenderer(FacesBean.Type type)
+ public TableSelectOneRenderer(
+ FacesBean.Type type)
{
super(type);
}
@Override
- protected void findTypeConstants(FacesBean.Type type)
+ protected void findTypeConstants(
+ FacesBean.Type type)
{
super.findTypeConstants(type);
_renderer = createCellRenderer(type);
@@ -62,7 +63,9 @@
//
@SuppressWarnings("unchecked")
@Override
- public void decode(FacesContext context, UIComponent component)
+ public void decode(
+ FacesContext context,
+ UIComponent component)
{
UIXCollection table = (UIXCollection) component;
Object oldKey = table.getRowKey();
@@ -114,7 +117,6 @@
}
}
-
//
// Encode
//
@@ -126,10 +128,11 @@
@Override
protected void encodeAll(
- FacesContext context,
- RenderingContext arc,
- UIComponent component,
- FacesBean bean) throws IOException
+ FacesContext context,
+ RenderingContext rc,
+ UIComponent component,
+ FacesBean bean
+ ) throws IOException
{
TableRenderingContext tContext =
TableRenderingContext.getCurrentInstance();
@@ -149,7 +152,7 @@
break;
case RenderStage.DATA_STAGE:
- renderCellContent(context, arc, tContext, component, bean);
+ renderCellContent(context, rc, tContext, component, bean);
break;
default:
@@ -162,21 +165,23 @@
return true;
}
- protected CoreRenderer createCellRenderer(FacesBean.Type type)
+ protected CoreRenderer createCellRenderer(
+ FacesBean.Type type)
{
return new Radio(type);
}
protected void renderCellContent(
FacesContext context,
- RenderingContext arc,
+ RenderingContext rc,
TableRenderingContext tContext,
UIComponent component,
- FacesBean bean) throws IOException
+ FacesBean bean
+ ) throws IOException
{
- arc.setCurrentClientId(tContext.getTableId());
- delegateRenderer(context, arc, component, bean, _renderer);
- arc.setCurrentClientId(null);
+ rc.setCurrentClientId(tContext.getTableId());
+ delegateRenderer(context, rc, component, bean, _renderer);
+ rc.setCurrentClientId(null);
}
/**
@@ -184,7 +189,8 @@
* for testing.
*/
static String __getSelectionParameterName(
- FacesContext context, UIComponent table)
+ FacesContext context,
+ UIComponent table)
{
return (table.getClientId(context) +
NamingContainer.SEPARATOR_CHAR +
@@ -193,13 +199,15 @@
public static class Radio extends SimpleSelectBooleanCheckboxRenderer
{
- public Radio(FacesBean.Type type)
+ public Radio(
+ FacesBean.Type type)
{
super(type);
}
@Override
- protected String getCompositeId(String clientId)
+ protected String getCompositeId(
+ String clientId)
{
return null;
}
@@ -208,15 +216,20 @@
* we do not want to render the simple span for the checkbox.
*/
@Override
- protected boolean getRenderSimpleSpan(FacesBean bean)
+ protected boolean getRenderSimpleSpan(
+ UIComponent component,
+ FacesBean bean)
{
return false;
}
+
/**
* don't render a special content style class on the radio.
*/
@Override
- protected String getContentStyleClass(FacesBean bean)
+ protected String getContentStyleClass(
+ UIComponent component,
+ FacesBean bean)
{
return null;
}
@@ -224,7 +237,8 @@
@Override
protected void renderId(
FacesContext context,
- UIComponent component) throws IOException
+ UIComponent component
+ ) throws IOException
{
TableRenderingContext tContext =
TableRenderingContext.getCurrentInstance();
@@ -235,19 +249,23 @@
writer.writeAttribute("name", param, null);
// =-=AEW Inefficient. We only need the "id" when there's
// a shortDescription (which is when we'll get a label)
- if (getShortDesc(getFacesBean(component)) != null)
+ if (getShortDesc(component, getFacesBean(component)) != null)
writer.writeAttribute("id", getClientId(context, component), null);
}
@Override
- protected String getClientId(FacesContext context, UIComponent component)
+ protected String getClientId(
+ FacesContext context,
+ UIComponent component)
{
// We use the table's container client ID
return component.getContainerClientId(context);
}
@Override
- protected Object getSubmittedValue(FacesBean bean)
+ protected Object getSubmittedValue(
+ UIComponent component,
+ FacesBean bean)
{
TableRenderingContext tContext =
TableRenderingContext.getCurrentInstance();
@@ -262,7 +280,8 @@
}
@Override
- protected Object getValueAttr(RenderingContext arc)
+ protected Object getValueAttr(
+ RenderingContext rc)
{
TableRenderingContext tContext =
TableRenderingContext.getCurrentInstance();
@@ -271,7 +290,9 @@
}
@Override
- protected String getShortDesc(FacesBean bean)
+ protected String getShortDesc(
+ UIComponent component,
+ FacesBean bean)
{
String key = getDefaultShortDescKey();
RenderingContext arc = RenderingContext.getCurrentInstance();
@@ -284,13 +305,17 @@
}
@Override
- protected char getAccessKey(FacesBean bean)
+ protected char getAccessKey(
+ UIComponent component,
+ FacesBean bean)
{
return CHAR_UNDEFINED;
}
@Override
- protected boolean isImmediate(FacesBean bean)
+ protected boolean isImmediate(
+ UIComponent component,
+ FacesBean bean)
{
TableRenderingContext tContext =
TableRenderingContext.getCurrentInstance();
@@ -298,13 +323,18 @@
}
@Override
- protected boolean getReadOnly(FacesContext context, FacesBean bean)
+ protected boolean getReadOnly(
+ FacesContext context,
+ UIComponent component,
+ FacesBean bean)
{
return false;
}
@Override
- protected boolean getDisabled(FacesBean bean)
+ protected boolean getDisabled(
+ UIComponent component,
+ FacesBean bean)
{
return false;
}
@@ -313,7 +343,9 @@
* @todo Support?
*/
@Override
- protected String getOnblur(FacesBean bean)
+ protected String getOnblur(
+ UIComponent component,
+ FacesBean bean)
{
return null;
}
@@ -322,28 +354,35 @@
* @todo Support?
*/
@Override
- protected String getOnfocus(FacesBean bean)
+ protected String getOnfocus(
+ UIComponent component,
+ FacesBean bean)
{
return null;
}
@Override
- protected String getOnchange(FacesBean bean)
+ protected String getOnchange(
+ UIComponent component,
+ FacesBean bean)
{
return null;
}
- protected String getOnselect(FacesBean bean)
+ protected String getOnselect(
+ UIComponent component,
+ FacesBean bean)
{
return null;
}
@Override
- protected String getText(FacesBean bean)
+ protected String getText(
+ UIComponent component,
+ FacesBean bean)
{
return null;
}
-
}
private CoreRenderer _renderer;
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java Thu Dec 10 17:46:13 2009
@@ -19,6 +19,7 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table;
import java.io.IOException;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -37,16 +38,19 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
+
public class TreeNodeColumnRenderer extends ColumnRenderer
{
@Override
- protected void renderKids(FacesContext context,
- RenderingContext arc,
- TableRenderingContext tContext,
- UIComponent column) throws IOException
+ protected void renderKids(
+ FacesContext context,
+ RenderingContext rc,
+ TableRenderingContext tContext,
+ UIComponent column
+ ) throws IOException
{
TreeTableRenderingContext ttrc = (TreeTableRenderingContext) tContext;
- boolean isRTL = arc.isRightToLeft();
+ boolean isRTL = rc.isRightToLeft();
UIXTreeTable hGrid = ttrc.getUIXTreeTable();
final boolean disclosed;
final String onclick;
@@ -115,40 +119,42 @@
// Render the style class on the link, so that we can
// disable the link's text decoration
- renderStyleClass(context, arc,
+ renderStyleClass(context, rc,
SkinSelectors.AF_TREE_TABLE_EXPANSION_ICON_STYLE_CLASS);
//HKuhn - don't render onclick in printable mode
- if (XhtmlRenderer.supportsScripting(arc))
+ if (XhtmlRenderer.supportsScripting(rc))
{
writer.writeAttribute("onclick", onclick, null);
writer.writeURIAttribute("href", "#", null);
}
// Render the expand/collapse Icon
- _renderExpansionIcon(context, arc, disclosed, onclick);
+ _renderExpansionIcon(context, rc, disclosed, onclick);
writer.endElement("a");
}
- _renderNodeIcon(context, arc, hGrid, disclosed, onclick != null);
+ _renderNodeIcon(context, rc, hGrid, disclosed, onclick != null);
UIComponent nodeStampColumn = ttrc.getTreeNodeStamp();
// if in screen reader mode render the node depth from the root as well
- _renderNodeStampBasedOnAccessibilty(context, arc, ttrc, nodeStampColumn);
+ _renderNodeStampBasedOnAccessibilty(context, rc, ttrc, nodeStampColumn);
writer.endElement("div");
}
-
- private int _getSpacerWidth(TreeTableRenderingContext ttrc)
+ private int _getSpacerWidth(
+ TreeTableRenderingContext ttrc)
{
return ttrc.getSpacerWidth();
}
// Renders the unique id for the expand/collapse icon
- private void _renderIconID(FacesContext fc,
- TableRenderingContext tContext) throws IOException
+ private void _renderIconID(
+ FacesContext fc,
+ TableRenderingContext tContext
+ ) throws IOException
{
// we need to render a unique ID for the expand/collapse link, so that
// PPR can restore the focus correctly after a PPR request:
@@ -159,10 +165,11 @@
// Renders the expansion Icon
private void _renderExpansionIcon(
- FacesContext context,
- RenderingContext arc,
+ FacesContext context,
+ RenderingContext rc,
boolean disclosed,
- Object onclick) throws IOException
+ Object onclick
+ ) throws IOException
{
final String iconName;
final String altTextKey;
@@ -181,31 +188,31 @@
altTextKey = _EXPAND_TIP_KEY;
}
- Icon icon = arc.getIcon(iconName);
+ Icon icon = rc.getIcon(iconName);
if (icon != null)
{
- Object altText = arc.getTranslatedString(altTextKey);
- OutputUtils.renderIcon(context, arc, icon, altText, null);
+ Object altText = rc.getTranslatedString(altTextKey);
+ OutputUtils.renderIcon(context, rc, icon, altText, null);
}
}
private void _renderNodeIcon(
- FacesContext context,
- RenderingContext arc,
- UIXTreeTable ttr,
- boolean disclosed,
- boolean hasChildren
- ) throws IOException
+ FacesContext context,
+ RenderingContext rc,
+ UIXTreeTable ttr,
+ boolean disclosed,
+ boolean hasChildren
+ ) throws IOException
{
- Icon nodeIcon = getNodeIcon(arc, getNodeType(ttr), disclosed, hasChildren);
+ Icon nodeIcon = getNodeIcon(rc, getNodeType(ttr), disclosed, hasChildren);
if (nodeIcon != null)
{
- OutputUtils.renderIcon(context, arc, nodeIcon, null, null);
+ OutputUtils.renderIcon(context, rc, nodeIcon, null, null);
}
}
protected String getNodeType(
- UIXTreeTable ttr
+ UIXTreeTable ttr
)
{
String nodeType = null;
@@ -234,10 +241,9 @@
}
protected String getNodeIconSelector(
- String nodeType,
- boolean disclosed,
- boolean hasChildren
- )
+ String nodeType,
+ boolean disclosed,
+ boolean hasChildren)
{
if (hasChildren)
{
@@ -254,11 +260,10 @@
}
protected Icon getNodeIcon(
- RenderingContext rc,
- String nodeType,
- boolean disclosed,
- boolean hasChildren
- )
+ RenderingContext rc,
+ String nodeType,
+ boolean disclosed,
+ boolean hasChildren)
{
if (nodeType == null || nodeType.length() == 0)
{
@@ -280,27 +285,28 @@
}
private void _renderNodeStampBasedOnAccessibilty(
- FacesContext context,
- RenderingContext arc,
+ FacesContext context,
+ RenderingContext rc,
TreeTableRenderingContext ttrc,
- UIComponent column) throws IOException
+ UIComponent column
+ ) throws IOException
{
- if (XhtmlRenderer.isScreenReaderMode(arc))
+ if (XhtmlRenderer.isScreenReaderMode(rc))
{
int depth = ttrc.getUIXTreeTable().getDepth() + 1;
- if (arc.isRightToLeft())
+ if (rc.isRightToLeft())
{
- super.renderKids(context, arc, ttrc, column);
- TreeUtils.writeNodeLevel(context, arc, depth, _NODE_LEVEL_TEXT_KEY);
+ super.renderKids(context, rc, ttrc, column);
+ TreeUtils.writeNodeLevel(context, rc, depth, _NODE_LEVEL_TEXT_KEY);
}
else
{
- TreeUtils.writeNodeLevel(context, arc, depth, _NODE_LEVEL_TEXT_KEY);
- super.renderKids(context, arc, ttrc, column);
+ TreeUtils.writeNodeLevel(context, rc, depth, _NODE_LEVEL_TEXT_KEY);
+ super.renderKids(context, rc, ttrc, column);
}
}
else
- super.renderKids(context, arc, ttrc, column);
+ super.renderKids(context, rc, ttrc, column);
}
// This String is included in the generated IDs that are
@@ -321,5 +327,4 @@
public static final String NODE_ICON_COLLAPSED_SUFFIX = "-collapsed";
public static final int NODE_ICON_MAX_WIDTH = 18;
-
}
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java Thu Dec 10 17:46:13 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -28,16 +28,18 @@
import org.apache.myfaces.trinidad.component.UIXTreeTable;
import org.apache.myfaces.trinidad.component.core.data.CoreTreeTable;
import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.skin.Icon;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat;
-import org.apache.myfaces.trinidad.skin.Icon;
+
public class TreeTableNavRenderer extends XhtmlRenderer
{
- public TreeTableNavRenderer(boolean isTop)
+ public TreeTableNavRenderer(
+ boolean isTop)
{
super(CoreTreeTable.TYPE);
_isTop = isTop;
@@ -53,10 +55,11 @@
@Override
protected void encodeAll(
- FacesContext context,
- RenderingContext arc,
- UIComponent component,
- FacesBean bean) throws IOException
+ FacesContext context,
+ RenderingContext rc,
+ UIComponent component,
+ FacesBean bean
+ ) throws IOException
{
//TODO
final Object childTypeText = null;
@@ -66,20 +69,21 @@
int rows = hgrid.getRows();
int first = hgrid.getFirst();
int rowCount = hgrid.getRowCount();
- _renderViewNavBar(context, arc, ttrc, hgrid,
+ _renderViewNavBar(context, rc, ttrc, hgrid,
first, childTypeText, _isTop, rows, rowCount);
}
private void _renderViewNavBar(
- FacesContext context,
- RenderingContext arc,
+ FacesContext context,
+ RenderingContext rc,
TreeTableRenderingContext ttrc,
- UIXTreeTable hgrid,
- int rangeStart,
- Object text,
- boolean isTop,
- int viewSize,
- int numChildren) throws IOException
+ UIXTreeTable hgrid,
+ int rangeStart,
+ Object text,
+ boolean isTop,
+ int viewSize,
+ int numChildren
+ ) throws IOException
{
int nextWindowStart = 0;
int nextWindowEnd = 0;
@@ -118,7 +122,7 @@
}
// First get the link direction text
- String direction = arc.getTranslatedString((isTop
+ String direction = rc.getTranslatedString((isTop
? _PREVIOUS_KEY
: _NEXT_KEY));
String linkText = direction;
@@ -154,7 +158,7 @@
srcs[strNum] = "" + numChildren;
}
- String format = arc.getTranslatedString(formatKey);
+ String format = rc.getTranslatedString(formatKey);
if (format != null)
{
FastMessageFormat fmf = new FastMessageFormat(format);
@@ -162,19 +166,20 @@
}
}
- _writeCellContents(context, arc, ttrc, hgrid, linkText, disabled, isTop, nextWindowStart);
+ _writeCellContents(context, rc, ttrc, hgrid, linkText, disabled, isTop, nextWindowStart);
}
private void _writeCellContents(
- FacesContext context,
- RenderingContext arc,
+ FacesContext context,
+ RenderingContext rc,
TreeTableRenderingContext ttrc,
- UIXTreeTable hgrid,
- String text,
- boolean disabled,
- boolean isTop,
- int index) throws IOException
+ UIXTreeTable hgrid,
+ String text,
+ boolean disabled,
+ boolean isTop,
+ int index
+ ) throws IOException
{
if (text == null)
return;
@@ -184,7 +189,7 @@
String onclick =
TreeUtils.callJSGotoNode(hgrid, ttrc.getJSVarName(), index);
- boolean isRTL = arc.isRightToLeft();
+ boolean isRTL = rc.isRightToLeft();
int depth = hgrid.getDepth()+1;
int spacerWidth = _getSpacerWidth();
@@ -203,31 +208,31 @@
"position:relative;top:0px;left:0px;margin-left:"+
depth * spacerWidth + "px", null);
}
-
- Icon icon = _getIcon(arc, isTop, disabled);
-
+
+ Icon icon = _getIcon(rc, isTop, disabled);
+
if (icon != null)
{
writer.startElement(XhtmlConstants.LINK_ELEMENT, null);
- String shortDesc =
- arc.getTranslatedString(isTop ? _PREVIOUS_ALT_KEY : _NEXT_ALT_KEY);
-
+ String shortDesc =
+ rc.getTranslatedString(isTop ? _PREVIOUS_ALT_KEY : _NEXT_ALT_KEY);
+
if (!disabled)
{
writer.writeURIAttribute(XhtmlConstants.HREF_ATTRIBUTE, "#", null);
writer.writeAttribute(XhtmlConstants.ONCLICK_ATTRIBUTE, onclick, null);
writer.writeAttribute("title", shortDesc, null);
- }
-
- String align = OutputUtils.getMiddleIconAlignment(arc);
- OutputUtils.renderIcon(context, arc, icon, shortDesc, align);
-
+ }
+
+ String align = OutputUtils.getMiddleIconAlignment(rc);
+ OutputUtils.renderIcon(context, rc, icon, shortDesc, align);
+
writer.endElement(XhtmlConstants.LINK_ELEMENT);
}
-
+
writer.startElement(XhtmlConstants.LINK_ELEMENT, null);
-
+
final String styleClass;
if (disabled)
{
@@ -238,22 +243,22 @@
styleClass = SkinSelectors.HGRID_NAV_ROW_ALINK_STYLE_CLASS;
writer.writeURIAttribute(XhtmlConstants.HREF_ATTRIBUTE, "#", null);
writer.writeAttribute(XhtmlConstants.ONCLICK_ATTRIBUTE, onclick, null);
- String shortDesc =
- arc.getTranslatedString(isTop ? _PREVIOUS_ALT_KEY : _NEXT_ALT_KEY);
+ String shortDesc =
+ rc.getTranslatedString(isTop ? _PREVIOUS_ALT_KEY : _NEXT_ALT_KEY);
writer.writeAttribute("title", shortDesc, null);
- }
-
- renderStyleClass(context, arc, styleClass);
+ }
+
+ renderStyleClass(context, rc, styleClass);
if (text != null)
writer.writeText(text, null);
writer.endElement(XhtmlConstants.LINK_ELEMENT);
-
+
writer.endElement("div");
writer.endElement(XhtmlConstants.TABLE_DATA_ELEMENT);
}
private Icon _getIcon(
- RenderingContext arc,
+ RenderingContext rc,
boolean isTop,
boolean isDisabled
)
@@ -272,8 +277,8 @@
? SkinSelectors.AF_TREE_TABLE_DISABLED_NAV_DOWN_ICON_NAME
: SkinSelectors.AF_TREE_TABLE_NAV_DOWN_ICON_NAME;
}
-
- return arc.getIcon(iconKey);
+
+ return rc.getIcon(iconKey);
}
private int _getSpacerWidth()
@@ -310,5 +315,5 @@
"af_treeTable.NAV_CELL_FORMAT_T_NC_private";
private static final String _FORMAT_KEY_NTNC =
"af_treeTable.NAV_CELL_FORMAT_NT_NC_private";
-
+
}
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/CellFormatRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/CellFormatRenderer.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/CellFormatRenderer.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/CellFormatRenderer.java Thu Dec 10 17:46:13 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,8 +20,6 @@
import java.io.IOException;
-import java.util.List;
-
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -29,21 +27,20 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.html.HtmlCellFormat;
-
import org.apache.myfaces.trinidad.context.RenderingContext;
-
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
+
public class CellFormatRenderer extends XhtmlRenderer
{
public CellFormatRenderer()
{
super(HtmlCellFormat.TYPE);
}
-
+
@Override
- protected void findTypeConstants(FacesBean.Type type)
+ protected void findTypeConstants(
+ FacesBean.Type type)
{
super.findTypeConstants(type);
_widthKey = type.findKey("width");
@@ -66,34 +63,35 @@
@Override
protected void encodeAll(
- FacesContext context,
- RenderingContext arc,
- UIComponent component,
- FacesBean bean) throws IOException
+ FacesContext context,
+ RenderingContext rc,
+ UIComponent component,
+ FacesBean bean
+ ) throws IOException
{
ResponseWriter rw = context.getResponseWriter();
- String element = isHeader(bean) ? "th" : "td";
+ String element = isHeader(component, bean) ? "th" : "td";
rw.startElement(element, component);
renderId(context, component);
- renderAllAttributes(context, arc, bean);
- renderHAlign(context, arc, getHalign(bean));
- rw.writeAttribute("valign", getValign(bean), "valign");
- rw.writeAttribute("abbr", getShortText(bean), "shortText");
- rw.writeAttribute("headers", getHeaders(bean), "headers");
- rw.writeAttribute("width", getWidth(bean), "width");
- rw.writeAttribute("height", getHeight(bean), "height");
-
- int colspan = getColumnSpan(bean);
+ renderAllAttributes(context, rc, component, bean);
+ renderHAlign(context, rc, getHalign(component, bean));
+ rw.writeAttribute("valign", getValign(component, bean), "valign");
+ rw.writeAttribute("abbr", getShortText(component, bean), "shortText");
+ rw.writeAttribute("headers", getHeaders(component, bean), "headers");
+ rw.writeAttribute("width", getWidth(component, bean), "width");
+ rw.writeAttribute("height", getHeight(component, bean), "height");
+
+ int colspan = getColumnSpan(component, bean);
if (colspan > 1)
rw.writeAttribute("colspan", colspan, "columnSpan");
- int rowspan = getRowSpan(bean);
+ int rowspan = getRowSpan(component, bean);
if (rowspan > 1)
rw.writeAttribute("rowspan", rowspan, "rowSpan");
- if (isWrappingDisabled(bean))
+ if (isWrappingDisabled(component, bean))
{
// On PDA browser where the width is limited, nowrap will not be set.
- if (isDesktop(arc))
+ if (isDesktop(rc))
{
rw.writeAttribute("nowrap", Boolean.TRUE, "wrappingDisabled");
}
@@ -104,37 +102,51 @@
rw.endElement(element);
}
- protected Object getWidth(FacesBean bean)
+ protected Object getWidth(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_widthKey);
}
- protected Object getHeight(FacesBean bean)
+ protected Object getHeight(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_heightKey);
}
- protected Object getHalign(FacesBean bean)
+ protected Object getHalign(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_halignKey);
}
- protected Object getValign(FacesBean bean)
+ protected Object getValign(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_valignKey);
}
- protected boolean isWrappingDisabled(FacesBean bean)
+ protected boolean isWrappingDisabled(
+ UIComponent component,
+ FacesBean bean)
{
return Boolean.TRUE.equals(bean.getProperty(_wrappingDisabledKey));
}
- protected Object getShortText(FacesBean bean)
+ protected Object getShortText(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_shortTextKey);
}
- protected int getColumnSpan(FacesBean bean)
+ protected int getColumnSpan(
+ UIComponent component,
+ FacesBean bean)
{
Object o = bean.getProperty(_columnSpanKey);
if (o == null)
@@ -143,7 +155,9 @@
return toInt(o);
}
- protected int getRowSpan(FacesBean bean)
+ protected int getRowSpan(
+ UIComponent component,
+ FacesBean bean)
{
Object o = bean.getProperty(_rowSpanKey);
if (o == null)
@@ -152,17 +166,20 @@
return toInt(o);
}
- protected Object getHeaders(FacesBean bean)
+ protected Object getHeaders(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_headersKey);
}
- protected boolean isHeader(FacesBean bean)
+ protected boolean isHeader(
+ UIComponent component,
+ FacesBean bean)
{
return Boolean.TRUE.equals(bean.getProperty(_headerKey));
}
-
private PropertyKey _widthKey;
private PropertyKey _heightKey;
private PropertyKey _halignKey;
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/RowLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/RowLayoutRenderer.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/RowLayoutRenderer.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/RowLayoutRenderer.java Thu Dec 10 17:46:13 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,8 +20,6 @@
import java.io.IOException;
-import java.util.List;
-
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -31,22 +29,22 @@
import org.apache.myfaces.trinidad.component.html.HtmlCellFormat;
import org.apache.myfaces.trinidad.component.html.HtmlRowLayout;
import org.apache.myfaces.trinidad.component.html.HtmlTableLayout;
-
import org.apache.myfaces.trinidad.context.RenderingContext;
-
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
+
public class RowLayoutRenderer extends XhtmlRenderer
{
public RowLayoutRenderer()
{
super(HtmlRowLayout.TYPE);
}
-
+
@Override
- protected void findTypeConstants(FacesBean.Type type)
+ protected void findTypeConstants(
+ FacesBean.Type type)
{
super.findTypeConstants(type);
_widthKey = type.findKey("width");
@@ -62,26 +60,24 @@
@Override
protected void encodeAll(
- FacesContext context,
- RenderingContext arc,
- UIComponent component,
- FacesBean bean) throws IOException
+ FacesContext context,
+ RenderingContext rc,
+ UIComponent component,
+ FacesBean bean
+ ) throws IOException
{
ResponseWriter rw = context.getResponseWriter();
boolean needsTable = _shouldRenderTable(component);
rw.startElement(needsTable ? "table" : "tr", component);
renderId(context, component);
- renderAllAttributes(context, arc, bean);
- renderHAlign(context, arc, getHalign(bean));
- rw.writeAttribute("valign", getValign(bean), "valign");
-
+ renderAllAttributes(context, rc, component, bean);
+ renderHAlign(context, rc, getHalign(component, bean));
+ rw.writeAttribute("valign", getValign(component, bean), "valign");
+
if (needsTable)
{
- OutputUtils.renderLayoutTableAttributes(context,
- arc,
- 0,
- getWidth(bean));
+ OutputUtils.renderLayoutTableAttributes(context, rc, 0, getWidth(component, bean));
rw.startElement("tr", null);
}
@@ -90,10 +86,11 @@
rw.endElement("tr");
if (needsTable)
rw.endElement("table");
-
+
}
- static private boolean _shouldRenderTable(UIComponent component)
+ static private boolean _shouldRenderTable(
+ UIComponent component)
{
UIComponent parent = XhtmlUtils.getStructuralParent(component);
return !(parent instanceof HtmlTableLayout);
@@ -102,7 +99,8 @@
@Override
protected void encodeChild(
FacesContext context,
- UIComponent child) throws IOException
+ UIComponent child
+ ) throws IOException
{
// TODO: handle cellFormat that is inside of (for example) an iterator
if (child instanceof HtmlCellFormat)
@@ -118,17 +116,23 @@
}
}
- protected Object getWidth(FacesBean bean)
+ protected Object getWidth(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_widthKey);
}
- protected Object getHalign(FacesBean bean)
+ protected Object getHalign(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_halignKey);
}
- protected Object getValign(FacesBean bean)
+ protected Object getValign(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_valignKey);
}
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/ScriptRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/ScriptRenderer.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/ScriptRenderer.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/ScriptRenderer.java Thu Dec 10 17:46:13 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,8 +20,6 @@
import java.io.IOException;
-import java.util.List;
-
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -29,20 +27,20 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.html.HtmlScript;
-
import org.apache.myfaces.trinidad.context.RenderingContext;
-
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
+
public class ScriptRenderer extends XhtmlRenderer
{
public ScriptRenderer()
{
super(HtmlScript.TYPE);
}
-
+
@Override
- protected void findTypeConstants(FacesBean.Type type)
+ protected void findTypeConstants(
+ FacesBean.Type type)
{
super.findTypeConstants(type);
_textKey = type.findKey("text");
@@ -70,13 +68,13 @@
// TODO: should we render language="javascript"? The
// old renderer did
renderScriptTypeAttribute(context, arc);
- if (!getGeneratesContent(bean))
+ if (!getGeneratesContent(component, bean))
{
renderScriptDeferAttribute(context, arc);
}
- String source = getSource(context, bean);
- String text = getText(bean);
+ String source = getSource(context, component, bean);
+ String text = getText(component, bean);
if (source != null)
{
renderEncodedResourceURI(context, "src", source);
@@ -99,7 +97,7 @@
{
rw.startElement("script", component);
renderScriptTypeAttribute(context, arc);
- if (!getGeneratesContent(bean))
+ if (!getGeneratesContent(component, bean))
{
renderScriptDeferAttribute(context, arc);
}
@@ -109,22 +107,29 @@
}
}
- protected String getSource(FacesContext context, FacesBean bean)
+ protected String getSource(
+ FacesContext context,
+ UIComponent component,
+ FacesBean bean)
{
return toResourceUri(context, bean.getProperty(_sourceKey));
}
- protected String getText(FacesBean bean)
+ protected String getText(
+ UIComponent component,
+ FacesBean bean)
{
return toString(bean.getProperty(_textKey));
}
- protected boolean getGeneratesContent(FacesBean bean)
+ protected boolean getGeneratesContent(
+ UIComponent component,
+ FacesBean bean)
{
Object o = bean.getProperty(_generatesContentKey);
if (o == null)
o = _generatesContentKey.getDefault();
-
+
// TODO: change the default, as very few scripts actually
// write content
return Boolean.TRUE.equals(o);
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/TableLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/TableLayoutRenderer.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/TableLayoutRenderer.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/TableLayoutRenderer.java Thu Dec 10 17:46:13 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,8 +20,6 @@
import java.io.IOException;
-import java.util.List;
-
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -29,21 +27,21 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.html.HtmlTableLayout;
-
import org.apache.myfaces.trinidad.context.RenderingContext;
-
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
+
public class TableLayoutRenderer extends XhtmlRenderer
{
public TableLayoutRenderer()
{
super(HtmlTableLayout.TYPE);
}
-
+
@Override
- protected void findTypeConstants(FacesBean.Type type)
+ protected void findTypeConstants(
+ FacesBean.Type type)
{
super.findTypeConstants(type);
_widthKey = type.findKey("width");
@@ -62,44 +60,45 @@
@Override
protected void encodeAll(
- FacesContext context,
- RenderingContext arc,
- UIComponent component,
- FacesBean bean) throws IOException
+ FacesContext context,
+ RenderingContext rc,
+ UIComponent component,
+ FacesBean bean
+ ) throws IOException
{
ResponseWriter rw = context.getResponseWriter();
rw.startElement("table", component);
renderId(context, component);
- renderAllAttributes(context, arc, bean);
- renderHAlign(context, arc, getHalign(bean));
+ renderAllAttributes(context, rc, component, bean);
+ renderHAlign(context, rc, getHalign(component, bean));
// TODO: if TABLES_CAP_ADVANCED and TABLES_CAP_ADVANCED_ATTRS
// are both false, don't render cell padding, cell spacing, or border
- OutputUtils.renderDataTableAttributes(context,
- arc,
- getCellPadding(bean),
- getCellSpacing(bean),
- getBorderWidth(bean),
- getWidth(bean),
- getSummary(bean));
-
-
+ OutputUtils.renderDataTableAttributes(context, rc, getCellPadding(component, bean),
+ getCellSpacing(component, bean), getBorderWidth(component, bean),
+ getWidth(component, bean), getSummary(component, bean));
encodeAllChildren(context, component);
rw.endElement("table");
}
- protected Object getWidth(FacesBean bean)
+ protected Object getWidth(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_widthKey);
}
- protected Object getHalign(FacesBean bean)
+ protected Object getHalign(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_halignKey);
}
- protected Object getCellSpacing(FacesBean bean)
+ protected Object getCellSpacing(
+ UIComponent component,
+ FacesBean bean)
{
Object o = bean.getProperty(_cellSpacingKey);
if (o == null)
@@ -107,7 +106,9 @@
return o;
}
- protected Object getCellPadding(FacesBean bean)
+ protected Object getCellPadding(
+ UIComponent component,
+ FacesBean bean)
{
Object o = bean.getProperty(_cellPaddingKey);
if (o == null)
@@ -115,7 +116,9 @@
return o;
}
- protected Object getBorderWidth(FacesBean bean)
+ protected Object getBorderWidth(
+ UIComponent component,
+ FacesBean bean)
{
Object o = bean.getProperty(_borderWidthKey);
if (o == null)
@@ -123,7 +126,9 @@
return o;
}
- protected Object getSummary(FacesBean bean)
+ protected Object getSummary(
+ UIComponent component,
+ FacesBean bean)
{
Object o = bean.getProperty(_summaryKey);
// Because table layout is for layout, default to an empty
@@ -133,7 +138,6 @@
return o;
}
-
private PropertyKey _widthKey;
private PropertyKey _halignKey;
private PropertyKey _cellSpacingKey;
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java Thu Dec 10 17:46:13 2009
@@ -19,17 +19,21 @@
package org.apache.myfaces.trinidadinternal.renderkit.htmlBasic;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
+import javax.faces.component.behavior.ClientBehavior;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
+
/**
* Implementation of FacesBean that purely passes through
* back to a UIComponent. This exists so that we can
@@ -131,7 +135,6 @@
throw new UnsupportedOperationException();
}
-
final public Set<PropertyKey> keySet()
{
throw new UnsupportedOperationException();
@@ -167,5 +170,15 @@
throw new UnsupportedOperationException();
}
+ public void addClientBehavior(String eventName, ClientBehavior behavior)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Map<String, List<ClientBehavior>> getClientBehaviors()
+ {
+ throw new UnsupportedOperationException();
+ }
+
private final UIComponent _component;
}
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandLinkRenderer.java Thu Dec 10 17:46:13 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,6 +19,7 @@
package org.apache.myfaces.trinidadinternal.renderkit.htmlBasic;
import java.io.IOException;
+
import java.util.List;
import javax.faces.component.UIComponent;
@@ -27,9 +28,9 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.render.RenderUtils;
-
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.CommandLinkRenderer;
+
/**
* Renderer for h:commandLink.
* <p>
@@ -81,38 +82,48 @@
return new CommandLinkRenderer()
{
@Override
- public FacesBean getFacesBean(UIComponent comp)
+ public FacesBean getFacesBean(
+ UIComponent comp)
{
return bean;
}
@Override
- protected String getText(FacesBean bean)
+ protected String getText(
+ UIComponent component,
+ FacesBean bean)
{
return toString(component.getAttributes().get("value"));
}
@Override
- protected String getShortDesc(FacesBean bean)
+ protected String getShortDesc(
+ UIComponent component,
+ FacesBean bean)
{
return toString(component.getAttributes().get("title"));
}
@Override
- protected char getAccessKey(FacesBean bean)
+ protected char getAccessKey(
+ UIComponent component,
+ FacesBean bean)
{
return toChar(component.getAttributes().get("accesskey"));
}
@Override
- protected String getInlineStyle(FacesBean bean)
+ protected String getInlineStyle(
+ UIComponent component,
+ FacesBean bean)
{
return toString(component.getAttributes().get("style"));
}
-
@Override
- protected boolean getDisabled(FacesBean bean)
+ protected boolean getDisabled(
+ UIComponent component,
+ FacesBean bean)
{
return Boolean.TRUE.equals(component.getAttributes().get("disabled"));
}
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlFormRenderer.java Thu Dec 10 17:46:13 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,6 +19,7 @@
package org.apache.myfaces.trinidadinternal.renderkit.htmlBasic;
import java.io.IOException;
+
import java.util.Map;
import javax.faces.component.UIComponent;
@@ -26,9 +27,9 @@
import javax.faces.render.Renderer;
import org.apache.myfaces.trinidad.bean.FacesBean;
-
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
+
/**
* Renderer for h:commandLink.
* <p>
@@ -69,32 +70,41 @@
return new FormRenderer()
{
@Override
- public FacesBean getFacesBean(UIComponent comp)
+ public FacesBean getFacesBean(
+ UIComponent comp)
{
return bean;
}
@Override
- protected String getInlineStyle(FacesBean bean)
+ protected String getInlineStyle(
+ UIComponent component,
+ FacesBean bean)
{
return toString(component.getAttributes().get("style"));
}
@Override
- protected String getTargetFrame(FacesBean bean)
+ protected String getTargetFrame(
+ UIComponent component,
+ FacesBean bean)
{
return toString(component.getAttributes().get("target"));
}
@Override
- protected String getShortDesc(FacesBean bean)
+ protected String getShortDesc(
+ UIComponent component,
+ FacesBean bean)
{
return toString(component.getAttributes().get("title"));
}
@SuppressWarnings("unchecked")
@Override
- protected boolean getUsesUpload(FacesBean bean)
+ protected boolean getUsesUpload(
+ UIComponent component,
+ FacesBean bean)
{
Map<String, Object> attrs = component.getAttributes();
return "multipart/form-data".equals(attrs.get("enctype"));
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java Thu Dec 10 17:46:13 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,21 +19,22 @@
package org.apache.myfaces.trinidadinternal.renderkit;
import java.io.IOException;
-import javax.faces.render.Renderer;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.convert.Converter;
import javax.faces.el.ValueBinding;
+import javax.faces.render.Renderer;
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.UIXComponent;
import org.apache.myfaces.trinidad.component.core.output.CoreOutputText;
import org.apache.myfaces.trinidad.context.RequestContext;
-
import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
+
public class FastRenderer2 extends Renderer
{
public FastRenderer2()
@@ -60,47 +61,51 @@
}
@Override
- public void encodeBegin(FacesContext context,
- UIComponent comp) throws IOException
+ public void encodeBegin(
+ FacesContext context,
+ UIComponent comp
+ ) throws IOException
{
RequestContext.getCurrentInstance();
FacesBean bean = ((UIXComponent) comp).getFacesBean();
- if (getEscape(bean))
+ if (getEscape(comp, bean))
{
ResponseWriter rw = context.getResponseWriter();
rw.startElement("span", comp);
-
+
rw.writeAttribute("id", comp.getId(), "id");
- rw.writeAttribute("title", getShortDesc(bean), "shortDesc");
- rw.writeAttribute("class", getStyleClass(bean), "styleClass");
- rw.writeAttribute("style", getInlineStyle(bean), "inlineStyle");
- rw.writeAttribute("onclick", getOnclick(bean), null);
- rw.writeAttribute("ondblclick", getOndblclick(bean), null);
- rw.writeAttribute("onkeydown", getOnkeydown(bean), null);
- rw.writeAttribute("onkeyup", getOnkeyup(bean), null);
- rw.writeAttribute("onkeypress", getOnkeypress(bean), null);
- rw.writeAttribute("onmousedown", getOnmousedown(bean), null);
- rw.writeAttribute("onmousemove", getOnmousemove(bean), null);
- rw.writeAttribute("onmouseout", getOnmouseout(bean), null);
- rw.writeAttribute("onmouseover", getOnmouseover(bean), null);
- rw.writeAttribute("onmouseup", getOnmouseup(bean), null);
+ rw.writeAttribute("title", getShortDesc(comp, bean), "shortDesc");
+ rw.writeAttribute("class", getStyleClass(comp, bean), "styleClass");
+ rw.writeAttribute("style", getInlineStyle(comp, bean), "inlineStyle");
+ rw.writeAttribute("onclick", getOnclick(comp, bean), null);
+ rw.writeAttribute("ondblclick", getOndblclick(comp, bean), null);
+ rw.writeAttribute("onkeydown", getOnkeydown(comp, bean), null);
+ rw.writeAttribute("onkeyup", getOnkeyup(comp, bean), null);
+ rw.writeAttribute("onkeypress", getOnkeypress(comp, bean), null);
+ rw.writeAttribute("onmousedown", getOnmousedown(comp, bean), null);
+ rw.writeAttribute("onmousemove", getOnmousemove(comp, bean), null);
+ rw.writeAttribute("onmouseout", getOnmouseout(comp, bean), null);
+ rw.writeAttribute("onmouseover", getOnmouseover(comp, bean), null);
+ rw.writeAttribute("onmouseup", getOnmouseup(comp, bean), null);
}
}
@Override
- public void encodeEnd(FacesContext context,
- UIComponent comp) throws IOException
+ public void encodeEnd(
+ FacesContext context,
+ UIComponent comp
+ ) throws IOException
{
RequestContext.getCurrentInstance();
ResponseWriter rw = context.getResponseWriter();
FacesBean bean = ((UIXComponent) comp).getFacesBean();
Object value = getConvertedValue(context, comp, bean);
- if (getEscape(bean))
+ if (getEscape(comp, bean))
{
if (value != null)
{
- int truncateAt = getTruncateAt(bean);
+ int truncateAt = getTruncateAt(comp, bean);
if (truncateAt > 0)
{
String valueStr = value.toString();
@@ -109,11 +114,11 @@
if (valueStr.length() > truncateAt)
value = valueStr.substring(0, truncateAt);
}
-
+
rw.writeText(value, "value");
}
- Object description = getDescription(bean);
+ Object description = getDescription(comp, bean);
if (description != null)
{
rw.startElement("span", null);
@@ -136,11 +141,11 @@
UIComponent component,
FacesBean bean)
{
- Object value = getValue(bean);
+ Object value = getValue(component, bean);
if (value == null)
return null;
- Converter converter = getConverter(bean);
+ Converter converter = getConverter(component, bean);
if ((converter == null) && !(value instanceof String))
{
converter = getConverterByType(context, bean);
@@ -166,7 +171,9 @@
return ConverterUtils.createConverter(context, type);
}
- protected boolean getEscape(FacesBean bean)
+ protected boolean getEscape(
+ UIComponent component,
+ FacesBean bean)
{
Object o = bean.getProperty(_escapeKey);
if (o == null)
@@ -175,98 +182,130 @@
return !Boolean.FALSE.equals(o);
}
- protected Object getShortDesc(FacesBean bean)
+ protected Object getShortDesc(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_shortDescKey);
}
- protected Object getStyleClass(FacesBean bean)
+ protected Object getStyleClass(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_styleClassKey);
}
- protected Object getInlineStyle(FacesBean bean)
+ protected Object getInlineStyle(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_inlineStyleKey);
}
- protected Object getOnclick(FacesBean bean)
+ protected Object getOnclick(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_onclickKey);
}
- protected Object getOndblclick(FacesBean bean)
+ protected Object getOndblclick(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_ondblclickKey);
}
- protected Object getOnkeydown(FacesBean bean)
+ protected Object getOnkeydown(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_onkeydownKey);
}
- protected Object getOnkeyup(FacesBean bean)
+ protected Object getOnkeyup(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_onkeyupKey);
}
- protected Object getOnkeypress(FacesBean bean)
+ protected Object getOnkeypress(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_onkeypressKey);
}
- protected Object getOnmousedown(FacesBean bean)
+ protected Object getOnmousedown(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_onmousedownKey);
}
- protected Object getOnmousemove(FacesBean bean)
+ protected Object getOnmousemove(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_onmousemoveKey);
}
- protected Object getOnmouseout(FacesBean bean)
+ protected Object getOnmouseout(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_onmouseoutKey);
}
- protected Object getOnmouseover(FacesBean bean)
+ protected Object getOnmouseover(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_onmouseoverKey);
}
- protected Object getOnmouseup(FacesBean bean)
+ protected Object getOnmouseup(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_onmouseupKey);
}
- protected int getTruncateAt(FacesBean bean)
+ protected int getTruncateAt(
+ UIComponent component,
+ FacesBean bean)
{
Object o = bean.getProperty(_truncateAtKey);
if (o == null)
o = _truncateAtKey.getDefault();
-
+
assert(o != null);
return ((Number) o).intValue();
}
- protected Object getDescription(FacesBean bean)
+ protected Object getDescription(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_descriptionKey);
}
- protected Object getValue(FacesBean bean)
+ protected Object getValue(
+ UIComponent component,
+ FacesBean bean)
{
return bean.getProperty(_valueKey);
}
-
- protected Converter getConverter(FacesBean bean)
+ protected Converter getConverter(
+ UIComponent component,
+ FacesBean bean)
{
return (Converter) bean.getProperty(_converterKey);
}
-
private PropertyKey _shortDescKey;
private PropertyKey _styleClassKey;
private PropertyKey _inlineStyleKey;
Modified: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java?rev=889345&r1=889344&r2=889345&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java (original)
+++ myfaces/trinidad/branches/ar_clientBehaviors/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java Thu Dec 10 17:46:13 2009
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,6 +19,7 @@
package org.apache.myfaces.trinidadinternal.renderkit;
import java.awt.Color;
+
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -27,33 +28,30 @@
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
+
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.faces.event.PhaseId;
import org.apache.myfaces.trinidad.change.ChangeManager;
-import org.apache.myfaces.trinidad.config.RegionManager;
-
import org.apache.myfaces.trinidad.component.visit.VisitContext;
import org.apache.myfaces.trinidad.component.visit.VisitHint;
-
-
+import org.apache.myfaces.trinidad.config.RegionManager;
import org.apache.myfaces.trinidad.context.AccessibilityProfile;
-import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.context.Agent;
-import org.apache.myfaces.trinidad.context.PageResolver;
-import org.apache.myfaces.trinidad.context.PageFlowScopeProvider;
import org.apache.myfaces.trinidad.context.DialogService;
-
+import org.apache.myfaces.trinidad.context.PageFlowScopeProvider;
+import org.apache.myfaces.trinidad.context.PageResolver;
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.webapp.UploadedFileProcessor;
-
+import org.apache.myfaces.trinidadinternal.context.MVisitContextFactory;
import org.apache.myfaces.trinidadinternal.context.PageFlowScopeProviderImpl;
import org.apache.myfaces.trinidadinternal.context.PageResolverDefaultImpl;
+
public class MRequestContext extends RequestContext
{
-
public MRequestContext()
{
attach();
@@ -99,7 +97,7 @@
@Override
public void returnFromDialog(
- Object returnValue,
+ Object returnValue,
Map<Object, Object> returnParam)
{
throw new UnsupportedOperationException("Should not be called during rendering");
@@ -107,10 +105,10 @@
@Override
public void launchDialog(
- UIViewRoot dialogRoot,
- Map<String, Object> dialogParameters,
- UIComponent source,
- boolean useWindow,
+ UIViewRoot dialogRoot,
+ Map<String, Object> dialogParameters,
+ UIComponent source,
+ boolean useWindow,
Map<String, Object> windowProperties)
{
throw new UnsupportedOperationException("Should not be called during rendering");
@@ -121,7 +119,7 @@
{
return false;
}
-
+
@Override
public boolean isPartialRequest(FacesContext context)
{
@@ -304,14 +302,14 @@
{
// throw new UnsupportedOperationException("Not implemented yet");
}
-
+
/**
* @see org.apache.myfaces.trinidad.context.RequestContext#addPartialTargets(javax.faces.component.UIComponent, java.lang.String[])
*/
@Override
public void addPartialTargets(UIComponent from, String... targets)
{
-
+
}
@Override
@@ -382,7 +380,7 @@
Set<VisitHint> hints,
PhaseId phaseId)
{
- throw new UnsupportedOperationException("Not implemented yet");
+ return MVisitContextFactory.createVisitContext(context, ids, hints, phaseId);
}
@Override
@@ -440,7 +438,7 @@
static private TimeZone _FIXED_TIME_ZONE =
TimeZone.getTimeZone("America/Los_Angeles");
-
+
static private final String _VIEW_MAP_KEY =
MRequestContext.class.getName() + ".VIEW_MAP";
}
Propchange: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 10 17:46:13 2009
@@ -1,4 +1,6 @@
/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:785365
/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:794062,794792,798299
+/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:888969
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:745675
+/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:888973
Propchange: myfaces/trinidad/branches/ar_clientBehaviors/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 10 17:46:13 2009
@@ -1,4 +1,6 @@
/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:785365
/myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:794062,794792,798299
+/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:888969
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:745675
+/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:888973