diff --git a/src/main/java/se/su/dsv/scipro/user/panels/UserProfilePanelFactory.java b/src/main/java/se/su/dsv/scipro/user/panels/UserProfilePanelFactory.java index c90a2c8529..42b8d3a708 100644 --- a/src/main/java/se/su/dsv/scipro/user/panels/UserProfilePanelFactory.java +++ b/src/main/java/se/su/dsv/scipro/user/panels/UserProfilePanelFactory.java @@ -1,5 +1,7 @@ package se.su.dsv.scipro.user.panels; +import org.apache.wicket.markup.html.panel.EmptyPanel; +import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; import org.odlabs.wiquery.ui.dialog.Dialog; import org.springframework.beans.factory.annotation.Autowired; @@ -8,6 +10,7 @@ import org.springframework.stereotype.Service; import se.su.dsv.scipro.data.dataobjects.Employee; import se.su.dsv.scipro.data.dataobjects.User; import se.su.dsv.scipro.match.dao.interfaces.SupervisorDao; +import se.su.dsv.scipro.supervisor.panels.ProfilePanel; /** * Factory intended to ease the creation of user-profile editing panels. @@ -19,19 +22,19 @@ public class UserProfilePanelFactory { /** * Creates and returns a suitable user-edit panel depending on what role the supplied user has. */ - public UserProfilePanel createUserProfilePanelForUser(final String componentId, final User u){ + public Panel createUserProfilePanelForUser(final String componentId, final User u){ if(u == null) throw new IllegalArgumentException("Creating a profile editing panel is not allowed for a null user"); final Employee s = supervisorDao.getFrom(u); if(s != null) - return new EmployeeProfilePanel(componentId,new Model<Employee>(s)); + return new ProfilePanel(componentId,new Model<Employee>(s)); else - return new UserProfilePanel(componentId,new Model<User>(u)); + return new EmptyPanel(componentId); } /** * Overloaded version of the above, automatically sets "correct" dimensions for a supplied Dialog. */ - public UserProfilePanel createUserProfilePanelForUser(final String componentId, final User u, final Dialog dialog){ + public Panel createUserProfilePanelForUser(final String componentId, final User u, final Dialog dialog){ if(userIsEmployee(u)){ dialog.setHeight(650); dialog.setWidth(700);