You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mc...@apache.org on 2010/06/19 01:44:35 UTC
svn commit: r956156 - in /myfaces/trinidad/trunk:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/
Author: mcooper
Date: Fri Jun 18 23:44:34 2010
New Revision: 956156
URL: http://svn.apache.org/viewvc?rev=956156&view=rev
Log:
TRINIDAD-1839 - Agent PLATFORM_IPHONE should detect iPad as well
The "iphone" platform is really the entire "iOS" platform which already included the iPhone and iPod touch but now also includes iPad.
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
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.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=956156&r1=956155&r2=956156&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 Fri Jun 18 23:44:34 2010
@@ -89,7 +89,7 @@ public interface Agent
public static final String PLATFORM_MAC = PLATFORM_MACOS;
/**
- * Constant for iPhone platform
+ * Constant for the iOS (iPhone/iPod touch/iPad) platform
*/
public static final String PLATFORM_IPHONE = "iphone";
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=956156&r1=956155&r2=956156&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 Fri Jun 18 23:44:34 2010
@@ -779,11 +779,17 @@ public class AgentFactoryImpl implements
if (agent.indexOf("iPhone") > 0)
{
+ // iPhone is a member of the iOS platform:
+ agentObj.setPlatform(Agent.PLATFORM_IPHONE);
+ }
+ else if (agent.indexOf("iPad") > 0)
+ {
+ // iPad is a member of the iOS platform:
agentObj.setPlatform(Agent.PLATFORM_IPHONE);
}
else if (agent.indexOf("iPod") > 0)
{
- // At the moment, the iPod touch version of this browser matches iPhone's
+ // iPod is a member of the iOS platform:
agentObj.setPlatform(Agent.PLATFORM_IPHONE);
}
else if (agent.indexOf("Win") > 0)
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=956156&r1=956155&r2=956156&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 Fri Jun 18 23:44:34 2010
@@ -645,7 +645,7 @@ public abstract class TrinidadAgent impl
public static final String SKIN_GENERIC_PDA = "genericpda";
/*
- * Skin family for all Safari browsers running in iPhones/iPod
+ * Skin family for all Safari browsers running in the iOS platform (iPhones/iPod/iPad)
*/
public static final String SKIN_WEBKIT_IPHONE = "iPhonewebkit";