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

[Gavin King]

  User: gavin   
  Date: 06/10/25 17:08:40

  Modified:    src/main/org/jboss/seam/core    BusinessProcess.java
                        Manager.java Pageflow.java
  Log:
  make messages extensible
  fix test harness bug
  
  Revision  Changes    Path
  1.8       +4 -4      jboss-seam/src/main/org/jboss/seam/core/BusinessProcess.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BusinessProcess.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/BusinessProcess.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- BusinessProcess.java	25 Oct 2006 15:14:35 -0000	1.7
  +++ BusinessProcess.java	25 Oct 2006 21:08:40 -0000	1.8
  @@ -272,7 +272,7 @@
         }
      }
   
  -   private void taskNotFound(Long taskId)
  +   protected void taskNotFound(Long taskId)
      {
         FacesMessages.instance().addFromResourceBundle(
               FacesMessage.SEVERITY_WARN, 
  @@ -282,7 +282,7 @@
            );
      }
   
  -   private void taskEnded(Long taskId)
  +   protected void taskEnded(Long taskId)
      {
         FacesMessages.instance().addFromResourceBundle(
               FacesMessage.SEVERITY_WARN, 
  @@ -292,7 +292,7 @@
            );
      }
   
  -   private void processEnded(Long processId)
  +   protected void processEnded(Long processId)
      {
         FacesMessages.instance().addFromResourceBundle(
               FacesMessage.SEVERITY_WARN, 
  @@ -302,7 +302,7 @@
            );
      }
   
  -   private void processNotFound(Long processId)
  +   protected void processNotFound(Long processId)
      {
         FacesMessages.instance().addFromResourceBundle(
               FacesMessage.SEVERITY_WARN, 
  
  
  
  1.102     +11 -6     jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -b -r1.101 -r1.102
  --- Manager.java	25 Oct 2006 20:13:24 -0000	1.101
  +++ Manager.java	25 Oct 2006 21:08:40 -0000	1.102
  @@ -41,7 +41,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.101 $
  + * @version $Revision: 1.102 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -981,11 +981,7 @@
   
      public void redirectToNoConversationView()
      {
  -      FacesMessages.instance().addFromResourceBundle( 
  -            FacesMessage.SEVERITY_WARN, 
  -            "org.jboss.seam.NoConversation", 
  -            "The conversation ended, timed out or was processing another request" 
  -         );
  +      noConversation();
         
         //stuff from jPDL takes precedence
         String pageflowName = (String) Contexts.getPageContext().get(Manager.PAGEFLOW_NAME);
  @@ -1012,6 +1008,15 @@
         }
      }
   
  +   protected void noConversation()
  +   {
  +      FacesMessages.instance().addFromResourceBundle( 
  +            FacesMessage.SEVERITY_WARN, 
  +            "org.jboss.seam.NoConversation", 
  +            "The conversation ended, timed out or was processing another request" 
  +         );
  +   }
  +
      public boolean isConversationAlreadyStored()
      {
         return conversationAlreadyStored;
  
  
  
  1.35      +6 -1      jboss-seam/src/main/org/jboss/seam/core/Pageflow.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pageflow.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pageflow.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -b -r1.34 -r1.35
  --- Pageflow.java	25 Oct 2006 15:14:35 -0000	1.34
  +++ Pageflow.java	25 Oct 2006 21:08:40 -0000	1.35
  @@ -106,12 +106,17 @@
      {
         FacesContext context = FacesContext.getCurrentInstance();
         navigate(context);
  +      illegalNavigation();
  +      context.renderResponse();
  +   }
  +
  +   protected void illegalNavigation()
  +   {
         FacesMessages.instance().addFromResourceBundle( 
               FacesMessage.SEVERITY_WARN, 
               "org.jboss.seam.IllegalNavigation", 
               "Illegal navigation" 
            );
  -      context.renderResponse();
      }
      
      public Node getNode()