Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/Attic/CSSThemeVisualElement.hbm.xml,v diff -u -r1.4 -r1.5 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml 17 Jan 2006 06:33:47 -0000 1.4 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml 23 Mar 2006 23:53:42 -0000 1.5 @@ -84,30 +84,7 @@ - - - - @hibernate.set - lazy="false" - inverse="true" - cascade="none" - @hibernate.collection-key - column="theme_id" - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.usermanagement.User" - - - - - - + Index: lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/themes/Attic/CSSThemeVisualElement.java,v diff -u -r1.3 -r1.4 --- lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java 17 Jan 2006 06:34:49 -0000 1.3 +++ lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java 23 Mar 2006 23:58:59 -0000 1.4 @@ -37,25 +37,21 @@ /** nullable persistent field */ private CSSThemeVisualElement parentTheme; - + /** persistent field */ - private Set users; - - /** persistent field */ private Set styles; /** persistent field */ private Set elements; /** full constructor */ - public CSSThemeVisualElement(Long id, String name, String description, boolean theme, CSSThemeVisualElement parentTheme, Set styles, Set users, Set elements) { + public CSSThemeVisualElement(Long id, String name, String description, boolean theme, CSSThemeVisualElement parentTheme, Set styles, Set elements) { this.id = id; this.name = name; this.description = description; this.theme = theme; this.parentTheme = parentTheme; this.styles = styles; - this.users = users; this.elements = elements; } @@ -187,44 +183,6 @@ this.styles = styles; } - /** - * - * Users who have this theme as their style. - * - * @hibernate.set - * lazy="false" - * inverse="true" - * cascade="none" - * @hibernate.collection-key - * column="theme_id" - * @hibernate.collection-one-to-many - * class="org.lamsfoundation.lams.usermanagement.User" - * - */ - private Set getUsers() { - return this.users; - } - - private void setUsers(Set users) { - this.users = users; - } - - public void clearUsers() { - if ( getUsers() != null ) { - getUsers().clear(); - } - } - - public void addUser(User user) { - if ( getUsers() == null ) { - Set set = new HashSet(); - set.add(user); - setUsers(set); - } else { - getUsers().add(user); - } - user.setTheme(this); - } /** *