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

[Gavin King]

  User: gavin   
  Date: 07/05/29 22:57:58

  Modified:    src/main/org/jboss/seam/core   BusinessProcess.java
                        JBossELInstaller.java
  Log:
  minor
  
  Revision  Changes    Path
  1.19      +13 -5     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.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- BusinessProcess.java	12 Feb 2007 16:47:28 -0000	1.18
  +++ BusinessProcess.java	30 May 2007 02:57:58 -0000	1.19
  @@ -1,4 +1,5 @@
   package org.jboss.seam.core;
  +
   import static org.jboss.seam.InterceptionType.NEVER;
   import static org.jboss.seam.annotations.Install.BUILT_IN;
   import java.io.Serializable;
  @@ -12,6 +13,7 @@
   import org.jboss.seam.contexts.Contexts;
   import org.jbpm.graph.exe.ProcessInstance;
   import org.jbpm.taskmgmt.exe.TaskInstance;
  +
   /**
    * Holds the task and process ids for the current conversation,
    * and provides programmatic control over the business process.
  @@ -23,7 +25,9 @@
   @Name("org.jboss.seam.core.businessProcess")
   @Intercept(NEVER)
   @Install(dependencies="org.jboss.seam.core.jbpm", precedence=BUILT_IN)
  -public class BusinessProcess extends AbstractMutable implements Serializable {
  +public class BusinessProcess extends AbstractMutable implements Serializable 
  +{
  +
      private static final long serialVersionUID = 4722350870845851070L;
      private Long processId;
      private Long taskId;
  @@ -67,14 +71,16 @@
       * The jBPM process instance id associated with
       * the current conversation.
       */
  -   public Long getProcessId() {
  +   public Long getProcessId() 
  +   {
         return processId;
      }
      /**
       * Set the process instance id, without validating
       * that the process instance actually exists.
       */
  -   public void setProcessId(Long processId) {
  +   public void setProcessId(Long processId) 
  +   {
         setDirty(this.processId, processId);
         this.processId = processId;
      }
  @@ -82,14 +88,16 @@
       * The jBPM task instance id associated with
       * the current conversation.
       */
  -   public Long getTaskId() {
  +   public Long getTaskId() 
  +   {
         return taskId;
      }
      /**
       * Set the task instance id, without validating
       * that the task instance actually exists.
       */
  -   public void setTaskId(Long taskId) {
  +   public void setTaskId(Long taskId) 
  +   {
         setDirty(this.taskId, taskId);
         this.taskId = taskId;
      }
  
  
  
  1.4       +14 -7     jboss-seam/src/main/org/jboss/seam/core/JBossELInstaller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossELInstaller.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/JBossELInstaller.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- JBossELInstaller.java	13 May 2007 08:33:33 -0000	1.3
  +++ JBossELInstaller.java	30 May 2007 02:57:58 -0000	1.4
  @@ -16,14 +16,16 @@
   @Name("org.jboss.seam.core.jbossELInstaller")
   @Startup
   @Scope(ScopeType.APPLICATION)
  -public class JBossELInstaller {        
  +public class JBossELInstaller 
  +{
       //private static final String TOMCAT_APPLICATION_CONTEXT = "org.apache.jasper.runtime.JspApplicationContextImpl";
       private static final String JSF_RI_ASSOCIATE = "com.sun.faces.ApplicationAssociate";
       
       private static final LogProvider log = Logging.getLogProvider(JBossELInstaller.class);
   
       @Create
  -    public void installJBossEL() {                   
  +    public void installJBossEL() 
  +    {        
   //        configureTomcatApplicationContext();
           configureRIAssociate();
       }
  @@ -31,14 +33,19 @@
       /**
        * Set the default expression factory for the JSF RI     
        */
  -    public void configureRIAssociate() {        
  +    public void configureRIAssociate() 
  +    {
           Object target = Contexts.getApplicationContext().get(JSF_RI_ASSOCIATE);
  -        if (target != null) {
  +        if (target != null) 
  +        {
               Method method = Reflections.getSetterMethod(target.getClass(), "expressionFactory");
  -            try {
  -                method.invoke(target, new Object[] {new ExpressionFactoryImpl()});  
  +            try 
  +            {
  +                method.invoke( target, new Object[] { new ExpressionFactoryImpl() } );  
                   log.debug("set expression factory on RI associate");
  -            } catch (Exception e) {
  +            } 
  +            catch (Exception e) 
  +            {
                   log.error("couldn't set expression factory on RI associate", e);
               }
           }