svn commit: r528574 - /incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java

[awiner]

Author: awiner
Date: Fri Apr 13 11:20:45 2007
New Revision: 528574

URL: http://svn.apache.org/viewvc?view=rev&rev=528574
Log:
Fix regression in FredJSP from ADFFACES-191 patch - uses of FredJSP for date
and color pickers were broken.

Modified:
    
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java

Modified: 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java
URL: 
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java?view=diff&rev=528574&r1=528573&r2=528574
==============================================================================
--- 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java
 (original)
+++ 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java
 Fri Apr 13 11:20:45 2007
@@ -243,12 +243,20 @@
     
     // http://issues.apache.org/jira/browse/ADFFACES-191    
     // Following code was once in CoreRenderKit.launchDialog.
-    StringBuilder onunload = new StringBuilder(53 + returnId.length());
-    onunload.append(_FRAMESET_ONUNLOAD_TEXT);
-    onunload.append(";window.opener.setTimeout(");
-    onunload.append("'ADFDialogReturn[").append(returnId).append("]();'");
-    onunload.append(",1)");
-    frameSet.setOnunload(onunload.toString());
+
+    if (returnId != null)
+    {
+      StringBuilder onunload = new StringBuilder(53 + returnId.length());
+      onunload.append(_FRAMESET_ONUNLOAD_TEXT);
+      onunload.append(";window.opener.setTimeout(");
+      onunload.append("'ADFDialogReturn[").append(returnId).append("]();'");
+      onunload.append(",1)");
+      frameSet.setOnunload(onunload.toString());
+    }
+    else
+    {
+      frameSet.setOnunload(_FRAMESET_ONUNLOAD_TEXT);
+    }
 
     root.getChildren().add(frameSet);
   }