You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by dr...@apache.org on 2007/09/04 14:49:51 UTC
svn commit: r572655 -
/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java
Author: drobinson
Date: Tue Sep 4 05:49:51 2007
New Revision: 572655
URL: http://svn.apache.org/viewvc?rev=572655&view=rev
Log:
TRINIDAD-681
Re-fixed corruption of panelBox styles, as stylemap wasn't restored after being overriden by MessageBoxRenderer
Modified:
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java?rev=572655&r1=572654&r2=572655&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java Tue Sep 4 05:49:51 2007
@@ -85,6 +85,12 @@
ResponseWriter writer = context.getResponseWriter();
+ Map<String, String> origSkinResourceMap = arc.getSkinResourceKeyMap();
+
+ // Setup the rendering context, so that default skin selectors of
+ // delegate renderers are mapped to those of this renderer
+ arc.setSkinResourceKeyMap(_RESOURCE_KEY_MAP);
+
// Check if INLINE validation mode is enabled
boolean inlineValidation =
RequestContext.ClientValidation.INLINE.equals(
@@ -126,10 +132,6 @@
writer.endElement("script");
}
- // Setup the rendering context, so that default skin selectors of
- // delegate renderers are mapped to those of this renderer
- arc.setSkinResourceKeyMap(_RESOURCE_KEY_MAP);
-
// Delegate rendering of the outer shell to the BoxRenderer class
// which will call back to this renderer to output the messages
_boxRenderer.encodeAll(context, arc, component, bean);
@@ -141,6 +143,9 @@
renderId(context, component);
writer.endElement(XhtmlConstants.SPAN_ELEMENT);
}
+
+ // Reset the skin resource map
+ arc.setSkinResourceKeyMap(origSkinResourceMap);
}
protected void _renderContent(