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

[Gavin King]

  User: gavin   
  Date: 06/12/18 11:50:31

  Modified:    src/main/org/jboss/seam/pages   Page.java
  Added:       src/main/org/jboss/seam/pages   Action.java
  Log:
  multiple actions per page, and conditional page actions
  
  Revision  Changes    Path
  1.2       +9 -27     jboss-seam/src/main/org/jboss/seam/pages/Page.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Page.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/Page.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Page.java	17 Dec 2006 19:46:41 -0000	1.1
  +++ Page.java	18 Dec 2006 16:50:31 -0000	1.2
  @@ -6,10 +6,8 @@
   import java.util.Map;
   import java.util.MissingResourceException;
   
  -
   import org.jboss.seam.core.Interpolator;
   import org.jboss.seam.core.Locale;
  -import org.jboss.seam.core.Expressions.MethodBinding;
   
   /**
    * Metadata about page actions, page parameters, action navigation,
  @@ -20,12 +18,11 @@
      private final String viewId;
      private String description;
      private Integer timeout;
  -   private MethodBinding action;
  -   private String outcome;
      private String noConversationViewId;
      private String resourceBundleName;
      private boolean switchEnabled = true;
  -   private List<Param> pageParameters = new ArrayList<Param>();
  +   private List<Param> parameters = new ArrayList<Param>();
  +   private List<Action> actions = new ArrayList<Action>();
      private Map<String, ActionNavigation> navigations = new HashMap<String, ActionNavigation>();
      private ActionNavigation defaultNavigation;
      private boolean conversationRequired;
  @@ -104,26 +101,6 @@
         return timeout;
      }
   
  -   public void setAction(MethodBinding action)
  -   {
  -      this.action = action;
  -   }
  -
  -   public MethodBinding getAction()
  -   {
  -      return action;
  -   }
  -
  -   public void setOutcome(String outcome)
  -   {
  -      this.outcome = outcome;
  -   }
  -
  -   public String getOutcome()
  -   {
  -      return outcome;
  -   }
  -
      public void setNoConversationViewId(String noConversationViewId)
      {
         this.noConversationViewId = noConversationViewId;
  @@ -154,9 +131,9 @@
         return switchEnabled;
      }
   
  -   public List<Param> getPageParameters()
  +   public List<Param> getParameters()
      {
  -      return pageParameters;
  +      return parameters;
      }
   
      public Map<String, ActionNavigation> getNavigations()
  @@ -194,4 +171,9 @@
         return conversationControl;
      }
   
  +   public List<Action> getActions()
  +   {
  +      return actions;
  +   }
  +
   }
  \ No newline at end of file
  
  
  
  1.1      date: 2006/12/18 16:50:31;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/pages/Action.java
  
  Index: Action.java
  ===================================================================
  package org.jboss.seam.pages;
  
  import org.jboss.seam.core.Expressions.MethodBinding;
  import org.jboss.seam.core.Expressions.ValueBinding;
  
  public class Action
  {
     private MethodBinding methodBinding;
     private ValueBinding valueBinding;
     private String outcome;
     
     public boolean isExecutable()
     {
        return valueBinding==null || 
             Boolean.TRUE.equals( valueBinding.getValue() );
     }
     
     public MethodBinding getMethodBinding()
     {
        return methodBinding;
     }
     public void setMethodBinding(MethodBinding methodBinding)
     {
        this.methodBinding = methodBinding;
     }
     
     public ValueBinding getValueBinding()
     {
        return valueBinding;
     }
     public void setValueBinding(ValueBinding valueBinding)
     {
        this.valueBinding = valueBinding;
     }
  
     public String getOutcome()
     {
        return outcome;
     }
     public void setOutcome(String outcome)
     {
        this.outcome = outcome;
     }
  }