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

[Gavin King]

  User: gavin   
  Date: 07/05/13 04:33:34

  Modified:    src/main/org/jboss/seam/jsf    SeamApplication.java
                        SeamStateManager.java SeamVariableResolver.java
  Log:
  get rid of use of deprecated methods
  
  Revision  Changes    Path
  1.8       +1 -0      jboss-seam/src/main/org/jboss/seam/jsf/SeamApplication.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamApplication.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamApplication.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- SeamApplication.java	5 May 2007 12:21:10 -0000	1.7
  +++ SeamApplication.java	13 May 2007 08:33:34 -0000	1.8
  @@ -31,6 +31,7 @@
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Init;
   
  + at SuppressWarnings("deprecation")
   public class SeamApplication extends Application
   {  
      
  
  
  
  1.9       +42 -11    jboss-seam/src/main/org/jboss/seam/jsf/SeamStateManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamStateManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamStateManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- SeamStateManager.java	4 Nov 2006 01:00:14 -0000	1.8
  +++ SeamStateManager.java	13 May 2007 08:33:34 -0000	1.9
  @@ -17,40 +17,68 @@
    * 
    * @author Gavin King
    */
  -public class SeamStateManager extends StateManager {
  + at SuppressWarnings("deprecation")
  +public class SeamStateManager extends StateManager 
  +{
      private final StateManager stateManager;
   
  -   public SeamStateManager(StateManager sm) {
  +   public SeamStateManager(StateManager sm) 
  +   {
         this.stateManager = sm;
      }
   
      @Override
  -   protected Object getComponentStateToSave(FacesContext ctx) {
  +   protected Object getComponentStateToSave(FacesContext ctx) 
  +   {
         throw new UnsupportedOperationException();
      }
   
      @Override
  -   protected Object getTreeStructureToSave(FacesContext ctx) {
  +   protected Object getTreeStructureToSave(FacesContext ctx) 
  +   {
         throw new UnsupportedOperationException();
      }
   
      @Override
  -   protected void restoreComponentState(FacesContext ctx, UIViewRoot viewRoot, String str) {
  +   protected void restoreComponentState(FacesContext ctx, UIViewRoot viewRoot, String str) 
  +   {
         throw new UnsupportedOperationException();
      }
   
      @Override
  -   protected UIViewRoot restoreTreeStructure(FacesContext ctx, String str1, String str2) {
  +   protected UIViewRoot restoreTreeStructure(FacesContext ctx, String str1, String str2) 
  +   {
         throw new UnsupportedOperationException();
      }
   
      @Override
  -   public UIViewRoot restoreView(FacesContext ctx, String str1, String str2) {
  +   public SerializedView saveSerializedView(FacesContext facesContext) 
  +   {
  +      
  +      if ( Contexts.isPageContextActive() )
  +      {
  +         //store the page parameters in the view root
  +         Pages.instance().storePageParameters(facesContext);
  +      }
  +
  +      return stateManager.saveSerializedView(facesContext);
  +   }
  +
  +   @Override
  +   public void writeState(FacesContext ctx, SerializedView sv) throws IOException 
  +   {
  +      stateManager.writeState(ctx, sv);
  +   }
  +
  +   @Override
  +   public UIViewRoot restoreView(FacesContext ctx, String str1, String str2) 
  +   {
         return stateManager.restoreView(ctx, str1, str2);
      }
   
      @Override
  -   public SerializedView saveSerializedView(FacesContext facesContext) {
  +   public Object saveView(FacesContext facesContext) 
  +   {
         
         if ( Contexts.isPageContextActive() )
         {
  @@ -58,16 +86,19 @@
            Pages.instance().storePageParameters(facesContext);
         }
   
  -      return stateManager.saveSerializedView(facesContext);
  +      return stateManager.saveView(facesContext);
      }
   
      @Override
  -   public void writeState(FacesContext ctx, SerializedView sv) throws IOException {
  +   public void writeState(FacesContext ctx, Object sv) throws IOException 
  +   {
         stateManager.writeState(ctx, sv);
      }
   
      @Override
  -   public boolean isSavingStateInClient(FacesContext ctx) {
  +   public boolean isSavingStateInClient(FacesContext ctx) 
  +   {
         return stateManager.isSavingStateInClient(ctx);
      }
  +   
   }
  \ No newline at end of file
  
  
  
  1.20      +3 -1      jboss-seam/src/main/org/jboss/seam/jsf/SeamVariableResolver.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamVariableResolver.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamVariableResolver.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- SeamVariableResolver.java	17 Jan 2007 19:25:12 -0000	1.19
  +++ SeamVariableResolver.java	13 May 2007 08:33:34 -0000	1.20
  @@ -24,8 +24,10 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.19 $
  + * @version $Revision: 1.20 $
    */
  + at SuppressWarnings("deprecation")
  + at Deprecated
   public class SeamVariableResolver extends VariableResolver
   {