1.1 --- a/src/main/java/ru/indvdum/mywork/openjpa/model/WorkId.java	Tue Aug 16 15:54:50 2011 +0300
     1.2 +++ b/src/main/java/ru/indvdum/mywork/openjpa/model/WorkId.java	Wed Aug 17 17:03:37 2011 +0300
     1.3 @@ -1,9 +1,17 @@
     1.4  package ru.indvdum.mywork.openjpa.model;
     1.5  
     1.6 +import javax.persistence.Embeddable;
     1.7 +
     1.8 +/**
     1.9 + * @author indvdum
    1.10 + * 17.08.2011 15:00:35
    1.11 + *
    1.12 + */
    1.13 +@Embeddable
    1.14  public class WorkId{
    1.15  	
    1.16 -	public Integer day;
    1.17 -	public Integer task;
    1.18 +	public Integer dayId;
    1.19 +	public Integer taskId;
    1.20  	
    1.21  	@Override
    1.22  	public boolean equals(Object obj) {
    1.23 @@ -15,20 +23,20 @@
    1.24  			return false;
    1.25  		final WorkId other = (WorkId) obj;
    1.26  		return (
    1.27 -				this.day == other.day 
    1.28 -				&& this.task == other.task 
    1.29 +				this.dayId == other.dayId 
    1.30 +				&& this.taskId == other.taskId 
    1.31  				|| (
    1.32 -						this.day != null 
    1.33 -						&& this.day.equals(other.day) 
    1.34 -						&& this.task != null 
    1.35 -						&& this.task.equals(other.task)
    1.36 +						this.dayId != null 
    1.37 +						&& this.dayId.equals(other.dayId) 
    1.38 +						&& this.taskId != null 
    1.39 +						&& this.taskId.equals(other.taskId)
    1.40  						)
    1.41  				);
    1.42  	}
    1.43  
    1.44  	@Override
    1.45  	public int hashCode() {
    1.46 -		return day ^ task;
    1.47 +		return dayId ^ taskId;
    1.48  	}
    1.49  
    1.50  }