Changeset 4047

Timestamp:

08/25/10 11:29:39 (21 months ago)

Author:

mszopinski

Message:

 

Location:

ssme/trunk/src/com/kh/ssme/model

Files:

• entity/RepeatTypeEntity.java (modified) (4 diffs)
• entity/TimeFrameEntity.java (modified) (1 diff)
• ifc/RepeatType.java (modified) (2 diffs)

ssme/trunk/src/com/kh/ssme/model/entity/RepeatTypeEntity.java

@@ -24 +24 @@
 
 import java.util.Date;
+import java.util.Set;
+import java.util.TreeSet;
 
 import javax.persistence.Basic;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
@@ -56 +58 @@
         
         @Basic
+        @Column(name = "frequency")
+        private Integer frequency_;
+        
+        @Basic
         @Column(name = "until")
         private Date until_;
         
+        @Basic
+        @Column(name = "from")
+        private Date from_;
+        
+        /**
+         * @return the from_
+         */
+        public Date getFrom_() {
+                return from_;
+        }
+
+        /**
+         * @param from_ the from_ to set
+         */
+        public void setFrom_(Date from_) {
+                this.from_ = from_;
+        }
+
         @Basic
         @Column(name = "repeatType")    
@@ -64 +88 @@
         private RepeatTypeEnum repeatType_;
         
-        @OneToOne(optional=false, targetEntity=TimeFrameEntity.class)
-        @JoinColumn(name="timeframe_id", nullable=false, updatable=true)
-        private TimeFrame time_;                
-
-        
+        @OneToMany(cascade=CascadeType.ALL, mappedBy="repeat_", targetEntity=RepeatTypeEntity.class)
+        private Set<TimeFrame> timeFrames_ =new TreeSet<TimeFrame>();;                  
+
         /**
          * Creates new instance of RepeatTypeEntity
@@ -143 +165 @@
         }
 
-        /* (non-Javadoc)
-         * @see com.kh.ssme.model.ifc.RepeatType#getTime()
-         */
-        @Override
-        public TimeFrame getTime() {
-                return time_;
-        }
-
-        /* (non-Javadoc)
-         * @see com.kh.ssme.model.ifc.RepeatType#setTime(com.kh.ssme.model.ifc.TimeFrame)
-         */
-        @Override
-        public void setTime(TimeFrame time) {
-                time_ = time;
+
+        /* (non-Javadoc)
+         * @see com.kh.ssme.model.ifc.RepeatType#setFrequency(java.lang.Integer)
+         */
+        @Override
+        public void setFrequency(Integer frequency_) {
+                this.frequency_ = frequency_;
+        }
+
+        /* (non-Javadoc)
+         * @see com.kh.ssme.model.ifc.RepeatType#getFrequency()
+         */
+        @Override
+        public Integer getFrequency() {
+                return frequency_;
+        }
+
+        /**
+         * @param timeFrames_ the timeFrames_ to set
+         */
+        @Override
+        public void setTimeFrames_(Set<TimeFrame> timeFrames_) {
+                this.timeFrames_ = timeFrames_;
+        }
+
+        /**
+         * @return the timeFrames_
+         */
+        @Override
+        public Set<TimeFrame> getTimeFrames() {
+                return timeFrames_;
         }       
 

ssme/trunk/src/com/kh/ssme/model/entity/TimeFrameEntity.java

@@ -70 +70 @@
         private Date to_;
         
-        @OneToOne(targetEntity=RepeatTypeEntity.class, optional=true, mappedBy="time_") 
+        @ManyToOne(optional=true, targetEntity=RepeatTypeEntity.class)
+        @JoinColumn(name="repeatType_id", nullable=true, updatable=true)
         private RepeatType repeat_;
                 

ssme/trunk/src/com/kh/ssme/model/ifc/RepeatType.java

@@ -24 +24 @@
 
 import java.util.Date;
+import java.util.Set;
 
 import com.kh.ssme.model.enums.RepeatTypeEnum;
@@ -48 +49 @@
         
         public void setRepeatType(RepeatTypeEnum repeatType);
-        
-        public TimeFrame getTime();
-        
-        public void setTime(TimeFrame time);
+
+        public void setFrequency(Integer frequency);
+
+        public Integer getFrequency();
+
+        public Set<TimeFrame> getTimeFrames();
+
+        public void setTimeFrames_(Set<TimeFrame> timeFrames);
         
 }