From adffaces-commits-return-388-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Thu Jul 27 07:01:30 2006 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 66913 invoked from network); 27 Jul 2006 07:01:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Jul 2006 07:01:29 -0000 Received: (qmail 35841 invoked by uid 500); 27 Jul 2006 07:01:28 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 35826 invoked by uid 500); 27 Jul 2006 07:01:27 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 35763 invoked by uid 99); 27 Jul 2006 07:01:27 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jul 2006 00:01:26 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jul 2006 00:01:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 540CB1A9824; Thu, 27 Jul 2006 00:00:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r425980 [4/5] - in /incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/context/ main/java/org/apache/myfaces/trinidadinternal/convert/ main/java/org/apache/... Date: Thu, 27 Jul 2006 07:00:19 -0000 To: adffaces-commits@incubator.apache.org From: matzew@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060727070053.540CB1A9824@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.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/renderkit/core/xhtml/TableRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java Thu Jul 27 00:00:09 2006 @@ -45,7 +45,7 @@ import org.apache.myfaces.trinidad.model.SortCriterion; 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.CoreRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.CellUtils; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.ColumnData; @@ -225,7 +225,7 @@ protected void encodeAll( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, UIComponent component, FacesBean bean) throws IOException { @@ -367,7 +367,7 @@ */ protected void renderTableAttributes( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, UIComponent component, FacesBean bean, Object cellPadding, @@ -390,7 +390,7 @@ */ protected TableRenderingContext createRenderingContext( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, UIComponent component ) { @@ -399,7 +399,7 @@ protected abstract void renderSingleRow( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent component) throws IOException; @@ -412,7 +412,7 @@ */ protected boolean renderTableWithoutColumns( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent component) throws IOException { @@ -458,7 +458,7 @@ */ protected int renderSpecialColumns( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent treeTable, int physicalColumnIndex) @@ -517,7 +517,7 @@ private void _renderDetailColumn( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { UIComponent column = _detailRenderer.getSpecialColumn(); delegateRenderer(context, arc, column, @@ -526,7 +526,7 @@ private void _renderSelectionColumn( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext) throws IOException { Map originalResourceKeyMap = arc.getSkinResourceKeyMap(); @@ -549,7 +549,7 @@ */ protected void renderNavigationHeaderBars( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent component, FacesBean bean) throws IOException @@ -569,7 +569,7 @@ */ private void _renderControlBar( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent component, boolean isUpper) throws IOException @@ -624,7 +624,7 @@ */ protected abstract void renderControlBar( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent component) throws IOException; @@ -636,7 +636,7 @@ */ protected abstract void renderSubControlBar( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent component, boolean isUpper) throws IOException; @@ -650,7 +650,7 @@ */ protected abstract void renderTableContent( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent component) throws IOException; @@ -712,7 +712,7 @@ * @todo reuse these Maps! */ public static void setSelectionResourceKeyMap( - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext) { if (tContext.hasSelection()) @@ -787,7 +787,7 @@ } protected void renderAllAttributes( - FacesContext context, AdfRenderingContext arc, FacesBean bean) + FacesContext context, RenderingContext arc, FacesBean bean) { } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.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/renderkit/core/xhtml/XhtmlFormattedText.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.java Thu Jul 27 00:00:09 2006 @@ -20,7 +20,7 @@ import javax.faces.context.FacesContext; import org.apache.myfaces.trinidadinternal.util.FormattedTextParser; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; /** @@ -108,7 +108,7 @@ // if (XhtmlLafRenderer.supportsStyleAttributes(context)) { XhtmlRenderer.renderStyleClass(context, - AdfRenderingContext.getCurrentInstance(), + RenderingContext.getCurrentInstance(), styleClass); } /*else if (XhtmlLafRenderer.renderStyleElements(context)) Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.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/renderkit/core/xhtml/XhtmlRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java Thu Jul 27 00:00:09 2006 @@ -31,7 +31,7 @@ import org.apache.myfaces.trinidad.render.TypedRenderer; 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.CoreRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext; import org.apache.myfaces.trinidadinternal.util.FormattedTextParser; @@ -90,36 +90,36 @@ // AGENT CAPABILITY CONVENIENCE METHODS // - static public boolean isDesktop(AdfRenderingContext arc) + static public boolean isDesktop(RenderingContext arc) { return (arc.getAgent().getAgentType() == AdfFacesAgent.TYPE_DESKTOP); } - static public boolean isIE(AdfRenderingContext arc) + static public boolean isIE(RenderingContext arc) { return (arc.getAgent().getAgentApplication() == AdfFacesAgent.APPLICATION_IEXPLORER); } - static public boolean isGecko(AdfRenderingContext arc) + static public boolean isGecko(RenderingContext arc) { return (arc.getAgent().getAgentApplication() == AdfFacesAgent.APPLICATION_GECKO); } - static public boolean isInaccessibleMode(AdfRenderingContext arc) + static public boolean isInaccessibleMode(RenderingContext arc) { return (arc.getAccessibilityMode() == - AdfRenderingContext.INACCESSIBLE_MODE); + RenderingContext.INACCESSIBLE_MODE); } - static public boolean isScreenReaderMode(AdfRenderingContext arc) + static public boolean isScreenReaderMode(RenderingContext arc) { return (arc.getAccessibilityMode() == - AdfRenderingContext.SCREEN_READER_MODE); + RenderingContext.SCREEN_READER_MODE); } - static public boolean supportsScripting(AdfRenderingContext arc) + static public boolean supportsScripting(RenderingContext arc) { Object scriptingSpeed = arc.getAgent().getCapability( AdfFacesAgent.CAP_SCRIPTING_SPEED); @@ -128,7 +128,7 @@ (AdfFacesAgent.SCRIPTING_SPEED_CAP_NONE != scriptingSpeed)); } - static public boolean supportsEditing(AdfRenderingContext arc) + static public boolean supportsEditing(RenderingContext arc) { Object cap = arc.getAgent().getCapability( AdfFacesAgent.CAP_EDITING); @@ -144,14 +144,14 @@ * See section 5.18 of xhtml modularization */ public static boolean supportsStyleAttributes( - AdfRenderingContext arc + RenderingContext arc ) { return (arc.getAgent().getCapability(AdfFacesAgent.CAP_STYLE_ATTRIBUTES) != AdfFacesAgent.STYLES_NONE); } - static public boolean supportsNavigation(AdfRenderingContext arc) + static public boolean supportsNavigation(RenderingContext arc) { Object cap = arc.getAgent().getCapability( AdfFacesAgent.CAP_NAVIGATION); @@ -164,14 +164,14 @@ * See section 5.4.1 of xhtml modularization. */ public static boolean supportsTextPresentation( - AdfRenderingContext arc + RenderingContext arc ) { Object cap = arc.getAgent().getCapability( AdfFacesAgent.CAP_TEXT_PRESENTATION); return !Boolean.FALSE.equals(cap); } - static public boolean supportsAccessKeys(AdfRenderingContext arc) + static public boolean supportsAccessKeys(RenderingContext arc) { // In screen reader mode, disable access keys. Despite // the name, they are currently considered an accessibility @@ -184,7 +184,7 @@ return !Boolean.FALSE.equals(cap); } - static public final boolean supportsDisabledFormElements(AdfRenderingContext arc) + static public final boolean supportsDisabledFormElements(RenderingContext arc) { Object cap = arc.getAgent().getCapability( AdfFacesAgent.CAP_DISABLED_FORM_ELEMENTS); @@ -192,7 +192,7 @@ } - static public final boolean supportsReadonlyFormElements(AdfRenderingContext arc) + static public final boolean supportsReadonlyFormElements(RenderingContext arc) { Object cap = arc.getAgent().getCapability( AdfFacesAgent.CAP_READONLY_FORM_ELEMENTS); @@ -201,7 +201,7 @@ } static public final boolean supportsAutoCompleteFormElements( - AdfRenderingContext arc) + RenderingContext arc) { Object cap = arc.getAgent().getCapability( AdfFacesAgent.CAP_AUTO_COMPLETE_FORM_ELEMENTS); @@ -209,7 +209,7 @@ } static public final boolean supportsSeparateWindow( - AdfRenderingContext arc) + RenderingContext arc) { return XhtmlUtils.supportsSeparateWindow(arc.getAgent()); } @@ -221,7 +221,7 @@ * See section 5.12 of xhtml modularization. */ static public final boolean supportsTarget( - AdfRenderingContext arc) + RenderingContext arc) { Object cap = arc.getAgent().getCapability( @@ -235,7 +235,7 @@ * Returns true if the agent supports the xmldom */ public static boolean supportsXMLDOM( - AdfRenderingContext arc) + RenderingContext arc) { Object cap = arc.getAgent().getCapability( AdfFacesAgent.CAP_XMLDOM); @@ -275,7 +275,7 @@ */ protected void renderAllAttributes( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, FacesBean bean) throws IOException { renderAllAttributes(context, arc, bean, true); @@ -289,7 +289,7 @@ */ protected void renderAllAttributes( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, FacesBean bean, boolean renderStyleAttrs) throws IOException { @@ -304,7 +304,7 @@ */ public static void renderInlineStyleAttribute( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, String style ) throws IOException { @@ -321,7 +321,7 @@ protected void renderInlineStyle( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, FacesBean bean) throws IOException { String style = getInlineStyle(bean); @@ -335,7 +335,7 @@ protected void renderShortDescAttribute( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, FacesBean bean) throws IOException { String shortDesc = getShortDesc(bean); @@ -347,7 +347,7 @@ protected void renderStyleAttributes( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, FacesBean bean) throws IOException { renderStyleAttributes(context, arc, bean, null); @@ -358,7 +358,7 @@ */ protected void renderStyleAttributes( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, FacesBean bean, String defaultStyleClass) throws IOException { @@ -405,7 +405,7 @@ */ static public void renderStyleClass( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, String styleClass) throws IOException { if (styleClass != null) @@ -423,7 +423,7 @@ */ static public void renderStyleClasses( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, String[] styleClasses) throws IOException { int length = 0; @@ -500,7 +500,7 @@ protected static void renderHAlign( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, Object hAlign) throws IOException { if (hAlign != null) @@ -575,7 +575,7 @@ static public String getAbsoluteImageUri( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, String imagePath) { return getBaseImageUri(context, arc) + imagePath; @@ -587,7 +587,7 @@ */ static protected String getBaseImageUri( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) { String contextUri = context.getExternalContext().getRequestContextPath(); return contextUri + "/adf/images/"; @@ -601,7 +601,7 @@ */ protected final void renderDecorativeIcon( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, String iconUri, Object width, Object height, @@ -615,7 +615,7 @@ protected final void renderDecorativeIcon( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, String iconUri, Object width, Object height, @@ -670,7 +670,7 @@ */ protected final void renderSpacer( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, String width, String height ) throws IOException @@ -684,7 +684,7 @@ */ protected final void renderTransparent( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, String width, String height, boolean needsQuoting, @@ -721,7 +721,7 @@ */ private void _renderTransparent( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, String width, String height, boolean needsQuoting, @@ -849,7 +849,7 @@ */ public static void renderScriptDeferAttribute( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { // At the moment we only render the defer attribute if // we are in the partial rendering pass. This is to @@ -866,7 +866,7 @@ context.getResponseWriter().writeAttribute("defer", Boolean.TRUE, null); } - public static void enableScriptDeferring(AdfRenderingContext arc, boolean isEnabled) + public static void enableScriptDeferring(RenderingContext arc, boolean isEnabled) { // This property is used to control whether or not scripts should // be deferred. We only defer scripts if we are rendering a @@ -904,7 +904,7 @@ */ public static void renderScriptTypeAttribute( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { if (isScreenReaderMode(arc)) { Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.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/renderkit/core/xhtml/XhtmlUtils.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java Thu Jul 27 00:00:09 2006 @@ -35,7 +35,7 @@ import org.apache.myfaces.trinidad.component.UIXSwitcher; 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.jsLibs.Scriptlet; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.XhtmlScriptletFactory; @@ -118,7 +118,7 @@ */ static public void addLib( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, Object libKey) throws IOException { if ((XhtmlRenderer.supportsScripting(arc)) && (libKey != null)) @@ -142,7 +142,7 @@ */ public static void writeLibImport( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, Object libURL) throws IOException { ResponseWriter writer = context.getResponseWriter(); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.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/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/AliasedScriptlet.java Thu Jul 27 00:00:09 2006 @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; /** @@ -64,7 +64,7 @@ // when it's outside of a partial page request, since the // partial page library itself needs it. // See comments in Scriptlet.__isOutsidePartialPage() - boolean __isOutsidePartialPage(AdfRenderingContext arc) + boolean __isOutsidePartialPage(RenderingContext arc) { return false; } @@ -114,7 +114,7 @@ protected void outputScriptletImpl( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { if (_dependencies != null) { @@ -127,7 +127,7 @@ protected void outputScriptletContent( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { // Nothing } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFieldInfoScriptlet.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFieldInfoScriptlet.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/renderkit/core/xhtml/jsLibs/ColorFieldInfoScriptlet.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFieldInfoScriptlet.java Thu Jul 27 00:00:09 2006 @@ -22,7 +22,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.XhtmlConstants; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils; @@ -54,7 +54,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/renderkit/core/xhtml/jsLibs/ColorFormatInfoScriptlet.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFormatInfoScriptlet.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/renderkit/core/xhtml/jsLibs/ColorFormatInfoScriptlet.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ColorFormatInfoScriptlet.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.renderkit.core.xhtml.XhtmlUtils; /** @@ -52,7 +52,7 @@ */ protected void outputScriptletContent( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { ResponseWriter writer = context.getResponseWriter(); String transparent = arc.getTranslatedString("af_chooseColor.TRANSPARENT"); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ConfigurationScriptlet.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ConfigurationScriptlet.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/renderkit/core/xhtml/jsLibs/ConfigurationScriptlet.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/ConfigurationScriptlet.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; /** * Scriptlet which hands off configuration information @@ -54,7 +54,7 @@ */ protected void outputScriptletContent( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) throws IOException { JspDirScriptlet.sharedInstance().embedInScriptTag(context, arc); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DateFormatInfoScriptlet.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DateFormatInfoScriptlet.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/renderkit/core/xhtml/jsLibs/DateFormatInfoScriptlet.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DateFormatInfoScriptlet.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.util.IntegerUtils; @@ -50,7 +50,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/renderkit/core/xhtml/jsLibs/DefaultTimeZoneScriptlet.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DefaultTimeZoneScriptlet.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/renderkit/core/xhtml/jsLibs/DefaultTimeZoneScriptlet.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DefaultTimeZoneScriptlet.java Thu Jul 27 00:00:09 2006 @@ -18,7 +18,7 @@ import java.io.IOException; import javax.faces.context.FacesContext; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; /** * Scriptlet for defaulting the time zone. @@ -46,7 +46,7 @@ protected void outputScriptletImpl( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { outputDependency(context, arc, XhtmlScriptletFactory.COOKIES_LIB); super.outputScriptletImpl(context, arc); @@ -54,7 +54,7 @@ protected void outputScriptletContent( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { context.getResponseWriter().writeText("_defaultTZ()", null); } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/GlobalVariablesScriptlet.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/GlobalVariablesScriptlet.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/renderkit/core/xhtml/jsLibs/GlobalVariablesScriptlet.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/GlobalVariablesScriptlet.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.renderkit.core.xhtml.XhtmlUtils; @@ -53,7 +53,7 @@ protected void outputScriptletContent( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { ResponseWriter writer = context.getResponseWriter(); Object errObj = Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/JspDirScriptlet.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/JspDirScriptlet.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/renderkit/core/xhtml/jsLibs/JspDirScriptlet.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/JspDirScriptlet.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.renderkit.core.pages.GenericEntry; @@ -48,7 +48,7 @@ protected void outputScriptletContent( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { ResponseWriter writer = context.getResponseWriter(); writer.writeText("var _jspDir='", null); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.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/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java Thu Jul 27 00:00:09 2006 @@ -19,7 +19,7 @@ import org.apache.myfaces.trinidad.logging.TrinidadLogger; import javax.faces.context.FacesContext; -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.resource.CoreRenderKitResourceLoader; @@ -83,7 +83,7 @@ protected void outputScriptletImpl( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { if (_dependencies != null) { @@ -96,14 +96,14 @@ protected void outputScriptletContent( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { // No-op. } protected void embedInScriptTagImpl( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { // =-=AEW REVISIT. You can't currently "embed" a library. // Of course, we're also not using this feature for LibraryScriptlets, @@ -113,7 +113,7 @@ protected String getLibraryName( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) { String libraryName = _libraryName; @@ -125,7 +125,7 @@ private String _getLibraryURL( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) { String libraryName = getLibraryName(context, arc); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.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/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java Thu Jul 27 00:00:09 2006 @@ -22,7 +22,7 @@ import javax.faces.context.ResponseWriter; import javax.faces.context.FacesContext; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.share.nls.DecimalFormatContext; import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext; @@ -58,7 +58,7 @@ */ protected void outputScriptletImpl( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { ResponseWriter writer = context.getResponseWriter(); LocaleContext lc = arc.getLocaleContext(); @@ -110,7 +110,7 @@ protected String getLibraryName( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) { Locale elementsLocale = _getJSLocaleElementsLocale( arc.getLocaleContext().getLocale()); @@ -144,7 +144,7 @@ * * @param context The current RenderingContext. */ - public String getSupportedLocaleVariant(AdfRenderingContext arc) + public String getSupportedLocaleVariant(RenderingContext arc) { String variant = arc.getLocaleContext().getLocale().getVariant(); variant = variant.toUpperCase(); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/Scriptlet.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/Scriptlet.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/renderkit/core/xhtml/jsLibs/Scriptlet.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/Scriptlet.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.renderkit.core.xhtml.XhtmlRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils; @@ -53,7 +53,7 @@ */ public void outputScriptlet( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { if (!_isAlreadyWritten(arc) && !__isOutsidePartialPage(arc)) @@ -74,7 +74,7 @@ // // Also note that this method is overridden for the MarlinCore // library. See XhtmlScriptletFactory. - boolean __isOutsidePartialPage(AdfRenderingContext arc) + boolean __isOutsidePartialPage(RenderingContext arc) { PartialPageContext pprContext = arc.getPartialPageContext(); if (pprContext == null) @@ -94,7 +94,7 @@ public void embedInScriptTag( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { if (!_isAlreadyWritten(arc)) { @@ -108,7 +108,7 @@ */ protected void outputScriptletImpl( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { ResponseWriter writer = context.getResponseWriter(); @@ -127,7 +127,7 @@ */ protected void embedInScriptTagImpl( FacesContext context, - AdfRenderingContext arc) throws IOException + RenderingContext arc) throws IOException { outputScriptletContent(context, arc); } @@ -138,7 +138,7 @@ */ abstract protected void outputScriptletContent( FacesContext context, - AdfRenderingContext arc) throws IOException; + RenderingContext arc) throws IOException; @@ -148,7 +148,7 @@ */ protected void outputDependency( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, Object dependency) throws IOException { XhtmlUtils.addLib(context, arc, dependency); @@ -166,7 +166,7 @@ // // Returns true if this scriptlet has already been written. // - private boolean _isAlreadyWritten(AdfRenderingContext arc) + private boolean _isAlreadyWritten(RenderingContext arc) { return arc.getProperties().get(getScriptletKey()) != null; } @@ -174,7 +174,7 @@ // // Marks that the scriptlet has been written. // - private void _markAsWritten(AdfRenderingContext arc) + private void _markAsWritten(RenderingContext arc) { arc.getProperties().put(getScriptletKey(), Boolean.TRUE); } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.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/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java Thu Jul 27 00:00:09 2006 @@ -15,7 +15,7 @@ */ package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; /** * @@ -143,7 +143,7 @@ // =-=AEW The MarlinCore library needs to be rendered even // when it's outside of a partial page request, since the // partial page library itself needs it. - boolean __isOutsidePartialPage(AdfRenderingContext context) + boolean __isOutsidePartialPage(RenderingContext context) { return false; } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/CellUtils.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/CellUtils.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/renderkit/core/xhtml/table/CellUtils.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/CellUtils.java Thu Jul 27 00:00:09 2006 @@ -23,7 +23,7 @@ import org.apache.myfaces.trinidadinternal.util.IntegerUtils; 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.XhtmlConstants; /** @@ -86,7 +86,7 @@ */ public static String getHeaderBorderStyle( TableRenderingContext tContext, - AdfRenderingContext afContext, + RenderingContext afContext, boolean isColumnHeader, boolean isSortable) { @@ -174,7 +174,7 @@ * physical/logical column indices and row index. */ public static String getDataBorderStyle( - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext ) { Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/ColumnData.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/ColumnData.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/renderkit/core/xhtml/table/ColumnData.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/ColumnData.java Thu Jul 27 00:00:09 2006 @@ -22,7 +22,7 @@ import org.apache.myfaces.trinidad.logging.TrinidadLogger; import org.apache.myfaces.trinidad.component.UIXTreeTable; import org.apache.myfaces.trinidad.component.core.data.CoreColumn; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer; /** @@ -320,7 +320,7 @@ public void setSpecialColumnData( TableRenderingContext tContext, - AdfRenderingContext arc, + RenderingContext arc, boolean noWrap, String formatType) { @@ -496,7 +496,7 @@ static private Object _getSpecialWidth( TableRenderingContext tContext, - AdfRenderingContext arc) + RenderingContext arc) { // =-= ACW: // if we don't set a width, then we get bugs: Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/DetailColumnRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/DetailColumnRenderer.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/renderkit/core/xhtml/table/DetailColumnRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/DetailColumnRenderer.java Thu Jul 27 00:00:09 2006 @@ -23,7 +23,7 @@ import org.apache.myfaces.trinidad.component.UIXCollection; import org.apache.myfaces.trinidad.component.UIXTable; import org.apache.myfaces.trinidad.component.core.data.CoreTable; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ShowDetailRenderer; import org.apache.myfaces.trinidadinternal.util.IntegerUtils; @@ -33,7 +33,7 @@ { protected void encodeAll( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, UIComponent component, FacesBean bean) throws IOException { @@ -57,7 +57,7 @@ protected String getHeaderText(FacesBean bean) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); return arc.getTranslatedString("af_table.DETAIL_COLUMN_HEADER"); } @@ -67,7 +67,7 @@ } protected void renderKids(FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent column) throws IOException { @@ -89,7 +89,7 @@ protected void renderAllAttributes( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, FacesBean bean) { @@ -98,7 +98,7 @@ @Override protected void renderPromptStart( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, UIComponent component, FacesBean bean) throws IOException { Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/FocusColumnRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/FocusColumnRenderer.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/renderkit/core/xhtml/table/FocusColumnRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/FocusColumnRenderer.java Thu Jul 27 00:00:09 2006 @@ -26,7 +26,7 @@ import org.apache.myfaces.trinidad.component.core.data.CoreColumn; -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.renderkit.core.xhtml.XhtmlConstants; import org.apache.myfaces.trinidadinternal.skin.icon.Icon; @@ -36,7 +36,7 @@ { protected String getHeaderText(FacesBean bean) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); return arc.getTranslatedString("af_treeTable.FOCUS_COLUMN_HEADER"); } @@ -51,7 +51,7 @@ } protected void renderKids(FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext trc, UIComponent column) throws IOException { @@ -88,7 +88,7 @@ // Renders the focus icon private void _renderFocusIcon( FacesContext fc, - AdfRenderingContext arc, + RenderingContext arc, String altText ) throws IOException { Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.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/renderkit/core/xhtml/table/SelectionColumnRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SelectionColumnRenderer.java Thu Jul 27 00:00:09 2006 @@ -19,7 +19,7 @@ import javax.faces.context.FacesContext; import org.apache.myfaces.trinidad.bean.FacesBean; import org.apache.myfaces.trinidad.component.core.data.CoreColumn; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants; @@ -28,7 +28,7 @@ { protected void renderKids(FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext trc, UIComponent column) throws IOException { @@ -43,7 +43,7 @@ protected String getHeaderText(FacesBean bean) { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); TableRenderingContext tContext = TableRenderingContext.getCurrentInstance(); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.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/renderkit/core/xhtml/table/SpecialColumnRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/SpecialColumnRenderer.java Thu Jul 27 00:00:09 2006 @@ -18,7 +18,7 @@ import javax.faces.component.UIComponent; import org.apache.myfaces.trinidad.bean.FacesBean; import org.apache.myfaces.trinidad.component.core.data.CoreColumn; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ColumnRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer; @@ -53,7 +53,7 @@ return null; } - protected String getHeaderInlineStyle(AdfRenderingContext arc) + protected String getHeaderInlineStyle(RenderingContext arc) { if (XhtmlRenderer.isIE(arc)) return "word-break:keep-all"; // bugs 2342291, 1999842 Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.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/renderkit/core/xhtml/table/TableRenderingContext.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableRenderingContext.java Thu Jul 27 00:00:09 2006 @@ -29,7 +29,7 @@ import org.apache.myfaces.trinidad.component.core.data.CoreTable; import org.apache.myfaces.trinidad.model.RowKeySet; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer; @@ -46,7 +46,7 @@ public TableRenderingContext( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, UIComponent component) { CollectionComponent collectionComponent = @@ -172,7 +172,7 @@ public final void setExplicitHeaderIDMode(boolean isEnabled) { if (!XhtmlRenderer.isInaccessibleMode( - AdfRenderingContext.getCurrentInstance())) + RenderingContext.getCurrentInstance())) _explicitHeaderIDMode = isEnabled; } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.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/renderkit/core/xhtml/table/TableSelectManyRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectManyRenderer.java Thu Jul 27 00:00:09 2006 @@ -36,7 +36,7 @@ import org.apache.myfaces.trinidad.event.SelectionEvent; import org.apache.myfaces.trinidad.model.RowKeySet; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils; @@ -176,7 +176,7 @@ public static void renderScripts( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext trc) throws IOException { if (arc.getProperties().put(_JS_RENDERED_KEY, Boolean.TRUE) == null) @@ -207,7 +207,7 @@ protected void renderCellContent( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent component, FacesBean bean) throws IOException Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.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/renderkit/core/xhtml/table/TableSelectOneRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java Thu Jul 27 00:00:09 2006 @@ -34,7 +34,7 @@ import org.apache.myfaces.trinidad.event.SelectionEvent; import org.apache.myfaces.trinidad.model.RowKeySet; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SimpleSelectBooleanCheckboxRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants; @@ -116,7 +116,7 @@ protected void encodeAll( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, UIComponent component, FacesBean bean) throws IOException { @@ -159,7 +159,7 @@ protected void renderCellContent( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent component, FacesBean bean) throws IOException @@ -239,7 +239,7 @@ } - protected Object getValueAttr(AdfRenderingContext arc) + protected Object getValueAttr(RenderingContext arc) { TableRenderingContext tContext = TableRenderingContext.getCurrentInstance(); @@ -251,7 +251,7 @@ protected String getShortDesc(FacesBean bean) { String key = getDefaultShortDescKey(); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); return arc.getTranslatedString(key); } Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.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/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java Thu Jul 27 00:00:09 2006 @@ -25,7 +25,7 @@ import org.apache.myfaces.trinidad.component.UIXTreeTable; import org.apache.myfaces.trinidad.model.RowKeySet; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ColumnRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants; @@ -36,7 +36,7 @@ { protected void renderKids(FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TableRenderingContext tContext, UIComponent column) throws IOException { @@ -143,7 +143,7 @@ // Renders the expansion Icon private void _renderExpansionIcon( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, boolean disclosed, Object onclick) throws IOException { @@ -174,7 +174,7 @@ private void _renderNodeStampBasedOnAccessibilty( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TreeTableRenderingContext ttrc, UIComponent column) throws IOException { Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.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/renderkit/core/xhtml/table/TreeTableNavRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java Thu Jul 27 00:00:09 2006 @@ -25,7 +25,7 @@ import org.apache.myfaces.trinidad.component.UIXTreeTable; import org.apache.myfaces.trinidad.component.core.data.CoreTreeTable; -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.renderkit.core.xhtml.XhtmlConstants; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer; @@ -49,7 +49,7 @@ protected void encodeAll( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, UIComponent component, FacesBean bean) throws IOException { @@ -67,7 +67,7 @@ private void _renderViewNavBar( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TreeTableRenderingContext ttrc, UIXTreeTable hgrid, int rangeStart, @@ -163,7 +163,7 @@ private void _writeCellContents( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, TreeTableRenderingContext ttrc, UIXTreeTable hgrid, String text, @@ -247,7 +247,7 @@ } private Icon _getIcon( - AdfRenderingContext arc, + RenderingContext arc, boolean isTop, boolean isDisabled ) Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.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/renderkit/core/xhtml/table/TreeTableRenderingContext.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java Thu Jul 27 00:00:09 2006 @@ -24,7 +24,7 @@ import org.apache.myfaces.trinidad.component.UIXTreeTable; import org.apache.myfaces.trinidad.model.RowKeySet; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants; /** @@ -50,7 +50,7 @@ public TreeTableRenderingContext( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, UIComponent hGrid) { super(context, arc, hGrid); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.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/renderkit/core/xhtml/table/TreeUtils.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java Thu Jul 27 00:00:09 2006 @@ -34,7 +34,7 @@ import org.apache.myfaces.trinidad.model.RowKeySet; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.HiddenLabelUtils; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.TableRenderer; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants; @@ -65,7 +65,7 @@ */ public static void writeNodeLevel( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, int depth, String nodeLevelTextKey ) throws IOException Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.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/renderkit/html/layout/CoreShowOneAccordionRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.java Thu Jul 27 00:00:09 2006 @@ -27,7 +27,7 @@ import org.apache.myfaces.trinidad.logging.TrinidadLogger; import org.apache.myfaces.trinidad.component.UIXShowDetail; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer; import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext; @@ -155,7 +155,7 @@ UIXRenderingContext rCtx = getRenderingContext(context, component); String styleClass = (String) component.getAttributes().get("styleClass"); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); if (styleClass != null) { XhtmlRenderer.renderStyleClasses(context, arc, new String [] { @@ -423,7 +423,7 @@ out.writeAttribute("cellPadding", "0", null); out.writeAttribute("summary", "", null); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); XhtmlRenderer.renderStyleClass(context, arc, getContentStyleClass()); out.startElement("tr", component); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.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/renderkit/html/layout/CoreShowOneChoiceRenderer.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java Thu Jul 27 00:00:09 2006 @@ -26,7 +26,7 @@ import org.apache.myfaces.trinidad.component.UIXShowDetail; import org.apache.myfaces.trinidad.context.RequestContext; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer; @@ -299,7 +299,7 @@ String js) throws IOException { - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); ResponseWriter writer = context.getResponseWriter(); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.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/renderkit/html/layout/ShowOneListRendererBase.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java Thu Jul 27 00:00:09 2006 @@ -30,7 +30,7 @@ import org.apache.myfaces.trinidad.logging.TrinidadLogger; import org.apache.myfaces.trinidad.component.UIXShowDetail; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils; import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer; import org.apache.myfaces.trinidadinternal.share.url.URLEncoder; @@ -168,7 +168,7 @@ out.writeAttribute("cellpadding", "0", null); String styleClass = (String) component.getAttributes().get("styleClass"); - AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance(); + RenderingContext arc = RenderingContext.getCurrentInstance(); if (styleClass != null) { XhtmlRenderer.renderStyleClass(context, arc, styleClass); Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.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/SkinExtension.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/SkinExtension.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java Thu Jul 27 00:00:09 2006 @@ -28,7 +28,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.skin.icon.ReferenceIcon; import org.apache.myfaces.trinidadinternal.util.OptimisticHashMap; @@ -594,7 +594,7 @@ { public void renderIcon( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, Map attrs ) throws IOException { Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.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/BaseImageIcon.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/BaseImageIcon.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java Thu Jul 27 00:00:09 2006 @@ -24,7 +24,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.renderkit.core.xhtml.OutputUtils; import org.apache.myfaces.trinidadinternal.style.Style; @@ -81,7 +81,7 @@ */ public Object getImageURI( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) { // Get the base URI String baseURI = _getBaseURI(context, arc); @@ -101,7 +101,7 @@ /** * Implementation of Icon.getImageWidth(). */ - public Integer getImageWidth(AdfRenderingContext arc) + public Integer getImageWidth(RenderingContext arc) { return _width; } @@ -109,7 +109,7 @@ /** * Implementation of Icon.getImageHeight(). */ - public Integer getImageHeight(AdfRenderingContext arc) + public Integer getImageHeight(RenderingContext arc) { return _height; } @@ -119,7 +119,7 @@ */ public void renderIcon( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, Map attrs ) throws IOException { @@ -216,14 +216,14 @@ */ abstract protected String getBaseURI( FacesContext context, - AdfRenderingContext arc); + RenderingContext arc); /** * Returns the URI of the image relative to the base URI. */ protected String getRelativeURI( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) { // We only need to check the reading direction if // we actually have a RTL version of the icon @@ -236,7 +236,7 @@ // Gets the baseURI, checking to make sure that it is properly terminated. private String _getBaseURI( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) { String baseURI = getBaseURI(context, arc); @@ -272,7 +272,7 @@ // Returns the width of the icon private Object _getWidth( - AdfRenderingContext arc, + RenderingContext arc, Map attrs ) { @@ -292,7 +292,7 @@ // Returns the height of the icon private Object _getHeight( - AdfRenderingContext arc, + RenderingContext arc, Map attrs ) { Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.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/ContextImageIcon.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/ContextImageIcon.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java Thu Jul 27 00:00:09 2006 @@ -22,7 +22,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletRequest; -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.io.ServletNameResolver; @@ -112,7 +112,7 @@ */ public InputStreamProvider getImageData( FacesContext context, - AdfRenderingContext arc + RenderingContext arc ) throws IOException { @@ -140,7 +140,7 @@ */ protected String getBaseURI( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) { return context.getExternalContext().getRequestContextPath() + '/'; Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/Icon.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/Icon.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/Icon.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/Icon.java Thu Jul 27 00:00:09 2006 @@ -22,7 +22,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; /** @@ -56,7 +56,7 @@ * Renders the Icon. * * @param FacesContext context - * @param AdfRenderingContext arc The AdfRenderingContext for the + * @param RenderingContext arc The AdfRenderingContext for the * current request. * @param attrs A Map which which provides access to * values that might be useful to Icon implementations, @@ -64,7 +64,7 @@ */ abstract public void renderIcon( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, Map attrs ) throws IOException; @@ -74,12 +74,12 @@ * which indicates to the caller that no image representation of * the Icon is available. * @param FacesContext context - * @param AdfRenderingContext arc The AdfRenderingContext for the + * @param RenderingContext arc The AdfRenderingContext for the * current request. */ public Object getImageURI( FacesContext context, - AdfRenderingContext arc) + RenderingContext arc) { return null; } @@ -89,9 +89,9 @@ * The default implementation of this method simply returns null, * which indicates to the caller the width of the image is not * known - or that the Icon does not provide an image representation. - * @param AdfRenderingContext arc + * @param RenderingContext arc */ - public Integer getImageWidth(AdfRenderingContext arc) + public Integer getImageWidth(RenderingContext arc) { return null; } @@ -101,10 +101,10 @@ * The default implementation of this method simply returns null, * which indicates to the caller the height of the image is not * known - or that the Icon does not provide an image representation. - * @param AdfRenderingContext arc + * @param RenderingContext arc * */ - public Integer getImageHeight(AdfRenderingContext arc) + public Integer getImageHeight(RenderingContext arc) { return null; } @@ -113,13 +113,13 @@ * Returns an InputStreamProvider which provides access to the * image data for image-based Icons. * @param FacesContext context - * @param AdfRenderingContext arc The AdfRenderingContext for the + * @param RenderingContext arc The AdfRenderingContext for the * current request. * @todo Is this still necessary? */ public InputStreamProvider getImageData( FacesContext context, - AdfRenderingContext arc + RenderingContext arc ) throws IOException { // This operation is not supported by default. Log a warning. Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/NullIcon.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/NullIcon.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/NullIcon.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/NullIcon.java Thu Jul 27 00:00:09 2006 @@ -18,7 +18,7 @@ import java.util.Map; import javax.faces.context.FacesContext; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; /** * Icon class for a completely empty, null icon. @@ -32,7 +32,7 @@ public void renderIcon( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, Map attrs ) { Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ReferenceIcon.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/ReferenceIcon.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/ReferenceIcon.java (original) +++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ReferenceIcon.java Thu Jul 27 00:00:09 2006 @@ -20,7 +20,7 @@ import java.util.Map; import javax.faces.context.FacesContext; -import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext; +import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext; /** * An Icon implementation that references another icon by name. @@ -40,7 +40,7 @@ public void renderIcon( FacesContext context, - AdfRenderingContext arc, + RenderingContext arc, Map attrs ) throws IOException {