removed dependency of AdminConsolePanel to LoginPanel

Change-Id: I98765dc76b7a960c3c9151c2bead83955abe4817
This commit is contained in:
Axel Uhl committed 2016-12-21 17:30:25 +01:00
1 parent 263a1c8ebc
commit 0a18d0881b
2 files changed
+1 -11

No files matched your search

@@ -83,7 +83,7 @@ public class AdminConsoleEntryPoint extends AbstractSailingEntryPoint implements
private Widget createAdminConsolePanel() { private Widget createAdminConsolePanel() {
AdminConsolePanel panel = new AdminConsolePanel(getUserService(), SailingPermissionsForRoleProvider.INSTANCE, AdminConsolePanel panel = new AdminConsolePanel(getUserService(), SailingPermissionsForRoleProvider.INSTANCE,
sailingService, getStringMessages().releaseNotes(), "/release_notes_admin.html", /* error reporter */ this, SecurityStylesheetResources.INSTANCE.css(), false); sailingService, getStringMessages().releaseNotes(), "/release_notes_admin.html", /* error reporter */ this, SecurityStylesheetResources.INSTANCE.css());
panel.addStyleName("adminConsolePanel"); panel.addStyleName("adminConsolePanel");
BetterDateTimeBox.initialize(); BetterDateTimeBox.initialize();
@@ -30,7 +30,6 @@ import com.sap.sse.security.shared.PermissionsForRoleProvider;
import com.sap.sse.security.shared.WildcardPermission; import com.sap.sse.security.shared.WildcardPermission;
import com.sap.sse.security.ui.client.UserService; import com.sap.sse.security.ui.client.UserService;
import com.sap.sse.security.ui.client.UserStatusEventHandler; import com.sap.sse.security.ui.client.UserStatusEventHandler;
import com.sap.sse.security.ui.loginpanel.LoginPanel;
import com.sap.sse.security.ui.loginpanel.LoginPanelCss; import com.sap.sse.security.ui.loginpanel.LoginPanelCss;
import com.sap.sse.security.ui.shared.UserDTO; import com.sap.sse.security.ui.shared.UserDTO;
@@ -154,12 +153,6 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
public AdminConsolePanel(UserService userService, PermissionsForRoleProvider permissionsForRoleProvider, public AdminConsolePanel(UserService userService, PermissionsForRoleProvider permissionsForRoleProvider,
ServerInfoRetriever buildVersionRetriever, String releaseNotesAnchorLabel, ServerInfoRetriever buildVersionRetriever, String releaseNotesAnchorLabel,
String releaseNotesURL, ErrorReporter errorReporter, LoginPanelCss loginPanelCss) { String releaseNotesURL, ErrorReporter errorReporter, LoginPanelCss loginPanelCss) {
this(userService, permissionsForRoleProvider, buildVersionRetriever, releaseNotesAnchorLabel, releaseNotesURL, errorReporter, loginPanelCss, true);
}
public AdminConsolePanel(UserService userService, PermissionsForRoleProvider permissionsForRoleProvider,
ServerInfoRetriever buildVersionRetriever, String releaseNotesAnchorLabel,
String releaseNotesURL, ErrorReporter errorReporter, LoginPanelCss loginPanelCss, boolean withLogin) {
super(Unit.EM); super(Unit.EM);
this.permissionsForRoleProvider = permissionsForRoleProvider; this.permissionsForRoleProvider = permissionsForRoleProvider;
this.permissionsAnyOfWhichIsRequiredToSeeWidget = new HashMap<>(); this.permissionsAnyOfWhichIsRequiredToSeeWidget = new HashMap<>();
@@ -212,9 +205,6 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
final DockPanel informationPanel = new DockPanel(); final DockPanel informationPanel = new DockPanel();
informationPanel.setSize("100%", "95%"); informationPanel.setSize("100%", "95%");
informationPanel.setSpacing(10); informationPanel.setSpacing(10);
if(withLogin) {
informationPanel.add(new LoginPanel(loginPanelCss, getUserService()), DockPanel.WEST);
}
informationPanel.add(errorReporter.getPersistentInformationWidget(), DockPanel.CENTER); informationPanel.add(errorReporter.getPersistentInformationWidget(), DockPanel.CENTER);
SystemInformationPanel sysinfoPanel = new SystemInformationPanel(buildVersionRetriever, errorReporter); SystemInformationPanel sysinfoPanel = new SystemInformationPanel(buildVersionRetriever, errorReporter);
sysinfoPanel.ensureDebugId("SystemInformation"); sysinfoPanel.ensureDebugId("SystemInformation");