You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mu...@apache.org on 2010/12/21 23:40:42 UTC
svn commit: r1051689 - in /myfaces/trinidad/trunk:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
Author: muthaman
Date: Tue Dec 21 22:40:42 2010
New Revision: 1051689
URL: http://svn.apache.org/viewvc?rev=1051689&view=rev
Log:
TRINIDAD-1978 - Platforms for Android and Palm Browsers Are Not Detected
Modified:
myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.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=1051689&r1=1051688&r2=1051689&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 Tue Dec 21 22:40:42 2010
@@ -128,6 +128,11 @@ public interface Agent
* Constant for generic PDA device browser
*/
public static final String PLATFORM_GENERICPDA = "genericpda";
+
+ /**
+ * Constant for android device browsers
+ */
+ public static final String PLATFORM_ANDROID = "android";
/**
* Constant for unknown platform version
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=1051689&r1=1051688&r2=1051689&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 Tue Dec 21 22:40:42 2010
@@ -846,9 +846,13 @@ public class AgentFactoryImpl implements
// At the moment, this includes Safari and Google Chrome
agentObj.setPlatform(Agent.PLATFORM_WINDOWS);
}
+ else if (agent.indexOf("Android") > 0)
+ {
+ //Includes Android Webkit browsers
+ agentObj.setPlatform(Agent.PLATFORM_ANDROID);
+ }
else if (agent.indexOf("Linux") > 0)
{
- // At the moment, this includes Android
agentObj.setPlatform(Agent.PLATFORM_LINUX);
}
else if (agent.indexOf("Mac") > 0)
@@ -861,7 +865,11 @@ public class AgentFactoryImpl implements
//Includes Blackberry Webkit browsers
agentObj.setPlatform(Agent.PLATFORM_BLACKBERRY);
}
-
+ else if (agent.indexOf("webOS") > 0)
+ {
+ agentObj.setPlatform(Agent.PLATFORM_PALM);
+ }
+
String version = _getVersion(agent, start);
agentObj.setType(Agent.TYPE_DESKTOP);
if ((agent.indexOf("Symbian") > -1) || (agent.indexOf("Nokia") > -1))