Index: lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java =================================================================== diff -u -ra20bdfc900a1a4696989abf243ce05f023b687fb -rc6ac9d85bc918f1faee1ffc70074a7d400cf9f88 --- lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java (.../CSSThemeVisualElement.java) (revision a20bdfc900a1a4696989abf243ce05f023b687fb) +++ lams_common/src/java/org/lamsfoundation/lams/themes/CSSThemeVisualElement.java (.../CSSThemeVisualElement.java) (revision c6ac9d85bc918f1faee1ffc70074a7d400cf9f88) @@ -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); - } /** *