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

Gavin King gavin.king at jboss.com
Wed Oct 11 00:42:12 EDT 2006


  User: gavin   
  Date: 06/10/11 00:42:12

  Modified:    src/main/org/jboss/seam/contexts       
                        BusinessProcessContext.java
                        ClientConversationContext.java MapContext.java
                        PageContext.java ServerConversationContext.java
                        WebRequestContext.java WebSessionContext.java
  Log:
  make tests run
  
  Revision  Changes    Path
  1.32      +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.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- BusinessProcessContext.java	10 Oct 2006 18:12:31 -0000	1.31
  +++ BusinessProcessContext.java	11 Oct 2006 04:42:12 -0000	1.32
  @@ -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.31 $
  + * @version $Revision: 1.32 $
    */
   public class BusinessProcessContext implements Context {
   
  @@ -63,7 +63,7 @@
      }
   
      public void set(String name, Object value) {
  -      Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
         if (value==null)
         {
            //yes, we need this
  @@ -74,7 +74,7 @@
            removals.remove(name);
            additions.put(name, value);
         }
  -      Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
      }
   
      public boolean isSet(String name) {
  @@ -82,10 +82,10 @@
      }
      
      public void remove(String name) {
  -      Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
         additions.remove(name);
         removals.add(name);
  -      Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
      }
   
      public String[] getNames() {
  
  
  
  1.7       +5 -5      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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ClientConversationContext.java	3 Oct 2006 23:15:58 -0000	1.6
  +++ ClientConversationContext.java	11 Oct 2006 04:42:12 -0000	1.7
  @@ -22,7 +22,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class ClientConversationContext implements Context {
   
  @@ -46,9 +46,9 @@
   
   	public void set(String name, Object value) 
      {
  -      Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
   		map.put(name, value);
  -      Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
   	}
   
   	public boolean isSet(String name) 
  @@ -58,9 +58,9 @@
      
   	public void remove(String name) 
      {
  -      Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
         map.remove(name);
  -      Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
   	}
   
      public String[] getNames() {
  
  
  
  1.3       +5 -5      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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- MapContext.java	29 Sep 2006 22:48:50 -0000	1.2
  +++ MapContext.java	11 Oct 2006 04:42:12 -0000	1.3
  @@ -1,4 +1,4 @@
  -//$Id: MapContext.java,v 1.2 2006/09/29 22:48:50 gavin Exp $
  +//$Id: MapContext.java,v 1.3 2006/10/11 04:42:12 gavin Exp $
   package org.jboss.seam.contexts;
   
   import java.util.HashMap;
  @@ -46,16 +46,16 @@
   
      public void remove(String name)
      {
  -      Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
         map.remove(name);
  -      Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
      }
   
      public void set(String name, Object value)
      {
  -      Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
         map.put(name, value);
  -      Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
      }
   
      public void flush() {}
  
  
  
  1.6       +5 -5      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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- PageContext.java	3 Oct 2006 23:15:58 -0000	1.5
  +++ PageContext.java	11 Oct 2006 04:42:12 -0000	1.6
  @@ -29,7 +29,7 @@
    * returns values from the page that was the source of the request.
    * 
    * @author Gavin King
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class PageContext implements Context {
   
  @@ -72,16 +72,16 @@
   
   	public void set(String name, Object value) 
      {
  -      Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
         getCurrentWritableMap().put(name, value);
  -      Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
   	}
   
   	public void remove(String name) 
      {
  -      Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
         getCurrentWritableMap().remove(name);
  -      Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
   	}
   
      public String[] getNames() {
  
  
  
  1.12      +5 -5      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.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- ServerConversationContext.java	10 Oct 2006 21:00:52 -0000	1.11
  +++ ServerConversationContext.java	11 Oct 2006 04:42:12 -0000	1.12
  @@ -26,7 +26,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   public class ServerConversationContext implements Context {
   
  @@ -104,7 +104,7 @@
   
      public void set(String name, Object value) 
      {
  -      Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
         if (value==null)
         {
            //yes, we need this
  @@ -115,7 +115,7 @@
            removals.remove(name);
            additions.put(name, value);
         }
  -      Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
   	}
   
   	public boolean isSet(String name) 
  @@ -125,10 +125,10 @@
      
   	public void remove(String name) 
      {
  -      Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
         additions.remove(name);
         removals.add(name);
  -      Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
   	}
   
      public String[] getNames() 
  
  
  
  1.18      +5 -5      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.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- WebRequestContext.java	29 Sep 2006 22:48:50 -0000	1.17
  +++ WebRequestContext.java	11 Oct 2006 04:42:12 -0000	1.18
  @@ -16,7 +16,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.17 $
  + * @version $Revision: 1.18 $
    */
   public class WebRequestContext implements Context {
   
  @@ -46,9 +46,9 @@
   	}
   
   	public void set(String name, Object value) {
  -      Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
   		request.setAttribute( getKey(name), value);
  -      Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
   	}
   
   	public boolean isSet(String name) {
  @@ -56,9 +56,9 @@
   	}
   
   	public void remove(String name) {
  -      Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
   		request.removeAttribute( getKey(name) );
  -      Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
   	}
   
   	public String[] getNames() {
  
  
  
  1.23      +5 -5      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.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- WebSessionContext.java	10 Oct 2006 19:37:37 -0000	1.22
  +++ WebSessionContext.java	11 Oct 2006 04:42:12 -0000	1.23
  @@ -17,7 +17,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.22 $
  + * @version $Revision: 1.23 $
    */
   public class WebSessionContext implements Context 
   {
  @@ -51,9 +51,9 @@
   
   	public void set(String name, Object value) 
      {
  -      Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preSetVariable." + name);
   		session.setAttribute( getKey(name), value );
  -      Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);
   	}
   
   	public boolean isSet(String name) 
  @@ -63,9 +63,9 @@
   
   	public void remove(String name) 
      {
  -      Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.preRemoveVariable." + name);
   		session.removeAttribute( getKey(name) );
  -      Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
  +      if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postRemoveVariable." + name);
   	}
   
   	public String[] getNames() 
  
  
  



More information about the jboss-cvs-commits mailing list