equal
deleted
inserted
replaced
2 |
2 |
3 import javax.persistence.Column; |
3 import javax.persistence.Column; |
4 import javax.persistence.EmbeddedId; |
4 import javax.persistence.EmbeddedId; |
5 import javax.persistence.Entity; |
5 import javax.persistence.Entity; |
6 import javax.persistence.FetchType; |
6 import javax.persistence.FetchType; |
|
7 import javax.persistence.GeneratedValue; |
7 import javax.persistence.ManyToOne; |
8 import javax.persistence.ManyToOne; |
8 import javax.persistence.MapsId; |
9 import javax.persistence.MapsId; |
9 import javax.persistence.Table; |
10 import javax.persistence.Table; |
10 |
11 |
11 /** |
12 /** |
18 public class Work implements IDatabaseObject { |
19 public class Work implements IDatabaseObject { |
19 |
20 |
20 private static final long serialVersionUID = 7138260708537798813L; |
21 private static final long serialVersionUID = 7138260708537798813L; |
21 |
22 |
22 @EmbeddedId |
23 @EmbeddedId |
23 WorkId id; |
24 private WorkId id = null; |
24 |
25 |
25 @Column(name = "HOURS") |
26 @Column(name = "HOURS") |
26 private Float hours = null; |
27 private Float hours = null; |
27 |
28 |
28 @Column(name = "RESULT") |
29 @Column(name = "RESULT") |
36 @ManyToOne(fetch = FetchType.EAGER) |
37 @ManyToOne(fetch = FetchType.EAGER) |
37 private Task task = null; |
38 private Task task = null; |
38 |
39 |
39 public Work(){ |
40 public Work(){ |
40 |
41 |
41 } |
|
42 |
|
43 @Override |
|
44 public boolean equals(Object obj) { |
|
45 if (this == obj) |
|
46 return true; |
|
47 if (obj == null) |
|
48 return false; |
|
49 if (!(obj instanceof Work)) |
|
50 return false; |
|
51 final Work other = (Work) obj; |
|
52 return ( |
|
53 this.day == other.day |
|
54 && this.task == other.task |
|
55 || ( |
|
56 this.day != null |
|
57 && this.day.equals(other.day) |
|
58 && this.task != null |
|
59 && this.task.equals(other.task) |
|
60 ) |
|
61 ); |
|
62 } |
42 } |
63 |
43 |
64 public Float getHours() { |
44 public Float getHours() { |
65 return hours; |
45 return hours; |
66 } |
46 } |
91 |
71 |
92 public void setTask(Task task) { |
72 public void setTask(Task task) { |
93 this.task = task; |
73 this.task = task; |
94 } |
74 } |
95 |
75 |
96 public String getDayName() { |
76 public WorkId getId() { |
97 return getDay().getDay().toString(); |
77 return id; |
98 } |
78 } |
99 |
79 |
100 public String getTaskName() { |
80 public void setId(WorkId id) { |
101 return getTask().getName(); |
81 this.id = id; |
102 } |
82 } |
103 |
83 |
104 } |
84 } |