You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2010/01/05 22:32:47 UTC
svn commit: r896231 [2/2] - in /myfaces/trinidad/trunk:
src/site/xdoc/devguide/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/
trinidad-impl/src/main/java/org/apache/myfaces/...
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java?rev=896231&r1=896230&r2=896231&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java Tue Jan 5 21:32:45 2010
@@ -53,7 +53,7 @@
)
{
return (context.getAgent().getAgentApplication() ==
- TrinidadAgent.APPLICATION_NETSCAPE);
+ TrinidadAgent.Application.NETSCAPE);
}
/**
@@ -64,7 +64,7 @@
)
{
return (context.getAgent().getAgentApplication() ==
- TrinidadAgent.APPLICATION_SAFARI);
+ TrinidadAgent.Application.SAFARI);
}
@@ -76,7 +76,7 @@
)
{
return (context.getAgent().getAgentApplication() ==
- TrinidadAgent.APPLICATION_GECKO);
+ TrinidadAgent.Application.GECKO);
}
/**
@@ -87,7 +87,7 @@
)
{
return (context.getAgent().getAgentApplication() ==
- TrinidadAgent.APPLICATION_IEXPLORER);
+ TrinidadAgent.Application.IEXPLORER);
}
/**
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.java?rev=896231&r1=896230&r2=896231&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.java Tue Jan 5 21:32:45 2010
@@ -615,7 +615,7 @@
public Object getValue(UIXRenderingContext context)
{
if (context.getAgent().getAgentApplication() ==
- TrinidadAgent.APPLICATION_NETSCAPE)
+ TrinidadAgent.Application.NETSCAPE)
return _netscapeObj;
else return _elseObj;
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java?rev=896231&r1=896230&r2=896231&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java Tue Jan 5 21:32:45 2010
@@ -53,7 +53,7 @@
// hopefully we can remove it eventually
if ( context.getAgent().getAgentType() == TrinidadAgent.TYPE_PDA &&
context.getAgent().getAgentApplication() ==
- TrinidadAgent.APPLICATION_IEXPLORER )
+ TrinidadAgent.Application.IEXPLORER )
setRenderingProperty(context,
VISIBLE_FORM_ELEMENT_RENDERED,
Boolean.TRUE);
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java?rev=896231&r1=896230&r2=896231&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java Tue Jan 5 21:32:45 2010
@@ -199,7 +199,7 @@
// See bug 2866954
if ( context.getAgent().getAgentOS() == TrinidadAgent.OS_MACOS &&
context.getAgent().getAgentApplication() ==
- TrinidadAgent.APPLICATION_IEXPLORER)
+ TrinidadAgent.Application.IEXPLORER)
valign = "top";
else
valign = "bottom";
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java?rev=896231&r1=896230&r2=896231&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java Tue Jan 5 21:32:45 2010
@@ -52,7 +52,7 @@
TrinidadAgent agent = context.getAgent();
switch (agent.getAgentApplication())
{
- case TrinidadAgent.APPLICATION_IEXPLORER:
+ case IEXPLORER:
if (agent.getAgentOS() == TrinidadAgent.OS_WINDOWS)
{
// IE 4 doesn't support the label hack.
@@ -71,13 +71,13 @@
return false;
// Mozilla does support the label hack
- case TrinidadAgent.APPLICATION_GECKO:
+ case GECKO:
// Make sure we don't change the VE to Gecko
assert(agent.getCapability(TrinidadAgent.CAP_IS_JDEV_VE) == null);
return true;
// Assume everyone else doesn't.
- case TrinidadAgent.APPLICATION_NETSCAPE:
+ case NETSCAPE:
default:
return false;
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java?rev=896231&r1=896230&r2=896231&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java Tue Jan 5 21:32:45 2010
@@ -1042,7 +1042,7 @@
if ((id != null) &&
(partialTargets != null) &&
- (agent.getAgentApplication() == TrinidadAgent.APPLICATION_IEXPLORER))
+ (agent.getAgentApplication() == TrinidadAgent.Application.IEXPLORER))
{
iconID = id.toString() + "-i";
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java?rev=896231&r1=896230&r2=896231&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java Tue Jan 5 21:32:45 2010
@@ -880,7 +880,7 @@
// 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 (TrinidadAgent.APPLICATION_ICE == agent.getAgentApplication())
+ if (TrinidadAgent.Application.ICE == agent.getAgentApplication())
return false;
//int encodings = ((Integer)agent.getCapability(
@@ -946,9 +946,9 @@
// For now, "top" in Netscape, "absmiddle" everywhere else
String align = null;
- int agentApplication = context.getAgent().getAgentApplication();
+ TrinidadAgent.Application agentApplication = context.getAgent().getAgentApplication();
- if (agentApplication == TrinidadAgent.APPLICATION_NETSCAPE)
+ if (agentApplication == TrinidadAgent.Application.NETSCAPE)
{
align = UIConstants.V_ALIGN_TOP;
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java?rev=896231&r1=896230&r2=896231&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java Tue Jan 5 21:32:45 2010
@@ -118,10 +118,10 @@
// At the moment we have blocking solved on IE and Mozilla
if (supportsPartialRendering(context))
{
- int application = context.getAgent().getAgentApplication();
+ TrinidadAgent.Application application = context.getAgent().getAgentApplication();
- return ((application == TrinidadAgent.APPLICATION_IEXPLORER)
- || (application == TrinidadAgent.APPLICATION_GECKO));
+ return ((application == TrinidadAgent.Application.IEXPLORER)
+ || (application == TrinidadAgent.Application.GECKO));
}
return false;
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeEqualsTest.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeEqualsTest.java?rev=896231&r1=896230&r2=896231&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeEqualsTest.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeEqualsTest.java Tue Jan 5 21:32:45 2010
@@ -33,6 +33,7 @@
import org.apache.myfaces.trinidad.skin.Icon;
import org.apache.myfaces.trinidadinternal.skin.icon.ContextImageIcon;
import org.apache.myfaces.trinidadinternal.skin.icon.TextIcon;
+import org.apache.myfaces.trinidadinternal.skin.AgentAtRuleMatcher;
/**
* Test the getStyleSheetId() method on the StyleSheetNode object.
@@ -133,17 +134,9 @@
Locale[] diffOrderLocalesArray = getDiffOrderLocalesArray();
// create a browsers map
- Map<Integer, Set<Version>> browsers = new HashMap<Integer, Set<Version>>();
- browsers.put(1, new HashSet<Version>(Arrays.asList(new Version("5"), new Version("6"))));
- browsers.put(2, new HashSet<Version>(Arrays.asList(new Version("7"), new Version("8"))));
- Map<Integer, Set<Version>> anotherBrowsers = new HashMap<Integer, Set<Version>>();
- anotherBrowsers.put(1, new HashSet<Version>(Arrays.asList(new Version("5"), new Version("6"))));
- anotherBrowsers.put(2, new HashSet<Version>(Arrays.asList(new Version("7"), new Version("8"))));
- Map<Integer, Set<Version>> anotherBrowsersDiffOrder
- = new HashMap<Integer, Set<Version>>();
- anotherBrowsersDiffOrder.put(2, new HashSet<Version>(Arrays.asList(new Version("8"), new Version("7"))));
- anotherBrowsersDiffOrder.put(1, new HashSet<Version>(Arrays.asList(new Version("6"), new Version("5"))));
-
+ String browserSelector = "netscape and (version:5), netscape and (version:6), ie and (version:7), ie and (version:8)";
+ String anotherBrowserSelector = browserSelector;
+ String anotherBrowserDiffOrder = "ie and (version:8), ie and (version:7), netscape and (version:6), netscape and (version:5)";
int[] platforms = {2, 3, 4};
int[] anotherPlatforms = {2, 3, 4};
@@ -168,7 +161,7 @@
null,
localesArray,
0,
- browsers,
+ new AgentAtRuleMatcher(browserSelector),
platforms,
0,
accProps);
@@ -178,7 +171,7 @@
null,
anotherLocalesArray,
0,
- anotherBrowsersDiffOrder,
+ new AgentAtRuleMatcher(anotherBrowserSelector),
anotherPlatforms,
0,
anotherAccProps);
@@ -188,7 +181,7 @@
null,
diffOrderLocalesArray,
0,
- anotherBrowsersDiffOrder,
+ new AgentAtRuleMatcher(anotherBrowserDiffOrder),
differentOrderPlatforms,
0,
differentOrderAccProps);
@@ -337,3 +330,4 @@
}
+