You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2011/07/20 20:27:14 UTC
svn commit: r1148880 - in /myfaces/trinidad/branches/1.2-ios-branch:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/
trinidad-impl/src/main/java/org/apache/myfaces/t...
Author: arobinson74
Date: Wed Jul 20 18:27:12 2011
New Revision: 1148880
URL: http://svn.apache.org/viewvc?rev=1148880&view=rev
Log:
Commit changes from iOS on trunk
Modified:
myfaces/trinidad/branches/1.2-ios-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java
myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml
Modified: myfaces/trinidad/branches/1.2-ios-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2-ios-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java?rev=1148880&r1=1148879&r2=1148880&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2-ios-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java (original)
+++ myfaces/trinidad/branches/1.2-ios-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java Wed Jul 20 18:27:12 2011
@@ -145,6 +145,11 @@ public interface Agent
public static final String AGENT_ORACLE_SES = "oracle_ses";
/**
+ * Constant for android device browsers
+ */
+ public static final String PLATFORM_ANDROID = "android";
+
+ /**
* Constant for unknown platform version
*/
public static final String PLATFORM_VERSION_UNKNOWN = "unknown";
Modified: myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java?rev=1148880&r1=1148879&r2=1148880&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java (original)
+++ myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentFactoryImpl.java Wed Jul 20 18:27:12 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,6 +865,10 @@ 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);
Modified: myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java?rev=1148880&r1=1148879&r2=1148880&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java (original)
+++ myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/AgentNameUtil.java Wed Jul 20 18:27:12 2011
@@ -178,6 +178,11 @@ public class AgentNameUtil
return TrinidadAgent.OS_GENERICPDA;
}
+ if (TrinidadAgent.PLATFORM_ANDROID.equals(platformName))
+ {
+ return TrinidadAgent.OS_ANDROID;
+ }
+
return TrinidadAgent.OS_UNKNOWN;
}
@@ -285,6 +290,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/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java?rev=1148880&r1=1148879&r2=1148880&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java (original)
+++ myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java Wed Jul 20 18:27:12 2011
@@ -64,6 +64,13 @@ public interface TrinidadAgent extends A
static public final CapabilityKey CAP_HEIGHT =
CapabilityKey.getCapabilityKey("height", true);
+ /**
+ * Touch-screen capability, indicating the agent supports TouchEvent and GestureEvent
+ * events.
+ */
+ static public final CapabilityKey CAP_TOUCH_SCREEN =
+ CapabilityKey.getCapabilityKey("touchScreen", true);
+
//
// XHTML Modularization
//
@@ -234,6 +241,24 @@ public interface TrinidadAgent extends A
static public Object SELECTORS_MULTIPLE =
CapabilityValue.getCapabilityValue (CAP_CSS_SELECTORS, "multiple");
+ // Values for CAP_TOUCH_SCREEN
+ /**
+ * Agent does not have a touch screen
+ */
+ static public final Object TOUCH_SCREEN_NONE =
+ CapabilityValue.getCapabilityValue (CAP_TOUCH_SCREEN, "none");
+
+ /**
+ * Agent only supports single finger touch events
+ */
+ static public final Object TOUCH_SCREEN_SINGLE =
+ CapabilityValue.getCapabilityValue (CAP_TOUCH_SCREEN, "single");
+ /**
+ * Agent supports multiple finger touch events and gestures
+ */
+ static public final Object TOUCH_SCREEN_MULTIPLE =
+ CapabilityValue.getCapabilityValue (CAP_TOUCH_SCREEN, "multiple");
+
/**
* Application constant for Desktop devices
*/
@@ -429,6 +454,10 @@ public interface TrinidadAgent extends A
*/
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/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java?rev=1148880&r1=1148879&r2=1148880&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java (original)
+++ myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java Wed Jul 20 18:27:12 2011
@@ -217,6 +217,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))
@@ -264,6 +266,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;
@@ -782,6 +787,8 @@ public class NameUtils
private static final String _PLATFORM_GENERICPDA = "genericpda";
+ private static final String _PLATFORM_ANDROID = "android";
+
// Accessibility constants
private static final String _ACC_HIGH_CONTRAST = "hc";
Modified: myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml?rev=1148880&r1=1148879&r2=1148880&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml (original)
+++ myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/resources/META-INF/agent/capabilities.xml Wed Jul 20 18:27:12 2011
@@ -89,6 +89,20 @@
<include src="email.xml" />
</capabilities>
+ <capabilities id="ios" agents="webkit/500+" platforms="ipad iphone ipod">
+ <!-- note, version included to give it a higher score than the webkit312 below -->
+ <include refid="html" />
+ <include src="webkit312.xml"/>
+ <include src="ios.xml"/>
+ </capabilities>
+
+ <capabilities id="android" agents="webkit/500+" platforms="android">
+ <!-- note, version included to give it a higher score than the webkit312 below -->
+ <include refid="html" />
+ <include src="webkit312.xml"/>
+ <include src="android.xml"/>
+ </capabilities>
+
<capabilities id="webkit" agents="webkit">
<include refid="html" />
<include src="webkit.xml"/>
Modified: myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml?rev=1148880&r1=1148879&r2=1148880&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml (original)
+++ myfaces/trinidad/branches/1.2-ios-branch/trinidad-impl/src/main/resources/META-INF/agent/htmlBasic.xml Wed Jul 20 18:27:12 2011
@@ -25,6 +25,7 @@
<capability name="tables" value="basic"/>
<capability name="frames" value="false"/>
<capability name="iframes" value="false"/>
+ <capability name="touchScreen" value="none" />
<capability name="-adfinternal-id" value="true"/>
<capability name="-adfinternal-advancedForms" value="false"/>
<capability name="-adfinternal-target" value="false"/>