Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java,v diff -u -r1.8 -r1.9 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java 7 Jun 2006 02:48:52 -0000 1.8 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java 9 Jun 2006 02:45:26 -0000 1.9 @@ -80,20 +80,6 @@ } /** - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO#deleteOrganisation(org.lamsfoundation.lams.usermanagement.Organisation) - */ - public void delete(Organisation organisation) { - Iterator iter = organisation.getChildOrganisations().iterator(); - Organisation parentOrganisation = organisation.getParentOrganisation(); - while(iter.hasNext()){ - Organisation childOrganisation = (Organisation)iter.next(); - childOrganisation.setParentOrganisation(parentOrganisation); - iter.remove(); - } - delete(organisation); - } - - /** * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO#deleteOrganisationById(java.lang.Integer) */ public void deleteOrganisationById(Integer organisationId) {