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 18:31:41 UTC
svn commit: r426189 [3/3] - in
/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal:
agent/ context/ image/ image/cache/ renderkit/ renderkit/core/
renderkit/core/pages/ ...
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SelectOptionRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SelectOptionRenderer.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SelectOptionRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SelectOptionRenderer.java Thu Jul 27 11:31:36 2006
@@ -19,7 +19,7 @@
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
@@ -40,7 +40,7 @@
boolean agentSupportsDisabledOptions = Boolean.TRUE
.equals(getAgentCapability(context,
- AdfFacesAgent.CAP_SUPPORTS_DISABLED_OPTIONS));
+ TrinidadAgent.CAP_SUPPORTS_DISABLED_OPTIONS));
if (!(agentSupportsDisabledOptions))
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java Thu Jul 27 11:31:36 2006
@@ -17,7 +17,7 @@
import java.io.IOException;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -51,16 +51,16 @@
renderAttribute(context, "summary", (summary==null) ? "" : summary);
}
- Object tableCap = getAgentCapability(context, AdfFacesAgent.CAP_TABLES);
+ Object tableCap = getAgentCapability(context, TrinidadAgent.CAP_TABLES);
boolean supportsAdvancedAttrs = false;
boolean supportsAdvanced = false;
if (tableCap != null)
{
- supportsAdvanced = (AdfFacesAgent.TABLES_CAP_ADVANCED == tableCap);
+ supportsAdvanced = (TrinidadAgent.TABLES_CAP_ADVANCED == tableCap);
supportsAdvancedAttrs = supportsAdvanced ||
- (AdfFacesAgent.TABLES_CAP_ADVANCED_ATTRS == tableCap);
+ (TrinidadAgent.TABLES_CAP_ADVANCED_ATTRS == tableCap);
if (supportsAdvancedAttrs)
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java Thu Jul 27 11:31:36 2006
@@ -32,7 +32,7 @@
import org.apache.myfaces.trinidadinternal.image.ImageProvider;
import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
import org.apache.myfaces.trinidadinternal.style.Style;
@@ -134,7 +134,7 @@
UIXRenderingContext context
)
{
- return getBooleanAgentCapability(context, AdfFacesAgent.CAP_ADVANCED_BUTTONS);
+ return getBooleanAgentCapability(context, TrinidadAgent.CAP_ADVANCED_BUTTONS);
}
/**
@@ -144,7 +144,7 @@
UIXRenderingContext context
)
{
- return getBooleanAgentCapability(context, AdfFacesAgent.CAP_VALIGN);
+ return getBooleanAgentCapability(context, TrinidadAgent.CAP_VALIGN);
}
/**
@@ -154,7 +154,7 @@
UIXRenderingContext context
)
{
- return getBooleanAgentCapability(context, AdfFacesAgent.CAP_NOWRAP);
+ return getBooleanAgentCapability(context, TrinidadAgent.CAP_NOWRAP);
}
/**
@@ -165,7 +165,7 @@
)
{
return getBooleanAgentCapability(context,
- AdfFacesAgent.CAP_ALT_RENDERS_TOOLTIP_ON_IMAGE);
+ TrinidadAgent.CAP_ALT_RENDERS_TOOLTIP_ON_IMAGE);
}
/**
@@ -1188,10 +1188,10 @@
// number of spacers. bug 3786394:
boolean useScript =
((count < 800)
- && (AdfFacesAgent.SCRIPTING_SPEED_CAP_FAST ==
- getAgentCapability(context, AdfFacesAgent.CAP_SCRIPTING_SPEED))
+ && (TrinidadAgent.SCRIPTING_SPEED_CAP_FAST ==
+ getAgentCapability(context, TrinidadAgent.CAP_SCRIPTING_SPEED))
&& (null ==
- getAgentCapability(context, AdfFacesAgent.CAP_IS_JDEV_VE)));
+ getAgentCapability(context, TrinidadAgent.CAP_IS_JDEV_VE)));
_renderTransparent(context, width, height, needsQuoting, id, useScript);
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java Thu Jul 27 11:31:36 2006
@@ -41,7 +41,7 @@
import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.share.config.Configuration;
import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
@@ -925,13 +925,13 @@
UIXRenderingContext context
)
{
- AdfFacesAgent agent = context.getAgent();
+ TrinidadAgent agent = context.getAgent();
// =-=ags Temporarily disabling the use of transparent images
// on ICE due to problems with tiling transparent images that
// are affecting UIXVE. This code should be removed once the
// underlying ICE bug is fixed (supposedly ICE 5.4.1)
- if (AdfFacesAgent.APPLICATION_ICE == agent.getAgentApplication())
+ if (TrinidadAgent.APPLICATION_ICE == agent.getAgentApplication())
return false;
//int encodings = ((Integer)agent.getCapability(
@@ -941,7 +941,7 @@
//if ((encodings & AdfFacesAgent.IMAGE_ENCODINGS_CAP_TRANSPARENT_PNG) != 0)
// return true;
- if (agent.getCapability(AdfFacesAgent.CAP_TRANSPARENT_PNG_TYPE_IMAGE) == Boolean.TRUE)
+ if (agent.getCapability(TrinidadAgent.CAP_TRANSPARENT_PNG_TYPE_IMAGE) == Boolean.TRUE)
return true;
// Otherwise, check GIF suport...
@@ -949,7 +949,7 @@
//return (((encodings & AdfFacesAgent.IMAGE_ENCODINGS_CAP_GIF) != 0) &&
// !Boolean.FALSE.equals(config.getProperty(_GIF_ENABLED)));
- return ((agent.getCapability(AdfFacesAgent.CAP_GIF_TYPE_IMAGE) == Boolean.TRUE) &&
+ return ((agent.getCapability(TrinidadAgent.CAP_GIF_TYPE_IMAGE) == Boolean.TRUE) &&
!Boolean.FALSE.equals(config.getProperty(_GIF_ENABLED)));
}
@@ -999,7 +999,7 @@
String align = null;
int agentApplication = context.getAgent().getAgentApplication();
- if (agentApplication == AdfFacesAgent.APPLICATION_NETSCAPE)
+ if (agentApplication == TrinidadAgent.APPLICATION_NETSCAPE)
{
align = UIConstants.V_ALIGN_TOP;
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java Thu Jul 27 11:31:36 2006
@@ -30,7 +30,7 @@
import org.apache.myfaces.trinidad.component.core.layout.CorePanelBox;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -572,8 +572,8 @@
UIXRenderingContext context
)
{
- AdfFacesAgent agent = context.getAgent();
- Object capImageStretch = agent.getCapability(AdfFacesAgent.CAP_IMAGE_STRETCH);
+ TrinidadAgent agent = context.getAgent();
+ Object capImageStretch = agent.getCapability(TrinidadAgent.CAP_IMAGE_STRETCH);
// If the Agent supports image stretching, return the
// Map with height=100%. Otherwise we don't
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java Thu Jul 27 11:31:36 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.laf.simple.pda;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeelManager;
import org.apache.myfaces.trinidadinternal.ui.laf.NameAndAgentScorer;
import org.apache.myfaces.trinidadinternal.ui.laf.base.pda.PdaHtmlLafUtils;
@@ -49,7 +49,7 @@
private static final NameAndAgentScorer _PDA_SCORER =
new NameAndAgentScorer("simple",
- IntegerUtils.getInteger(AdfFacesAgent.TYPE_PDA),
+ IntegerUtils.getInteger(TrinidadAgent.TYPE_PDA),
null,
null,
null);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java Thu Jul 27 11:31:36 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.partial;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
@@ -99,8 +99,8 @@
{
// First, make sure the agent supports partial rendering
- AdfFacesAgent agent = context.getAgent();
- Object capPartial = agent.getCapability(AdfFacesAgent.CAP_PARTIAL_RENDERING);
+ TrinidadAgent agent = context.getAgent();
+ Object capPartial = agent.getCapability(TrinidadAgent.CAP_PARTIAL_RENDERING);
if (!Boolean.TRUE.equals(capPartial))
return false;
@@ -116,8 +116,8 @@
{
int application = context.getAgent().getAgentApplication();
- return ((application == AdfFacesAgent.APPLICATION_IEXPLORER)
- || (application == AdfFacesAgent.APPLICATION_GECKO));
+ return ((application == TrinidadAgent.APPLICATION_IEXPLORER)
+ || (application == TrinidadAgent.APPLICATION_GECKO));
}
return false;
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java Thu Jul 27 11:31:36 2006
@@ -26,7 +26,7 @@
import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.share.config.ContextBasedConfiguration;
import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
import org.apache.myfaces.trinidadinternal.share.xml.XMLUtils;
@@ -149,7 +149,7 @@
return _adfRenderingContext.getSkin();
}
- public AdfFacesAgent getAgent()
+ public TrinidadAgent getAgent()
{
return _adfRenderingContext.getAgent();
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java?rev=426189&r1=426188&r2=426189&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java Thu Jul 27 11:31:36 2006
@@ -25,7 +25,7 @@
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
/**
@@ -716,7 +716,7 @@
RenderingContext arc = RenderingContext.getCurrentInstance();
if (!Boolean.FALSE.equals(arc.getAgent().getCapability(
- AdfFacesAgent.CAP_NAVIGATION)))
+ TrinidadAgent.CAP_NAVIGATION)))
context.getResponseWriter().writeURIAttribute("href", href, null);
}