antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Replaced Hashtables with HashSets, some indentation fixes.

Browse source
This commit is contained in:
hns 2003-05-27 11:18:31 +00:00
parent 5c192c437a
commit 7a7b8158a3
1 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
src/helma/util/CronJob.java
View file

@ -38,7 +38,7 @@ package helma.util;
* software without prior written permission. For written * software without prior written permission. For written
* permission, please contact support@protomatter.com. * permission, please contact support@protomatter.com.
* *
* 5. Products derived from this software may not be called "Protomatter", * 5. Products derived from this software may not be called "Protomatter",
* nor may "Protomatter" appear in their name, without prior written * nor may "Protomatter" appear in their name, without prior written
* permission of the Protomatter Software Project * permission of the Protomatter Software Project
* (support@protomatter.com). * (support@protomatter.com).
@ -62,7 +62,7 @@ import java.util.*;
/** /**
* A cron entry, derived from Protomatter's CronEntry class. * A cron entry, derived from Protomatter's CronEntry class.
* This class encapsulates a function call, a timeout value * This class encapsulates a function call, a timeout value
* and a specification for when the given event should be * and a specification for when the given event should be
* delivered to the given topics. The specification of when * delivered to the given topics. The specification of when
* the event should be delivered is based on the UNIX cron * the event should be delivered is based on the UNIX cron
@ -72,17 +72,18 @@ import java.util.*;
public class CronJob { public class CronJob {
// used as the value in hashtables private static HashSet all = new HashSet (2);
private static Object value = new Object();
private static Hashtable all = new Hashtable ();
private static String ALL_VALUE = "*"; private static String ALL_VALUE = "*";
static {
all.add (ALL_VALUE);
}
private Hashtable year; private HashSet year;
private Hashtable month; private HashSet month;
private Hashtable day; private HashSet day;
private Hashtable weekday; private HashSet weekday;
private Hashtable hour; private HashSet hour;
private Hashtable minute; private HashSet minute;
private String name = null; private String name = null;
private String function = null; private String function = null;
@ -161,7 +162,8 @@ public class CronJob {
*/ */
public static CronJob newJob (String functionName, String year, String month, String day, String weekday, String hour, String minute) { public static CronJob newJob (String functionName, String year, String month,
String day, String weekday, String hour, String minute) {
CronJob job = new CronJob (functionName); CronJob job = new CronJob (functionName);
job.setFunction (functionName); job.setFunction (functionName);
if (year != null) if (year != null)
@ -215,7 +217,7 @@ public class CronJob {
} else if (jobSpec.equalsIgnoreCase("minute")) { } else if (jobSpec.equalsIgnoreCase("minute")) {
parseMinute (job, value); parseMinute (job, value);
} else if (jobSpec.equalsIgnoreCase("timeout")) { } else if (jobSpec.equalsIgnoreCase("timeout")) {
parseTimeout (job, value); parseTimeout (job, value);
} }
} catch (NoSuchElementException nsee) { } catch (NoSuchElementException nsee) {
} }
@ -396,36 +398,34 @@ public class CronJob {
} }
} }
public static void parseTimeout (CronJob job, String timeout) { public static void parseTimeout (CronJob job, String timeout) {
long timeoutValue = 1000 * Long.valueOf(timeout).longValue (); long timeoutValue = 1000 * Long.valueOf(timeout).longValue ();
job.setTimeout (timeoutValue); job.setTimeout (timeoutValue);
} }
public static long nextFullMinute () { public static long nextFullMinute () {
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
long millisAfterMinute = (now % 60000); long millisAfterMinute = (now % 60000);
return (now + 60000 - millisAfterMinute); return (now + 60000 - millisAfterMinute);
} }
public static long millisToNextFullMinute () { public static long millisToNextFullMinute () {
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
long millisAfterMinute = (now % 60000); long millisAfterMinute = (now % 60000);
return (60000 - millisAfterMinute); return (60000 - millisAfterMinute);
} }
/** /**
* Create an empty CronJob. * Create an empty CronJob.
*/ */
public CronJob (String name) { public CronJob (String name) {
this.name = name; this.name = name;
all.put (ALL_VALUE, value); year = new HashSet (all);
year = new Hashtable (all); month = new HashSet (all);
month = new Hashtable (all); day = new HashSet (all);
day = new Hashtable (all); weekday = new HashSet (all);
weekday = new Hashtable (all); hour = new HashSet (all);
hour = new Hashtable (all); minute = new HashSet (all);
minute = new Hashtable (all);
} }
/** /**
@ -439,29 +439,29 @@ public class CronJob {
// try and short-circuit as fast as possible. // try and short-circuit as fast as possible.
Integer theYear = new Integer(cal.get(Calendar.YEAR)); Integer theYear = new Integer(cal.get(Calendar.YEAR));
if (!year.containsKey(ALL_VALUE) && !year.containsKey(theYear)) if (!year.contains(ALL_VALUE) && !year.contains(theYear))
return false; return false;
Integer theMonth = new Integer(cal.get(Calendar.MONTH)); Integer theMonth = new Integer(cal.get(Calendar.MONTH));
if (!month.containsKey(ALL_VALUE) && !month.containsKey(theMonth)) if (!month.contains(ALL_VALUE) && !month.contains(theMonth))
return false; return false;
Integer theDay = new Integer(cal.get(Calendar.DAY_OF_MONTH)); Integer theDay = new Integer(cal.get(Calendar.DAY_OF_MONTH));
if (!day.containsKey(ALL_VALUE) && !day.containsKey(theDay)) if (!day.contains(ALL_VALUE) && !day.contains(theDay))
return false; return false;
Integer theWeekDay = new Integer(cal.get(Calendar.DAY_OF_WEEK)); Integer theWeekDay = new Integer(cal.get(Calendar.DAY_OF_WEEK));
if (!weekday.containsKey(ALL_VALUE) && !weekday.containsKey(theWeekDay)) if (!weekday.contains(ALL_VALUE) && !weekday.contains(theWeekDay))
return false; return false;
Integer theHour = new Integer(cal.get(Calendar.HOUR_OF_DAY)); Integer theHour = new Integer(cal.get(Calendar.HOUR_OF_DAY));
if (!hour.containsKey(ALL_VALUE) && !hour.containsKey(theHour)) if (!hour.contains(ALL_VALUE) && !hour.contains(theHour))
return false; return false;
Integer theMinute = new Integer(cal.get(Calendar.MINUTE)); Integer theMinute = new Integer(cal.get(Calendar.MINUTE));
if (!minute.containsKey(ALL_VALUE) && !minute.containsKey(theMinute)) if (!minute.contains(ALL_VALUE) && !minute.contains(theMinute))
return false; return false;
return true; return true;
} }
@ -472,7 +472,7 @@ public class CronJob {
public void addYear(int year) public void addYear(int year)
{ {
this.year.remove(ALL_VALUE); this.year.remove(ALL_VALUE);
this.year.put(new Integer(year), value); this.year.add(new Integer(year));
} }
/** /**
@ -494,7 +494,7 @@ public class CronJob {
public void setAllYears(boolean set) public void setAllYears(boolean set)
{ {
if (set) if (set)
this.year.put(ALL_VALUE, value); this.year.add(ALL_VALUE);
else else
this.year.remove(ALL_VALUE); this.year.remove(ALL_VALUE);
} }
@ -508,7 +508,7 @@ public class CronJob {
public void addMonth(int month) public void addMonth(int month)
{ {
this.month.remove(ALL_VALUE); this.month.remove(ALL_VALUE);
this.month.put(new Integer(month), value); this.month.add(new Integer(month));
} }
/** /**
@ -532,7 +532,7 @@ public class CronJob {
public void setAllMonths(boolean set) public void setAllMonths(boolean set)
{ {
if (set) if (set)
this.month.put(ALL_VALUE, value); this.month.add(ALL_VALUE);
else else
this.month.remove(ALL_VALUE); this.month.remove(ALL_VALUE);
} }
@ -544,7 +544,7 @@ public class CronJob {
public void addDay(int day) public void addDay(int day)
{ {
this.day.remove(ALL_VALUE); this.day.remove(ALL_VALUE);
this.day.put(new Integer(day), value); this.day.add(new Integer(day));
} }
/** /**
@ -566,7 +566,7 @@ public class CronJob {
public void setAllDays(boolean set) public void setAllDays(boolean set)
{ {
if (set) if (set)
this.day.put(ALL_VALUE, value); this.day.add(ALL_VALUE);
else else
this.day.remove(ALL_VALUE); this.day.remove(ALL_VALUE);
} }
@ -580,7 +580,7 @@ public class CronJob {
public void addWeekday(int weekday) public void addWeekday(int weekday)
{ {
this.weekday.remove(ALL_VALUE); this.weekday.remove(ALL_VALUE);
this.weekday.put(new Integer(weekday), value); this.weekday.add(new Integer(weekday));
} }
/** /**
@ -604,7 +604,7 @@ public class CronJob {
public void setAllWeekdays(boolean set) public void setAllWeekdays(boolean set)
{ {
if (set) if (set)
this.weekday.put(ALL_VALUE, value); this.weekday.add(ALL_VALUE);
else else
this.weekday.remove(ALL_VALUE); this.weekday.remove(ALL_VALUE);
} }
@ -616,7 +616,7 @@ public class CronJob {
public void addHour(int hour) public void addHour(int hour)
{ {
this.hour.remove(ALL_VALUE); this.hour.remove(ALL_VALUE);
this.hour.put(new Integer(hour), value); this.hour.add(new Integer(hour));
} }
/** /**
@ -638,7 +638,7 @@ public class CronJob {
public void setAllHours(boolean set) public void setAllHours(boolean set)
{ {
if (set) if (set)
this.hour.put(ALL_VALUE, value); this.hour.add(ALL_VALUE);
else else
this.hour.remove(ALL_VALUE); this.hour.remove(ALL_VALUE);
} }
@ -650,7 +650,7 @@ public class CronJob {
public void addMinute(int minute) public void addMinute(int minute)
{ {
this.minute.remove(ALL_VALUE); this.minute.remove(ALL_VALUE);
this.minute.put(new Integer(minute), value); this.minute.add(new Integer(minute));
} }
/** /**
@ -672,12 +672,11 @@ public class CronJob {
public void setAllMinutes(boolean set) public void setAllMinutes(boolean set)
{ {
if (set) if (set)
this.minute.put(ALL_VALUE, value); this.minute.add(ALL_VALUE);
else else
this.minute.remove(ALL_VALUE); this.minute.remove(ALL_VALUE);
} }
/** /**
* Set this entry's name * Set this entry's name
*/ */
@ -727,9 +726,10 @@ public class CronJob {
{ {
return this.timeout; return this.timeout;
} }
public String toString () { public String toString ()
return "[CronJob " + name + "]"; {
} return "[CronJob " + name + "]";
}
} }