Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java,v diff -u -r1.6 -r1.7 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java 11 May 2006 06:58:37 -0000 1.6 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java 1 Jun 2006 01:16:35 -0000 1.7 @@ -69,6 +69,8 @@ /** persistent field */ private Set lessons; + private OrganisationState organisationState; + /** full constructor */ public Organisation(String name, String description, Organisation parentOrganisation, Date createDate, Workspace workspace, OrganisationType organisationType, Set userOrganisations, Set childOrganisations, Set lessons) { this.name = name; @@ -261,7 +263,21 @@ this.lessons = lessons; } - public String toString() { + /** + * @hibernate.many-to-one + * not-null="true" + * @hibernate.column name="organisation_state_id" + * + */ + public OrganisationState getOrganisationState() { + return this.organisationState; + } + + public void setOrganisationState(OrganisationState organisationState) { + this.organisationState = organisationState; + } + + public String toString() { return new ToStringBuilder(this) .append("organisationId", getOrganisationId()) .toString();