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

[Michael Youngstrom]

  User: myoungstrom
  Date: 07/06/14 19:08:04

  Modified:    src/main/org/jboss/seam/core     TimerSchedule.java
                        QuartzDispatcher.java Schedule.java
                        AbstractDispatcher.java
  Log:
  Fixes for: JBSEAM-1459, JBSEAM-1458, JBSEAM-1377
  
  Revision  Changes    Path
  1.5       +24 -1     jboss-seam/src/main/org/jboss/seam/core/TimerSchedule.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TimerSchedule.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TimerSchedule.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- TimerSchedule.java	6 Jun 2007 00:49:36 -0000	1.4
  +++ TimerSchedule.java	14 Jun 2007 23:08:04 -0000	1.5
  @@ -64,6 +64,29 @@
   
      TimerSchedule() {}
      
  +   
  +   
      public static final TimerSchedule ONCE_IMMEDIATELY = new TimerSchedule();
      
  +   @Override
  +   public int hashCode()
  +   {
  +      final int prime = 31;
  +      int result = super.hashCode();
  +      result = prime * result + ((intervalDuration == null) ? 0 : intervalDuration.hashCode());
  +      return result;
  +   }
  +
  +   @Override
  +   public boolean equals(Object obj)
  +   {
  +      if (!super.equals(obj)) return false;
  +      final TimerSchedule other = (TimerSchedule) obj;
  +      if (intervalDuration == null)
  +      {
  +         if (other.intervalDuration != null) return false;
  +      }
  +      else if (!intervalDuration.equals(other.intervalDuration)) return false;
  +      return true;
  +   }
   }
  
  
  
  1.5       +0 -4      jboss-seam/src/main/org/jboss/seam/core/QuartzDispatcher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: QuartzDispatcher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/QuartzDispatcher.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- QuartzDispatcher.java	6 Jun 2007 00:49:36 -0000	1.4
  +++ QuartzDispatcher.java	14 Jun 2007 23:08:04 -0000	1.5
  @@ -6,8 +6,6 @@
   import java.rmi.server.UID;
   import java.util.Date;
   
  -import javax.interceptor.Interceptors;
  -
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Create;
  @@ -15,7 +13,6 @@
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
  -import org.jboss.seam.ejb.SeamInterceptor;
   import org.jboss.seam.intercept.InvocationContext;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
  @@ -38,7 +35,6 @@
    */
   @Scope(ScopeType.APPLICATION)
   @Name("org.jboss.seam.core.dispatcher")
  - at Interceptors(SeamInterceptor.class)
   @Install(value=false, precedence=BUILT_IN)
   public class QuartzDispatcher extends AbstractDispatcher<QuartzDispatcher.QuartzTriggerHandle, Schedule>
   {
  
  
  
  1.3       +31 -0     jboss-seam/src/main/org/jboss/seam/core/Schedule.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Schedule.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Schedule.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Schedule.java	6 Jun 2007 00:49:36 -0000	1.2
  +++ Schedule.java	14 Jun 2007 23:08:04 -0000	1.3
  @@ -55,4 +55,35 @@
   
      public Schedule () { }
   
  +   @Override
  +   public int hashCode()
  +   {
  +      final int prime = 31;
  +      int result = 1;
  +      result = prime * result + ((duration == null) ? 0 : duration.hashCode());
  +      result = prime * result + ((expiration == null) ? 0 : expiration.hashCode());
  +      return result;
  +   }
  +
  +   @Override
  +   public boolean equals(Object obj)
  +   {
  +      if (this == obj) return true;
  +      if (obj == null) return false;
  +      if (getClass() != obj.getClass()) return false;
  +      final Schedule other = (Schedule) obj;
  +      if (duration == null)
  +      {
  +         if (other.duration != null) return false;
  +      }
  +      else if (!duration.equals(other.duration)) return false;
  +      if (expiration == null)
  +      {
  +         if (other.expiration != null) return false;
  +      }
  +      else if (!expiration.equals(other.expiration)) return false;
  +      return true;
  +   }
  +   
  +   
   }
  
  
  
  1.8       +2 -2      jboss-seam/src/main/org/jboss/seam/core/AbstractDispatcher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractDispatcher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/AbstractDispatcher.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- AbstractDispatcher.java	6 Jun 2007 00:49:36 -0000	1.7
  +++ AbstractDispatcher.java	14 Jun 2007 23:08:04 -0000	1.8
  @@ -86,7 +86,7 @@
         protected abstract void call();
      }
      
  -   static class AsynchronousInvocation extends Asynchronous
  +   protected static class AsynchronousInvocation extends Asynchronous
      {
         static final long serialVersionUID = 7426196491669891310L;
         
  @@ -127,7 +127,7 @@
         }
      }
      
  -   static class AsynchronousEvent extends Asynchronous
  +   protected static class AsynchronousEvent extends Asynchronous
      {
         static final long serialVersionUID = 2074586442931427819L;