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

[Gavin King]

  User: gavin   
  Date: 07/05/24 11:51:27

  Modified:    src/main/org/jboss/seam/mock  MockApplication.java
  Log:
  attempted fix for JBSEAM-1294, and other potential issues
  
  Revision  Changes    Path
  1.15      +18 -5     jboss-seam/src/main/org/jboss/seam/mock/MockApplication.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MockApplication.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockApplication.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- MockApplication.java	15 May 2007 20:02:49 -0000	1.14
  +++ MockApplication.java	24 May 2007 15:51:27 -0000	1.15
  @@ -28,6 +28,7 @@
   import javax.faces.convert.IntegerConverter;
   import javax.faces.convert.LongConverter;
   import javax.faces.convert.ShortConverter;
  +import javax.faces.el.EvaluationException;
   import javax.faces.el.MethodBinding;
   import javax.faces.el.PropertyResolver;
   import javax.faces.el.ReferenceSyntaxException;
  @@ -36,6 +37,10 @@
   import javax.faces.event.ActionListener;
   import javax.faces.validator.Validator;
   
  +import org.jboss.seam.jsf.SeamELResolver;
  +import org.jboss.seam.jsf.SeamNavigationHandler;
  +import org.jboss.seam.jsf.SeamStateManager;
  +import org.jboss.seam.jsf.SeamViewHandler;
   import org.jboss.seam.util.EL;
   import org.jboss.seam.util.Reflections;
   import org.jboss.seam.util.UnifiedELMethodBinding;
  @@ -75,10 +80,12 @@
         throw new UnsupportedOperationException();
      }
      
  +   private javax.el.ELResolver elResolver = new SeamELResolver(); 
  +   
      @Override
      public javax.el.ELResolver getELResolver() 
      {
  -      throw new UnsupportedOperationException();
  +      return elResolver;
      }
      
      @Override
  @@ -145,7 +152,7 @@
         this.msgBundleName = bundleName;
      }
   
  -   private NavigationHandler navigationHandler = new MockNavigationHandler();
  +   private NavigationHandler navigationHandler = new SeamNavigationHandler( new MockNavigationHandler() );
   
      @Override
      public NavigationHandler getNavigationHandler()
  @@ -171,7 +178,13 @@
         throw new UnsupportedOperationException();
      }
   
  -   private VariableResolver variableResolver = null; // TODO: big big todo!!!!!!!!!!
  +   private VariableResolver variableResolver = /*new SeamVariableResolver(*/ new VariableResolver() { 
  +      @Override
  +      public Object resolveVariable(FacesContext ctx, String name) throws EvaluationException
  +      {
  +         return null;
  +      }
  +   } /*)*/;
   
      @Override
      public VariableResolver getVariableResolver()
  @@ -185,7 +198,7 @@
         this.variableResolver = variableResolver;
      }
   
  -   private ViewHandler viewHandler = new MockViewHandler();
  +   private ViewHandler viewHandler = new SeamViewHandler( new MockViewHandler() );
   
      @Override
      public ViewHandler getViewHandler()
  @@ -199,7 +212,7 @@
         this.viewHandler = viewHandler;
      }
   
  -   private StateManager stateManager = new MockStateManager();
  +   private StateManager stateManager = new SeamStateManager( new MockStateManager() );
   
      @Override
      public StateManager getStateManager()