myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcoo...@apache.org
Subject svn commit: r956676 - in /myfaces/trinidad/branches/1.2.12.3.1-branch: trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/
Date Mon, 21 Jun 2010 19:46:35 GMT
Author: mcooper
Date: Mon Jun 21 19:46:34 2010
New Revision: 956676

URL: http://svn.apache.org/viewvc?rev=956676&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/branches/1.2.12.3.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
    myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
    myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java

Modified: myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java?rev=956676&r1=956675&r2=956676&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
(original)
+++ myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
Mon Jun 21 19:46: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/branches/1.2.12.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java?rev=956676&r1=956675&r2=956676&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
(original)
+++ myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
Mon Jun 21 19:46:34 2010
@@ -773,11 +773,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/branches/1.2.12.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java?rev=956676&r1=956675&r2=956676&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
(original)
+++ myfaces/trinidad/branches/1.2.12.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
Mon Jun 21 19:46:34 2010
@@ -474,7 +474,7 @@ public interface TrinidadAgent extends A
   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";
   



Mime
View raw message