From c20f638b282f9f99a9542425d7c7a09a385f9ba7 Mon Sep 17 00:00:00 2001 From: Erik Suta Date: Wed, 25 Jun 2014 12:07:30 +0200 Subject: [PATCH] MID-1931 more small code improvements and cleanup. --- .../web/component/data/PageSizePopover.java | 14 ++++++++------ .../midpoint/web/component/data/TablePanel.java | 12 ++++++------ .../com/evolveum/midpoint/web/page/PageBase.java | 4 ---- .../web/page/admin/configuration/PageAccounts.java | 1 - .../page/admin/configuration/PageDebugList.java | 1 - .../web/page/admin/reports/PageCreatedReports.java | 1 - .../web/page/admin/resources/PageResource.java | 1 - .../web/page/admin/resources/PageResources.java | 1 - .../resources/content/PageContentAccounts.java | 1 - .../midpoint/web/page/admin/roles/PageRoles.java | 1 - .../midpoint/web/page/admin/server/PageTasks.java | 1 - .../midpoint/web/page/admin/users/PageUsers.java | 1 - .../page/admin/users/component/TreeTablePanel.java | 2 +- .../web/page/admin/workflow/PageWorkItems.java | 1 - .../midpoint/web/session/UserProfileStorage.java | 6 ------ 15 files changed, 15 insertions(+), 33 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java index 11d08ce9f04..cc5f355cd20 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java @@ -3,6 +3,7 @@ import com.evolveum.midpoint.web.component.AjaxSubmitButton; import com.evolveum.midpoint.web.component.util.SimplePanel; import com.evolveum.midpoint.web.session.UserProfileStorage; +import com.evolveum.midpoint.web.util.SearchFormEnterBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; @@ -55,12 +56,6 @@ protected void initLayout() { Form form = new Form(ID_FORM); popover.add(form); - TextField input = new TextField(ID_INPUT, createInputModel()); - input.add(new RangeValidator(5, 50)); - input.setLabel(createStringResource("PageSizePopover.title")); - input.setType(Integer.class); - form.add(input); - AjaxSubmitButton button = new AjaxSubmitButton(ID_BUTTON) { @Override @@ -77,6 +72,13 @@ protected void onSubmit(AjaxRequestTarget target, Form form) { } }; form.add(button); + + TextField input = new TextField(ID_INPUT, createInputModel()); + input.add(new RangeValidator(5, 50)); + input.setLabel(createStringResource("PageSizePopover.title")); + input.add(new SearchFormEnterBehavior(button)); + input.setType(Integer.class); + form.add(input); } private IModel createInputModel() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java index df397b9c727..25613363249 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java @@ -45,7 +45,6 @@ public class TablePanel extends Panel { private IModel showPaging = new Model(true); private IModel showCount = new Model(true); - private IModel showPagingSize = new Model(false); private UserProfileStorage.TableId tableId; @@ -100,8 +99,13 @@ protected void pageSizeChanged(AjaxRequestTarget target) { @Override protected boolean isPageSizePopupVisible() { - return showPagingSize.getObject(); + if(tableId != null){ + return true; + } else { + return false; + } } + }; addVisibleBehaviour(count, showCount); table.addBottomToolbar(count); @@ -163,10 +167,6 @@ public void setCurrentPage(ObjectPaging paging) { getDataTable().setCurrentPage(page); } - public void setShowPagingSize(boolean show) { - this.showPagingSize.setObject(show); - } - public void setShowPaging(boolean showPaging) { this.showPaging.setObject(showPaging); this.showCount.setObject(showPaging); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java index abe2ac1c97c..3f0575d973f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java @@ -639,8 +639,4 @@ public void receiveNotifyMessage(AjaxRequestTarget target, NotifyMessage message target.appendJavaScript(sb.toString()); } - - public Integer getPagingSize(UserProfileStorage.TableId tableId){ - return getSessionStorage().getUserProfile().getPagingSize(tableId); - } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java index 1a3ce7995ef..f41abdcee24 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java @@ -202,7 +202,6 @@ public void onClick(AjaxRequestTarget target) { provider.setOptions(SelectorOptions.createCollection(GetOperationOptions.createRaw())); provider.setQuery(ObjectQuery.createObjectQuery(createResourceQueryFilter())); TablePanel accounts = new TablePanel(ID_ACCOUNTS, provider, createAccountsColumns(), UserProfileStorage.TableId.CONF_PAGE_ACCOUNTS); - accounts.setShowPagingSize(true); accounts.add(new VisibleEnableBehaviour() { @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java index 0cc04526521..9d4f8ad9439 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java @@ -208,7 +208,6 @@ private void addOrReplaceTable(RepositoryObjectDataProvider provider) { Form mainForm = (Form) get(ID_MAIN_FORM); TablePanel table = new TablePanel(ID_TABLE, provider, initColumns(provider.getType()), UserProfileStorage.TableId.CONF_DEBUG_LIST_PANEL); - table.setShowPagingSize(true); table.setOutputMarkupId(true); mainForm.addOrReplace(table); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java index 790c62dd12e..ab849797849 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java @@ -184,7 +184,6 @@ protected void saveProviderPaging(ObjectQuery query, ObjectPaging paging) { provider.setQuery(query); TablePanel table = new TablePanel(ID_CREATED_REPORTS_TABLE, provider, initColumns(ajaxDownloadBehavior), UserProfileStorage.TableId.PAGE_CREATED_REPORTS_PANEL); - table.setShowPagingSize(true); table.setShowPaging(true); table.setOutputMarkupId(true); mainForm.add(table); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java index 4039487800d..282c5374b1c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java @@ -123,7 +123,6 @@ private void initLayout() { provider.setSort("displayName", SortOrder.ASCENDING); TablePanel objectTypes = new TablePanel<>("objectTypesTable", provider, initObjectTypesColumns(), UserProfileStorage.TableId.PAGE_RESOURCE_PANEL); - objectTypes.setShowPagingSize(true); objectTypes.setShowPaging(true); objectTypes.setOutputMarkupId(true); mainForm.add(objectTypes); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java index d07f8a8649b..6e295198a08 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java @@ -144,7 +144,6 @@ private void initLayout() { TablePanel resources = new TablePanel<>(ID_TABLE, initResourceDataProvider(), initResourceColumns(), UserProfileStorage.TableId.PAGE_RESOURCES_PANEL); - resources.setShowPagingSize(true); resources.setOutputMarkupId(true); mainForm.add(resources); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java index 3d9df07c896..6a5c91c8b39 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java @@ -238,7 +238,6 @@ protected void addInlineMenuToDto(AccountContentDto dto) { List columns = initColumns(); TablePanel table = new TablePanel(ID_TABLE, provider, columns, UserProfileStorage.TableId.PAGE_RESOURCE_ACCOUNTS_PANEL); - table.setShowPagingSize(true); table.setOutputMarkupId(true); mainForm.add(table); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java index 9ad2b67e56a..6eab7db733c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java @@ -130,7 +130,6 @@ protected void saveProviderPaging(ObjectQuery query, ObjectPaging paging) { List> columns = initColumns(); TablePanel table = new TablePanel<>(ID_TABLE, provider, columns, UserProfileStorage.TableId.TABLE_ROLES); table.setOutputMarkupId(true); - table.setShowPagingSize(true); RolesStorage storage = getSessionStorage().getRoles(); table.setCurrentPage(storage.getRolesPaging()); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java index afdb9bddd88..d7db93827bc 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java @@ -159,7 +159,6 @@ private void initLayout() { provider.setQuery(createTaskQuery()); TablePanel taskTable = new TablePanel<>(ID_TASK_TABLE, provider, taskColumns, UserProfileStorage.TableId.PAGE_TASKS_PANEL); - taskTable.setShowPagingSize(true); taskTable.setOutputMarkupId(true); mainForm.add(taskTable); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java index dde9558c15e..2587ff2aee3 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java @@ -308,7 +308,6 @@ public UserListItemDto createDataObjectWrapper(PrismObject obj) { provider.setOptions(options); TablePanel table = new TablePanel(ID_TABLE, provider, columns, UserProfileStorage.TableId.PAGE_USERS_PANEL); - table.setShowPagingSize(true); table.setOutputMarkupId(true); UsersStorage storage = getSessionStorage().getUsers(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java index 62bf09a2279..614d20e9344 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java @@ -331,7 +331,7 @@ public ObjectQuery getQuery() { }; tableProvider.setOptions(WebModelUtils.createMinimalOptions()); List> tableColumns = createTableColumns(); - TablePanel table = new TablePanel(ID_TABLE, tableProvider, tableColumns); + TablePanel table = new TablePanel(ID_TABLE, tableProvider, tableColumns, UserProfileStorage.TableId.TREE_TABLE_PANEL); table.setOutputMarkupId(true); form.add(table); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java index acd0ea777e5..a9317fd736f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java @@ -93,7 +93,6 @@ private void initLayout() { List> workItemColumns = initWorkItemColumns(); TablePanel workItemTable = new TablePanel<>("workItemTable", new WorkItemDtoProvider(PageWorkItems.this, assigned), workItemColumns, UserProfileStorage.TableId.PAGE_WORK_ITEMS); - workItemTable.setShowPagingSize(true); workItemTable.setOutputMarkupId(true); mainForm.add(workItemTable); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java index eda8b3d29bb..2674e626bd4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java @@ -34,11 +34,8 @@ public enum TableId{ TABLE_ROLES, TABLE_USERS, TREE_TABLE_PANEL, - RESOURCE_WIZARD_ATTRIBUTE_PANEL, - WF_WORK_ITEMS_PANEL, CONF_PAGE_ACCOUNTS, CONF_DEBUG_LIST_PANEL, - PAGE_REPORTS_PANEL, PAGE_CREATED_REPORTS_PANEL, PAGE_RESOURCE_PANEL, PAGE_RESOURCES_PANEL, @@ -53,11 +50,8 @@ public enum TableId{ put(TableId.TABLE_ROLES, null); put(TableId.TABLE_USERS, null); put(TableId.TREE_TABLE_PANEL, null); - put(TableId.RESOURCE_WIZARD_ATTRIBUTE_PANEL, null); - put(TableId.WF_WORK_ITEMS_PANEL, null); put(TableId.CONF_PAGE_ACCOUNTS, null); put(TableId.CONF_DEBUG_LIST_PANEL, null); - put(TableId.PAGE_REPORTS_PANEL, null); put(TableId.PAGE_CREATED_REPORTS_PANEL, null); put(TableId.PAGE_RESOURCE_PANEL, null); put(TableId.PAGE_RESOURCES_PANEL, null);