You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2009/10/14 22:22:34 UTC
svn commit: r825259 - in /myfaces/trinidad/trunk:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/
trin...
Author: matzew
Date: Wed Oct 14 20:22:34 2009
New Revision: 825259
URL: http://svn.apache.org/viewvc?rev=825259&view=rev
Log:
TRINIDAD-1585 - Update the support for the Opera browser.
Thanks to Mark Yvanovich for the patch
Modified:
myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java?rev=825259&r1=825258&r2=825259&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java Wed Oct 14 20:22:34 2009
@@ -150,6 +150,11 @@
public static final String AGENT_GECKO = "gecko";
/**
+ * Constant for Opera agent.
+ */
+ public static final String AGENT_OPERA = "opera";
+
+ /**
* Constant for email agent. Used for all email agents like Outlook 2007
* and Thunderbird
*/
Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java?rev=825259&r1=825258&r2=825259&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java Wed Oct 14 20:22:34 2009
@@ -675,6 +675,11 @@
return (Agent.AGENT_WEBKIT.equals(rc.getAgent().getAgentName()));
}
+ static public boolean isOpera(RenderingContext rc)
+ {
+ return (Agent.AGENT_OPERA.equals(rc.getAgent().getAgentName()));
+ }
+
static public boolean isIPhone(RenderingContext rc)
{
return (Agent.PLATFORM_IPHONE.equals(rc.getAgent().getPlatformName()));
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java?rev=825259&r1=825258&r2=825259&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java Wed Oct 14 20:22:34 2009
@@ -705,7 +705,7 @@
else
{
agentObj.setType(Agent.TYPE_DESKTOP);
- agentObj.setAgent(Agent.AGENT_GECKO);
+ agentObj.setAgent(Agent.AGENT_OPERA);
int operaIndex = agent.indexOf("Opera/");
int firstSpace = agent.indexOf(" ");
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java?rev=825259&r1=825258&r2=825259&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java Wed Oct 14 20:22:34 2009
@@ -82,6 +82,11 @@
return TrinidadAgent.APPLICATION_SAFARI;
}
+ if (TrinidadAgent.AGENT_OPERA.equals(agentName))
+ {
+ return TrinidadAgent.APPLICATION_OPERA;
+ }
+
if(TrinidadAgent.AGENT_BLACKBERRY.equals(agentName))
{
return TrinidadAgent.APPLICATION_BLACKBERRY;
@@ -213,6 +218,8 @@
return TrinidadAgent.AGENT_NETFRONT;
case TrinidadAgent.APPLICATION_SAFARI:
return TrinidadAgent.AGENT_WEBKIT;
+ case TrinidadAgent.APPLICATION_OPERA:
+ return TrinidadAgent.AGENT_OPERA;
case TrinidadAgent.APPLICATION_BLACKBERRY:
return TrinidadAgent.AGENT_BLACKBERRY;
case TrinidadAgent.APPLICATION_NOKIA_S60:
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java?rev=825259&r1=825258&r2=825259&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java Wed Oct 14 20:22:34 2009
@@ -353,6 +353,12 @@
* Application constant for email.
*/
static public final int APPLICATION_EMAIL = 16;
+
+ /**
+ * Application constant for opera.
+ */
+ static public final int APPLICATION_OPERA = 17;
+
/**
* OS constant for an unknown operating system.
*/
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java?rev=825259&r1=825258&r2=825259&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java Wed Oct 14 20:22:34 2009
@@ -61,6 +61,8 @@
browser = TrinidadAgent.APPLICATION_ICE;
else if (_BROWSER_WEBKIT.equals(browserName))
browser = TrinidadAgent.APPLICATION_SAFARI;
+ else if (_BROWSER_OPERA.equals(browserName))
+ browser = TrinidadAgent.APPLICATION_OPERA;
else if (_BROWSER_BLACKBERRY.equals(browserName))
browser = TrinidadAgent.APPLICATION_BLACKBERRY;
else if (_BROWSER_NOKIA_S60.equals(browserName))
@@ -102,6 +104,9 @@
case TrinidadAgent.APPLICATION_SAFARI:
name = _BROWSER_WEBKIT;
break;
+ case TrinidadAgent.APPLICATION_OPERA:
+ name = _BROWSER_OPERA;
+ break;
case TrinidadAgent.APPLICATION_BLACKBERRY:
name = _BROWSER_BLACKBERRY;
break;
@@ -761,6 +766,9 @@
private static final String _BROWSER_GENERICPDA = "genericpda";
private static final String _BROWSER_EMAIL = "email";
+
+ private static final String _BROWSER_OPERA = "opera";
+
// Platform constants
private static final String _PLATFORM_WINDOWS = "windows";