1.1 --- a/src/main/java/ru/indvdum/mywork/openjpa/model/Day.java	Wed Nov 23 17:25:20 2011 +0300
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,119 +0,0 @@
     1.4 -package ru.indvdum.mywork.openjpa.model;
     1.5 -
     1.6 -import java.sql.Time;
     1.7 -import java.text.DateFormat;
     1.8 -import java.text.SimpleDateFormat;
     1.9 -import java.util.Date;
    1.10 -
    1.11 -import javax.persistence.Column;
    1.12 -import javax.persistence.Entity;
    1.13 -import javax.persistence.GeneratedValue;
    1.14 -import javax.persistence.GenerationType;
    1.15 -import javax.persistence.Id;
    1.16 -import javax.persistence.Table;
    1.17 -
    1.18 -/**
    1.19 - * @author indvdum
    1.20 - * 12.08.2011 17:31:00
    1.21 - *
    1.22 - */
    1.23 -@Entity
    1.24 -@Table(name = "DAYS")
    1.25 -public class Day implements IDatabaseObject {
    1.26 -
    1.27 -	private static final long serialVersionUID = 1471705339524132968L;
    1.28 -	
    1.29 -	@Id
    1.30 -	@GeneratedValue(strategy = GenerationType.IDENTITY)
    1.31 -	@Column(name = "ID", nullable = false)
    1.32 -	private Integer id = null;
    1.33 -	
    1.34 -	@Column(name = "DAY")
    1.35 -	private Date day = null;
    1.36 -	
    1.37 -	@Column(name = "STARTWORK")
    1.38 -	private Time startWork = null;
    1.39 -	
    1.40 -	@Column(name = "ENDWORK")
    1.41 -	private Time endWork = null;
    1.42 -	
    1.43 -	@Column(name = "HOURS")
    1.44 -	private Float hours = null;
    1.45 -	
    1.46 -	public Day(){
    1.47 -
    1.48 -	}
    1.49 -
    1.50 -	@Override
    1.51 -	public boolean equals(Object obj) {
    1.52 -		if (this == obj)
    1.53 -			return true;
    1.54 -		if (obj == null)
    1.55 -			return false;
    1.56 -		if (!(obj instanceof Day))
    1.57 -			return false;
    1.58 -		final Day other = (Day) obj;
    1.59 -		return (getId() == other.getId() || (getId() != null && getId().equals(other.getId())));
    1.60 -	}
    1.61 -	
    1.62 -	@Override
    1.63 -	public int hashCode() {
    1.64 -		if(getId() != null && getId() != 0)
    1.65 -			return getId().hashCode();
    1.66 -		else
    1.67 -			return super.hashCode();
    1.68 -	}
    1.69 -
    1.70 -	@Override
    1.71 -	public String toString() {
    1.72 -		return getDateFormatter().format(getDay());
    1.73 -	}
    1.74 -
    1.75 -	public Integer getId() {
    1.76 -		return id;
    1.77 -	}
    1.78 -
    1.79 -	public void setId(Integer id) {
    1.80 -		this.id = id;
    1.81 -	}
    1.82 -
    1.83 -	public Date getDay() {
    1.84 -		return day;
    1.85 -	}
    1.86 -	
    1.87 -	public String getFormattedDay() {
    1.88 -		return toString();
    1.89 -	}
    1.90 -
    1.91 -	public void setDay(Date day) {
    1.92 -		this.day = day;
    1.93 -	}
    1.94 -
    1.95 -	public Time getStartWork() {
    1.96 -		return startWork;
    1.97 -	}
    1.98 -
    1.99 -	public void setStartWork(Time startWork) {
   1.100 -		this.startWork = startWork;
   1.101 -	}
   1.102 -
   1.103 -	public Time getEndWork() {
   1.104 -		return endWork;
   1.105 -	}
   1.106 -
   1.107 -	public void setEndWork(Time endWork) {
   1.108 -		this.endWork = endWork;
   1.109 -	}
   1.110 -
   1.111 -	public Float getHours() {
   1.112 -		return hours;
   1.113 -	}
   1.114 -
   1.115 -	public void setHours(Float hours) {
   1.116 -		this.hours = hours;
   1.117 -	}
   1.118 -
   1.119 -	protected DateFormat getDateFormatter() {
   1.120 -		return new SimpleDateFormat("dd.MM.yyyy");
   1.121 -	}
   1.122 -}