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

Gavin King gavin.king at jboss.com
Wed Feb 21 11:58:41 EST 2007


  User: gavin   
  Date: 07/02/21 11:58:41

  Modified:    src/main/org/jboss/seam/contexts         
                        BusinessProcessContext.java
                        ClientConversationContext.java
                        FacesApplicationContext.java MapContext.java
                        PageContext.java ServerConversationContext.java
                        WebApplicationContext.java WebRequestContext.java
                        WebSessionContext.java
  Log:
  JBSEAM-893
  
  Revision  Changes    Path
  1.34      +5 -5      jboss-seam/src/main/org/jboss/seam/contexts/BusinessProcessContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BusinessProcessContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/BusinessProcessContext.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- BusinessProcessContext.java	16 Dec 2006 02:58:10 -0000	1.33
  +++ BusinessProcessContext.java	21 Feb 2007 16:58:41 -0000	1.34
  @@ -11,14 +11,14 @@
   import java.util.Map;
   import java.util.Set;
   
  -import org.jboss.seam.log.LogProvider;
  -import org.jboss.seam.log.Logging;
  +import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.core.Events;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.ProcessInstance;
   import org.jboss.seam.core.TaskInstance;
  +import org.jboss.seam.log.LogProvider;
  +import org.jboss.seam.log.Logging;
   import org.jbpm.context.exe.ContextInstance;
   
   /**
  @@ -27,7 +27,7 @@
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    * @author <a href="mailto:steve at hibernate.org">Steve Ebersole</a>
    * @author Gavin King
  - * @version $Revision: 1.33 $
  + * @version $Revision: 1.34 $
    */
   public class BusinessProcessContext implements Context {
   
  @@ -118,7 +118,7 @@
   
      public Object get(Class clazz)
      {
  -      return get( Seam.getComponentName(clazz) );
  +      return get( Component.getComponentName(clazz) );
      }
      
      public void clear()
  
  
  
  1.10      +3 -3      jboss-seam/src/main/org/jboss/seam/contexts/ClientConversationContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClientConversationContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/ClientConversationContext.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- ClientConversationContext.java	4 Nov 2006 01:00:14 -0000	1.9
  +++ ClientConversationContext.java	21 Feb 2007 16:58:41 -0000	1.10
  @@ -11,8 +11,8 @@
   
   import javax.faces.context.FacesContext;
   
  +import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.core.Events;
   import org.jboss.seam.core.Manager;
   
  @@ -22,7 +22,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   public class ClientConversationContext implements Context {
   
  @@ -75,7 +75,7 @@
   
      public Object get(Class clazz)
      {
  -      return get( Seam.getComponentName(clazz) );
  +      return get( Component.getComponentName(clazz) );
      }
   
      /**
  
  
  
  1.7       +3 -3      jboss-seam/src/main/org/jboss/seam/contexts/FacesApplicationContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesApplicationContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/FacesApplicationContext.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- FacesApplicationContext.java	8 Oct 2006 20:58:03 -0000	1.6
  +++ FacesApplicationContext.java	21 Feb 2007 16:58:41 -0000	1.7
  @@ -11,14 +11,14 @@
   
   import javax.faces.context.ExternalContext;
   
  +import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.core.Events;
   
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class FacesApplicationContext implements Context {
   
  @@ -81,7 +81,7 @@
   
      public Object get(Class clazz)
      {
  -      return get( Seam.getComponentName(clazz) );
  +      return get( Component.getComponentName(clazz) );
      }
   
      public void flush() {}
  
  
  
  1.4       +3 -3      jboss-seam/src/main/org/jboss/seam/contexts/MapContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MapContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/MapContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- MapContext.java	11 Oct 2006 04:42:12 -0000	1.3
  +++ MapContext.java	21 Feb 2007 16:58:41 -0000	1.4
  @@ -1,11 +1,11 @@
  -//$Id: MapContext.java,v 1.3 2006/10/11 04:42:12 gavin Exp $
  +//$Id: MapContext.java,v 1.4 2007/02/21 16:58:41 gavin Exp $
   package org.jboss.seam.contexts;
   
   import java.util.HashMap;
   import java.util.Map;
   
  +import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.core.Events;
   
   public class MapContext implements Context
  @@ -26,7 +26,7 @@
   
      public Object get(Class clazz)
      {
  -      return get( Seam.getComponentName(clazz) );
  +      return get( Component.getComponentName(clazz) );
      }
   
      public Object get(String name)
  
  
  
  1.14      +3 -3      jboss-seam/src/main/org/jboss/seam/contexts/PageContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PageContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/PageContext.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- PageContext.java	23 Nov 2006 22:37:20 -0000	1.13
  +++ PageContext.java	21 Feb 2007 16:58:41 -0000	1.14
  @@ -16,8 +16,8 @@
   import javax.faces.context.FacesContext;
   import javax.faces.event.PhaseId;
   
  +import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.core.Events;
   
   /**
  @@ -33,7 +33,7 @@
    * returns values from the page that was the source of the request.
    * 
    * @author Gavin King
  - * @version $Revision: 1.13 $
  + * @version $Revision: 1.14 $
    */
   public class PageContext implements Context {
   
  @@ -119,7 +119,7 @@
   
      public Object get(Class clazz)
      {
  -      return get( Seam.getComponentName(clazz) );
  +      return get( Component.getComponentName(clazz) );
      }
   
      /**
  
  
  
  1.20      +3 -2      jboss-seam/src/main/org/jboss/seam/contexts/ServerConversationContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerConversationContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/ServerConversationContext.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- ServerConversationContext.java	19 Dec 2006 22:54:44 -0000	1.19
  +++ ServerConversationContext.java	21 Feb 2007 16:58:41 -0000	1.20
  @@ -14,6 +14,7 @@
   import java.util.Map;
   import java.util.Set;
   
  +import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.PerNestedConversation;
  @@ -26,7 +27,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.19 $
  + * @version $Revision: 1.20 $
    */
   public class ServerConversationContext implements Context {
   
  @@ -188,7 +189,7 @@
   
      public Object get(Class clazz)
      {
  -      return get( Seam.getComponentName(clazz) );
  +      return get( Component.getComponentName(clazz) );
      }
      
      public void clear()
  
  
  
  1.19      +3 -3      jboss-seam/src/main/org/jboss/seam/contexts/WebApplicationContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WebApplicationContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/WebApplicationContext.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- WebApplicationContext.java	25 Nov 2006 02:56:06 -0000	1.18
  +++ WebApplicationContext.java	21 Feb 2007 16:58:41 -0000	1.19
  @@ -11,14 +11,14 @@
   
   import javax.servlet.ServletContext;
   
  +import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.core.Events;
   
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.18 $
  + * @version $Revision: 1.19 $
    */
   public class WebApplicationContext implements Context 
   {
  @@ -85,7 +85,7 @@
   
      public Object get(Class clazz)
      {
  -      return get( Seam.getComponentName(clazz) );
  +      return get( Component.getComponentName(clazz) );
      }
   
      public void flush() {}
  
  
  
  1.20      +3 -3      jboss-seam/src/main/org/jboss/seam/contexts/WebRequestContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WebRequestContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/WebRequestContext.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- WebRequestContext.java	25 Nov 2006 02:56:06 -0000	1.19
  +++ WebRequestContext.java	21 Feb 2007 16:58:41 -0000	1.20
  @@ -9,14 +9,14 @@
   import java.util.ArrayList;
   import java.util.Enumeration;
   
  +import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.core.Events;
   
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.19 $
  + * @version $Revision: 1.20 $
    */
   public class WebRequestContext implements Context {
   
  @@ -81,7 +81,7 @@
   
      public Object get(Class clazz)
      {
  -      return get( Seam.getComponentName(clazz) );
  +      return get( Component.getComponentName(clazz) );
      }
   
      public void flush() {}
  
  
  
  1.28      +3 -2      jboss-seam/src/main/org/jboss/seam/contexts/WebSessionContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WebSessionContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/WebSessionContext.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- WebSessionContext.java	13 Dec 2006 04:54:19 -0000	1.27
  +++ WebSessionContext.java	21 Feb 2007 16:58:41 -0000	1.28
  @@ -9,6 +9,7 @@
   import java.util.ArrayList;
   import java.util.Enumeration;
   
  +import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
   import org.jboss.seam.core.Events;
  @@ -16,7 +17,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.27 $
  + * @version $Revision: 1.28 $
    */
   public class WebSessionContext implements Context 
   {
  @@ -85,7 +86,7 @@
      
      public Object get(Class clazz)
      {
  -      return get( Seam.getComponentName(clazz) );
  +      return get( Component.getComponentName(clazz) );
      }
   
      public void flush() 
  
  
  



More information about the jboss-cvs-commits mailing list