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

[Christian Bauer]

  User: cbauer  
  Date: 07/11/13 02:58:09

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/action  
                        Authenticator.java DocumentHome.java
  Log:
  Fixed 'create user homepage' bug, added macro detection
  
  Revision  Changes    Path
  1.10      +1 -0      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Authenticator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- Authenticator.java	9 Nov 2007 15:08:26 -0000	1.9
  +++ Authenticator.java	13 Nov 2007 07:58:09 -0000	1.10
  @@ -166,6 +166,7 @@
           homePage.setWriteAccessLevel(UserRoleAccessFactory.ADMINROLE_ACCESSLEVEL);
           homePage.setReadAccessLevel(UserRoleAccessFactory.GUESTROLE_ACCESSLEVEL);
           homePage.setMenuItem(true);
  +        homePage.setMacros(WikiUtil.findMacros(homePage, homeDirectory, homePage.getContent()));
           homeDirectory.addChild(homePage);
           homeDirectory.setDefaultDocument(homePage);
   
  
  
  
  1.37      +2 -33     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- DocumentHome.java	12 Nov 2007 11:14:30 -0000	1.36
  +++ DocumentHome.java	13 Nov 2007 07:58:09 -0000	1.37
  @@ -9,7 +9,6 @@
   import static javax.faces.application.FacesMessage.SEVERITY_INFO;
   
   import org.jboss.seam.annotations.*;
  -import org.jboss.seam.ui.validator.FormattedTextValidator;
   import org.jboss.seam.wiki.core.model.*;
   import org.jboss.seam.wiki.core.engine.*;
   import org.jboss.seam.wiki.core.dao.FeedDAO;
  @@ -18,6 +17,7 @@
   import org.jboss.seam.wiki.core.action.prefs.DocumentEditorPreferences;
   import org.jboss.seam.wiki.core.action.prefs.CommentsPreferences;
   import org.jboss.seam.wiki.core.action.prefs.WikiPreferences;
  +import org.jboss.seam.wiki.util.WikiUtil;
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.log.Log;
  @@ -28,9 +28,6 @@
   import java.util.Calendar;
   import java.util.GregorianCalendar;
   
  -import antlr.RecognitionException;
  -import antlr.ANTLRException;
  -
   @Name("documentHome")
   @Scope(ScopeType.CONVERSATION)
   public class DocumentHome extends NodeHome<Document> {
  @@ -215,7 +212,7 @@
           getInstance().setContent(
               wikiLinkResolver.convertToWikiProtocol(dir.getAreaNumber(), formContent)
           );
  -        getInstance().setMacros( findMacros() );
  +        getInstance().setMacros( WikiUtil.findMacros(getInstance(), getParentDirectory(), formContent) );
       }
   
       private void syncInstanceToForm(Directory dir) {
  @@ -223,34 +220,6 @@
           formContent = wikiLinkResolver.convertFromWikiProtocol(dir.getAreaNumber(), getInstance().getContent());
       }
   
  -    private String findMacros() {
  -        if (formContent == null) return null;
  -        final StringBuilder usedMacros = new StringBuilder();
  -        WikiTextParser parser = new WikiTextParser(formContent, false, false);
  -        parser.setCurrentDocument(getInstance());
  -        parser.setCurrentDirectory(getParentDirectory());
  -        parser.setResolver((WikiLinkResolver)Component.getInstance("wikiLinkResolver"));
  -
  -        try {
  -            class MacroRenderer extends NullWikiTextRenderer {
  -                public String renderMacro(String macroName) {
  -                    usedMacros.append(macroName).append(" ");
  -                    return null;
  -                }
  -            }
  -            parser.setRenderer( new MacroRenderer() ).parse(false);
  -
  -        } catch (RecognitionException rex) {
  -            // Swallow and log and low debug level
  -            getLog().debug( "Ignored parse error finding marcos in text: " + FormattedTextValidator.getErrorMessage(formContent, rex) );
  -        } catch (ANTLRException ex) {
  -            // All other errors are fatal;
  -            throw new RuntimeException(ex);
  -        }
  -
  -        return usedMacros.toString();
  -    }
  -
       /* -------------------------- Public Features ------------------------------ */
   
       public String getFormContent() {