[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui ...

[Christian Bauer]

  User: cbauer  
  Date: 07/04/10 04:08:11

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/ui 
                        UIWikiFormattedText.java
  Log:
  Deploys but doesn't really run on JBoss AS 4.2 (richfaces/ajax4jsf bugs with JSF RI)
  
  Revision  Changes    Path
  1.14      +3 -2      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIWikiFormattedText.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- UIWikiFormattedText.java	5 Apr 2007 13:04:14 -0000	1.13
  +++ UIWikiFormattedText.java	10 Apr 2007 08:08:11 -0000	1.14
  @@ -101,7 +101,8 @@
                           default: thumbnailWidth = file.getImageMetaInfo().getSizeX();
                       }
                       Conversation conversation = (Conversation) Component.getInstance("conversation");
  -                    String thumbnailUrl = WikiUtil.renderURL(inlineLink.getNode()) + "&width=" + thumbnailWidth + "&cid=" + conversation.getId();
  +                    // I have no idea why this needs HTML entities for the & symbol - Firefox complains about invalid XML if an & is in an attribute value!
  +                    String thumbnailUrl = WikiUtil.renderURL(inlineLink.getNode()) + "&width=" + thumbnailWidth + "&cid=" + conversation.getId();
   
                       return "<a href=\""
                               + (inlineLink.isBroken() ? inlineLink.getUrl() : WikiUtil.renderURL(inlineLink.getNode()))
  @@ -167,7 +168,7 @@
   
                           // Render the actual child component - the plugin XHTML
                           UIComponent pluginChild = findComponent(macroName);
  -                        if (pluginChild == null) throw new RuntimeException("Couldn't find plugin child component: " + macroName);
  +                        if (pluginChild == null) return ""; // Swallow it
                           pluginChild.encodeBegin(getFacesContext());
                           JSF.renderChildren(getFacesContext(), pluginChild);
                           pluginChild.encodeEnd(getFacesContext());