You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/07/27 03:39:51 UTC
svn commit: r425942 [4/15] - in
/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/agent/
main/java/org/apache/myfaces/trinidadinternal/agent/parse/
main/java/org/apache/my...
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/DebugResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/DebugResponseWriter.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/DebugResponseWriter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/DebugResponseWriter.java Wed Jul 26 20:39:26 2006
@@ -16,18 +16,17 @@
package org.apache.myfaces.trinidadinternal.io;
import java.io.IOException;
- import java.io.Writer;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
- import java.util.Stack;
- import java.util.HashMap;
- import java.util.HashSet;
- import java.util.Set;
- import java.util.Map;
+import javax.faces.component.UIComponent;
+import javax.faces.context.ResponseWriter;
- import javax.faces.component.UIComponent;
- import javax.faces.context.ResponseWriter;
-
- import org.apache.myfaces.trinidad.logging.ADFLogger;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
/**
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/HtmlResponseWriter.java Wed Jul 26 20:39:26 2006
@@ -16,24 +16,20 @@
package org.apache.myfaces.trinidadinternal.io;
import java.io.IOException;
-import java.io.Writer;
import java.io.UnsupportedEncodingException;
-
+import java.io.Writer;
import java.util.ArrayList;
import javax.faces.component.UIComponent;
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
import org.apache.myfaces.trinidadinternal.share.util.CaboHttpUtils;
-
import org.apache.myfaces.trinidadinternal.ui.io.EscapedText;
import org.apache.myfaces.trinidadinternal.ui.io.EscapedTextFactory;
import org.apache.myfaces.trinidadinternal.ui.io.HTMLEscapes;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
* Implementation of ResponseWriter for outputting HTML.
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/IndentingResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/IndentingResponseWriter.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/IndentingResponseWriter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/IndentingResponseWriter.java Wed Jul 26 20:39:26 2006
@@ -17,7 +17,6 @@
import java.io.IOException;
import java.io.Writer;
-
import java.util.HashSet;
import java.util.Set;
@@ -205,6 +204,7 @@
"tbody".equals(name) ||
"tr".equals(name) ||
"nobr".equals(name) ||
+ "wbr".equals(name) ||
"script".equals(name));
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/io/XhtmlResponseWriter.java Wed Jul 26 20:39:26 2006
@@ -16,23 +16,19 @@
package org.apache.myfaces.trinidadinternal.io;
import java.io.IOException;
-import java.io.Writer;
import java.io.UnsupportedEncodingException;
-
+import java.io.Writer;
import java.util.ArrayList;
import javax.faces.component.UIComponent;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidadinternal.share.util.CaboHttpUtils;
-
import org.apache.myfaces.trinidadinternal.ui.io.EscapedText;
import org.apache.myfaces.trinidadinternal.ui.io.EscapedTextFactory;
import org.apache.myfaces.trinidadinternal.ui.io.XMLEscapes;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
* Implementation of ResponseWriter for outputting XHTML.
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadata.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadata.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadata.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadata.java Wed Jul 26 20:39:26 2006
@@ -16,10 +16,8 @@
package org.apache.myfaces.trinidadinternal.metadata;
import java.io.IOException;
import java.io.InputStream;
-
import java.io.StringReader;
import java.net.URL;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -28,17 +26,14 @@
import java.util.Map;
import javax.faces.context.FacesContext;
-
import javax.servlet.ServletContext;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidad.config.RegionConfig;
import org.apache.myfaces.trinidad.config.RegionManager;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
import org.apache.myfaces.trinidadinternal.ui.data.bind.ConvertBoundValue;
-
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/ClassRendererInstantiator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/ClassRendererInstantiator.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/ClassRendererInstantiator.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/ClassRendererInstantiator.java Wed Jul 26 20:39:26 2006
@@ -15,11 +15,10 @@
*/
package org.apache.myfaces.trinidadinternal.renderkit;
-import org.apache.myfaces.trinidad.logging.ADFLogger;
+import javax.faces.render.Renderer;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
-
-import javax.faces.render.Renderer;
/**
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBase.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBase.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBase.java Wed Jul 26 20:39:26 2006
@@ -16,12 +16,10 @@
package org.apache.myfaces.trinidadinternal.renderkit;
import java.util.Map;
-
import java.util.concurrent.ConcurrentHashMap;
-import javax.faces.render.Renderer;
import javax.faces.render.RenderKit;
-
+import javax.faces.render.Renderer;
import org.apache.myfaces.trinidad.logging.ADFLogger;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java Wed Jul 26 20:39:26 2006
@@ -20,7 +20,6 @@
import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
-
import javax.faces.context.FacesContext;
import org.apache.myfaces.trinidad.component.UIXForm;
Copied: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java (from r425846, incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/AdfRenderingContext.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/AdfRenderingContext.java&r1=425846&r2=425942&rev=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/AdfRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java Wed Jul 26 20:39:26 2006
@@ -19,7 +19,6 @@
import java.util.MissingResourceException;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormData;
@@ -32,14 +31,14 @@
/**
* @todo REMOVE DEPENDENCY ON AcessibilityMode
*/
-abstract public class AdfRenderingContext
+abstract public class RenderingContext
{
/**
* Retrieves the AdfRenderingContext active for the current thread.
*/
- static public AdfRenderingContext getCurrentInstance()
+ static public RenderingContext getCurrentInstance()
{
- return (AdfRenderingContext) _CURRENT_CONTEXT.get();
+ return (RenderingContext) _CURRENT_CONTEXT.get();
}
static public final Object INACCESSIBLE_MODE =
@@ -47,7 +46,7 @@
static public final Object SCREEN_READER_MODE =
AccessibilityMode.SCREEN_READER_MODE;
- public AdfRenderingContext()
+ public RenderingContext()
{
attach();
}
@@ -166,5 +165,5 @@
static private final ThreadLocal _CURRENT_CONTEXT = new ThreadLocal();
static private final ADFLogger _LOG =
- ADFLogger.createADFLogger(AdfRenderingContext.class);
+ ADFLogger.createADFLogger(RenderingContext.class);
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java Wed Jul 26 20:39:26 2006
@@ -18,17 +18,15 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
-
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.faces.FactoryFinder;
import javax.faces.application.ViewHandler;
-import javax.faces.component.UIComponent;
import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
import javax.faces.component.UIData;
import javax.faces.component.UIForm;
import javax.faces.component.UIGraphic;
@@ -44,41 +42,34 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseStream;
import javax.faces.context.ResponseWriter;
-import javax.faces.render.Renderer;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
+import javax.faces.render.Renderer;
import javax.faces.render.ResponseStateManager;
-
import javax.servlet.ServletResponse;
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
import org.apache.myfaces.trinidad.context.Agent;
-
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
import org.apache.myfaces.trinidad.render.DialogRenderKitService;
import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
-
-import org.apache.myfaces.trinidadinternal.context.AdfFacesPhaseListener;
-
-import org.apache.myfaces.trinidadinternal.io.DebugResponseWriter;
+import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.AgentUtil;
+import org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener;
import org.apache.myfaces.trinidadinternal.io.DebugHtmlResponseWriter;
+import org.apache.myfaces.trinidadinternal.io.DebugResponseWriter;
import org.apache.myfaces.trinidadinternal.io.HtmlResponseWriter;
import org.apache.myfaces.trinidadinternal.io.IndentingResponseWriter;
import org.apache.myfaces.trinidadinternal.io.XhtmlResponseWriter;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.RenderKitBase;
import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PartialPageUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
import org.apache.myfaces.trinidadinternal.renderkit.htmlBasic.HtmlCommandLinkRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.htmlBasic.HtmlFormRenderer;
-
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.agent.AgentUtil;
import org.apache.myfaces.trinidadinternal.share.util.CaboHttpUtils;
import org.apache.myfaces.trinidadinternal.webapp.DispatchServletResponse;
@@ -134,9 +125,9 @@
*/
static public String chooseRenderKit(FacesContext context)
{
- AdfFacesContext afc = AdfFacesContext.getCurrentInstance();
+ RequestContext afc = RequestContext.getCurrentInstance();
// According to the spec FacesContext can be null.
- // In that case AdfFacesContext could also be null.
+ // In that case RequestContext could also be null.
// bug 4695929:
if (afc != null)
{
@@ -163,7 +154,7 @@
static public void saveDialogPostbackValues(
String returnId)
{
- Map pageFlowScope = AdfFacesContext.getCurrentInstance().getPageFlowScope();
+ Map pageFlowScope = RequestContext.getCurrentInstance().getPageFlowScope();
pageFlowScope.put(_RETURN_ID, returnId);
}
@@ -204,7 +195,7 @@
_copyProperty(windowProperties, "height", sourceAttrs, "windowHeight");
}
- Map pageFlowScope = AdfFacesContext.getCurrentInstance().getPageFlowScope();
+ Map pageFlowScope = RequestContext.getCurrentInstance().getPageFlowScope();
if (processParameters != null)
pageFlowScope.putAll(processParameters);
@@ -224,7 +215,7 @@
if (!_supportsSeparateWindow(context))
return false;
- AdfFacesContext afC = AdfFacesContext.getCurrentInstance();
+ RequestContext afC = RequestContext.getCurrentInstance();
try
{
String returnId = (String) afC.getPageFlowScope().get(_RETURN_ID);
@@ -285,7 +276,7 @@
Map requestMap = context.getExternalContext().getRequestMap();
UIViewRoot originalRoot = (UIViewRoot) requestMap.get(
- AdfFacesPhaseListener.INITIAL_VIEW_ROOT_KEY);
+ TrinidadPhaseListener.INITIAL_VIEW_ROOT_KEY);
// If we're doing a partial update, and the page has changed, switch to a
// full page context.
if (context.getViewRoot() != originalRoot)
@@ -346,7 +337,7 @@
if (hasDialog || hasScript)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
if (hasDialog)
DialogRequest.addDependencies(context, arc);
@@ -402,7 +393,7 @@
*/
public void encodeBegin(FacesContext context)
{
- /*CoreAdfRenderingContext arc = */new CoreAdfRenderingContext();
+ /*CoreAdfRenderingContext arc = */new CoreRenderingContext();
}
@@ -419,7 +410,7 @@
*/
public void encodeFinally(FacesContext context)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
if (arc != null)
{
arc.release();
@@ -493,7 +484,7 @@
static private ResponseWriter _addDebugResponseWriters(
ResponseWriter responseWriter)
{
- AdfFacesContext adfFacesContext = AdfFacesContext.getCurrentInstance();
+ RequestContext adfFacesContext = RequestContext.getCurrentInstance();
if (adfFacesContext.isDebugOutput())
{
responseWriter = new IndentingResponseWriter(responseWriter);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.renderkit.core;
import java.io.IOException;
-
import java.util.Iterator;
import java.util.List;
@@ -27,10 +26,9 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.component.UIXComponent;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
-import org.apache.myfaces.trinidadinternal.webapp.AdfFacesFilterImpl;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
/**
* Basic implementation of the core rendering functionality
@@ -150,7 +148,7 @@
{
if (!getRendersChildren())
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
if (arc == null)
throw new IllegalStateException("No AdfRenderingContext");
@@ -168,7 +166,7 @@
public final void encodeEnd(FacesContext context,
UIComponent component) throws IOException
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
if (arc == null)
throw new IllegalStateException("No AdfRenderingContext");
@@ -189,7 +187,7 @@
*/
protected void encodeBegin(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
UIComponent component,
FacesBean bean) throws IOException
{
@@ -203,7 +201,7 @@
*/
protected void encodeEnd(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
UIComponent component,
FacesBean bean) throws IOException
{
@@ -218,7 +216,7 @@
*/
protected void encodeAll(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
UIComponent component,
FacesBean bean) throws IOException
{
@@ -280,7 +278,7 @@
*/
protected void delegateRenderer(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
UIComponent component,
FacesBean bean,
CoreRenderer renderer) throws IOException
@@ -300,7 +298,7 @@
*/
protected void delegateRendererBegin(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
UIComponent component,
FacesBean bean,
CoreRenderer renderer) throws IOException
@@ -320,7 +318,7 @@
*/
protected void delegateRendererEnd(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
UIComponent component,
FacesBean bean,
CoreRenderer renderer) throws IOException
@@ -401,7 +399,7 @@
// The best fix would really be somehow skipping the Apply Request
// Values phase altogether, while still queueing the ReturnEvent
// properly. But how the heck is that gonna happen?
- return AdfFacesFilterImpl.isExecutingDialogReturn(context);
+ return TrinidadFilterImpl.isExecutingDialogReturn(context);
}
protected FacesBean getFacesBean(UIComponent component)
@@ -410,14 +408,14 @@
}
static protected final Object getRenderingProperty(
- AdfRenderingContext arc,
+ RenderingContext arc,
Object key)
{
return arc.getProperties().get(key);
}
static protected final Object setRenderingProperty(
- AdfRenderingContext arc,
+ RenderingContext arc,
Object key,
Object value)
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java Wed Jul 26 20:39:26 2006
@@ -21,7 +21,7 @@
import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
import org.apache.myfaces.trinidadinternal.agent.CapabilityKey;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
public class CoreRendererUtils
{
@@ -55,7 +55,7 @@
* by the agent associated with the provided rendering context.
*/
public static boolean supportsPartialRendering(
- AdfRenderingContext context
+ RenderingContext context
)
{
return supportsBooleanCapability(context,
@@ -63,7 +63,7 @@
}
public static boolean supportsNameIdentification(
- AdfRenderingContext context
+ RenderingContext context
)
{
return supportsBooleanCapability(context,
@@ -71,7 +71,7 @@
}
public static boolean supportsBooleanCapability(
- AdfRenderingContext context,
+ RenderingContext context,
CapabilityKey cap
)
{
Copied: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java (from r425846, incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreAdfRenderingContext.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreAdfRenderingContext.java&r1=425846&r2=425942&rev=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreAdfRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java Wed Jul 26 20:39:26 2006
@@ -16,51 +16,41 @@
package org.apache.myfaces.trinidadinternal.renderkit.core;
import java.beans.Beans;
-
import java.io.File;
-
import java.util.HashMap;
import java.util.Map;
import javax.faces.context.FacesContext;
-
import javax.servlet.ServletContext;
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidad.context.Agent;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgentImpl;
import org.apache.myfaces.trinidadinternal.agent.AgentUtil;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormData;
-
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PartialPageUtils;
import org.apache.myfaces.trinidadinternal.share.config.AccessibilityMode;
-
import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
+import org.apache.myfaces.trinidadinternal.share.nls.MutableDecimalFormatContext;
+import org.apache.myfaces.trinidadinternal.share.nls.MutableLocaleContext;
import org.apache.myfaces.trinidadinternal.skin.Skin;
import org.apache.myfaces.trinidadinternal.skin.SkinFactory;
import org.apache.myfaces.trinidadinternal.skin.SkinNotAvailable;
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
-
import org.apache.myfaces.trinidadinternal.style.StyleContext;
import org.apache.myfaces.trinidadinternal.style.util.StyleUtils;
-
-import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PartialPageUtils;
-import org.apache.myfaces.trinidadinternal.share.nls.MutableDecimalFormatContext;
-import org.apache.myfaces.trinidadinternal.share.nls.MutableLocaleContext;
import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
-public class CoreAdfRenderingContext extends AdfRenderingContext
+public class CoreRenderingContext extends RenderingContext
{
- public CoreAdfRenderingContext()
+ public CoreRenderingContext()
{
FacesContext context = FacesContext.getCurrentInstance();
- AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+ RequestContext afContext = RequestContext.getCurrentInstance();
_outputMode = afContext.getOutputMode();
_agent = _initializeAgent(context, afContext.getAgent(), _outputMode);
@@ -139,7 +129,7 @@
return _localeContext.isRightToLeft();
}
- return AdfFacesContext.getCurrentInstance().isRightToLeft();
+ return RequestContext.getCurrentInstance().isRightToLeft();
}
public String getOutputMode()
@@ -203,7 +193,7 @@
if (_localeContext == null)
{
_initializeLocaleContext(FacesContext.getCurrentInstance(),
- AdfFacesContext.getCurrentInstance());
+ RequestContext.getCurrentInstance());
}
return _localeContext;
@@ -325,9 +315,9 @@
* SkinFactory that best matches
* the <skin-family> and current render-kit-id.
* @param fContext FacesContext
- * @param context AdfFacesContext
+ * @param context RequestContext
*/
- private void _initializeSkin(AdfFacesContext afContext)
+ private void _initializeSkin(RequestContext afContext)
{
String skinFamily = afContext.getSkinFamily();
String renderKitId = "org.apache.myfaces.trinidad.desktop";
@@ -370,8 +360,8 @@
{
// First, get an AdfFacesAgent out of the plain Agent
// =-=AEW In theory, we should only be getting a plain Agent
- // out of the AdfFacesContext: for some reason, we're going
- // straight to an AdfFacesAgent in AdfFacesContext
+ // out of the RequestContext: for some reason, we're going
+ // straight to an AdfFacesAgent in RequestContext
AdfFacesAgent agent;
if (base instanceof AdfFacesAgent)
agent = (AdfFacesAgent) base;
@@ -398,7 +388,7 @@
//
private void _initializePPR(
FacesContext fContext,
- AdfFacesContext context)
+ RequestContext context)
{
// Don't bother if PPR isn't even supported
if (!CoreRendererUtils.supportsPartialRendering(this))
@@ -456,7 +446,7 @@
private void _initializeLocaleContext(
FacesContext fContext,
- AdfFacesContext context)
+ RequestContext context)
{
MutableLocaleContext localeContext = new MutableLocaleContext(
fContext.getViewRoot().getLocale());
@@ -528,5 +518,5 @@
}
static private final ADFLogger _LOG =
- ADFLogger.createADFLogger(CoreAdfRenderingContext.class);
+ ADFLogger.createADFLogger(CoreRenderingContext.class);
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java Wed Jul 26 20:39:26 2006
@@ -15,29 +15,25 @@
*/
package org.apache.myfaces.trinidadinternal.renderkit.core;
-import javax.faces.application.StateManager;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.render.ResponseStateManager;
-
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
import java.io.OptionalDataException;
import java.io.StringReader;
-import java.io.BufferedReader;
import java.io.StringWriter;
-import java.io.BufferedWriter;
-
-
-import java.util.zip.GZIPOutputStream;
+import java.util.Map;
import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
-import java.util.Map;
+import javax.faces.application.StateManager;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidad.util.Base64InputStream;
import org.apache.myfaces.trinidad.util.Base64OutputStream;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/DialogRequest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/DialogRequest.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/DialogRequest.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/DialogRequest.java Wed Jul 26 20:39:26 2006
@@ -16,15 +16,15 @@
package org.apache.myfaces.trinidadinternal.renderkit.core;
import java.io.IOException;
-
import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
+
import javax.faces.component.UIViewRoot;
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.FredJSP;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PartialPageUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
@@ -59,14 +59,14 @@
static public void addDependencies(
FacesContext context,
- AdfRenderingContext arc) throws IOException
+ RenderingContext arc) throws IOException
{
XhtmlUtils.addLib(context, arc, "_launchDialog()");
}
public void renderLaunchJavascript(
FacesContext context,
- AdfRenderingContext arc) throws IOException
+ RenderingContext arc) throws IOException
{
ResponseWriter out = context.getResponseWriter();
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java Wed Jul 26 20:39:26 2006
@@ -18,21 +18,20 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
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.HtmlRenderer;
import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
import org.apache.myfaces.trinidadinternal.skin.Skin;
import org.apache.myfaces.trinidadinternal.skin.SkinStyleProvider;
import org.apache.myfaces.trinidadinternal.style.StyleContext;
-import org.apache.myfaces.trinidadinternal.style.StyleProvider;
import org.apache.myfaces.trinidadinternal.style.StyleMap;
+import org.apache.myfaces.trinidadinternal.style.StyleProvider;
class StyleContextImpl implements StyleContext
{
public StyleContextImpl(
- AdfRenderingContext arc,
+ RenderingContext arc,
Skin skin,
String generatedFilesPath)
{
@@ -140,7 +139,7 @@
}
- private AdfRenderingContext _arc;
+ private RenderingContext _arc;
private String _generatedFilesPath;
private StyleProvider _styleProvider;
private StyleMap _styleMap;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.desktop;
import java.io.IOException;
-
import java.util.List;
import javax.faces.component.UIComponent;
@@ -31,9 +30,8 @@
import org.apache.myfaces.trinidad.component.UIXTable;
import org.apache.myfaces.trinidad.component.core.data.CoreColumn;
import org.apache.myfaces.trinidad.component.core.data.CoreTable;
-
import org.apache.myfaces.trinidadinternal.io.RepeatIdResponseWriter;
-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;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ShowDetailRenderer;
@@ -83,7 +81,7 @@
protected final void renderSingleRow(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component) throws IOException
{
@@ -109,7 +107,7 @@
*/
protected void renderSelectionLinks(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component) throws IOException
{
@@ -147,7 +145,7 @@
*/
protected boolean hasControlBarLinks(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component) throws IOException
{
@@ -166,7 +164,7 @@
*/
protected void renderControlBarLinks(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext trc,
UIComponent component,
boolean useDivider) throws IOException
@@ -207,7 +205,7 @@
protected final void renderControlBarLink(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
String onclick,
String translationKey,
String id,
@@ -228,7 +226,7 @@
protected void renderSubControlBar(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component,
boolean isUpper) throws IOException
@@ -243,7 +241,7 @@
protected void renderTableContent(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component) throws IOException
{
@@ -389,7 +387,7 @@
private void _writeIEscrollScript(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
String tableId,
String scrollID) throws IOException
{
@@ -506,7 +504,7 @@
// render the control bar
protected final void renderControlBar(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component)
throws IOException
@@ -584,7 +582,7 @@
*/
protected void renderRangePagingControl(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component)
throws IOException
@@ -609,7 +607,7 @@
protected void renderTableRows(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext trc,
UIComponent component,
FacesBean bean) throws IOException
@@ -628,7 +626,7 @@
*/
protected void renderTableAttributes(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
UIComponent component,
FacesBean bean,
Object cellPadding,
@@ -645,7 +643,7 @@
*/
protected void renderCellFormatAttributes(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext) throws IOException
{
// renders "style", "class", "nowrap", "headers".
@@ -687,7 +685,7 @@
*/
private void _renderTableHeader(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component)
throws IOException
@@ -714,7 +712,7 @@
private void _renderEmptyTable(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext)
throws IOException
{
@@ -732,7 +730,7 @@
*/
protected final void renderEmptyTableRow(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
int specialColumnCount) throws IOException
{
@@ -741,7 +739,7 @@
protected final void renderEmptyTableRow(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
int specialColumnCount,
CoreRenderer emptyTextRenderer) throws IOException
@@ -779,7 +777,7 @@
private void _renderEmptyCell(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
int physicalColumn,
String text) throws IOException
@@ -800,7 +798,7 @@
private void _renderTableRows(
FacesContext context,
- final AdfRenderingContext arc,
+ final RenderingContext arc,
final TableRenderingContext tContext,
UIComponent component
)
@@ -894,7 +892,7 @@
*/
protected final void renderColumnHeader(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component) throws IOException
{
@@ -915,7 +913,7 @@
*/
protected final void renderRegularHeaders(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component,
int physicalCol) throws IOException
@@ -977,7 +975,7 @@
*/
protected final void renderFooter(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component) throws IOException
@@ -1060,7 +1058,7 @@
protected void renderAllAttributes(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
FacesBean bean)
{
}
@@ -1088,13 +1086,13 @@
protected String getDisclosedText(FacesBean bean)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
return arc.getTranslatedString(_HIDE_ALL_DETAILS_TEXT_KEY);
}
protected String getUndisclosedText(FacesBean bean)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
return arc.getTranslatedString(_SHOW_ALL_DETAILS_TEXT_KEY);
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.desktop;
import java.io.IOException;
-
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -26,17 +25,16 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.trinidad.logging.ADFLogger;
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.CollectionComponent;
import org.apache.myfaces.trinidad.component.UIXHierarchy;
import org.apache.myfaces.trinidad.component.UIXTreeTable;
import org.apache.myfaces.trinidad.component.core.data.CoreTreeTable;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
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.FormData;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.NavigationPathRenderer;
@@ -100,7 +98,7 @@
TreeUtils.decodeFocusEvent(parameters, component);
TreeUtils.decodeGotoEvent(parameters, component);
// bug 4522210:
- AdfFacesContext.getCurrentInstance().addPartialTarget(component);
+ RequestContext.getCurrentInstance().addPartialTarget(component);
}
}
@@ -110,7 +108,7 @@
*/
protected TableRenderingContext createRenderingContext(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
UIComponent component
)
{
@@ -124,7 +122,7 @@
*/
protected boolean renderTableWithoutColumns(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component) throws IOException
{
@@ -136,7 +134,7 @@
*/
protected void encodeAll(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
UIComponent component,
FacesBean bean) throws IOException
{
@@ -183,7 +181,7 @@
*/
protected void renderNavigationHeaderBars(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component,
FacesBean bean) throws IOException
@@ -194,7 +192,7 @@
protected final void renderRangePagingControl(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent table)
throws IOException
@@ -216,7 +214,7 @@
protected boolean hasControlBarLinks(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component) throws IOException
{
@@ -227,7 +225,7 @@
protected void renderControlBarLinks(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component,
boolean useDivider) throws IOException
@@ -272,7 +270,7 @@
*/
protected int renderSpecialColumns(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component,
int physicalColumnIndex)
@@ -313,7 +311,7 @@
*/
protected void renderTableRows(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext trc,
UIComponent component,
FacesBean bean) throws IOException
@@ -349,7 +347,7 @@
// Renders the hGridLocator Icon
private void _renderLocatorIcon(
FacesContext fc,
- AdfRenderingContext arc)
+ RenderingContext arc)
throws IOException
{
Icon icon = arc.getIcon(XhtmlConstants.AF_TREE_TABLE_LOCATOR_ICON_NAME);
@@ -371,7 +369,7 @@
private void _renderBreadCrumbs(
FacesContext fc,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext context,
UIComponent tree,
FacesBean bean) throws IOException
@@ -416,7 +414,7 @@
private void _renderTableRows(
FacesContext context,
- final AdfRenderingContext arc,
+ final RenderingContext arc,
final TreeTableRenderingContext ttrc) throws IOException
{
final UIXTreeTable treeTableBase = ttrc.getUIXTreeTable();
@@ -483,7 +481,7 @@
*/
private int _renderEmptyTableRow(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TreeTableRenderingContext ttrc) throws IOException
{
// we do not include the object hierarchy column in the specialCols
@@ -523,7 +521,7 @@
{
protected void renderLink(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
UIComponent child,
int renderedCount,
boolean isLastChild) throws IOException
@@ -583,7 +581,7 @@
protected UIComponent getStamp(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
UIXHierarchy component,
FacesBean bean
)
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java Wed Jul 26 20:39:26 2006
@@ -16,8 +16,8 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.pages;
import java.io.IOException;
-import java.util.Map;
import java.util.Date;
+import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -31,12 +31,11 @@
import org.apache.myfaces.trinidad.component.core.output.CoreObjectSpacer;
import org.apache.myfaces.trinidad.component.html.HtmlRowLayout;
import org.apache.myfaces.trinidad.component.html.HtmlTableLayout;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
-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.share.url.EncoderUtils;
/**
@@ -56,12 +55,12 @@
{
/**
- * @todo Integrate the time zone with AdfFacesContext (somehow)
+ * @todo Integrate the time zone with RequestContext (somehow)
*/
static public void service(FacesContext context)
throws IOException
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
CoreDocument doc = new CoreDocument();
context.getViewRoot().getChildren().add(doc);
doc.setTitle(arc.getTranslatedString(_DIALOG_TITLE_KEY));
@@ -202,13 +201,13 @@
date = new Date();
}
- AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+ RequestContext afContext = RequestContext.getCurrentInstance();
afContext.returnFromDialog(date, null);
return true;
}
else if (XhtmlConstants.CANCEL_EVENT.equals(event))
{
- AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+ RequestContext afContext = RequestContext.getCurrentInstance();
afContext.returnFromDialog(null, null);
return true;
}
@@ -225,7 +224,7 @@
String value = (String) requestParams.get(name);
if (value == null || value.equals(""))
{
- AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+ RequestContext afContext = RequestContext.getCurrentInstance();
Object o = afContext.getPageFlowScope().get(name);
if (o != null)
value = o.toString();
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarUtils.java Wed Jul 26 20:39:26 2006
@@ -22,8 +22,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.trinidad.component.core.input.CoreChooseDate;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
/**
@@ -121,7 +120,7 @@
// adjust the date from AdfRenderingContext's LocaleContext's
// timeZone to server timeZone.
Calendar clientCal =
- Calendar.getInstance(AdfRenderingContext.getCurrentInstance().
+ Calendar.getInstance(RenderingContext.getCurrentInstance().
getLocaleContext().getTimeZone());
clientCal.setTimeInMillis(dateValueInMs);
long tzOffset = clientCal.get(Calendar.ZONE_OFFSET) +
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.pages;
import java.io.IOException;
-
import java.util.Map;
import javax.faces.context.FacesContext;
@@ -33,9 +32,8 @@
import org.apache.myfaces.trinidad.component.html.HtmlRowLayout;
import org.apache.myfaces.trinidad.component.html.HtmlScript;
import org.apache.myfaces.trinidad.component.html.HtmlTableLayout;
-
import org.apache.myfaces.trinidadinternal.convert.ColorConverter;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
/**
* Entry point for the "colorPicker" JSP.
@@ -56,7 +54,7 @@
{
Map requestParams = context.getExternalContext().getRequestParameterMap();
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
CoreDocument doc = new CoreDocument();
context.getViewRoot().getChildren().add(doc);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.pages;
import java.io.IOException;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
@@ -26,21 +25,17 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
import org.apache.myfaces.trinidad.component.core.CoreImportScript;
import org.apache.myfaces.trinidad.component.core.output.CoreOutputText;
-import org.apache.myfaces.trinidad.component.html.HtmlHtml;
import org.apache.myfaces.trinidad.component.html.HtmlFrame;
import org.apache.myfaces.trinidad.component.html.HtmlFrameBorderLayout;
+import org.apache.myfaces.trinidad.component.html.HtmlHtml;
import org.apache.myfaces.trinidad.component.html.HtmlScript;
-
import org.apache.myfaces.trinidadinternal.context.PageFlowScopeProviderImpl;
-import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderKit;
import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-
/**
* Entry point for the "fred" JSP.
* <p>
@@ -96,7 +91,7 @@
static void service(FacesContext context) throws IOException
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
// Don't use HtmlHead or CoreDocument; these add a stylesheet link,
// which we don't need or want
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java Wed Jul 26 20:39:26 2006
@@ -26,12 +26,10 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-
import javax.servlet.http.HttpServletResponse;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.render.InternalView;
-
import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
@@ -92,7 +90,7 @@
String entryKey = (String) context.getExternalContext().getRequestParameterMap().get(__ENTRY_KEY_PARAM);
if (entryKey == null)
{
- AdfFacesContext adfFacesContext = AdfFacesContext.getCurrentInstance();
+ RequestContext adfFacesContext = RequestContext.getCurrentInstance();
if (adfFacesContext != null)
{
Object o = adfFacesContext.getPageFlowScope().get(__ENTRY_KEY_PARAM);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/InlineDatePickerJSP.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/InlineDatePickerJSP.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/InlineDatePickerJSP.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/InlineDatePickerJSP.java Wed Jul 26 20:39:26 2006
@@ -23,8 +23,7 @@
import org.apache.myfaces.trinidad.component.html.HtmlBody;
import org.apache.myfaces.trinidad.component.html.HtmlHtml;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
@@ -51,7 +50,7 @@
{
Map requestParams = context.getExternalContext().getRequestParameterMap();
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
arc.getPartialPageContext().addPartialTarget(
(String) requestParams.get(XhtmlConstants.SOURCE_PARAM));
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/JspUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/JspUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/JspUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/JspUtils.java Wed Jul 26 20:39:26 2006
@@ -18,7 +18,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.trinidad.component.core.nav.CoreGoButton;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.util.nls.StringUtils;
/**
@@ -30,7 +30,7 @@
class JspUtils
{
static public CoreGoButton createGoButton(
- AdfRenderingContext arc,
+ RenderingContext arc,
String textKey)
{
CoreGoButton button = new CoreGoButton();
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.pda;
import java.io.IOException;
-
import java.util.List;
import javax.faces.component.UIComponent;
@@ -29,19 +28,15 @@
import org.apache.myfaces.trinidad.component.UIXTable;
import org.apache.myfaces.trinidad.component.core.data.CoreColumn;
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.xhtml.TableRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
-
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.BandingData;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.ColumnData;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.RenderStage;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.RowData;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TableRenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TableUtils;
-
import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
public class PdaTableRenderer extends TableRenderer
@@ -55,7 +50,7 @@
protected final void renderControlBar(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component)
throws IOException
@@ -104,7 +99,7 @@
protected void renderSubControlBar(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component,
boolean isUpper) throws IOException
@@ -114,7 +109,7 @@
private void _renderEmptyCell(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
boolean isSelect,
Object emptyText) throws IOException
@@ -135,7 +130,7 @@
// render the actual table content, with headers
protected void renderTableContent(
FacesContext context,
- final AdfRenderingContext arc,
+ final RenderingContext arc,
final TableRenderingContext tContext,
final UIComponent component) throws IOException
{
@@ -291,7 +286,7 @@
private void _renderColumnFooter(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component) throws IOException
@@ -348,7 +343,7 @@
protected final void renderSingleRow(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component) throws IOException
{
@@ -406,7 +401,7 @@
// render the complete column header
private void _renderColumnHeader(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
TableRenderingContext tContext,
UIComponent component) throws IOException
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java Wed Jul 26 20:39:26 2006
@@ -17,15 +17,14 @@
import java.io.IOException;
import java.io.Writer;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidadinternal.io.ResponseWriterDecorator;
public class PPRResponseWriter extends ResponseWriterDecorator
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java Wed Jul 26 20:39:26 2006
@@ -15,18 +15,16 @@
*/
package org.apache.myfaces.trinidadinternal.renderkit.core.ppr;
-import java.util.Iterator;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-
-import org.apache.myfaces.trinidadinternal.context.AdfFacesContextImpl;
-
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.logging.ADFLogger;
+import org.apache.myfaces.trinidadinternal.context.RequestContextImpl;
/**
* Context object which is used to track the targets of a partial
@@ -61,7 +59,7 @@
* the specified ids.
*/
public PartialPageContext(
- AdfFacesContext afContext)
+ RequestContext afContext)
{
this();
@@ -69,8 +67,8 @@
// phases (we don't get here until render response). If so, the IDs have
// been kept on the AdfContext. We'll grab them now and add them to the
// target list.
- AdfFacesContextImpl adfContext =
- (AdfFacesContextImpl) afContext;
+ RequestContextImpl adfContext =
+ (RequestContextImpl) afContext;
Iterator targetIter = adfContext.getPartialTargets();
while (targetIter.hasNext())
_targets.put(targetIter.next(), Boolean.FALSE);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/ScriptBufferingResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/ScriptBufferingResponseWriter.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/ScriptBufferingResponseWriter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/ScriptBufferingResponseWriter.java Wed Jul 26 20:39:26 2006
@@ -26,7 +26,6 @@
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidad.util.ArrayMap;
import org.apache.myfaces.trinidadinternal.io.ResponseWriterDecorator;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java Wed Jul 26 20:39:26 2006
@@ -15,12 +15,11 @@
*/
package org.apache.myfaces.trinidadinternal.renderkit.core.skin;
-import org.apache.myfaces.trinidadinternal.ui.laf.base.desktop.BaseDesktopConstants;
import org.apache.myfaces.trinidadinternal.skin.icon.ContextImageIcon;
import org.apache.myfaces.trinidadinternal.skin.icon.NullIcon;
import org.apache.myfaces.trinidadinternal.skin.icon.ReferenceIcon;
import org.apache.myfaces.trinidadinternal.skin.icon.TextIcon;
-
+import org.apache.myfaces.trinidadinternal.ui.laf.base.desktop.BaseDesktopConstants;
import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CoreSkinUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CoreSkinUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CoreSkinUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/CoreSkinUtils.java Wed Jul 26 20:39:26 2006
@@ -17,11 +17,12 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.skin;
import java.io.IOException;
+
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.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
/**
@@ -38,13 +39,13 @@
// This method derives those objects, so if you have them already, use the
// other method.
public static void __renderBackgroundIcon(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Icon icon)
throws IOException
{
if (icon != null)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
FacesContext fContext = context.getFacesContext();
__renderBackgroundIcon(fContext, arc, icon);
}
@@ -54,7 +55,7 @@
// This is more optimized than the method that takes a RenderingContext
public static void __renderBackgroundIcon(
FacesContext fContext,
- AdfRenderingContext arc,
+ RenderingContext arc,
Icon icon)
throws IOException
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java Wed Jul 26 20:39:26 2006
@@ -22,9 +22,9 @@
import java.util.Map;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
/**
@@ -54,7 +54,7 @@
*/
public void renderIcon(
FacesContext context,
- AdfRenderingContext arc,
+ RenderingContext arc,
Map attrs
) throws IOException
{
@@ -68,7 +68,7 @@
*/
public Object getImageURI(
FacesContext context,
- AdfRenderingContext arc)
+ RenderingContext arc)
{
Icon icon = _getIcon(arc);
@@ -78,7 +78,7 @@
/**
* Override of Icon.getImageWidth().
*/
- public Integer getImageWidth(AdfRenderingContext arc)
+ public Integer getImageWidth(RenderingContext arc)
{
Icon icon = _getIcon(arc);
@@ -88,7 +88,7 @@
/**
* Override of Icon.getImageHeight().
*/
- public Integer getImageHeight(AdfRenderingContext arc)
+ public Integer getImageHeight(RenderingContext arc)
{
Icon icon = _getIcon(arc);
@@ -96,7 +96,7 @@
}
// Returns the Icon to use
- private Icon _getIcon(AdfRenderingContext arc)
+ private Icon _getIcon(RenderingContext arc)
{
return (arc.getAgent().getAgentOS() == AdfFacesAgent.OS_MACOS) ?
_macOSIcon :
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/TranslatedTextIcon.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/TranslatedTextIcon.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/TranslatedTextIcon.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/TranslatedTextIcon.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,7 @@
package org.apache.myfaces.trinidadinternal.renderkit.core.skin;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.skin.icon.TextIcon;
/**
@@ -37,7 +37,7 @@
/**
* Returns the text to render.
*/
- protected String getText(AdfRenderingContext arc)
+ protected String getText(RenderingContext arc)
{
return arc.getTranslatedString(_key);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AccessKeyUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AccessKeyUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AccessKeyUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AccessKeyUtils.java Wed Jul 26 20:39:26 2006
@@ -19,6 +19,7 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+
import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
/**