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

[Peter Muir]

  User: pmuir   
  Date: 07/09/27 08:01:18

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/ui   
                        WikiTextEditor.java UIWikiFormattedText.java
  Removed:     examples/wiki/src/main/org/jboss/seam/wiki/core/ui   
                        SeamTextValidator.java
  Log:
  JBSEAM-1929, update wiki example, add to blog example
  
  Revision  Changes    Path
  1.4       +2 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextEditor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiTextEditor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextEditor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- WikiTextEditor.java	26 Sep 2007 09:35:01 -0000	1.3
  +++ WikiTextEditor.java	27 Sep 2007 12:01:18 -0000	1.4
  @@ -5,6 +5,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.faces.FacesMessages;
  +import org.jboss.seam.ui.validator.FormattedTextValidator;
   
   import java.util.Map;
   import java.util.HashMap;
  @@ -40,7 +41,7 @@
   
       public void validate(String textEditorId, String value) {
           if (value == null) return;
  -        SeamTextValidator validator = new SeamTextValidator();
  +        FormattedTextValidator validator = new FormattedTextValidator();
           try {
               validator.validate(null, null, value);
           } catch (ValidatorException e) {
  
  
  
  1.30      +2 -1      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.29
  retrieving revision 1.30
  diff -u -b -r1.29 -r1.30
  --- UIWikiFormattedText.java	26 Sep 2007 09:36:17 -0000	1.29
  +++ UIWikiFormattedText.java	27 Sep 2007 12:01:18 -0000	1.30
  @@ -20,6 +20,7 @@
   import org.jboss.seam.log.Log;
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.ui.util.JSF;
  +import org.jboss.seam.ui.validator.FormattedTextValidator;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Conversation;
   import org.jboss.seam.wiki.core.engine.WikiLink;
  @@ -220,7 +221,7 @@
   
           } catch (RecognitionException rex) {
               // Log a nice message for any lexer/parser errors, users can disable this if they want to
  -            log.warn( SeamTextValidator.getErrorMessage((String) getValue(), rex) );
  +            log.warn( FormattedTextValidator.getErrorMessage((String) getValue(), rex) );
           } catch (ANTLRException ex) {
               // All other errors are fatal;
               throw new RuntimeException(ex);