[Jboss-svn-commits] JBL Code SVN: r2843 - trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule

[<jbo...@li...>]

Author: vsellier
Date: 2006-03-09 17:03:36 -0500 (Thu, 09 Mar 2006)
New Revision: 2843

Added:
   trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleCancel.java
Modified:
   trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/Schedule.java
   trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleNow.java
   trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleOnce.java
   trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/SchedulePeriodic.java
Log:
static variables rafactoring


Modified: trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/Schedule.java
===================================================================
--- trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/Schedule.java	2006-03-09 18:23:13 UTC (rev 2842)
+++ trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/Schedule.java	2006-03-09 22:03:36 UTC (rev 2843)
@@ -13,24 +13,25 @@
  * @author noel
  *
  */
-public class Schedule implements Serializable
+public abstract class Schedule implements Serializable
 {
 	
 	private static final long serialVersionUID = 181723683354366172L;
 
-
 	public final static int TYPE_NONE=0;
 	public final static int TYPE_ONCE=100;
 	public final static int TYPE_NOW=200;
 	public final static int TYPE_PERIODIC=300;
-	public static int TYPE=TYPE_NONE;
+    public final static int TYPE_CANCEL = 400;
 
 	protected Calendar startDate=null;  
 
-	public int getType()
-	{
-		return TYPE;
-	}
+	/**
+	 * Return the int value of the schedule type
+	 * @return the int value
+     * TODO Migrate type value on sub class
+	 */
+	public abstract int getType();
 
 	public Calendar getStartDate()
 	{

Added: trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleCancel.java
===================================================================
--- trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleCancel.java	2006-03-09 18:23:13 UTC (rev 2842)
+++ trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleCancel.java	2006-03-09 22:03:36 UTC (rev 2843)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.reporting.api.schedule;
+
+/**
+ * Used to cancel a previous scheduled task
+ * 
+ * @author <a href="vin...@gm...">Vincent Sellier</a>
+ * @version $Revision: 1.1 $
+ */
+public class ScheduleCancel extends Schedule
+{
+
+   /** The serialVersionUID */
+   private static final long serialVersionUID = -7666780548030388690L;
+
+   private String taskId;
+   
+   public ScheduleCancel(String taskId)
+   {
+      super();
+      this.taskId = taskId;
+   }
+
+   public int getType()
+   {
+      return TYPE_CANCEL;
+   }
+
+   /** 
+    * Gets the task id to cancel
+    * @return the task id
+    */
+   public String getTaskId() {
+      return taskId;
+   }
+   
+}

Modified: trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleNow.java
===================================================================
--- trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleNow.java	2006-03-09 18:23:13 UTC (rev 2842)
+++ trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleNow.java	2006-03-09 22:03:36 UTC (rev 2843)
@@ -19,15 +19,15 @@
 {
 	private static final long serialVersionUID = 2184402284269896195L;
 
-	static
+    public ScheduleNow()
 	{
-		TYPE=TYPE_NOW;
-	}
-	public ScheduleNow()
-	{
 		this.setStartDate(Calendar.getInstance());
 	}
 
+    public int getType() {
+       return Schedule.TYPE_NOW;
+    }
+    
 	public String toString()
 	{
 		Format f = new SimpleDateFormat("dd/MMM/yyyy hh:mm");

Modified: trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleOnce.java
===================================================================
--- trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleOnce.java	2006-03-09 18:23:13 UTC (rev 2842)
+++ trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/ScheduleOnce.java	2006-03-09 22:03:36 UTC (rev 2843)
@@ -19,10 +19,6 @@
 {
 	
 	private static final long serialVersionUID = -6266614906218835730L;
-	static
-	{
-		TYPE=TYPE_ONCE;
-	}
 
 	public ScheduleOnce()
 	{
@@ -34,7 +30,12 @@
 		this.setStartDate( in_date );
 	}
 	
-	public String toString()
+	public int getType() 
+    {
+	   return TYPE_ONCE;
+    }
+    
+    public String toString()
 	{
 		Format f = new SimpleDateFormat("dd/MMM/yyyy hh:mm");
 		return "ScheduleOnce: date = " + f.format(this.getStartDate().getTime());

Modified: trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/SchedulePeriodic.java
===================================================================
--- trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/SchedulePeriodic.java	2006-03-09 18:23:13 UTC (rev 2842)
+++ trunk/labs/reportingservices/reporting-services/src/main/org/jboss/reporting/api/schedule/SchedulePeriodic.java	2006-03-09 22:03:36 UTC (rev 2843)
@@ -42,13 +42,6 @@
 	 */
 	 private int[] dayOfWeekExceptions={Calendar.SATURDAY,Calendar.SUNDAY};
 	
-
-	
-	static
-	{
-		TYPE=TYPE_PERIODIC;
-	}
-
 	// CTOR
 	public SchedulePeriodic()
 	{
@@ -61,7 +54,10 @@
 		periodUnit = in_periodUnit;
 	}
 
-
+   public int getType() {
+       return Schedule.TYPE_PERIODIC;
+    }
+    
 	// accessors
 	public int[] getDayOfWeekExceptions()
 	{