svn commit: r488727 - in /incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core: desktop/TrainRenderer.java pda/TrainRenderer.java

[awiner]

Author: awiner
Date: Tue Dec 19 09:02:36 2006
New Revision: 488727

URL: http://svn.apache.org/viewvc?view=rev&rev=488727
Log:
Don't NPE if a train is not in a form

Modified:
    
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
    
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java

Modified: 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
URL: 
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java?view=diff&rev=488727&r1=488726&r2=488727
==============================================================================
--- 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
 (original)
+++ 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
 Tue Dec 19 09:02:36 2006
@@ -166,7 +166,13 @@
                                    ", found " + 
                                    component.getClass().getName());
     }
-    
+
+    if (arc.getFormData() == null)
+    {
+      _LOG.warning("Trains must be used inside of a form");
+      return;
+    }
+
     UIXProcess process = (UIXProcess) component;
     UIComponent stamp = process.getNodeStamp();
 

Modified: 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java
URL: 
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java?view=diff&rev=488727&r1=488726&r2=488727
==============================================================================
--- 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java
 (original)
+++ 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/TrainRenderer.java
 Tue Dec 19 09:02:36 2006
@@ -20,17 +20,18 @@
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.UIXProcess;
 import org.apache.myfaces.trinidad.component.core.nav.CoreTrain;
 import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
+
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
-import org.apache.myfaces.trinidad.util.IntegerUtils;
 
 public class TrainRenderer
   extends XhtmlRenderer
@@ -51,6 +52,12 @@
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
+    if (arc.getFormData() == null)
+    {
+      _LOG.warning("Trains must be used inside of a form");
+      return;
+    }
+
     UIXProcess process = (UIXProcess) component;          
     UIComponent stamp = process.getNodeStamp();
     
@@ -121,4 +128,7 @@
   static private final String _SINGLE_RANGE_FORMAT_NO_TOTAL_STRING =
     "af_train.FORMAT_NO_TOTAL";
 
+  private static final TrinidadLogger _LOG = 
+    TrinidadLogger.createTrinidadLogger(TrainRenderer.class);
+  
 }