You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/01/12 08:17:57 UTC
svn commit: r611380 - in /myfaces/trinidad/trunk_1.2.x:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-api/src/main/resources/
trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/
trinidad-impl/src/main/java/org/apa...
Author: matzew
Date: Fri Jan 11 23:17:56 2008
New Revision: 611380
URL: http://svn.apache.org/viewvc?rev=611380&view=rev
Log:
TRINIDAD-894
thx to Venkata Guddanti for the patch
Modified:
myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RenderingContext.java
myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/resources/trinidad-config.xsd
myfaces/trinidad/trunk_1.2.x/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RenderingContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RenderingContext.java?rev=611380&r1=611379&r2=611380&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RenderingContext.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RenderingContext.java Fri Jan 11 23:17:56 2008
@@ -92,6 +92,7 @@
abstract public boolean isRightToLeft();
abstract public String getOutputMode();
abstract public RequestContext.Accessibility getAccessibilityMode();
+ abstract public boolean isAnimationEnabled();
// TODO This is a hack API to enable caching of the client ID.
// All fine, but we should have a more general mechanism.
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java?rev=611380&r1=611379&r2=611380&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java Fri Jan 11 23:17:56 2008
@@ -270,6 +270,11 @@
*/
public abstract ClientValidation getClientValidation();
+ /**
+ * Returns the system wide setting to turn animation on/off.
+ */
+ public abstract boolean isAnimationEnabled();
+
//
// General localization
//
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/resources/trinidad-config.xsd
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/resources/trinidad-config.xsd?rev=611380&r1=611379&r2=611380&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/resources/trinidad-config.xsd (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/resources/trinidad-config.xsd Fri Jan 11 23:17:56 2008
@@ -172,6 +172,15 @@
</documentation>
</annotation>
</element>
+
+ <element name="animation-enabled" minOccurs="0" maxOccurs="1"
+ type="config:booleanExpressionType">
+ <annotation>
+ <documentation>The <animation-enabled> is a system wide setting to turn animation on or off.
+ </documentation>
+ </annotation>
+ </element>
+
</all>
</complexType>
</element>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java?rev=611380&r1=611379&r2=611380&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java Fri Jan 11 23:17:56 2008
@@ -165,6 +165,17 @@
_rtl = rtl;
}
+ public void setAnimationEnabled(boolean animationEnabled)
+ {
+ _animationEnabled = animationEnabled;
+ }
+
+ @Override
+ public boolean isAnimationEnabled()
+ {
+ return _animationEnabled;
+ }
+
@Override
public Locale getFormattingLocale()
{
@@ -339,5 +350,6 @@
private Accessibility _accMode;
private Agent _agent;
private boolean _rtl = false;
+ private boolean _animationEnabled = true;
private Locale _formattingLocale;
}
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java?rev=611380&r1=611379&r2=611380&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextBean.java Fri Jan 11 23:17:56 2008
@@ -70,7 +70,8 @@
PropertyKey.CAP_NOT_BOUND);
static public final PropertyKey REMOTE_DEVICE_REPOSITORY_URI =
TYPE.registerKey("remote-device-repository-uri");
-
+ static public final PropertyKey ANIMATION_ENABLED_KEY =
+ TYPE.registerKey("animation-enabled", Boolean.class, true);
static
{
TYPE.lock();
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java?rev=611380&r1=611379&r2=611380&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java Fri Jan 11 23:17:56 2008
@@ -266,6 +266,12 @@
}
@Override
+ public boolean isAnimationEnabled()
+ {
+ return Boolean.TRUE.equals(_bean.getProperty(RequestContextBean.ANIMATION_ENABLED_KEY));
+ }
+
+ @Override
public char getNumberGroupingSeparator()
{
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java?rev=611380&r1=611379&r2=611380&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java Fri Jan 11 23:17:56 2008
@@ -85,6 +85,7 @@
_initializePPR(context, afContext);
// Get and cache (since it can be EL-bound)
_accessibilityMode = afContext.getAccessibilityMode();
+ _animationEnabled = afContext.isAnimationEnabled();
}
@@ -182,6 +183,12 @@
return _accessibilityMode;
}
+ @Override
+ public boolean isAnimationEnabled()
+ {
+ return _animationEnabled;
+ }
+
/**
* This will create a FormData object if it's null.
*/
@@ -668,6 +675,7 @@
private Map<String, String> _skinResourceKeyMap;
private String _outputMode;
private RequestContext.Accessibility _accessibilityMode;
+ private boolean _animationEnabled;
private PartialPageContext _pprContext;
private LocaleContext _localeContext;
private StyleContext _styleContext;
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java?rev=611380&r1=611379&r2=611380&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java Fri Jan 11 23:17:56 2008
@@ -44,6 +44,7 @@
public class MRequestContext extends RequestContext
{
+
public MRequestContext()
{
attach();
@@ -180,6 +181,17 @@
_rtl = rtl;
}
+ public void setAnimationEnabled(boolean animationEnabled)
+ {
+ _animationEnabled = animationEnabled;
+ }
+
+ @Override
+ public boolean isAnimationEnabled()
+ {
+ return _animationEnabled;
+ }
+
@Override
public Locale getFormattingLocale()
{
@@ -315,6 +327,8 @@
private ClientValidation _clientValidation = ClientValidation.ALERT;
private Agent _agent;
private boolean _rtl = false;
+ private boolean _animationEnabled = true;
+
static private TimeZone _FIXED_TIME_ZONE =
TimeZone.getTimeZone("America/Los_Angeles");