Author: awiner
Date: Thu Sep 28 16:45:37 2006
New Revision: 451062
URL: http://svn.apache.org/viewvc?view=rev&rev=451062
Log:
Some more refactoring to get ready for more public APIs, in particular
CoreRenderer
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/DialogRenderKitService.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/DialogRenderKitService.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/DialogRenderKitService.java?view=diff&rev=451062&r1=451061&r2=451062
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/DialogRenderKitService.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/DialogRenderKitService.java
Thu Sep 28 16:45:37 2006
@@ -59,7 +59,7 @@
* by the RenderKit, and does not necessarily have to map
* to a full window.
* @param windowProperties a map of UI parameters used to
- * modify the dialog. The st of property names that are
+ * modify the dialog. The list of property names that are
* supported will depend on the <code>RenderKit</code>, but
* common examples include "width" and "height".
* @return true if launching the dialog was handled by this service, false
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.java?view=diff&rev=451062&r1=451061&r2=451062
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderer.java
Thu Sep 28 16:45:37 2006
@@ -32,7 +32,6 @@
import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
-import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
/**
* Basic implementation of the core rendering functionality
@@ -388,26 +387,9 @@
return true;
}
-
-
-
protected boolean skipDecode(FacesContext context)
{
- // =-=AEW HACK! When executing a "dialog return" from the filter,
- // we've generally saved off the original parameters such that
- // decoding again isn't a problem. But we can run into some problems:
- // (1) A component that doesn't know about ReturnEvents: it'll
- // decode again, thereby firing the event again that launched
- // the dialog (and you go right back to the dialog)
- // (2) The component does know about ReturnEvents, but
- // someone launches a dialog in response to the ReturnEvent,
- // after setting the value of an input field. But since
- // we've still saved off the original parameters,
- // now we're back in
- // The best fix would really be somehow skipping the Apply Request
- // Values phase altogether, while still queueing the ReturnEvent
- // properly. But how the heck is that gonna happen?
- return TrinidadFilterImpl.isExecutingDialogReturn(context);
+ return false;
}
protected FacesBean getFacesBean(UIComponent component)
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.java?view=diff&rev=451062&r1=451061&r2=451062
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlFormattedText.java
Thu Sep 28 16:45:37 2006
@@ -29,7 +29,8 @@
* @version $Name: $ ($Revision:
adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/renderkit/core/xhtml/XhtmlFormattedText.java#0
$) $Date: 10-nov-2005.19:02:31 $
* @author The Oracle ADF Faces Team
*/
-class XhtmlFormattedText
+// TODO find a good way to expose this class, perhaps via the RenderingContext?
+public class XhtmlFormattedText
{
static public FormattedTextParser getFormattedTextParser()
{
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java?view=diff&rev=451062&r1=451061&r2=451062
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
Thu Sep 28 16:45:37 2006
@@ -37,6 +37,7 @@
import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
import org.apache.myfaces.trinidadinternal.util.FormattedTextParser;
+import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
/**
* @todo Move "supportsStyleAttributes()", etc., architecture
@@ -214,6 +215,26 @@
//
// END OF AGENT CAPABILITY CONVENIENCE METHODS
//
+
+
+ protected boolean skipDecode(FacesContext context)
+ {
+ // =-=AEW HACK! When executing a "dialog return" from the filter,
+ // we've generally saved off the original parameters such that
+ // decoding again isn't a problem. But we can run into some problems:
+ // (1) A component that doesn't know about ReturnEvents: it'll
+ // decode again, thereby firing the event again that launched
+ // the dialog (and you go right back to the dialog)
+ // (2) The component does know about ReturnEvents, but
+ // someone launches a dialog in response to the ReturnEvent,
+ // after setting the value of an input field. But since
+ // we've still saved off the original parameters,
+ // now we're back in
+ // The best fix would really be somehow skipping the Apply Request
+ // Values phase altogether, while still queueing the ReturnEvent
+ // properly. But how the heck is that gonna happen?
+ return TrinidadFilterImpl.isExecutingDialogReturn(context);
+ }
/**
