[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui ...

[Gavin King]

  User: gavin   
  Date: 06/10/08 20:10:31

  Modified:    src/ui/org/jboss/seam/ui  UIAction.java
  Log:
  fixed JBSEAM-324, s:link and server restart / clustering
  fixed bug in resource bundle cascading
  
  Revision  Changes    Path
  1.3       +6 -26     jboss-seam/src/ui/org/jboss/seam/ui/UIAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UIAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UIAction.java	30 Mar 2006 14:57:34 -0000	1.2
  +++ UIAction.java	9 Oct 2006 00:10:31 -0000	1.3
  @@ -1,12 +1,10 @@
   package org.jboss.seam.ui;
   
  -import java.util.HashSet;
  -import java.util.Map;
  -import java.util.Set;
  -
   import javax.faces.component.UIParameter;
   import javax.faces.context.FacesContext;
   
  +import org.jboss.seam.core.SafeActions;
  +
   public class UIAction extends UIParameter
   {
      
  @@ -43,11 +41,12 @@
      @Override
      public Object getValue()
      {
  +      String viewId = getFacesContext().getViewRoot().getViewId();
         if ( isMethodBinding() )
         {
  -         String expression = getMethodBindingExpression();
  -         allowAction(expression);
  -         return expression.substring( 2, expression.length()-1 ); 
  +         String actionId = SafeActions.toActionId( viewId, getMethodBindingExpression() );
  +         SafeActions.instance().addSafeAction(actionId);
  +         return actionId;
         }
         else
         {
  @@ -55,25 +54,6 @@
         }
      }
   
  -   private void allowAction(String expression)
  -   {
  -      Map applicationMap = getFacesContext().getExternalContext().getApplicationMap();
  -      Set actions;
  -      synchronized (UIAction.class)
  -      {
  -         actions = (Set) applicationMap.get("org.jboss.seam.actions");
  -         if (actions==null)
  -         {
  -            actions = new HashSet();
  -            applicationMap.put("org.jboss.seam.actions", actions);
  -         }
  -      }
  -      synchronized (actions)
  -      {
  -         actions.add(expression);
  -      }
  -   }
  -   
      @Override
      public void restoreState(FacesContext context, Object state) {
         Object[] values = (Object[]) state;