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

[Peter Muir]

  User: pmuir   
  Date: 07/09/03 08:50:28

  Modified:    src/main/org/jboss/seam/navigation    Pages.java
                        RedirectNavigationHandler.java
                        RenderNavigationHandler.java
  Log:
  JBSEAM-1746, thanks to Matt Drees
  
  Revision  Changes    Path
  1.14      +5 -3      jboss-seam/src/main/org/jboss/seam/navigation/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/navigation/Pages.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- Pages.java	4 Aug 2007 13:59:24 -0000	1.13
  +++ Pages.java	3 Sep 2007 12:50:28 -0000	1.14
  @@ -332,7 +332,7 @@
               String var = dataModelSelection.substring(0, colonLoc);
               String name = dataModelSelection.substring(colonLoc+1, bracketLoc);
               int index = Integer.parseInt( dataModelSelection.substring( bracketLoc+1, dataModelSelection.length()-1 ) );
  -            Object value = Contexts.lookupInStatefulContexts(name);
  +            Object value = Component.getInstance(name, true);
               if (value!=null)
               {
                  DataModel dataModel = (DataModel) value;
  @@ -1344,7 +1344,8 @@
            Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
                     getFacesMessageValuesMap().get( severityName.toUpperCase() );
  -         rule.addNavigationHandler( new RenderNavigationHandler(viewId, message, severity, control) );
  +         rule.addNavigationHandler( new RenderNavigationHandler(viewId == null ? null : 
  +            Expressions.instance().createValueExpression(viewId, String.class), message, severity, control) );
         }
         
         Element redirect = element.element("redirect");
  @@ -1364,7 +1365,8 @@
            Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
                     getFacesMessageValuesMap().get( severityName.toUpperCase() );
  -         rule.addNavigationHandler( new RedirectNavigationHandler(viewId, params, message, severity, control) );
  +         rule.addNavigationHandler( new RedirectNavigationHandler(viewId == null ? null : 
  +            Expressions.instance().createValueExpression(viewId, String.class), params, message, severity, control) );
         }
         
         List<Element> childElements = element.elements("out");
  
  
  
  1.4       +56 -54    jboss-seam/src/main/org/jboss/seam/navigation/RedirectNavigationHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RedirectNavigationHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/navigation/RedirectNavigationHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- RedirectNavigationHandler.java	19 Jul 2007 12:58:13 -0000	1.3
  +++ RedirectNavigationHandler.java	3 Sep 2007 12:50:28 -0000	1.4
  @@ -7,6 +7,8 @@
   import javax.faces.application.FacesMessage.Severity;
   import javax.faces.context.FacesContext;
   
  +import org.jboss.seam.core.Expressions.ValueExpression;
  +
   /**
    * Metadata for a &lt;redirect/&gt; in pages.xml
    * 
  @@ -15,13 +17,13 @@
    */
   public final class RedirectNavigationHandler extends NavigationHandler
   {
  -   private final String viewId;
  +   private final ValueExpression<String> viewId;
      private final List<Param> params;
      private final String message;
      private final Severity severity;
      private final String control;
   
  -   public RedirectNavigationHandler(String viewId, List<Param> params, String message, Severity severity, String control)
  +   public RedirectNavigationHandler(ValueExpression<String> viewId, List<Param> params, String message, Severity severity, String control)
      {
         this.viewId = viewId;
         this.params = params;
  @@ -48,7 +50,7 @@
            //}
         }
         
  -      redirect(viewId, parameters);
  +      redirect(viewId == null ? null : viewId.getValue(), parameters);
         return true;
      }
   
  
  
  
  1.3       +35 -33    jboss-seam/src/main/org/jboss/seam/navigation/RenderNavigationHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RenderNavigationHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/navigation/RenderNavigationHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- RenderNavigationHandler.java	21 Jun 2007 05:27:29 -0000	1.2
  +++ RenderNavigationHandler.java	3 Sep 2007 12:50:28 -0000	1.3
  @@ -3,6 +3,8 @@
   import javax.faces.application.FacesMessage.Severity;
   import javax.faces.context.FacesContext;
   
  +import org.jboss.seam.core.Expressions.ValueExpression;
  +
   /**
    * Metadata for a &lt;render/&gt; in pages.xml
    * 
  @@ -11,12 +13,12 @@
    */
   public final class RenderNavigationHandler extends NavigationHandler
   {
  -   private final String viewId;
  +   private final ValueExpression<String> viewId;
      private final String message;
      private final Severity severity;
      private final String control;
   
  -   public RenderNavigationHandler(String viewId, String message, Severity severity, String control)
  +   public RenderNavigationHandler(ValueExpression<String> viewId, String message, Severity severity, String control)
      {
         this.viewId = viewId;
         this.message = message;
  @@ -28,7 +30,7 @@
      public boolean navigate(FacesContext context)
      {
         addFacesMessage(message, severity, control);
  -      render(viewId);
  +      render(viewId == null ? null : viewId.getValue());
         return true;
      }
   }
  \ No newline at end of file