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 2011/01/08 01:49:59 UTC
svn commit: r1056575 - in /myfaces/trinidad/trunk:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-api/src/test/clirr/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/
trinidad-impl/src/main/java/org/apach...
Author: muthaman
Date: Sat Jan 8 00:49:58 2011
New Revision: 1056575
URL: http://svn.apache.org/viewvc?rev=1056575&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-api/src/test/clirr/clirr-runner.txt
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=1056575&r1=1056574&r2=1056575&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 Sat Jan 8 00:49:58 2011
@@ -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-api/src/test/clirr/clirr-runner.txt
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/test/clirr/clirr-runner.txt?rev=1056575&r1=1056574&r2=1056575&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/test/clirr/clirr-runner.txt (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/test/clirr/clirr-runner.txt Sat Jan 8 00:49:58 2011
@@ -1235,6 +1235,7 @@ INFO: 7011: org.apache.myfaces.trinidad.
ERROR: 7005: org.apache.myfaces.trinidad.component.visit.VisitTreeUtils: Parameter 3 of 'public boolean visitSingleComponent(javax.faces.context.FacesContext, java.lang.String, org.apache.myfaces.trinidad.component.visit.VisitCallback)' has changed its type to javax.faces.component.visit.VisitCallback
INFO: 6000: org.apache.myfaces.trinidad.context.Agent: Added public field AGENT_GOOGLEBOT
INFO: 6000: org.apache.myfaces.trinidad.context.Agent: Added public field AGENT_MSNBOT
+INFO: 6000: org.apache.myfaces.trinidad.context.Agent: Added public field PLATFORM_ANDROID
INFO: 6000: org.apache.myfaces.trinidad.context.Agent: Added public field TYPE_WEBCRAWLER
INFO: 8000: org.apache.myfaces.trinidad.context.ComponentContextChange: Class org.apache.myfaces.trinidad.context.ComponentContextChange added
INFO: 8000: org.apache.myfaces.trinidad.context.ComponentContextManager: Class org.apache.myfaces.trinidad.context.ComponentContextManager added
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=1056575&r1=1056574&r2=1056575&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 Sat Jan 8 00:49:58 2011
@@ -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))
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=1056575&r1=1056574&r2=1056575&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 Sat Jan 8 00:49:58 2011
@@ -86,6 +86,11 @@ public class AgentNameUtil
return TrinidadAgent.OS_GENERICPDA;
}
+ if (TrinidadAgent.PLATFORM_ANDROID.equals(platformName))
+ {
+ return TrinidadAgent.OS_ANDROID;
+ }
+
return TrinidadAgent.OS_UNKNOWN;
}
@@ -147,6 +152,8 @@ public class AgentNameUtil
return TrinidadAgent.PLATFORM_NOKIA_S60;
case TrinidadAgent.OS_GENERICPDA:
return TrinidadAgent.PLATFORM_GENERICPDA;
+ case TrinidadAgent.OS_ANDROID:
+ return TrinidadAgent.PLATFORM_ANDROID;
default:
return null;
}
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=1056575&r1=1056574&r2=1056575&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 Sat Jan 8 00:49:58 2011
@@ -601,8 +601,12 @@ public abstract class TrinidadAgent impl
* OS constant for generic PDA
*/
static public final int OS_GENERICPDA = 10;
-
-
+
+ /**
+ * OS constant for Android
+ */
+ static public final int OS_ANDROID = 11;
+
/**
* Name Constant for Netfront agent
*/
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=1056575&r1=1056574&r2=1056575&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 Sat Jan 8 00:49:58 2011
@@ -153,6 +153,8 @@ public class NameUtils
platform = TrinidadAgent.OS_NOKIA_S60;
else if (_PLATFORM_GENERICPDA.equals(platformName))
platform = TrinidadAgent.OS_GENERICPDA;
+ else if (_PLATFORM_ANDROID.equals(platformName))
+ platform = TrinidadAgent.OS_ANDROID;
else if (!_PLATFORM_UNIX.equals(platformName))
@@ -200,6 +202,9 @@ public class NameUtils
case TrinidadAgent.OS_GENERICPDA:
name = _PLATFORM_GENERICPDA;
break;
+ case TrinidadAgent.OS_ANDROID:
+ name = _PLATFORM_ANDROID;
+ break;
case TrinidadAgent.OS_UNKNOWN:
// This case is only here to avoid the default assertion
break;
@@ -697,6 +702,8 @@ public class NameUtils
private static final String _PLATFORM_NOKIA_S60 = "nokia_s60";
private static final String _PLATFORM_GENERICPDA = "genericpda";
+
+ private static final String _PLATFORM_ANDROID = "android";
// Accessibility constants
private static final String _ACC_HIGH_CONTRAST = "hc";