You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by aw...@apache.org on 2007/07/24 23:25:24 UTC

svn commit: r559225 - in /myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main: java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ xrts/org/apache/myfaces/trinidadinternal/resource/

Author: awiner
Date: Tue Jul 24 14:25:23 2007
New Revision: 559225

URL: http://svn.apache.org/viewvc?view=rev&rev=559225
Log:
TRINIDAD-118: NullPointerException when using an inputDate without form
- Log a warning
- And fix a typo in poll logging

Modified:
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java?view=diff&rev=559225&r1=559224&r2=559225
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java Tue Jul 24 14:25:23 2007
@@ -200,6 +200,11 @@
       {
 
         FormData fData = arc.getFormData();
+        if (fData == null)
+        {
+          _LOG.warning("COMPONENT_REQUIRES_FORM", component);
+          return;
+        }
 
         boolean immediate = isImmediate(bean);
         ((CoreFormData) fData).addOnSubmitConverterValidators(component,

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java?view=diff&rev=559225&r1=559224&r2=559225
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PollRenderer.java Tue Jul 24 14:25:23 2007
@@ -220,7 +220,7 @@
     
     if (rc.getFormData() == null)
     {
-      _LOG.warning("POLL_COMPOENT_MUST_INSIDE_FORM", elementID);
+      _LOG.warning("POLL_COMPONENT_MUST_INSIDE_FORM", elementID);
       return null;
     }
 

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts?view=diff&rev=559225&r1=559224&r2=559225
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts Tue Jul 24 14:25:23 2007
@@ -322,7 +322,7 @@
 <resource key="ERR_PARTIAL_PAGE_RENDERING">Error during partial-page rendering</resource>
 
 <!-- POLL_COMPOENT_MUST_INSIDE_FORM -->
-<resource key="POLL_COMPOENT_MUST_INSIDE_FORM">The poll component must be inside of a form;  disabling poll {0}</resource>
+<resource key="POLL_COMPONENT_MUST_INSIDE_FORM">The poll component must be inside of a form;  disabling poll {0}</resource>
 
 <!-- SELECTED_SHUTTLE_ITEMS_EXCEEDED_TOTAL_NUMBER -->
 <resource key="SELECTED_SHUTTLE_ITEMS_EXCEEDED_TOTAL_NUMBER">The number of items selected for shuttle ''{0}'' exceeds the total number of items in the shuttle. No selected items will be returned.</resource>
@@ -1020,5 +1020,8 @@
 
 <!-- STATUS_INDICATOR_MISSING_ICONS -->
 <resource key="STATUS_INDICATOR_MISSING_ICONS">The statusIndicator component requires both a 'ready' and 'busy' icon;  one is missing.</resource>
+
+<!-- COMPONENT_REQUIRES_FORM -->
+<resource key="COMPONENT_REQUIRES_FORM">The {0} component must be inside of a form to function correctly.</resource>
 
 </resources>