[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/crontab Crontab.java CrontabEntry.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/crontab
In directory jcorp2.servlets.net:/tmp/cvs-serv17415/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/crontab

Modified Files:
	Crontab.java CrontabEntry.java 
Log Message:
deleting an entry in from JobQueue did not remove it from the crontab. It does now.


Index: Crontab.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/crontab/Crontab.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Crontab.java	22 Nov 2003 12:27:05 -0000	1.11
--- Crontab.java	13 May 2004 00:32:56 -0000	1.12
***************
*** 203,206 ****
--- 203,235 ----
          return entry;
      }
+     
+ 	/**
+ 	 * Adds a crontab to execute based upon various Cron-like parameters as
+ 	 * numbers
+ 	 * @param minute execute every X minutes
+ 	 * @param hour execute every X hours
+ 	 * @param dayOfMonth execute every X days of the month
+ 	 * @param month execute every X days of the month
+ 	 * @param dayOfWeek execute every specified day of the week
+ 	 * @param year execute every X specified years
+ 	 * @param label Useful label for possible debugging purposes
+ 	 * @param listener the listener to get notified when the crontab's time is
+ 	 * due
+ 	 * @param jobNumber Job Number for this CrontabEntry's associated JobQueue entry
+ 	 * @return Crontab Entry
+ 	 * @throws CronException upon construction error
+ 	 */
+ 	public synchronized CrontabEntry addCrontabEntry(int minute, int hour,
+ 													 int dayOfMonth, int month,
+ 													 int dayOfWeek, int year, String label,
+ 													 CrontabListenerI listener, String jobNumber)
+ 			throws CronException {
+ 		CrontabEntry entry = new CrontabEntry(minute, hour, dayOfMonth, month,
+ 				dayOfWeek, year, label, listener);
+ 		entry.setJobNumber(jobNumber);
+ 		addCrontabEntry(entry);
+ 
+ 		return entry;
+ 	}
  
  

Index: CrontabEntry.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/crontab/CrontabEntry.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CrontabEntry.java	13 Jan 2004 23:31:28 -0000	1.16
--- CrontabEntry.java	13 May 2004 00:32:56 -0000	1.17
***************
*** 160,163 ****
--- 160,168 ----
        */
      protected long counterValue;
+     
+ 	/**
+ 	  * Job Number for this CrontabEntry's associated JobQueue entry
+ 	  */
+ 	protected String jobNumber = null;
  
      /**
***************
*** 653,655 ****
--- 658,676 ----
          }
      }
+ 	/**
+ 	 * Return Job Number for this CrontabEntry's associated JobQueue entry
+ 	 * @return Job Number for this CrontabEntry's associated JobQueue entry
+ 	 */
+ 	public String getJobNumber() {
+ 		return jobNumber;
+ 	}
+ 
+ 	/**
+ 	 * Set Job Number for this CrontabEntry's associated JobQueue entry
+ 	 * @param s Job Number for this CrontabEntry's associated JobQueue entry
+ 	 */
+ 	public void setJobNumber(String s) {
+ 		jobNumber = s;
+ 	}
+ 
  }