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

[Christian Bauer]

  User: cbauer  
  Date: 07/04/20 05:10:12

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/engine 
                        WikiTextParser.java
  Log:
  Finished document history and diff feature
  
  Revision  Changes    Path
  1.4       +10 -1     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/WikiTextParser.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiTextParser.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/WikiTextParser.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- WikiTextParser.java	5 Apr 2007 13:04:14 -0000	1.3
  +++ WikiTextParser.java	20 Apr 2007 09:10:12 -0000	1.4
  @@ -39,10 +39,12 @@
       private List<WikiLink> externalLinks = new ArrayList<WikiLink>();
       private Set<String> macroNames = new HashSet<String>();
       private boolean renderDuplicateMacros;
  +    private boolean resolveLinks;
   
  -    public WikiTextParser(String wikiText, boolean renderDuplicateMacros) {
  +    public WikiTextParser(String wikiText, boolean renderDuplicateMacros, boolean resolveLinks) {
           super(new SeamTextLexer(new StringReader(wikiText)));
           this.renderDuplicateMacros = renderDuplicateMacros;
  +        this.resolveLinks = resolveLinks;
   
           resolver = (WikiLinkResolver)Component.getInstance("wikiLinkResolver");
   
  @@ -100,6 +102,13 @@
       }
   
       protected String linkTag(String descriptionText, String linkText) {
  +        if (!resolveLinks) {
  +            // Don't resolve links, just call back to renderer for simple inline rendering of what we have
  +            WikiLink unresolvedLink = new WikiLink(false, false);
  +            unresolvedLink.setDescription(descriptionText);
  +            unresolvedLink.setUrl(linkText);
  +            return renderer.renderInlineLink(unresolvedLink);
  +        }
   
           resolver.resolveLinkText(currentDirectory.getAreaNumber(), resolvedLinks, linkText);
           WikiLink link = resolvedLinks.get((linkText));