Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java Thu Jul 27 00:00:09 2006 @@ -23,7 +23,7 @@ import javax.faces.context.ResponseWriter; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.style.Style; import org.apache.myfaces.trinidadinternal.style.util.StyleUtils; @@ -84,7 +84,7 @@ */ public void renderIcon( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, Map attrs ) throws IOException { @@ -153,7 +153,7 @@ /** * Returns the text to render. */ - protected String getText(AdfRenderingContext arc) + protected String getText(RenderingContext arc) { if ((_rtlText != null) && arc.isRightToLeft() ) return _rtlText;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/URIImageIcon.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/URIImageIcon.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/URIImageIcon.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/URIImageIcon.java Thu Jul 27 00:00:09 2006 @@ -17,7 +17,7 @@ package org.apache.myfaces.trinidadinternal.skin.icon; import javax.faces.context.FacesContext; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.style.Style; /** @@ -100,7 +100,7 @@ */ protected String getBaseURI( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) { return null; } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.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/RootRenderingContext.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java Thu Jul 27 00:00:09 2006 @@ -30,7 +30,7 @@ import org.apache.myfaces.trinidad.logging.TrinidadLogger; -import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext; import org.apache.myfaces.trinidadinternal.share.config.Configuration; import org.apache.myfaces.trinidadinternal.share.config.ContextBasedConfiguration; @@ -94,7 +94,7 @@ fContext.getExternalContext().getRequestContextPath()); setProperty(UIConstants.MARLIN_NAMESPACE, CONTEXT_PATH_PROPERTY, - CoreAdfRenderingContext.getTemporaryDirectory(fContext)); + CoreRenderingContext.getTemporaryDirectory(fContext)); } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.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/action/FirePartialAction.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java Thu Jul 27 00:00:09 2006 @@ -42,7 +42,7 @@ import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafRenderer; import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet; import org.apache.myfaces.trinidadinternal.ui.partial.PartialPageRendererUtils; @@ -520,7 +520,7 @@ protected void outputScriptletContent( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) throws IOException { // Make sure we have a form Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.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/expl/UIFunctions.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java Thu Jul 27 00:00:09 2006 @@ -22,7 +22,7 @@ import javax.faces.context.FacesContext; import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.skin.Skin; @@ -170,7 +170,7 @@ { // Get the Icon from the Skin UIXRenderingContext context = uix.getRenderingContext(); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); Skin skin = context.getSkin(); Icon icon = skin.getIcon(name); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.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/base/desktop/HtmlLafRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java Thu Jul 27 00:00:09 2006 @@ -22,7 +22,7 @@ import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; @@ -193,7 +193,7 @@ // If we have an icon, render it inside of a table cell if (icon != null) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); ResponseWriter writer = context.getResponseWriter(); writer.startElement(TABLE_DATA_ELEMENT, null); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessingRenderer.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/base/desktop/ProcessingRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessingRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessingRenderer.java Thu Jul 27 00:00:09 2006 @@ -25,7 +25,7 @@ import org.apache.myfaces.trinidad.component.UIXProgress; import org.apache.myfaces.trinidad.model.BoundedRangeModel; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils; import org.apache.myfaces.trinidadinternal.skin.icon.Icon; import org.apache.myfaces.trinidadinternal.skin.icon.NullIcon; @@ -111,7 +111,7 @@ if ((determinateIcon != null) && (!determinateIcon.equals(NullIcon.sharedInstance()))) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); OutputUtils.renderIcon(fContext, arc, @@ -145,7 +145,7 @@ if ((indeterminateIcon != null) && (!indeterminateIcon.equals(NullIcon.sharedInstance()))) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); OutputUtils.renderIcon(fContext, arc, Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.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/base/desktop/TreeRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.java Thu Jul 27 00:00:09 2006 @@ -31,7 +31,7 @@ import org.apache.myfaces.trinidad.model.RowKeySet; import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TreeUtils; import org.apache.myfaces.trinidadinternal.ui.NodeUtils; @@ -906,7 +906,7 @@ { if (isScreenReaderMode(context)) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fc = FacesContext.getCurrentInstance(); if(isRightToLeft(context)) { Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/LinkRenderer.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/base/pda/LinkRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/LinkRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/LinkRenderer.java Thu Jul 27 00:00:09 2006 @@ -15,7 +15,7 @@ */ package org.apache.myfaces.trinidadinternal.ui.laf.base.pda; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.LinkUtils; import org.apache.myfaces.trinidadinternal.ui.UINode; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/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/base/pda/MessageBoxRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/MessageBoxRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/MessageBoxRenderer.java Thu Jul 27 00:00:09 2006 @@ -23,7 +23,7 @@ import org.apache.myfaces.trinidad.component.core.output.CoreMessages; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean; @@ -108,7 +108,7 @@ ResponseWriter writer = context.getResponseWriter(); MarlinBean text = new MarlinBean(STYLED_TEXT_NAME); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); icon.renderIcon(fContext, arc, null); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/BreadCrumbsRenderer.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/base/xhtml/BreadCrumbsRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/BreadCrumbsRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/BreadCrumbsRenderer.java Thu Jul 27 00:00:09 2006 @@ -28,7 +28,7 @@ import org.apache.myfaces.trinidad.component.UIXHierarchy; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.skin.icon.Icon; import org.apache.myfaces.trinidadinternal.ui.Renderer; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; @@ -462,7 +462,7 @@ // render the separator if (_separatorIcon != null) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); OutputUtils.renderIcon(fContext, arc, _separatorIcon, "", null); } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormValueRenderer.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/base/xhtml/FormValueRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormValueRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormValueRenderer.java Thu Jul 27 00:00:09 2006 @@ -24,7 +24,7 @@ import org.apache.myfaces.trinidad.logging.TrinidadLogger; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormData; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils; import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters; @@ -120,7 +120,7 @@ String name4 ) { - FormData fd = AdfRenderingContext.getCurrentInstance().getFormData(); + FormData fd = RenderingContext.getCurrentInstance().getFormData(); fd.addNeededValue(name1); if (name2!=null) { @@ -155,7 +155,7 @@ return; } - FormData fd = AdfRenderingContext.getCurrentInstance().getFormData(); + FormData fd = RenderingContext.getCurrentInstance().getFormData(); fd.addRenderedValue(name.toString()); } } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconRenderer.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/base/xhtml/IconRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconRenderer.java Thu Jul 27 00:00:09 2006 @@ -21,7 +21,7 @@ import java.util.Map; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.share.xml.NamespaceURI; import org.apache.myfaces.trinidadinternal.ui.Renderer; @@ -89,7 +89,7 @@ // The span is written out here because the writer needs to see the UIComponent. ResponseWriter writer = context.getResponseWriter(); writer.startElement("span", node.getUIComponent()); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); icon.renderIcon(fContext, arc, _getNodeAttributeMap(context, node)); writer.endElement("span"); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.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/base/xhtml/LinkRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java Thu Jul 27 00:00:09 2006 @@ -20,8 +20,8 @@ import javax.faces.component.UIComponent; import javax.faces.context.ResponseWriter; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; -import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext; import org.apache.myfaces.trinidadinternal.share.url.URLEncoder; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; @@ -124,8 +124,8 @@ UINode node ) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); - boolean isDisabled = ((CoreAdfRenderingContext) arc).isLinkDisabled(); + RenderingContext arc = RenderingContext.getCurrentInstance(); + boolean isDisabled = ((CoreRenderingContext) arc).isLinkDisabled(); boolean disabledAttr = XhtmlLafUtils.getLocalBooleanAttribute(context, node, DISABLED_ATTR, @@ -149,8 +149,8 @@ */ public static void setDisabled(UIXRenderingContext context, boolean isDisabled) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); - ((CoreAdfRenderingContext) arc).setLinkDisabled(isDisabled); + RenderingContext arc = RenderingContext.getCurrentInstance(); + ((CoreRenderingContext) arc).setLinkDisabled(isDisabled); } public static void setSaveModelDisabled(UIXRenderingContext context, boolean isDisabled) Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkUtils.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/base/xhtml/LinkUtils.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkUtils.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkUtils.java Thu Jul 27 00:00:09 2006 @@ -17,8 +17,8 @@ package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; -import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; @@ -103,8 +103,8 @@ */ public static void startDefaultStyleClassDisabled(UIXRenderingContext context) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); - ((CoreAdfRenderingContext) arc).setDefaultLinkStyleDisabled(true); + RenderingContext arc = RenderingContext.getCurrentInstance(); + ((CoreRenderingContext) arc).setDefaultLinkStyleDisabled(true); } /** @@ -113,8 +113,8 @@ */ public static void endDefaultStyleClassDisabled(UIXRenderingContext context) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); - ((CoreAdfRenderingContext) arc).setDefaultLinkStyleDisabled(false); + RenderingContext arc = RenderingContext.getCurrentInstance(); + ((CoreRenderingContext) arc).setDefaultLinkStyleDisabled(false); } /** @@ -123,8 +123,8 @@ */ public static boolean isDefaultStyleClassDisabled(UIXRenderingContext context) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); - return ((CoreAdfRenderingContext) arc).isDefaultLinkStyleDisabled(); + RenderingContext arc = RenderingContext.getCurrentInstance(); + return ((CoreRenderingContext) arc).isDefaultLinkStyleDisabled(); } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.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/base/xhtml/NavigationBarRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java Thu Jul 27 00:00:09 2006 @@ -20,7 +20,7 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.skin.Skin; import org.apache.myfaces.trinidadinternal.util.IntegerUtils; @@ -1812,7 +1812,7 @@ } } Skin skin = context.getSkin(); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); String iconURI = (String)(skin.getIcon( Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationPathRenderer.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/base/xhtml/NavigationPathRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationPathRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationPathRenderer.java Thu Jul 27 00:00:09 2006 @@ -29,8 +29,8 @@ import org.apache.myfaces.trinidad.component.UIXPage; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; -import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils; import org.apache.myfaces.trinidadinternal.ui.Renderer; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; @@ -228,7 +228,7 @@ stamp.render(context); if (isLastChild) - ((CoreAdfRenderingContext) context).setLinkDisabled(false); + ((CoreRenderingContext) context).setLinkDisabled(false); } finally { @@ -396,7 +396,7 @@ // render the separator if (_separatorIcon != null) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); OutputUtils.renderIcon(fContext, arc, _separatorIcon, "", null); } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.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/base/xhtml/ProcessUtils.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java Thu Jul 27 00:00:09 2006 @@ -28,7 +28,7 @@ import org.apache.myfaces.trinidadinternal.ui.UIConstants; import org.apache.myfaces.trinidadinternal.ui.UINode; import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet; import org.apache.myfaces.trinidadinternal.util.IntegerUtils; @@ -442,7 +442,7 @@ protected void outputScriptletContent( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { // We output a function "_navSubmit" (UIX submit a goto event) // which takes the following arguments: @@ -478,7 +478,7 @@ protected void outputScriptletContent( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { ResponseWriter writer = context.getResponseWriter(); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.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/base/xhtml/XhtmlLafUtils.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java Thu Jul 27 00:00:09 2006 @@ -30,7 +30,7 @@ import javax.faces.context.ResponseWriter; import org.apache.myfaces.trinidad.logging.TrinidadLogger; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.AutoSubmitUtils; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils; @@ -841,7 +841,7 @@ ) throws IOException { XhtmlUtils.addLib(context.getFacesContext(), - AdfRenderingContext.getCurrentInstance(), + RenderingContext.getCurrentInstance(), libKey); } @@ -854,7 +854,7 @@ Object libURL) throws IOException { XhtmlUtils.writeLibImport(context.getFacesContext(), - AdfRenderingContext.getCurrentInstance(), + RenderingContext.getCurrentInstance(), libURL); } @@ -978,7 +978,7 @@ boolean embedded ) throws IOException { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); OutputUtils.renderIcon(fContext, arc, icon, shortDesc, align, embedded); } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.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/ContentContainerRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java Thu Jul 27 00:00:09 2006 @@ -25,7 +25,7 @@ import org.apache.myfaces.trinidad.util.ArrayMap; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.util.IntegerUtils; import org.apache.myfaces.trinidad.component.core.layout.CorePanelBox; @@ -212,7 +212,7 @@ assert (text != null); FacesContext fContext = context.getFacesContext(); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); ResponseWriter writer = fContext.getResponseWriter(); @@ -290,7 +290,7 @@ // Use the Icon's height if it is known. If the height isn't, // known, we need to specify some height for IE - otherwise the // image does not show up! - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); Object height = icon.getImageHeight(arc); if (height == null) @@ -308,7 +308,7 @@ int columnCount ) throws IOException { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); // Render the top row if we have the necessary icons if (_hasTopRow(icons, text)) @@ -326,7 +326,7 @@ private void _renderContentsRow( UIXRenderingContext context, FacesContext fContext, - AdfRenderingContext arc, + RenderingContext arc, UINode node, IconData icons, int columnCount @@ -376,7 +376,7 @@ // Renders the bottom row private void _renderBottomRow( FacesContext fContext, - AdfRenderingContext arc, + RenderingContext arc, IconData icons, int columnCount ) throws IOException @@ -428,7 +428,7 @@ // Renders the top row private void _renderTopRow( FacesContext fContext, - AdfRenderingContext arc, + RenderingContext arc, IconData icons, int columnCount ) throws IOException Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.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/GlobalButtonBarRenderer.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.java Thu Jul 27 00:00:09 2006 @@ -21,7 +21,7 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; @@ -68,7 +68,7 @@ // Render the icon FacesContext fContext = context.getFacesContext(); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); OutputUtils.renderIcon(fContext, arc, icon, "", null); writer.endElement(TABLE_DATA_ELEMENT); 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=425980&r1=425979&r2=425980&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 Thu Jul 27 00:00:09 2006 @@ -21,7 +21,7 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils; import org.apache.myfaces.trinidadinternal.util.IntegerUtils; @@ -88,7 +88,7 @@ int columnCount = _getColumnCount(icons); FacesContext fContext = context.getFacesContext(); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); // Render the top row if we have one if (_hasTopRow(icons)) _renderTopRow(fContext, arc, icons, columnCount); @@ -111,7 +111,7 @@ int columnCount = _getColumnCount(icons); FacesContext fContext = context.getFacesContext(); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); // Close up the contents row _endContentsRow(fContext, arc, icons); @@ -127,7 +127,7 @@ private void _startContentsRow( UIXRenderingContext context, FacesContext fContext, - AdfRenderingContext arc, + RenderingContext arc, IconData icons, int columnCount ) throws IOException @@ -155,7 +155,7 @@ // End the table row with the contents private void _endContentsRow( FacesContext fContext, - AdfRenderingContext arc, + RenderingContext arc, IconData icons ) throws IOException { @@ -183,7 +183,7 @@ // Renders the bottom row private void _renderBottomRow( FacesContext fContext, - AdfRenderingContext arc, + RenderingContext arc, IconData icons, int columnCount ) throws IOException @@ -233,7 +233,7 @@ // Renders the top row private void _renderTopRow( FacesContext fContext, - AdfRenderingContext arc, + RenderingContext arc, IconData icons, int columnCount ) throws IOException 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=425980&r1=425979&r2=425980&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 Thu Jul 27 00:00:09 2006 @@ -21,7 +21,7 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; import org.apache.myfaces.trinidadinternal.ui.UINode; import org.apache.myfaces.trinidadinternal.skin.Skin; @@ -98,7 +98,7 @@ int columnCount = _getColumnCount(icons); FacesContext fContext = context.getFacesContext(); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); // Render the top row if we have one if (_hasTopRow(icons)) @@ -122,7 +122,7 @@ int columnCount = _getColumnCount(icons); FacesContext fContext = context.getFacesContext(); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); // Close up the contents row _endContentsRow(fContext, arc, icons); @@ -173,7 +173,7 @@ // End the table row with the contents private void _endContentsRow( FacesContext fContext, - AdfRenderingContext arc, + RenderingContext arc, IconData icons ) throws IOException { @@ -201,7 +201,7 @@ // Renders the bottom row private void _renderBottomRow( FacesContext fContext, - AdfRenderingContext arc, + RenderingContext arc, IconData icons, int columnCount ) throws IOException @@ -251,7 +251,7 @@ // Renders the top row private void _renderTopRow( FacesContext fContext, - AdfRenderingContext arc, + RenderingContext arc, IconData icons, int columnCount ) throws IOException 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=425980&r1=425979&r2=425980&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 Thu Jul 27 00:00:09 2006 @@ -23,7 +23,7 @@ import javax.faces.context.FacesContext; import org.apache.myfaces.trinidad.logging.TrinidadLogger; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.share.io.InputStreamProvider; import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext; @@ -150,7 +150,7 @@ char accessKey ) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); FacesContext fContext = context.getFacesContext(); return new SimpleButtonUtils.Key( fContext, @@ -190,7 +190,7 @@ { public Key( FacesContext fContext, - AdfRenderingContext arc, + RenderingContext arc, UIXRenderingContext context, String skinId, String name, @@ -293,7 +293,7 @@ } private UIXRenderingContext _context; - private AdfRenderingContext _arc; + private RenderingContext _arc; private FacesContext _fContext; } 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=425980&r1=425979&r2=425980&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 Thu Jul 27 00:00:09 2006 @@ -36,7 +36,7 @@ import org.apache.myfaces.trinidadinternal.skin.Skin; import org.apache.myfaces.trinidadinternal.style.StyleContext; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; /** * RenderingContext implementation that supports JSF. @@ -97,7 +97,7 @@ static public PartialPageContext getPartialPageContext(FacesContext fContext) { return (PartialPageContext) - AdfRenderingContext.getCurrentInstance().getPartialPageContext(); + RenderingContext.getCurrentInstance().getPartialPageContext(); } /** @@ -108,7 +108,7 @@ { super(); - _adfRenderingContext = AdfRenderingContext.getCurrentInstance(); + _adfRenderingContext = RenderingContext.getCurrentInstance(); init(fContext); @@ -220,7 +220,7 @@ } } - private AdfRenderingContext _adfRenderingContext; + private RenderingContext _adfRenderingContext; private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(FacesRenderingContext.class); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.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/FormattedTextParser.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java Thu Jul 27 00:00:09 2006 @@ -26,7 +26,7 @@ import org.apache.myfaces.trinidad.logging.TrinidadLogger; import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; /** * Class responsible for performing a very lightweight parse @@ -714,7 +714,7 @@ 11)) return; - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); if (!Boolean.FALSE.equals(arc.getAgent().getCapability( AdfFacesAgent.CAP_NAVIGATION))) context.getResponseWriter().writeURIAttribute("href", href, null); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java?rev=425980&r1=425979&r2=425980&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java Thu Jul 27 00:00:09 2006 @@ -66,7 +66,7 @@ public void encodeEnd(FacesContext context) { context.setResponseWriter(_savedWriter); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); // Our hidden label utility code makes sure it never writes out // the same label twice consecutively - but between batches of
