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

[Christian Bauer]

  User: cbauer  
  Date: 08/01/10 19:09:16

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/engine  
                        WikiMacro.java MacroWikiTextRenderer.java
  Log:
  Improved macro handling in documents and URL rendering
  
  Revision  Changes    Path
  1.2       +5 -0      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/WikiMacro.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiMacro.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/WikiMacro.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- WikiMacro.java	30 Dec 2007 02:33:23 -0000	1.1
  +++ WikiMacro.java	11 Jan 2008 00:09:16 -0000	1.2
  @@ -32,6 +32,11 @@
           this.name = name;
       }
   
  +    public WikiMacro(Integer position, String name) {
  +        this.position = position;
  +        this.name = name;
  +    }
  +
       public Integer getPosition() {
           return position;
       }
  
  
  
  1.3       +0 -6      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/MacroWikiTextRenderer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MacroWikiTextRenderer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/engine/MacroWikiTextRenderer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- MacroWikiTextRenderer.java	30 Dec 2007 02:33:23 -0000	1.2
  +++ MacroWikiTextRenderer.java	11 Jan 2008 00:09:16 -0000	1.3
  @@ -9,11 +9,9 @@
   public class MacroWikiTextRenderer extends NullWikiTextRenderer {
   
       private Set<WikiMacro> macros = new LinkedHashSet<WikiMacro>();
  -    private StringBuilder macrosString = new StringBuilder();
   
       public String renderMacro(WikiMacro macro) {
           macros.add(macro);
  -        macrosString.append(macro.getName()).append(" ");
           return null;
       }
   
  @@ -21,10 +19,6 @@
           return macros;
       }
   
  -    public String getMacrosString() {
  -        return macrosString.toString();
  -    }
  -
       public static MacroWikiTextRenderer renderMacros(String wikiText) {
           WikiTextParser parser = new WikiTextParser(wikiText, false, false);
           MacroWikiTextRenderer renderer = new MacroWikiTextRenderer();