diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsTablePanel.java index 872635ebfa4..8396a1783bb 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsTablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsTablePanel.java @@ -24,8 +24,8 @@ import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn; import com.evolveum.midpoint.web.component.data.column.LinkColumn; import com.evolveum.midpoint.web.page.admin.workflow.PageWorkItem; -import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDtoNewProvider; -import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemNewDto; +import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDtoProvider; +import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDto; import com.evolveum.midpoint.web.session.UserProfileStorage; import com.evolveum.midpoint.web.util.OnePageParameterEncoder; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -48,9 +48,9 @@ public class WorkItemsTablePanel extends BasePanel { private static final String ID_WORK_ITEMS_TABLE = "workItemsTable"; - private ISortableDataProvider provider; + private ISortableDataProvider provider; - public WorkItemsTablePanel(String id, ISortableDataProvider provider, + public WorkItemsTablePanel(String id, ISortableDataProvider provider, UserProfileStorage.TableId tableId, long pageSize, boolean showAssigned) { super(id); this.provider = provider; @@ -59,30 +59,30 @@ public WorkItemsTablePanel(String id, ISortableDataProvider> columns = new ArrayList<>(); + List> columns = new ArrayList<>(); // TODO configurable - columns.add(new CheckBoxHeaderColumn()); + columns.add(new CheckBoxHeaderColumn()); // TODO clickable links and info icons - columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.object"), WorkItemNewDto.F_OBJECT_NAME)); - columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.target"), WorkItemNewDto.F_TARGET_NAME)); + columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.object"), WorkItemDto.F_OBJECT_NAME)); + columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.target"), WorkItemDto.F_TARGET_NAME)); if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_WORK_ITEMS_ALL_URL, AuthorizationConstants.AUTZ_UI_WORK_ITEM_URL)) { - columns.add(new LinkColumn(createStringResource("WorkItemsPanel.name"), WorkItemNewDto.F_NAME, WorkItemNewDto.F_NAME) { + columns.add(new LinkColumn(createStringResource("WorkItemsPanel.name"), WorkItemDto.F_NAME, WorkItemDto.F_NAME) { @Override - public void onClick(AjaxRequestTarget target, IModel rowModel) { + public void onClick(AjaxRequestTarget target, IModel rowModel) { PageParameters parameters = new PageParameters(); parameters.add(OnePageParameterEncoder.PARAMETER, rowModel.getObject().getWorkItemId()); setResponsePage(new PageWorkItem(parameters, (PageBase) WorkItemsTablePanel.this.getPage())); } }); } else { - columns.add(new AbstractColumn(createStringResource("WorkItemsPanel.name")) { + columns.add(new AbstractColumn(createStringResource("WorkItemsPanel.name")) { @Override - public void populateItem(Item> item, String componentId, - final IModel rowModel) { + public void populateItem(Item> item, String componentId, + final IModel rowModel) { item.add(new Label(componentId, new AbstractReadOnlyModel() { @Override public Object getObject() { @@ -93,10 +93,10 @@ public Object getObject() { }); } - columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.started"), WorkItemNewDto.F_PROCESS_STARTED)); - columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.created"), WorkItemNewDto.F_CREATED)); + columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.started"), WorkItemDto.F_PROCESS_STARTED)); + columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.created"), WorkItemDto.F_CREATED)); if (showAssigned) { - columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.assigned"), WorkItemNewDto.F_ASSIGNEE_OR_CANDIDATES)); + columns.add(new PropertyColumn(createStringResource("WorkItemsPanel.assigned"), WorkItemDto.F_ASSIGNEE_OR_CANDIDATES)); } TablePanel workItemsTable = new TablePanel<>(ID_WORK_ITEMS_TABLE, provider, columns, tableId, pageSize); @@ -107,12 +107,12 @@ private TablePanel getWorkItemTable() { return (TablePanel) get(ID_WORK_ITEMS_TABLE); } - public List getSelectedWorkItems() { + public List getSelectedWorkItems() { DataTable table = getWorkItemTable().getDataTable(); - WorkItemDtoNewProvider provider = (WorkItemDtoNewProvider) table.getDataProvider(); + WorkItemDtoProvider provider = (WorkItemDtoProvider) table.getDataProvider(); - List selected = new ArrayList<>(); - for (WorkItemNewDto row : provider.getAvailableData()) { + List selected = new ArrayList<>(); + for (WorkItemDto row : provider.getAvailableData()) { if (row.isSelected()) { selected.add(row); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/AdminHomeDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/AdminHomeDto.java index b6810011415..8a5695ba7aa 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/AdminHomeDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/AdminHomeDto.java @@ -16,7 +16,7 @@ package com.evolveum.midpoint.web.page.admin.home.dto; -import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemNewDto; +import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDto; import java.io.Serializable; import java.util.ArrayList; @@ -28,7 +28,7 @@ public class AdminHomeDto implements Serializable { private List assignments; private List orgAssignments; private List resources; - private List workItems; + private List workItems; public List getOrgAssignments() { if (orgAssignments == null) { @@ -58,9 +58,9 @@ public List getResources() { return resources; } - public List getWorkItems() { + public List getWorkItems() { if (workItems == null) { - workItems = new ArrayList(); + workItems = new ArrayList(); } return workItems; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java index ff3d16dac96..cd887edcd78 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java @@ -39,7 +39,7 @@ import com.evolveum.midpoint.web.component.AjaxSubmitButton; import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; import com.evolveum.midpoint.web.page.admin.home.PageDashboard; -import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemNewDto; +import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDto; import com.evolveum.midpoint.web.util.OnePageParameterEncoder; import com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemType; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -82,7 +82,7 @@ public class PageWorkItem extends PageAdminWorkItems { private PageParameters parameters; - private LoadableModel workItemDtoModel; + private LoadableModel workItemDtoModel; public PageWorkItem() { this(new PageParameters(), null); @@ -98,9 +98,9 @@ public PageWorkItem(PageParameters parameters, PageBase previousPage, boolean re setPreviousPage(previousPage); setReinitializePreviousPages(reinitializePreviousPage); - workItemDtoModel = new LoadableModel(false) { + workItemDtoModel = new LoadableModel(false) { @Override - protected WorkItemNewDto load() { + protected WorkItemDto load() { return loadWorkItemDtoIfNecessary(); } }; @@ -119,13 +119,13 @@ protected String load() { }; } - private WorkItemNewDto loadWorkItemDtoIfNecessary() { + private WorkItemDto loadWorkItemDtoIfNecessary() { if (workItemDtoModel.isLoaded()) { return workItemDtoModel.getObject(); } Task task = createSimpleTask(OPERATION_LOAD_WORK_ITEM); OperationResult result = task.getResult(); - WorkItemNewDto workItemDto = null; + WorkItemDto workItemDto = null; try { String id = parameters.get(OnePageParameterEncoder.PARAMETER).toString(); final ObjectQuery query = QueryBuilder.queryFor(WorkItemType.class, getPrismContext()) @@ -140,7 +140,7 @@ private WorkItemNewDto loadWorkItemDtoIfNecessary() { } else if (workItems.size() == 0) { throw new SystemException("No work item with ID of " + id); } - workItemDto = new WorkItemNewDto(workItems.get(0)); + workItemDto = new WorkItemDto(workItems.get(0)); result.recordSuccessIfUnknown(); } catch (Exception ex) { result.recordFatalError("Couldn't get work item.", ex); @@ -278,7 +278,7 @@ private void savePerformed(AjaxRequestTarget target, boolean decision) { OperationResult result = new OperationResult(OPERATION_SAVE_WORK_ITEM); try { - WorkItemNewDto dto = workItemDtoModel.getObject(); + WorkItemDto dto = workItemDtoModel.getObject(); getWorkflowService().approveOrRejectWorkItem(dto.getWorkItemId(), decision, dto.getApproverComment(), result); setReinitializePreviousPages(true); } catch (Exception ex) { 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 8904a551feb..6e888fcca7e 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 @@ -28,8 +28,8 @@ import com.evolveum.midpoint.web.application.PageDescriptor; import com.evolveum.midpoint.web.component.AjaxButton; import com.evolveum.midpoint.web.component.wf.WorkItemsTablePanel; -import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDtoNewProvider; -import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemNewDto; +import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDtoProvider; +import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDto; import com.evolveum.midpoint.web.session.UserProfileStorage; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.form.Form; @@ -75,7 +75,7 @@ private void initLayout() { Form mainForm = new Form("mainForm"); add(mainForm); - WorkItemsTablePanel panel = new WorkItemsTablePanel(ID_WORK_ITEMS_PANEL, new WorkItemDtoNewProvider(PageWorkItems.this, assigned), + WorkItemsTablePanel panel = new WorkItemsTablePanel(ID_WORK_ITEMS_PANEL, new WorkItemDtoProvider(PageWorkItems.this, assigned), UserProfileStorage.TableId.PAGE_WORK_ITEMS, getItemsPerPage(UserProfileStorage.TableId.PAGE_WORK_ITEMS), true); panel.setOutputMarkupId(true); @@ -127,7 +127,7 @@ public void onClick(AjaxRequestTarget target) { mainForm.add(reject); } - private boolean isSomeItemSelected(List items, AjaxRequestTarget target) { + private boolean isSomeItemSelected(List items, AjaxRequestTarget target) { if (!items.isEmpty()) { return true; } @@ -142,17 +142,17 @@ private WorkItemsTablePanel getWorkItemsPanel() { } private void approveOrRejectWorkItemsPerformed(AjaxRequestTarget target, boolean approve) { - List WorkItemNewDtoList = getWorkItemsPanel().getSelectedWorkItems(); - if (!isSomeItemSelected(WorkItemNewDtoList, target)) { + List workItemDtoList = getWorkItemsPanel().getSelectedWorkItems(); + if (!isSomeItemSelected(workItemDtoList, target)) { return; } OperationResult mainResult = new OperationResult(OPERATION_APPROVE_OR_REJECT_ITEMS); WorkflowService workflowService = getWorkflowService(); - for (WorkItemNewDto workItemNewDto : WorkItemNewDtoList) { + for (WorkItemDto workItemDto : workItemDtoList) { OperationResult result = mainResult.createSubresult(OPERATION_APPROVE_OR_REJECT_ITEM); try { - workflowService.approveOrRejectWorkItem(workItemNewDto.getWorkItemId(), approve, null, result); + workflowService.approveOrRejectWorkItem(workItemDto.getWorkItemId(), approve, null, result); result.computeStatus(); } catch (Exception e) { result.recordPartialError("Couldn't approve/reject work item due to an unexpected exception.", e); @@ -173,17 +173,17 @@ private void approveOrRejectWorkItemsPerformed(AjaxRequestTarget target, boolean } private void claimWorkItemsPerformed(AjaxRequestTarget target) { - List WorkItemNewDtoList = getWorkItemsPanel().getSelectedWorkItems(); - if (!isSomeItemSelected(WorkItemNewDtoList, target)) { + List workItemDtoList = getWorkItemsPanel().getSelectedWorkItems(); + if (!isSomeItemSelected(workItemDtoList, target)) { return; } OperationResult mainResult = new OperationResult(OPERATION_CLAIM_ITEMS); WorkflowService workflowService = getWorkflowService(); - for (WorkItemNewDto workItemNewDto : WorkItemNewDtoList) { + for (WorkItemDto workItemDto : workItemDtoList) { OperationResult result = mainResult.createSubresult(OPERATION_CLAIM_ITEM); try { - workflowService.claimWorkItem(workItemNewDto.getWorkItemId(), result); + workflowService.claimWorkItem(workItemDto.getWorkItemId(), result); result.computeStatusIfUnknown(); } catch (ObjectNotFoundException | SecurityViolationException | RuntimeException e) { result.recordPartialError("Couldn't claim work item due to an unexpected exception.", e); @@ -204,17 +204,17 @@ private void claimWorkItemsPerformed(AjaxRequestTarget target) { } private void releaseWorkItemsPerformed(AjaxRequestTarget target) { - List WorkItemNewDtoList = getWorkItemsPanel().getSelectedWorkItems(); - if (!isSomeItemSelected(WorkItemNewDtoList, target)) { + List workItemDtoList = getWorkItemsPanel().getSelectedWorkItems(); + if (!isSomeItemSelected(workItemDtoList, target)) { return; } OperationResult mainResult = new OperationResult(OPERATION_RELEASE_ITEMS); WorkflowService workflowService = getWorkflowService(); - for (WorkItemNewDto workItemNewDto : WorkItemNewDtoList) { + for (WorkItemDto workItemDto : workItemDtoList) { OperationResult result = mainResult.createSubresult(OPERATION_RELEASE_ITEM); try { - workflowService.releaseWorkItem(workItemNewDto.getWorkItemId(), result); + workflowService.releaseWorkItem(workItemDto.getWorkItemId(), result); result.computeStatusIfUnknown(); } catch (ObjectNotFoundException | SecurityViolationException | RuntimeException e) { result.recordPartialError("Couldn't release work item due to an unexpected exception.", e); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java index 0f46d7c1d49..258467afc36 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java @@ -19,7 +19,7 @@ import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.web.component.wf.processes.itemApproval.ItemApprovalHistoryPanel; -import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemNewDto; +import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDto; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.model.IModel; @@ -28,7 +28,7 @@ /** * @author mederly */ -public class WorkItemPanel extends BasePanel { +public class WorkItemPanel extends BasePanel { private static final Trace LOGGER = TraceManager.getTrace(WorkItemPanel.class); @@ -42,21 +42,21 @@ public class WorkItemPanel extends BasePanel { private static final String ID_HISTORY = "history"; private static final String ID_APPROVER_COMMENT = "approverComment"; - public WorkItemPanel(String id, IModel model) { + public WorkItemPanel(String id, IModel model) { super(id, model); initLayout(); } protected void initLayout() { - add(new Label(ID_REQUESTED_BY, new PropertyModel(getModel(), WorkItemNewDto.F_REQUESTER_NAME))); - add(new Label(ID_REQUESTED_BY_FULL_NAME, new PropertyModel(getModel(), WorkItemNewDto.F_REQUESTER_FULL_NAME))); - add(new Label(ID_REQUESTED_ON, new PropertyModel(getModel(), WorkItemNewDto.F_PROCESS_STARTED))); - add(new Label(ID_WORK_ITEM_CREATED_ON, new PropertyModel(getModel(), WorkItemNewDto.F_CREATED))); - add(new Label(ID_ASSIGNEE, new PropertyModel(getModel(), WorkItemNewDto.F_ASSIGNEE))); - add(new Label(ID_CANDIDATES, new PropertyModel(getModel(), WorkItemNewDto.F_CANDIDATES))); - add(new ItemApprovalHistoryPanel(ID_HISTORY, new PropertyModel(getModel(), WorkItemNewDto.F_WORKFLOW_CONTEXT))); + add(new Label(ID_REQUESTED_BY, new PropertyModel(getModel(), WorkItemDto.F_REQUESTER_NAME))); + add(new Label(ID_REQUESTED_BY_FULL_NAME, new PropertyModel(getModel(), WorkItemDto.F_REQUESTER_FULL_NAME))); + add(new Label(ID_REQUESTED_ON, new PropertyModel(getModel(), WorkItemDto.F_PROCESS_STARTED))); + add(new Label(ID_WORK_ITEM_CREATED_ON, new PropertyModel(getModel(), WorkItemDto.F_CREATED))); + add(new Label(ID_ASSIGNEE, new PropertyModel(getModel(), WorkItemDto.F_ASSIGNEE))); + add(new Label(ID_CANDIDATES, new PropertyModel(getModel(), WorkItemDto.F_CANDIDATES))); + add(new ItemApprovalHistoryPanel(ID_HISTORY, new PropertyModel(getModel(), WorkItemDto.F_WORKFLOW_CONTEXT))); //add(new DeltaPanel(ID_DELTA_TO_BE_APPROVED, deltaModel)); - add(new TextArea(ID_APPROVER_COMMENT, new PropertyModel(getModel(), WorkItemNewDto.F_APPROVER_COMMENT))); + add(new TextArea(ID_APPROVER_COMMENT, new PropertyModel(getModel(), WorkItemDto.F_APPROVER_COMMENT))); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkflowRequestsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkflowRequestsPanel.java index f6857a75b72..a6973f6c469 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkflowRequestsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkflowRequestsPanel.java @@ -2,43 +2,25 @@ import com.evolveum.midpoint.gui.api.component.BasePanel; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; -import com.evolveum.midpoint.prism.xml.XmlTypeConverter; -import com.evolveum.midpoint.schema.result.OperationResultStatus; import com.evolveum.midpoint.security.api.AuthorizationConstants; import com.evolveum.midpoint.web.component.data.TablePanel; import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn; import com.evolveum.midpoint.web.component.data.column.IconColumn; import com.evolveum.midpoint.web.component.data.column.LinkColumn; -import com.evolveum.midpoint.web.component.util.ListDataProvider; -import com.evolveum.midpoint.web.component.util.SimplePanel; -import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceController; -import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceDto; -import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceState; import com.evolveum.midpoint.web.page.admin.server.PageTaskEdit; -import com.evolveum.midpoint.web.page.admin.server.dto.OperationResultStatusIcon; -import com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstance; import com.evolveum.midpoint.web.page.admin.workflow.dto.ProcessInstanceDto; -import com.evolveum.midpoint.web.page.admin.workflow.dto.ProcessInstanceDtoProvider; -import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemNewDto; import com.evolveum.midpoint.web.session.UserProfileStorage; import com.evolveum.midpoint.web.util.OnePageParameterEncoder; import com.evolveum.midpoint.wf.util.ApprovalUtils; -import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType; -import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; -import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.request.mapper.parameter.PageParameters; import java.util.ArrayList; -import java.util.Date; import java.util.List; import static com.evolveum.midpoint.web.page.admin.server.dto.OperationResultStatusIcon.FATAL_ERROR; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemNewDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java similarity index 98% rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemNewDto.java rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java index effb9845972..ec48c3fdaa5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemNewDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java @@ -26,7 +26,7 @@ * @author lazyman * @author mederly */ -public class WorkItemNewDto extends Selectable { +public class WorkItemDto extends Selectable { public static final String F_NAME = "name"; public static final String F_CREATED = "created"; @@ -52,7 +52,7 @@ public class WorkItemNewDto extends Selectable { protected WorkItemType workItem; protected String approverComment; - public WorkItemNewDto(WorkItemType workItem) { + public WorkItemDto(WorkItemType workItem) { this.workItem = workItem; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoNewProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java similarity index 93% rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoNewProvider.java rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java index da76f1dbcb9..7c162e4eb80 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoNewProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java @@ -44,10 +44,10 @@ /** * @author lazyman */ -public class WorkItemDtoNewProvider extends BaseSortableDataProvider { +public class WorkItemDtoProvider extends BaseSortableDataProvider { - private static final transient Trace LOGGER = TraceManager.getTrace(WorkItemDtoNewProvider.class); - private static final String DOT_CLASS = WorkItemDtoNewProvider.class.getName() + "."; + private static final transient Trace LOGGER = TraceManager.getTrace(WorkItemDtoProvider.class); + private static final String DOT_CLASS = WorkItemDtoProvider.class.getName() + "."; private static final String OPERATION_LIST_ITEMS = DOT_CLASS + "listItems"; private static final String OPERATION_COUNT_ITEMS = DOT_CLASS + "countItems"; @@ -62,13 +62,13 @@ public String currentUser() { return principal.getOid(); } - public WorkItemDtoNewProvider(Component component, boolean assigned) { + public WorkItemDtoProvider(Component component, boolean assigned) { super(component); this.assigned = assigned; } @Override - public Iterator internalIterator(long first, long count) { + public Iterator internalIterator(long first, long count) { getAvailableData().clear(); Task task = getTaskManager().createTaskInstance(); @@ -83,7 +83,7 @@ public Iterator internalIterator(long first, long coun for (WorkItemType item : items) { try { - getAvailableData().add(new WorkItemNewDto(item)); + getAvailableData().add(new WorkItemDto(item)); } catch (Exception e) { LoggingUtils.logUnexpectedException(LOGGER, "Unhandled exception when listing work item {}", e, item); result.recordFatalError("Couldn't list work item.", e); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java index f99860999de..bb5bf0e283c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java @@ -41,7 +41,7 @@ import com.evolveum.midpoint.web.page.admin.home.dto.AccountCallableResult; import com.evolveum.midpoint.web.page.admin.workflow.WorkflowRequestsPanel; import com.evolveum.midpoint.web.page.admin.workflow.dto.ProcessInstanceDto; -import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemNewDto; +import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDto; import com.evolveum.midpoint.web.page.self.component.DashboardSearchPanel; import com.evolveum.midpoint.web.page.self.component.LinksPanel; import com.evolveum.midpoint.web.security.SecurityUtils; @@ -133,19 +133,19 @@ public void detach() { final PrismContext prismContext = getPrismContext(); - AsyncDashboardPanel> workItemsPanel = - new AsyncDashboardPanel>(ID_WORK_ITEMS_PANEL, createStringResource("PageSelfDashboard.workItems"), + AsyncDashboardPanel> workItemsPanel = + new AsyncDashboardPanel>(ID_WORK_ITEMS_PANEL, createStringResource("PageSelfDashboard.workItems"), "fa fa-fw fa-tasks", DashboardColor.RED) { @Override - protected SecurityContextAwareCallable>> createCallable( + protected SecurityContextAwareCallable>> createCallable( Authentication auth, IModel callableParameterModel) { - return new SecurityContextAwareCallable>>( + return new SecurityContextAwareCallable>>( getSecurityEnforcer(), auth) { @Override - public CallableResult> callWithContextPrepared() throws Exception { + public CallableResult> callWithContextPrepared() throws Exception { return loadWorkItems(prismContext); } }; @@ -153,7 +153,7 @@ public CallableResult> callWithContextPrepared() throws Exc @Override protected Component getMainComponent(String markupId) { - ISortableDataProvider provider = new ListDataProvider(this, new PropertyModel>(getModel(), CallableResult.F_VALUE)); + ISortableDataProvider provider = new ListDataProvider(this, new PropertyModel>(getModel(), CallableResult.F_VALUE)); return new WorkItemsTablePanel(markupId, provider, null, 10, false); } }; @@ -201,12 +201,12 @@ public boolean isVisible() { } - private CallableResult> loadWorkItems(PrismContext prismContext) { + private CallableResult> loadWorkItems(PrismContext prismContext) { LOGGER.debug("Loading work items."); AccountCallableResult callableResult = new AccountCallableResult(); - List list = new ArrayList<>(); + List list = new ArrayList<>(); callableResult.setValue(list); if (!getWorkflowManager().isEnabled()) { @@ -229,7 +229,7 @@ private CallableResult> loadWorkItems(PrismContext prismCon .build(); List workItems = getModelService().searchContainers(WorkItemType.class, query, null, task, result); for (WorkItemType workItem : workItems) { - list.add(new WorkItemNewDto(workItem)); + list.add(new WorkItemDto(workItem)); } } catch (Exception e) { result.recordFatalError("Couldn't get list of work items.", e);