[jboss-cvs] jboss-seam/src/main/org/jboss/seam/exception ...

[Peter Muir]

  User: pmuir   
  Date: 07/09/03 12:10:53

  Modified:    src/main/org/jboss/seam/exception   
                        AnnotationRedirectHandler.java Exceptions.java
                        ConfigRedirectHandler.java
  Log:
  JBSEAM-1813
  
  Revision  Changes    Path
  1.2       +3 -1      jboss-seam/src/main/org/jboss/seam/exception/AnnotationRedirectHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AnnotationRedirectHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/exception/AnnotationRedirectHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AnnotationRedirectHandler.java	25 Jun 2007 22:56:49 -0000	1.1
  +++ AnnotationRedirectHandler.java	3 Sep 2007 16:10:53 -0000	1.2
  @@ -4,6 +4,8 @@
   import javax.faces.application.FacesMessage.Severity;
   
   import org.jboss.seam.annotations.exception.Redirect;
  +import org.jboss.seam.core.Expressions;
  +import org.jboss.seam.core.Expressions.ValueExpression;
   
   /**
    * Implements @Redirect
  @@ -35,7 +37,7 @@
      @Override
      protected String getViewId(Exception e)
      {
  -      return e.getClass().getAnnotation(Redirect.class).viewId();
  +      return Expressions.instance().createValueExpression(e.getClass().getAnnotation(Redirect.class).viewId(), String.class).getValue();
      }
      
      @Override
  
  
  
  1.3       +2 -1      jboss-seam/src/main/org/jboss/seam/exception/Exceptions.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Exceptions.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/exception/Exceptions.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Exceptions.java	27 Jun 2007 03:19:55 -0000	1.2
  +++ Exceptions.java	3 Sep 2007 16:10:53 -0000	1.3
  @@ -20,6 +20,7 @@
   import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Events;
  +import org.jboss.seam.core.Expressions;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.ResourceLoader;
   import org.jboss.seam.log.LogProvider;
  @@ -154,7 +155,7 @@
            Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
                     Pages.getFacesMessageValuesMap().get( severityName.toUpperCase() );
  -         return new ConfigRedirectHandler(viewId, clazz, endConversation, message, severity);
  +         return new ConfigRedirectHandler(Expressions.instance().createValueExpression(viewId, String.class), clazz, endConversation, message, severity);
         }
         
         Element error = exception.element("http-error");
  
  
  
  1.2       +16 -3     jboss-seam/src/main/org/jboss/seam/exception/ConfigRedirectHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConfigRedirectHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/exception/ConfigRedirectHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ConfigRedirectHandler.java	25 Jun 2007 22:56:49 -0000	1.1
  +++ ConfigRedirectHandler.java	3 Sep 2007 16:10:53 -0000	1.2
  @@ -2,6 +2,9 @@
   
   import javax.faces.application.FacesMessage.Severity;
   
  +import org.jboss.seam.core.Expressions;
  +import org.jboss.seam.core.Expressions.ValueExpression;
  +
   /**
    * Implements <redirect/> for pages.xml
    * 
  @@ -10,13 +13,17 @@
    */
   public final class ConfigRedirectHandler extends RedirectHandler
   {
  -   private final String id;
  +   private final ValueExpression<String> id;
      private final Class clazz;
      private final boolean conversation;
      private final String message;
      private final Severity messageSeverity;
   
  -   public ConfigRedirectHandler(String id, Class clazz, boolean conversation, String message, Severity messageSeverity)
  +   /**
  +    * Construct a ConfigRedirectHandler.
  +    * 
  +    */
  +   public ConfigRedirectHandler(ValueExpression<String> id, Class clazz, boolean conversation, String message, Severity messageSeverity)
      {
         this.id = id;
         this.clazz = clazz;
  @@ -25,6 +32,12 @@
         this.messageSeverity = messageSeverity;
      }
   
  +   @Deprecated
  +   public ConfigRedirectHandler(String id, Class clazz, boolean conversation, String message, Severity messageSeverity)
  +   {
  +      this(Expressions.instance().createValueExpression(id, String.class), clazz, conversation, message, messageSeverity);
  +   }
  +
      @Override
      protected String getMessage(Exception e)
      {
  @@ -34,7 +47,7 @@
      @Override
      protected String getViewId(Exception e)
      {
  -      return id;
  +      return id.getValue();
      }
   
      @Override