removed unused code

This commit is contained in:
Kai Börnert
2019-02-25 14:29:16 +01:00
parent 3db9fa9caf
commit 4fd0a34af6
@@ -96,17 +96,6 @@ public class AdminConsolePanel extends HeaderPanel implements HandleTabSelectabl
*/
private final Map<Widget, RefreshableAdminConsolePanel> panelsByWidget;
/**
* If {@code null}, any permission will be accepted by
* {@link #rememberWidgetLocationAndPermissions(VerticalOrHorizontalTabLayoutPanel, Widget, String, HasPermissions...)}
* which is used by all methods that add a panel and optionally specify permissions required to see that panel.
* If this field holds a valid permission collection, only permissions from this collection will be accepted.
* This can be used to keep a central repository of all such permissions which in turn may be used to
* automatically create a role that implies all those permissions for users to have full access to the
* admin console and its panels.
*/
private final Iterable<? extends WildcardPermission> acceptablePermissionsRequiredToSeeWidgets;
/**
* Generic selection handler that forwards selected tabs to a refresher that ensures that data gets reloaded. If
* you add a new tab then make sure to have a look at #refreshDataFor(Widget widget) to ensure that upon
@@ -159,19 +148,10 @@ public class AdminConsolePanel extends HeaderPanel implements HandleTabSelectabl
return target;
}
public AdminConsolePanel(UserService userService, ServerInfoDTO serverInfo,
String releaseNotesAnchorLabel, String releaseNotesURL, ErrorReporter errorReporter,
LoginPanelCss loginPanelCss, StringMessages stringMessages) {
this(userService, serverInfo, releaseNotesAnchorLabel, releaseNotesURL, errorReporter,
loginPanelCss, stringMessages,
/* acceptablePermissionsRequiredToSeeWidgets==null means accept any permission */ null);
}
public AdminConsolePanel(UserService userService,
ServerInfoDTO serverInfo, String releaseNotesAnchorLabel,
String releaseNotesURL, ErrorReporter errorReporter, LoginPanelCss loginPanelCss, StringMessages stringMessages,
Iterable<? extends WildcardPermission> acceptablePermissionsRequiredToSeeWidgets) {
this.acceptablePermissionsRequiredToSeeWidgets = acceptablePermissionsRequiredToSeeWidgets;
String releaseNotesURL, ErrorReporter errorReporter, LoginPanelCss loginPanelCss,
StringMessages stringMessages) {
this.permissionsAnyOfWhichIsRequiredToSeeWidget = new HashMap<>();
this.userService = userService;
roleSpecificTabs = new LinkedHashSet<>();
@@ -363,14 +343,6 @@ public class AdminConsolePanel extends HeaderPanel implements HandleTabSelectabl
*/
private void rememberWidgetLocationAndPermissions(VerticalOrHorizontalTabLayoutPanel tabPanel, Widget widgetToAdd,
String tabTitle, WildcardPermission... requiresAnyOfThesePermissions) {
if (acceptablePermissionsRequiredToSeeWidgets != null) {
for (final WildcardPermission requiredPermission : requiresAnyOfThesePermissions) {
if (!Util.contains(acceptablePermissionsRequiredToSeeWidgets, requiredPermission)) {
throw new RuntimeException("Internal error: permission "+requiredPermission+
" missing from the set of acceptable admin console permissions "+acceptablePermissionsRequiredToSeeWidgets);
}
}
}
roleSpecificTabs.add(new Triple<VerticalOrHorizontalTabLayoutPanel, Widget, String>(tabPanel, widgetToAdd, tabTitle));
final Set<WildcardPermission> permissionsAsSet = new HashSet<>(Arrays.asList(requiresAnyOfThesePermissions));
permissionsAnyOfWhichIsRequiredToSeeWidget.put(widgetToAdd, permissionsAsSet);