Permalink
Browse files

Merge branch 'master' of github.com:ithunt/TeamSpace

  • Loading branch information...
2 parents 06f15bd + 445ab81 commit 547c2184cc6d3aef61592dd63843c11cea52bff1 Tim Garvin committed Nov 6, 2011
Showing with 7 additions and 19 deletions.
  1. +7 −19 src/main/java/edu/rit/taskers/model/Contact.java
@@ -17,7 +17,7 @@
protected String bio;
protected String pictureURL;
- protected Space space;
+ protected Integer spaceId;
public Contact() {
@@ -96,26 +96,14 @@ public void setPictureURL(String pictureURL) {
this.pictureURL = pictureURL;
}
- @OneToOne(fetch = FetchType.EAGER, targetEntity = Space.class)
- @JoinColumn(name = "SpaceID", nullable = true)
- public Space getSpace() {
- return space;
+ @Column(name = "SpaceID", nullable = true)
+ public Integer getSpaceId() {
+ return spaceId;
}
- public void setSpace(Space space) {
- this.space = space;
+ public void setSpaceId(Integer spaceId) {
+ this.spaceId = spaceId;
}
- @Override
- public String toString() {
- return "Contact{" +
- "id=" + id +
- ", name='" + name + '\'' +
- ", phone='" + phone + '\'' +
- ", email='" + email + '\'' +
- ", role='" + role + '\'' +
- ", bio='" + bio + '\'' +
- ", pictureURL='" + pictureURL + '\'' +
- '}';
- }
+
}

0 comments on commit 547c218

Please sign in to comment.