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/07/09 09:34:13 UTC
svn commit: r675107 - in
/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml:
SimpleInputColorRenderer.java SimpleInputDateRenderer.java
jsLibs/LocaleInfoScriptlet.java
Author: matzew
Date: Wed Jul 9 00:34:12 2008
New Revision: 675107
URL: http://svn.apache.org/viewvc?rev=675107&view=rev
Log:
TRINIDAD-1150 - Problem upgrading to version 1.0.5 (or 2.0.8) of trinidad with customized renderkit
applied fix to 1.2 trunk only, since the patch was already applied to 1.0 trunk a while ago.
Thanks to Yee-Wah Lee for her patch.
Modified:
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java?rev=675107&r1=675106&r2=675107&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java Wed Jul 9 00:34:12 2008
@@ -159,6 +159,16 @@
UIComponent component,
FacesBean bean) throws IOException
{
+ if (!_colorScriptletsRegistered)
+ {
+ ColorFieldInfoScriptlet.sharedInstance().registerSelf();
+ (new AliasedScriptlet(_COLOR_FIELD_LIB, null,
+ new String[]{"openWindow()",
+ "_getColorFieldFormat()",
+ ColorFieldInfoScriptlet.COLOR_FIELD_INFO_KEY
+ })).registerSelf();
+ _colorScriptletsRegistered = true;
+ }
String chooseId = _computeChooseId(context, component, bean);
arc.getProperties().put(_CACHED_CHOOSE_ID, chooseId);
@@ -615,18 +625,7 @@
private PropertyKey _compactKey;
private static final String _COLOR_FIELD_LIB = "ColorField";
-
- static
- {
- ColorFieldInfoScriptlet.sharedInstance().registerSelf();
- (new AliasedScriptlet(_COLOR_FIELD_LIB, null,
- new String[]{"openWindow()",
- "_getColorFieldFormat()",
- ColorFieldInfoScriptlet.COLOR_FIELD_INFO_KEY
- })).registerSelf();
- }
-
-
+ private static boolean _colorScriptletsRegistered = false;
private static final Integer _DEFAULT_COLUMNS = 11;
// AdfRenderingContext property key for the Map which tracks whether
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java?rev=675107&r1=675106&r2=675107&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java Wed Jul 9 00:34:12 2008
@@ -185,6 +185,14 @@
UIComponent component,
FacesBean bean) throws IOException
{
+
+ if (!_dateScriptletsRegistered)
+ {
+ // Register our scriptlet
+ DateTimeZoneOffsetScriptlet.sharedInstance().registerSelf();
+ _dateScriptletsRegistered = true;
+ }
+
String chooseId = _computeChooseId(context, component, bean);
arc.getProperties().put(_CACHED_CHOOSE_ID, chooseId);
@@ -688,12 +696,8 @@
// name for our scriptlet
private static final String _DATE_TIME_ZONE_OFFSET_KEY = "dateTimeZoneOffset";
- static
- {
- // Register our scriptlet
- DateTimeZoneOffsetScriptlet.sharedInstance().registerSelf();
- }
-
+ private static boolean _dateScriptletsRegistered = false;
+
private static final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(SimpleInputDateRenderer.class);
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java?rev=675107&r1=675106&r2=675107&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java Wed Jul 9 00:34:12 2008
@@ -165,7 +165,9 @@
*/
public String getSupportedLocaleVariant(RenderingContext arc)
{
- String variant = arc.getLocaleContext().getFormattingLocale().getVariant();
+ LocaleContext lc = arc.getLocaleContext();
+ Locale l = lc.getFormattingLocale();
+ String variant = l.getVariant();
variant = variant.toUpperCase();
if (variant.startsWith("ORACLE"))