Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java Wed Jul 26 23:44:58 2006 @@ -25,7 +25,7 @@ import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils; import org.apache.myfaces.trinidadinternal.util.IntegerUtils; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; import org.apache.myfaces.trinidadinternal.skin.Skin; import org.apache.myfaces.trinidadinternal.skin.icon.Icon; @@ -52,7 +52,7 @@ * Implementation of ElementRenderer.getName(); */ protected String getElementName( - RenderingContext context, + UIXRenderingContext context, UINode node ) { @@ -63,7 +63,7 @@ * Override of BaseRenderer.renderAttributes(). */ protected void renderAttributes( - RenderingContext context, + UIXRenderingContext context, UINode node )throws IOException { @@ -76,7 +76,7 @@ * Override of BaseRenderer.prerender() */ protected void prerender( - RenderingContext context, + UIXRenderingContext context, UINode node ) throws IOException @@ -101,7 +101,7 @@ * Override of BaseRenderer.postrender() */ protected void postrender( - RenderingContext context, + UIXRenderingContext context, UINode node ) throws IOException @@ -125,7 +125,7 @@ // Start the table row with the contents private void _startContentsRow( - RenderingContext context, + UIXRenderingContext context, FacesContext fContext, AdfRenderingContext arc, IconData icons, @@ -357,7 +357,7 @@ // Get the IconData to use for rendering this sideBar private IconData _getIconData( - RenderingContext context + UIXRenderingContext context ) { // Check to see whether we have already created
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java Wed Jul 26 23:44:58 2006 @@ -19,7 +19,7 @@ import org.apache.myfaces.trinidad.component.UIXHierarchy; import org.apache.myfaces.trinidad.component.UIXPage; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.PageRendererUtils; @@ -33,7 +33,7 @@ protected UIXHierarchy getHierarchyBase( - RenderingContext context, + UIXRenderingContext context, UINode node ) { @@ -43,7 +43,7 @@ protected UINode getStamp( - RenderingContext context, + UIXRenderingContext context, UINode node ) { @@ -53,7 +53,7 @@ protected boolean setNewPath( - RenderingContext context, + UIXRenderingContext context, UINode node, UIXHierarchy component ) @@ -68,7 +68,7 @@ * indexed children). */ protected boolean isEmpty( - RenderingContext context, + UIXRenderingContext context, UINode node ) { Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java Wed Jul 26 23:44:58 2006 @@ -19,7 +19,7 @@ import org.apache.myfaces.trinidad.component.UIXPage; import org.apache.myfaces.trinidad.component.core.nav.CoreCommandNavigationItem; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.PageRendererUtils; @@ -30,7 +30,7 @@ public class PageMenuButtonsRenderer extends GlobalButtonBarRenderer { protected UIXHierarchy getHierarchyBase( - RenderingContext context, + UIXRenderingContext context, UINode node ) { @@ -39,7 +39,7 @@ } protected UINode getStamp( - RenderingContext context, + UIXRenderingContext context, UINode node ) { @@ -48,7 +48,7 @@ } protected boolean setNewPath( - RenderingContext context, + UIXRenderingContext context, UINode node, UIXHierarchy component ) Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java Wed Jul 26 23:44:58 2006 @@ -22,7 +22,7 @@ import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; /** @@ -44,7 +44,7 @@ * Tests whether the button should be rendered as an image. */ protected boolean doRenderImageContent( - RenderingContext context, + UIXRenderingContext context, UINode node ) { @@ -62,7 +62,7 @@ * button image. */ protected ImageProviderRequest createImageProviderRequest( - RenderingContext context, + UIXRenderingContext context, Object name, Object text, Color foreground, @@ -98,7 +98,7 @@ * button text. */ protected String getServerStyleName( - RenderingContext context, + UIXRenderingContext context, UINode node, boolean disabled ) Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java Wed Jul 26 23:44:58 2006 @@ -22,7 +22,7 @@ import javax.faces.context.ResponseWriter; import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; import org.apache.myfaces.trinidadinternal.skin.Skin; import org.apache.myfaces.trinidadinternal.skin.icon.Icon; @@ -43,7 +43,7 @@ * Implementation of ElementRenderer.getName(); */ protected String getElementName( - RenderingContext context, + UIXRenderingContext context, UINode node ) { @@ -54,7 +54,7 @@ * Returns the sideBar's style class: OraSideBar */ protected Object getStyleClass( - RenderingContext context, + UIXRenderingContext context, UINode node ) { @@ -65,7 +65,7 @@ * Override of BaseRenderer.renderAttributes(). */ protected void renderAttributes( - RenderingContext context, + UIXRenderingContext context, UINode node )throws IOException { @@ -83,7 +83,7 @@ * Override of BaseRenderer.prerender() */ protected void prerender( - RenderingContext context, + UIXRenderingContext context, UINode node ) throws IOException @@ -112,7 +112,7 @@ * Override of BaseRenderer.postrender() */ protected final void postrender( - RenderingContext context, + UIXRenderingContext context, UINode node ) throws IOException @@ -140,7 +140,7 @@ // Start the table row with the contents private void _startContentsRow( - RenderingContext context, + UIXRenderingContext context, UINode node, IconData icons, int columnCount @@ -293,7 +293,7 @@ // Renders the filter named child private void _renderFilterChild( - RenderingContext context, + UIXRenderingContext context, UINode node ) throws IOException { @@ -393,7 +393,7 @@ // Get the IconData to use for rendering this sideBar private IconData _getIconData( - RenderingContext context + UIXRenderingContext context ) { // Check to see whether we have already created Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java Wed Jul 26 23:44:58 2006 @@ -32,7 +32,7 @@ import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest; import org.apache.myfaces.trinidadinternal.image.cache.CompositeButtonKey; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.skin.Skin; import org.apache.myfaces.trinidadinternal.skin.icon.Icon; import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils; @@ -57,7 +57,7 @@ // Otherwise the button is rendered using the base.desktop // button implementation (browser buttons). static public boolean doRenderImageButton( - RenderingContext context + UIXRenderingContext context ) { // First, check the _IMAGE_BUTTON_KEY (or _IMAGE_BUTTON_RTL_KEY if rtl) @@ -138,7 +138,7 @@ // Creates the ImageProviderRequest for the composite button lookup static public ImageProviderRequest createButtonRequest( - RenderingContext context, + UIXRenderingContext context, Object name, Object text, Color foreground, @@ -191,7 +191,7 @@ public Key( FacesContext fContext, AdfRenderingContext arc, - RenderingContext context, + UIXRenderingContext context, String skinId, String name, String text, @@ -292,14 +292,14 @@ return null; } - private RenderingContext _context; + private UIXRenderingContext _context; private AdfRenderingContext _arc; private FacesContext _fContext; } - private static boolean _isRightToLeft(RenderingContext context) + private static boolean _isRightToLeft(UIXRenderingContext context) { LocaleContext lContext = context.getLocaleContext(); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java Wed Jul 26 23:44:58 2006 @@ -22,7 +22,7 @@ import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; /** @@ -38,7 +38,7 @@ * Tests whether the button should be rendered as an image. */ protected boolean doRenderImageContent( - RenderingContext context, + UIXRenderingContext context, UINode node ) { @@ -56,7 +56,7 @@ * button image. */ protected ImageProviderRequest createImageProviderRequest( - RenderingContext context, + UIXRenderingContext context, Object name, Object text, Color foreground, @@ -92,7 +92,7 @@ * button text. */ protected String getServerStyleName( - RenderingContext context, + UIXRenderingContext context, UINode node, boolean disabled ) Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java Wed Jul 26 23:44:58 2006 @@ -18,7 +18,7 @@ import java.io.IOException; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; import org.apache.myfaces.trinidadinternal.skin.Skin; import org.apache.myfaces.trinidadinternal.skin.icon.Icon; @@ -51,7 +51,7 @@ { protected void renderNode( - RenderingContext context, + UIXRenderingContext context, UINode child, boolean selected, boolean isFirst, @@ -102,7 +102,7 @@ * for a background image */ protected void renderTabStyleAttrs( - RenderingContext context, + UIXRenderingContext context, UINode node, boolean selected, boolean disabled @@ -125,7 +125,7 @@ * renderBetweenNodes(). */ protected void renderBetweenNodes( - RenderingContext context, + UIXRenderingContext context, UINode node ) throws IOException { @@ -135,7 +135,7 @@ // Retrieve the Icons used by this globalHeader - private static IconData _getIconData(RenderingContext context) + private static IconData _getIconData(UIXRenderingContext context) { // First check for a local property IconData icons = (IconData)context.getLocalProperty(0, _ICONS_KEY, null); @@ -169,7 +169,7 @@ } // Create the IconData for the specified Skin - private static IconData _createIconData(RenderingContext context) + private static IconData _createIconData(UIXRenderingContext context) { Icon enabledStart = context.getIcon( AF_MENU_TABS_ENABLED_START_ICON_NAME); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java Wed Jul 26 23:44:58 2006 @@ -17,7 +17,7 @@ import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; /** * Utility methods for Renderers which support partial page rendering. @@ -75,7 +75,7 @@ * Returns true if we are performing a partial page render. */ public static boolean isPartialRenderingPass( - RenderingContext context + UIXRenderingContext context ) { return (context.getPartialPageContext() != null); @@ -94,7 +94,7 @@ * (PPR is considered accessible, so we do not check the accessibility mode) */ public static boolean supportsPartialRendering( - RenderingContext context + UIXRenderingContext context ) { @@ -108,7 +108,7 @@ } public static boolean supportsBlocking( - RenderingContext context + UIXRenderingContext context ) { // At the moment we have blocking solved on IE and Mozilla Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/Path.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/Path.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/Path.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/Path.java Wed Jul 26 23:44:58 2006 @@ -15,7 +15,7 @@ */ package org.apache.myfaces.trinidadinternal.ui.path; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; /** @@ -39,7 +39,7 @@ * @param depth the number of steps in the path to follow */ public UINode followPath( - RenderingContext context, + UIXRenderingContext context, UINode from, int start, int depth); @@ -51,7 +51,7 @@ * cannot be followed. * @param from the node to start from */ - public UINode followPath(RenderingContext context, UINode from); + public UINode followPath(UIXRenderingContext context, UINode from); /** Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java Wed Jul 26 23:44:58 2006 @@ -17,7 +17,7 @@ import org.apache.myfaces.trinidadinternal.util.IntegerUtils; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; /** @@ -179,7 +179,7 @@ * will just return <code>from</code> */ public UINode followPath( - RenderingContext context, + UIXRenderingContext context, UINode from, int start, int depth @@ -208,7 +208,7 @@ * @param from the node to start from */ final public UINode followPath( - RenderingContext context, + UIXRenderingContext context, UINode from ) { @@ -294,7 +294,7 @@ } static private UINode _follow( - RenderingContext context, + UIXRenderingContext context, UINode from, Object element ) Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/state/Selection.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/state/Selection.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/state/Selection.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/state/Selection.java Wed Jul 26 23:44:58 2006 @@ -15,7 +15,7 @@ */ package org.apache.myfaces.trinidadinternal.ui.state; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; /** * The Selection interface encapsulates access to one or more selected indicies @@ -36,7 +36,7 @@ * @param index the index to test, pass -1 to ignore this parameter */ public boolean isSelected( - RenderingContext context, + UIXRenderingContext context, Object value, int index); } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java Wed Jul 26 23:44:58 2006 @@ -30,7 +30,7 @@ import org.apache.myfaces.trinidadinternal.share.config.ContextBasedConfiguration; import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext; import org.apache.myfaces.trinidadinternal.share.xml.XMLUtils; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.RootRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UIConstants; import org.apache.myfaces.trinidadinternal.skin.Skin; @@ -52,7 +52,7 @@ * @todo Why are passing a UIComponent? In some places, * we're passing null for the component! */ - static public RenderingContext getRenderingContext( + static public UIXRenderingContext getRenderingContext( FacesContext fContext, UIComponent component) throws IOException { @@ -65,7 +65,7 @@ * @todo Why are passing a UIComponent? In some places, * we're passing null for the component! */ - static public RenderingContext getRenderingContext( + static public UIXRenderingContext getRenderingContext( FacesContext fContext, UIComponent component, boolean createIfNull) throws IOException Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FireActionBoundValue.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FireActionBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FireActionBoundValue.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FireActionBoundValue.java Wed Jul 26 23:44:58 2006 @@ -20,7 +20,7 @@ import javax.faces.component.UIParameter; import javax.faces.context.FacesContext; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.action.FirePartialAction; import org.apache.myfaces.trinidadinternal.ui.collection.Parameter; import org.apache.myfaces.trinidadinternal.ui.data.BoundValue; @@ -64,7 +64,7 @@ _part = part; } - public Object getValue(RenderingContext context) + public Object getValue(UIXRenderingContext context) { FacesContext fContext = (context == null) ? FacesContext.getCurrentInstance() : context.getFacesContext(); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINode.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINode.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINode.java Wed Jul 26 23:44:58 2006 @@ -31,7 +31,7 @@ import org.apache.myfaces.trinidadinternal.ui.AttributeKey; import org.apache.myfaces.trinidadinternal.ui.NodeRole; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UIConstants; import org.apache.myfaces.trinidadinternal.ui.UINode; @@ -86,7 +86,7 @@ return _get(family, rendererType); } - public int getIndexedChildCount(RenderingContext context) + public int getIndexedChildCount(UIXRenderingContext context) { return _component.getChildCount(); } @@ -96,7 +96,7 @@ * @todo can the children UIComponentUINode instances be cached anywhere? * @todo come up with a real namespace/local name for these UINodes */ - public UINode getIndexedChild(RenderingContext context, int childIndex) + public UINode getIndexedChild(UIXRenderingContext context, int childIndex) { UIComponent child = (UIComponent) _component.getChildren().get(childIndex); return __getUINode(child); @@ -106,7 +106,7 @@ * @todo can the children UIComponentUINode instances be cached anywhere? * @todo come up with a real namespace/local name for these UINodes */ - public UINode getNamedChild(RenderingContext context, String childName) + public UINode getNamedChild(UIXRenderingContext context, String childName) { UIComponent child = (UIComponent) _component.getFacet(childName); if (child == null) @@ -116,7 +116,7 @@ } - public Iterator getChildNames(RenderingContext context) + public Iterator getChildNames(UIXRenderingContext context) { if (_component instanceof UIXComponentBase) return ((UIXComponentBase) _component).getFacetNames(); @@ -127,7 +127,7 @@ /** * @todo implement this (if necessary) */ - public Iterator getAttributeNames(RenderingContext context) + public Iterator getAttributeNames(UIXRenderingContext context) { throw new UnsupportedOperationException(); } @@ -142,7 +142,7 @@ } - public Object getAttributeValue(RenderingContext context, AttributeKey attrKey) + public Object getAttributeValue(UIXRenderingContext context, AttributeKey attrKey) { // Note that we do not support BoundValues on generic UIComponents; // this is intentional! @@ -157,7 +157,7 @@ * @todo Any other UIComponent attributes that a parent UINode would care * about? How about SELECTED_ATTR? */ - public Object getRawAttributeValue(RenderingContext context, + public Object getRawAttributeValue(UIXRenderingContext context, AttributeKey attrKey) { // Here, we're concerned not about a Renderer trying to retrieve @@ -173,7 +173,7 @@ /** * Returns the role that this node occupies. */ - public NodeRole getNodeRole(RenderingContext context) + public NodeRole getNodeRole(UIXRenderingContext context) { return UIConstants.UNKNOWN_ROLE; } @@ -243,7 +243,7 @@ } ****/ - public void render(RenderingContext context) + public void render(UIXRenderingContext context) throws IOException { render(context, this); @@ -255,7 +255,7 @@ * integrated our OutputMethod with ResponseWriter (we needed * to get our OutputMethod to close any pending elements. */ - public void render(RenderingContext context, UINode dataNode) + public void render(UIXRenderingContext context, UINode dataNode) throws IOException { // We currently have no acceptable way to deal with "dataNode" @@ -266,7 +266,7 @@ // We need to keep pushing the RenderingContext so that // we properly handle composite rendering. FacesContext fContext = context.getFacesContext(); - RenderingContext oldContext = + UIXRenderingContext oldContext = UINodeRendererBase.__setRenderingContext(fContext, context); _renderComponent(fContext, _component); @@ -350,7 +350,7 @@ public UINode getNamedChild(String name) { throw new UnsupportedOperationException(); } - public Object getAttributeValue(RenderingContext context, String name) { throw new UnsupportedOperationException(); } + public Object getAttributeValue(UIXRenderingContext context, String name) { throw new UnsupportedOperationException(); } private String _namespace; private UIComponent _component; Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINodeList.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINodeList.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINodeList.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIComponentUINodeList.java Wed Jul 26 23:44:58 2006 @@ -19,7 +19,7 @@ import javax.faces.component.UIComponent; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; import org.apache.myfaces.trinidadinternal.ui.collection.UINodeList; @@ -42,12 +42,12 @@ _component = component; } - public int size(RenderingContext context) + public int size(UIXRenderingContext context) { return _component.getChildCount(); } - public UINode getUINode(RenderingContext context, int index) + public UINode getUINode(UIXRenderingContext context, int index) { List children = _component.getChildren(); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java Wed Jul 26 23:44:58 2006 @@ -22,7 +22,7 @@ import javax.faces.render.Renderer; import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; /** * @@ -39,7 +39,7 @@ if (!getRendersChildren()) { UIXComponentUINode adapter = UIXComponentUINode.__getAdapter(component); - RenderingContext rContext = getRenderingContext(context, component); + UIXRenderingContext rContext = getRenderingContext(context, component); adapter.prerenderInternal(rContext, adapter); } } @@ -56,7 +56,7 @@ throws IOException { UIXComponentUINode adapter = UIXComponentUINode.__getAdapter(component); - RenderingContext rContext = getRenderingContext(context, component); + UIXRenderingContext rContext = getRenderingContext(context, component); if (getRendersChildren()) { @@ -77,7 +77,7 @@ /** * Get - and create if necessary - a RenderingContext. */ - static protected RenderingContext getRenderingContext( + static protected UIXRenderingContext getRenderingContext( FacesContext context, UIComponent component) throws IOException { @@ -87,12 +87,12 @@ /** * Get - and create if necessary - a RenderingContext. */ - static protected RenderingContext getRenderingContext( + static protected UIXRenderingContext getRenderingContext( FacesContext context, UIComponent component, boolean createIfNull) throws IOException { - RenderingContext rContext = __getRenderingContext(context); + UIXRenderingContext rContext = __getRenderingContext(context); if (rContext == null && createIfNull) { @@ -105,14 +105,14 @@ } - static RenderingContext __setRenderingContext( + static UIXRenderingContext __setRenderingContext( FacesContext fContext, - RenderingContext rContext) + UIXRenderingContext rContext) { if (rContext == null) throw new NullPointerException(); - RenderingContext oldContext = __getRenderingContext(fContext); + UIXRenderingContext oldContext = __getRenderingContext(fContext); if (oldContext == rContext) return null; @@ -141,15 +141,15 @@ static void __restoreRenderingContext( FacesContext fContext, - RenderingContext rContext) + UIXRenderingContext rContext) { if (rContext != null) fContext.getExternalContext().getRequestMap().put(_CONTEXT_KEY, rContext); } - static RenderingContext __getRenderingContext(FacesContext fContext) + static UIXRenderingContext __getRenderingContext(FacesContext fContext) { - return (RenderingContext) + return (UIXRenderingContext) fContext.getExternalContext().getRequestMap().get(_CONTEXT_KEY); } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIXComponentUINode.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIXComponentUINode.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIXComponentUINode.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UIXComponentUINode.java Wed Jul 26 23:44:58 2006 @@ -30,7 +30,7 @@ import org.apache.myfaces.trinidadinternal.ui.Renderer; import org.apache.myfaces.trinidadinternal.ui.RendererFactory; import org.apache.myfaces.trinidadinternal.ui.RendererManager; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.RoledRenderer; import org.apache.myfaces.trinidadinternal.ui.UIConstants; import org.apache.myfaces.trinidadinternal.ui.UINode; @@ -62,7 +62,7 @@ /** * Returns the role that this node occupies. */ - public NodeRole getNodeRole(RenderingContext context) + public NodeRole getNodeRole(UIXRenderingContext context) { if (context != null) { @@ -82,7 +82,7 @@ return UIConstants.UNKNOWN_ROLE; } - public Iterator getAttributeNames(RenderingContext context) + public Iterator getAttributeNames(UIXRenderingContext context) { AttributeMap attributes = getAttributeMap(false); @@ -132,7 +132,7 @@ * <p> * @see #getAttributeNames */ - public Object getAttributeValue(RenderingContext context, AttributeKey attrKey) + public Object getAttributeValue(UIXRenderingContext context, AttributeKey attrKey) { return getAttributeValueImpl(context, attrKey, true); } @@ -145,13 +145,13 @@ * <p> * @see org.apache.myfaces.trinidadinternal.ui.data.BoundValue */ - public Object getRawAttributeValue(RenderingContext context, AttributeKey attrKey) + public Object getRawAttributeValue(UIXRenderingContext context, AttributeKey attrKey) { return getAttributeValueImpl(context, attrKey, false); } - public void renderInternal(RenderingContext context, UINode dataNode) + public void renderInternal(UIXRenderingContext context, UINode dataNode) throws IOException { Renderer renderer = null; @@ -209,7 +209,7 @@ - public void prerenderInternal(RenderingContext context, UINode dataNode) + public void prerenderInternal(UIXRenderingContext context, UINode dataNode) throws IOException { Renderer renderer = null; @@ -270,7 +270,7 @@ - public void postrenderInternal(RenderingContext context, UINode dataNode) + public void postrenderInternal(UIXRenderingContext context, UINode dataNode) throws IOException { Renderer renderer = null; @@ -347,7 +347,7 @@ throw re; } - private void _logNoRenderer(RenderingContext context) + private void _logNoRenderer(UIXRenderingContext context) { if (_LOG.isWarning()) { @@ -368,7 +368,7 @@ } protected Renderer getRenderer( - RenderingContext context, + UIXRenderingContext context, UINode dataNode ) { @@ -386,7 +386,7 @@ * Bottleneck method for all attribute getting. */ protected Object getAttributeValueImpl( - RenderingContext context, + UIXRenderingContext context, AttributeKey attrKey, boolean returnBoundValue ) Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/ValueBindingBoundValue.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/ValueBindingBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/ValueBindingBoundValue.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/ValueBindingBoundValue.java Wed Jul 26 23:44:58 2006 @@ -18,7 +18,7 @@ import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.data.BoundValue; class ValueBindingBoundValue implements BoundValue @@ -34,7 +34,7 @@ /** * @todo Better way to retrieve FacesContext */ - public Object getValue(RenderingContext rContext) + public Object getValue(UIXRenderingContext rContext) { FacesContext fContext = FacesContext.getCurrentInstance(); return _binding.getValue(fContext); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ClientIdBoundValue.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ClientIdBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ClientIdBoundValue.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ClientIdBoundValue.java Wed Jul 26 23:44:58 2006 @@ -21,7 +21,7 @@ import org.apache.myfaces.trinidad.component.core.output.CoreOutputText; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.data.BoundValue; /** @@ -59,7 +59,7 @@ - public Object getValue(RenderingContext context) + public Object getValue(UIXRenderingContext context) { if (_onlyIfIdSet) { Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java Wed Jul 26 23:44:58 2006 @@ -24,7 +24,7 @@ import org.apache.myfaces.trinidad.component.UIXValue; import org.apache.myfaces.trinidadinternal.convert.ConverterUtils; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.data.BoundValue; @@ -45,7 +45,7 @@ _component = component; } - public Object getValue(RenderingContext context) + public Object getValue(UIXRenderingContext context) { FacesBean bean = _component.getFacesBean(); // Try to get an explicit Converter Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/EntriesBoundValue.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/EntriesBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/EntriesBoundValue.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/EntriesBoundValue.java Wed Jul 26 23:44:58 2006 @@ -18,7 +18,7 @@ import org.apache.myfaces.trinidad.bean.FacesBean; import org.apache.myfaces.trinidad.bean.PropertyKey; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.data.BoundValue; /** @@ -59,7 +59,7 @@ _key = key; } - public Object getValue(RenderingContext context) + public Object getValue(UIXRenderingContext context) { return (_key != null) ? _bean.entries(_key) : null; } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/MenuSelectedValueBoundValue.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/MenuSelectedValueBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/MenuSelectedValueBoundValue.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/MenuSelectedValueBoundValue.java Wed Jul 26 23:44:58 2006 @@ -19,7 +19,7 @@ import org.apache.myfaces.trinidad.component.UIXNavigationHierarchy; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.data.BoundValue; /** @@ -38,7 +38,7 @@ _menuComponent = (UIXNavigationHierarchy)component; } - public Object getValue(RenderingContext context) + public Object getValue(UIXRenderingContext context) { UIComponent stamp = getStamp(_menuComponent); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/PropertyBoundValue.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/PropertyBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/PropertyBoundValue.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/PropertyBoundValue.java Wed Jul 26 23:44:58 2006 @@ -16,7 +16,7 @@ package org.apache.myfaces.trinidadinternal.uinode.bind; import org.apache.myfaces.trinidadinternal.ui.data.BoundValue; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidad.bean.FacesBean; import org.apache.myfaces.trinidad.bean.PropertyKey; @@ -61,7 +61,7 @@ _key = bean.getType().findKey(key.getName()); } - public Object getValue(RenderingContext context) + public Object getValue(UIXRenderingContext context) { return (_key != null) ? _bean.getProperty(_key) : null; } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/RequiredBoundValue.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/RequiredBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/RequiredBoundValue.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/RequiredBoundValue.java Wed Jul 26 23:44:58 2006 @@ -18,7 +18,7 @@ import org.apache.myfaces.trinidad.component.UIXComponent; import org.apache.myfaces.trinidad.component.UIXEditableValue; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UIConstants; import org.apache.myfaces.trinidadinternal.ui.data.BoundValue; @@ -37,7 +37,7 @@ _ev = ev; } - public Object getValue(RenderingContext context) + public Object getValue(UIXRenderingContext context) { Object requiredObject = _ev.getAttributes().get(UIXEditableValue.REQUIRED_KEY); boolean isRequired = Boolean.TRUE.equals(requiredObject); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/URLBoundValue.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/URLBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/URLBoundValue.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/URLBoundValue.java Wed Jul 26 23:44:58 2006 @@ -17,7 +17,7 @@ import javax.faces.context.FacesContext; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.data.BoundValue; @@ -36,7 +36,7 @@ _base = base; } - public Object getValue(RenderingContext context) + public Object getValue(UIXRenderingContext context) { String url = (String) _base.getValue(context); if (url == null) Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandNavigationItemFacesBean.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandNavigationItemFacesBean.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandNavigationItemFacesBean.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/nav/CommandNavigationItemFacesBean.java Wed Jul 26 23:44:58 2006 @@ -17,7 +17,7 @@ import org.apache.myfaces.trinidad.bean.PropertyKey; import org.apache.myfaces.trinidad.component.UIXComponent; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UIConstants; import org.apache.myfaces.trinidadinternal.ui.collection.AttributeMap; import org.apache.myfaces.trinidadinternal.ui.data.BoundValue; Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java?rev=425978&r1=425977&r2=425978&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/MessageUtils.java Wed Jul 26 23:44:58 2006 @@ -27,7 +27,7 @@ import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRendererUtils; import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat; -import org.apache.myfaces.trinidadinternal.ui.RenderingContext; +import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafRenderer; import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils; @@ -105,7 +105,7 @@ } public static String getGlobalMessage( - RenderingContext context, + UIXRenderingContext context, String summary, String detail) {
