1.1 --- a/src/main/java/ru/indvdum/mywork/openjpa/model/Task.java Wed Aug 17 17:03:37 2011 +0300
1.2 +++ b/src/main/java/ru/indvdum/mywork/openjpa/model/Task.java Fri Aug 19 16:23:26 2011 +0300
1.3 @@ -19,7 +19,7 @@
1.4 private static final long serialVersionUID = -4457948503094306717L;
1.5
1.6 @Id
1.7 - @GeneratedValue(strategy = GenerationType.IDENTITY)
1.8 + @GeneratedValue
1.9 @Column(name = "ID", nullable = false)
1.10 private Integer id = null;
1.11
1.12 @@ -42,7 +42,20 @@
1.13 if (!(obj instanceof Task))
1.14 return false;
1.15 final Task other = (Task) obj;
1.16 - return (this.id == other.id || (this.id != null && this.id.equals(other.id)));
1.17 + return (getId() == other.getId() || (getId() != null && getId().equals(other.getId())));
1.18 + }
1.19 +
1.20 + @Override
1.21 + public int hashCode() {
1.22 + if(getId() != null && getId() != 0)
1.23 + return getId().hashCode();
1.24 + else
1.25 + return super.hashCode();
1.26 + }
1.27 +
1.28 + @Override
1.29 + public String toString() {
1.30 + return getName();
1.31 }
1.32
1.33 public Integer getId() {