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

[Christian Bauer]

  User: cbauer  
  Date: 07/04/26 01:29:17

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/ui  
                        WikiFormattedTextHandler.java
                        UIWikiFormattedText.java
  Log:
  Broken Hibernate Search integration, to debug for Emmanuel
  
  Revision  Changes    Path
  1.7       +3 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiFormattedTextHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- WikiFormattedTextHandler.java	19 Apr 2007 09:32:06 -0000	1.6
  +++ WikiFormattedTextHandler.java	26 Apr 2007 05:29:17 -0000	1.7
  @@ -83,10 +83,12 @@
           setAttribute(ctx, cmp, "brokenLinkStyleClass");
           setAttribute(ctx, cmp, "attachmentLinkStyleClass");
           setAttribute(ctx, cmp, "thumbnailLinkStyleClass");
  +        setAttribute(ctx, cmp, "updateResolvedLinks");
       }
   
       private void setAttribute(FaceletContext ctx, UIComponent cmp, String name) {
           TagAttribute attribute = this.getAttribute(name);
  +        if (attribute != null)
           cmp.getAttributes().put(name, attribute.getObject(ctx));
       }
   
  
  
  
  1.21      +8 -5      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.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- UIWikiFormattedText.java	20 Apr 2007 09:10:13 -0000	1.20
  +++ UIWikiFormattedText.java	26 Apr 2007 05:29:17 -0000	1.21
  @@ -60,8 +60,7 @@
   
               public String renderInlineLink(WikiLink inlineLink) {
                   return "<a href=\""
  -                        + (inlineLink.isBroken() ? inlineLink.getUrl() : WikiUtil.renderURL(inlineLink
  -                        .getNode()))
  +                        + (inlineLink.isBroken() ? inlineLink.getUrl() : WikiUtil.renderURL(inlineLink.getNode()))
                           + "\" class=\""
                           + (inlineLink.isBroken() ? getAttributes().get("brokenLinkStyleClass")
                           : getAttributes().get("linkStyleClass")) + "\">"
  @@ -78,7 +77,8 @@
               }
   
               public String renderFileAttachmentLink(int attachmentNumber, WikiLink attachmentLink) {
  -                return "<a href=\"#attachment" + attachmentNumber + "\" class=\""
  +                return "<a href=\""
  +                        + "#attachment" + attachmentNumber + "\" class=\""
                           + getAttributes().get("attachmentLinkStyleClass") + "\">"
                           + attachmentLink.getDescription() + "[" + attachmentNumber + "]" + "</a>";
               }
  @@ -156,8 +156,11 @@
               }
           });
   
  -        // Run the parser
  -        parser.parse(true);
  +        // Run the parser (default to true for updating resolved links)
  +        Boolean updateResolvedLinks =
  +                getAttributes().get("updatedResolvedLinks") == null
  +                || Boolean.valueOf((String) getAttributes().get("updatedResolvedLinks"));
  +        parser.parse(updateResolvedLinks);
   
           facesContext.getResponseWriter().write(parser.toString());