[jboss-cvs] jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit ...

[Peter Muir]

  User: pmuir   
  Date: 07/03/23 10:31:42

  Modified:    seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit  
                        FormattedTextRendererBase.java
                        CacheRendererBase.java
  Log:
  CDK port improvements
  
  Revision  Changes    Path
  1.2       +1 -29     jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FormattedTextRendererBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FormattedTextRendererBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FormattedTextRendererBase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- FormattedTextRendererBase.java	19 Mar 2007 20:48:17 -0000	1.1
  +++ FormattedTextRendererBase.java	23 Mar 2007 14:31:42 -0000	1.2
  @@ -1,21 +1,13 @@
   package org.jboss.seam.ui.renderkit;
   
   import java.io.IOException;
  -import java.io.Reader;
  -import java.io.StringReader;
   
   import javax.faces.component.UIComponent;
   import javax.faces.context.FacesContext;
   import javax.faces.context.ResponseWriter;
   
  -import org.jboss.seam.text.SeamTextLexer;
  -import org.jboss.seam.text.SeamTextParser;
  -import org.jboss.seam.util.Resources;
  -
   import org.jboss.seam.ui.component.UIFormattedText;
   
  -import antlr.ANTLRException;
  -
   public class FormattedTextRendererBase extends org.ajax4jsf.framework.renderer.ComponentRendererBase
   {
   
  @@ -28,26 +20,6 @@
      @Override
      protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException
      {
  -      UIFormattedText formattedText = (UIFormattedText) component;
  -      if ( formattedText.getValue() == null) return;
  -      Reader r = new StringReader( (String) formattedText.getValue() );
  -      SeamTextLexer lexer = new SeamTextLexer(r);
  -      SeamTextParser parser = new SeamTextParser(lexer);
  -      try
  -      {
  -         parser.startRule();
  +     writer.write(((UIFormattedText) component).getFormattedText());
         }
  -      catch (ANTLRException re)
  -      {
  -         throw new RuntimeException(re);
  -      }
  -      writer.write(parser.toString());
  -      
  -   }
  -   
  -   public Resources getResources()
  -   {
  -      return new Resources();
  -   }
  -
   }
  
  
  
  1.2       +2 -3      jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheRendererBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- CacheRendererBase.java	20 Mar 2007 17:58:59 -0000	1.1
  +++ CacheRendererBase.java	23 Mar 2007 14:31:42 -0000	1.2
  @@ -8,7 +8,6 @@
   import javax.faces.context.ResponseWriter;
   
   import org.ajax4jsf.framework.renderer.AjaxComponentRendererBase;
  -import org.jboss.cache.CacheException;
   import org.jboss.seam.core.PojoCache;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
  @@ -68,7 +67,7 @@
         {
            PojoCache.instance().put(region, key, content);
         }
  -      catch (CacheException ce)
  +      catch (Exception ce)
         {
            log.error("error accessing cache", ce);
         }
  @@ -80,7 +79,7 @@
         {
            return (String) PojoCache.instance().get(region, key);
         }
  -      catch (CacheException ce)
  +      catch (Exception ce)
         {
            log.error("error accessing cache", ce);
            return null;