Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java =================================================================== diff -u -r971b10afb69d1d7cd47f15c7d8baf44504f9fae1 -r82b183dd70d510da92947637a6ab39361c063e33 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java (.../UserDTO.java) (revision 971b10afb69d1d7cd47f15c7d8baf44504f9fae1) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java (.../UserDTO.java) (revision 82b183dd70d510da92947637a6ab39361c063e33) @@ -23,7 +23,7 @@ package org.lamsfoundation.lams.usermanagement.dto; import org.lamsfoundation.lams.themes.CSSThemeVisualElement; - +import org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO; /** * @author Manpreet Minhas */ @@ -34,18 +34,31 @@ private String lastName; private String login; private String email; - private CSSThemeVisualElement theme; + // private CSSThemeVisualElement theme; + private CSSThemeBriefDTO theme; +// public UserDTO(Integer userID, String firstName, String lastName, +// String login, String email, CSSThemeVisualElement theme) { +// this.userID = userID; +// this.firstName = firstName; +// this.lastName = lastName; +// this.login = login; +// this.email = email; +// this.theme = theme; +// } + public UserDTO(Integer userID, String firstName, String lastName, - String login, String email, CSSThemeVisualElement theme) { + String login, String email, CSSThemeBriefDTO theme) { this.userID = userID; this.firstName = firstName; this.lastName = lastName; this.login = login; this.email = email; this.theme = theme; } + + /** * @return Returns the firstName. */ @@ -70,12 +83,24 @@ public Integer getUserID() { return userID; } - - public CSSThemeVisualElement getTheme() { + + + public CSSThemeBriefDTO getTheme() { return theme; } - - public void setTheme(CSSThemeVisualElement theme) { + + + public void setTheme(CSSThemeBriefDTO theme) { this.theme = theme; } + +// public CSSThemeVisualElement getTheme() { +// return theme; +// } +// +// public void setTheme(CSSThemeVisualElement theme) { +// this.theme = theme; +// } + + }