diff options
author | Henri Herscher <henri@oreka.org> | 2005-11-23 20:38:58 +0000 |
---|---|---|
committer | Henri Herscher <henri@oreka.org> | 2005-11-23 20:38:58 +0000 |
commit | 6da9ebee8ca1ae047cd250465e0935df114f07e9 (patch) | |
tree | 8855d15d1bad194193b41ccb0d7899ec95094646 | |
parent | 14d391c50b03599177ee4c55f57689329f435827 (diff) |
Added support for start day and stop day in recording programs
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@69 09dcff7a-b715-0410-9601-b79a96267cd0
-rw-r--r-- | orkbasej/java/net/sf/oreka/persistent/RecProgram.java | 53 | ||||
-rw-r--r-- | orkweb/context/WEB-INF/orkweb.application | 2 |
2 files changed, 22 insertions, 33 deletions
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecProgram.java b/orkbasej/java/net/sf/oreka/persistent/RecProgram.java index e763542..211185d 100644 --- a/orkbasej/java/net/sf/oreka/persistent/RecProgram.java +++ b/orkbasej/java/net/sf/oreka/persistent/RecProgram.java @@ -29,6 +29,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; import net.sf.oreka.Cycle; +import net.sf.oreka.Day; import net.sf.oreka.Direction; /** @@ -49,10 +50,10 @@ public class RecProgram { private int maxDuration = 0; private double randomPercent = 0.0; private Cycle cycle = Cycle.PERMANENT; - private int startDay = 0; - private int stopDay = 0; - private Date startTime; - private Date stopTime; + private Day startDay = Day.UNKN; + private Day stopDay = Day.UNKN; + private Date startTime = new Date(0); + private Date stopTime = new Date(0); private int recPerCycle = 0; private int recordedSoFar = 0; private String localParty = ""; @@ -372,24 +373,6 @@ public class RecProgram { /** * @hibernate.property * not-null="true" - * @return Returns the startDay. - */ - public int getStartDay() { - return startDay; - } - - - /** - * @param startDay The startDay to set. - */ - public void setStartDay(int startDay) { - this.startDay = startDay; - } - - - /** - * @hibernate.property - * not-null="true" * @return Returns the startTime. */ public Date getStartTime() { @@ -405,24 +388,30 @@ public class RecProgram { } - /** - * @hibernate.property - * not-null="true" - * @return Returns the stopDay. - */ - public int getStopDay() { + public Day getStartDay() { + return startDay; + } + + + + public void setStartDay(Day startDay) { + this.startDay = startDay; + } + + + + public Day getStopDay() { return stopDay; } - /** - * @param stopDay The stopDay to set. - */ - public void setStopDay(int stopDay) { + + public void setStopDay(Day stopDay) { this.stopDay = stopDay; } + /** * @hibernate.property * not-null="true" diff --git a/orkweb/context/WEB-INF/orkweb.application b/orkweb/context/WEB-INF/orkweb.application index 3a3b934..a5c978b 100644 --- a/orkweb/context/WEB-INF/orkweb.application +++ b/orkweb/context/WEB-INF/orkweb.application @@ -9,7 +9,7 @@ <!--<page name="Home" specification-path="Home.page"/>--> - <!--<meta key="org.apache.tapestry.page-class-packages" value="net.sf.oreka.pages"/> --> + <meta key="org.apache.tapestry.page-class-packages" value="net.sf.oreka.pages"/> <meta key="org.apache.tapestry.component-class-packages" value="net.sf.oreka.tcomponents"/> <library id="contrib" specification-path="/org/apache/tapestry/contrib/Contrib.library"/> |