1.1 --- a/src/main/java/ru/indvdum/mywork/openjpa/model/WorkId.java	Wed Nov 23 17:25:20 2011 +0300
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,42 +0,0 @@
     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 dayId;
    1.17 -	public Integer taskId;
    1.18 -	
    1.19 -	@Override
    1.20 -	public boolean equals(Object obj) {
    1.21 -		if (this == obj)
    1.22 -			return true;
    1.23 -		if (obj == null)
    1.24 -			return false;
    1.25 -		if (!(obj instanceof WorkId))
    1.26 -			return false;
    1.27 -		final WorkId other = (WorkId) obj;
    1.28 -		return (
    1.29 -				this.dayId == other.dayId 
    1.30 -				&& this.taskId == other.taskId 
    1.31 -				|| (
    1.32 -						this.dayId != null 
    1.33 -						&& this.dayId.equals(other.dayId) 
    1.34 -						&& this.taskId != null 
    1.35 -						&& this.taskId.equals(other.taskId)
    1.36 -						)
    1.37 -				);
    1.38 -	}
    1.39 -
    1.40 -	@Override
    1.41 -	public int hashCode() {
    1.42 -		return dayId ^ taskId;
    1.43 -	}
    1.44 -
    1.45 -}