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/22 23:44:45 UTC
svn commit: r1052089 - 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: Wed Dec 22 22:44:45 2010
New Revision: 1052089
URL: http://svn.apache.org/viewvc?rev=1052089&view=rev
Log:
TRINIDAD-1986 - Fix for TRINIDAD-1978 Has Broken the Trinidad Build
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=1052089&r1=1052088&r2=1052089&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 Dec 22 22:44:45 2010
@@ -128,11 +128,6 @@ 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=1052089&r1=1052088&r2=1052089&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 Dec 22 22:44:45 2010
@@ -846,13 +846,9 @@ 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)
@@ -865,11 +861,7 @@ 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))