1.1 --- a/src/main/java/ru/indvdum/mywork/openjpa/model/Work.java	Tue Aug 16 15:54:50 2011 +0300
     1.2 +++ b/src/main/java/ru/indvdum/mywork/openjpa/model/Work.java	Wed Aug 17 17:03:37 2011 +0300
     1.3 @@ -1,11 +1,9 @@
     1.4  package ru.indvdum.mywork.openjpa.model;
     1.5  
     1.6 -import javax.persistence.CascadeType;
     1.7  import javax.persistence.Column;
     1.8 +import javax.persistence.EmbeddedId;
     1.9  import javax.persistence.Entity;
    1.10  import javax.persistence.FetchType;
    1.11 -import javax.persistence.Id;
    1.12 -import javax.persistence.IdClass;
    1.13  import javax.persistence.ManyToOne;
    1.14  import javax.persistence.MapsId;
    1.15  import javax.persistence.Table;
    1.16 @@ -16,21 +14,13 @@
    1.17   *
    1.18   */
    1.19  @Entity
    1.20 -@IdClass(WorkId.class)
    1.21  @Table(name = "WORK")
    1.22  public class Work implements IDatabaseObject {
    1.23  
    1.24  	private static final long serialVersionUID = 7138260708537798813L;
    1.25  	
    1.26 -//	@Id
    1.27 -//	@PrimaryKeyJoinColumn
    1.28 -//	@Column(name = "DAYID", nullable = false)
    1.29 -//	private Integer dayId = null;
    1.30 -//	
    1.31 -//	@Id
    1.32 -//	@PrimaryKeyJoinColumn
    1.33 -//	@Column(name = "TASKID", nullable = false)
    1.34 -//	private Integer taskId = null;
    1.35 +	@EmbeddedId
    1.36 +	WorkId id;
    1.37  	
    1.38  	@Column(name = "HOURS")
    1.39  	private Float hours = null;
    1.40 @@ -38,13 +28,13 @@
    1.41  	@Column(name = "RESULT")
    1.42  	private String result = null;
    1.43  	
    1.44 -	@Id
    1.45 -	@ManyToOne(fetch = FetchType.EAGER, cascade = {CascadeType.PERSIST})
    1.46 -	Day day = null;
    1.47 +	@MapsId("dayId")
    1.48 +	@ManyToOne(fetch = FetchType.EAGER)
    1.49 +	private Day day = null;
    1.50  	
    1.51 -	@Id
    1.52 -	@ManyToOne(fetch = FetchType.EAGER, cascade = {CascadeType.PERSIST})
    1.53 -	Task task = null;
    1.54 +	@MapsId("taskId")
    1.55 +	@ManyToOne(fetch = FetchType.EAGER)
    1.56 +	private Task task = null;
    1.57  	
    1.58  	public Work(){
    1.59  		
    1.60 @@ -71,22 +61,6 @@
    1.61  				);
    1.62  	}
    1.63  
    1.64 -//	public Integer getDayId() {
    1.65 -//		return dayId;
    1.66 -//	}
    1.67 -//
    1.68 -//	public void setDayId(Integer dayId) {
    1.69 -//		this.dayId = dayId;
    1.70 -//	}
    1.71 -//
    1.72 -//	public Integer getTaskId() {
    1.73 -//		return taskId;
    1.74 -//	}
    1.75 -//
    1.76 -//	public void setTaskId(Integer taskId) {
    1.77 -//		this.taskId = taskId;
    1.78 -//	}
    1.79 -
    1.80  	public Float getHours() {
    1.81  		return hours;
    1.82  	}
    1.83 @@ -111,4 +85,20 @@
    1.84  		this.day = day;
    1.85  	}
    1.86  
    1.87 +	public Task getTask() {
    1.88 +		return task;
    1.89 +	}
    1.90 +
    1.91 +	public void setTask(Task task) {
    1.92 +		this.task = task;
    1.93 +	}
    1.94 +
    1.95 +	public String getDayName() {
    1.96 +		return getDay().getDay().toString();
    1.97 +	}
    1.98 +	
    1.99 +	public String getTaskName() {
   1.100 +		return getTask().getName();
   1.101 +	}
   1.102 +
   1.103  }