Skip to content

Commit

Permalink
Tidying "New" classes in GUI (first wave).
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Mar 11, 2016
1 parent 6ac1f98 commit 36b1e10
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 95 deletions.
40 changes: 20 additions & 20 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsTablePanel.java
View file
Expand Up @@ -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;
Expand All @@ -48,9 +48,9 @@ public class WorkItemsTablePanel extends BasePanel {

private static final String ID_WORK_ITEMS_TABLE = "workItemsTable";

private ISortableDataProvider<WorkItemNewDto, String> provider;
private ISortableDataProvider<WorkItemDto, String> provider;

public WorkItemsTablePanel(String id, ISortableDataProvider<WorkItemNewDto, String> provider,
public WorkItemsTablePanel(String id, ISortableDataProvider<WorkItemDto, String> provider,
UserProfileStorage.TableId tableId, long pageSize, boolean showAssigned) {
super(id);
this.provider = provider;
Expand All @@ -59,30 +59,30 @@ public WorkItemsTablePanel(String id, ISortableDataProvider<WorkItemNewDto, Stri

// this is called locally in order to take showAssigned into account
private void initLayout(UserProfileStorage.TableId tableId, long pageSize, boolean showAssigned) {
List<IColumn<WorkItemNewDto, String>> columns = new ArrayList<>();
List<IColumn<WorkItemDto, String>> columns = new ArrayList<>();

// TODO configurable
columns.add(new CheckBoxHeaderColumn<WorkItemNewDto>());
columns.add(new CheckBoxHeaderColumn<WorkItemDto>());

// 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<WorkItemNewDto>(createStringResource("WorkItemsPanel.name"), WorkItemNewDto.F_NAME, WorkItemNewDto.F_NAME) {
columns.add(new LinkColumn<WorkItemDto>(createStringResource("WorkItemsPanel.name"), WorkItemDto.F_NAME, WorkItemDto.F_NAME) {
@Override
public void onClick(AjaxRequestTarget target, IModel<WorkItemNewDto> rowModel) {
public void onClick(AjaxRequestTarget target, IModel<WorkItemDto> 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<WorkItemNewDto, String>(createStringResource("WorkItemsPanel.name")) {
columns.add(new AbstractColumn<WorkItemDto, String>(createStringResource("WorkItemsPanel.name")) {
@Override
public void populateItem(Item<ICellPopulator<WorkItemNewDto>> item, String componentId,
final IModel<WorkItemNewDto> rowModel) {
public void populateItem(Item<ICellPopulator<WorkItemDto>> item, String componentId,
final IModel<WorkItemDto> rowModel) {
item.add(new Label(componentId, new AbstractReadOnlyModel<Object>() {
@Override
public Object getObject() {
Expand All @@ -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);
Expand All @@ -107,12 +107,12 @@ private TablePanel getWorkItemTable() {
return (TablePanel) get(ID_WORK_ITEMS_TABLE);
}

public List<WorkItemNewDto> getSelectedWorkItems() {
public List<WorkItemDto> getSelectedWorkItems() {
DataTable table = getWorkItemTable().getDataTable();
WorkItemDtoNewProvider provider = (WorkItemDtoNewProvider) table.getDataProvider();
WorkItemDtoProvider provider = (WorkItemDtoProvider) table.getDataProvider();

List<WorkItemNewDto> selected = new ArrayList<>();
for (WorkItemNewDto row : provider.getAvailableData()) {
List<WorkItemDto> selected = new ArrayList<>();
for (WorkItemDto row : provider.getAvailableData()) {
if (row.isSelected()) {
selected.add(row);
}
Expand Down
8 changes: 4 additions & 4 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/AdminHomeDto.java
View file
Expand Up @@ -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;
Expand All @@ -28,7 +28,7 @@ public class AdminHomeDto implements Serializable {
private List<SimpleAssignmentDto> assignments;
private List<SimpleAssignmentDto> orgAssignments;
private List<String> resources;
private List<WorkItemNewDto> workItems;
private List<WorkItemDto> workItems;

public List<SimpleAssignmentDto> getOrgAssignments() {
if (orgAssignments == null) {
Expand Down Expand Up @@ -58,9 +58,9 @@ public List<String> getResources() {
return resources;
}

public List<WorkItemNewDto> getWorkItems() {
public List<WorkItemDto> getWorkItems() {
if (workItems == null) {
workItems = new ArrayList<WorkItemNewDto>();
workItems = new ArrayList<WorkItemDto>();
}
return workItems;
}
Expand Down
16 changes: 8 additions & 8 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -82,7 +82,7 @@ public class PageWorkItem extends PageAdminWorkItems {

private PageParameters parameters;

private LoadableModel<WorkItemNewDto> workItemDtoModel;
private LoadableModel<WorkItemDto> workItemDtoModel;

public PageWorkItem() {
this(new PageParameters(), null);
Expand All @@ -98,9 +98,9 @@ public PageWorkItem(PageParameters parameters, PageBase previousPage, boolean re
setPreviousPage(previousPage);
setReinitializePreviousPages(reinitializePreviousPage);

workItemDtoModel = new LoadableModel<WorkItemNewDto>(false) {
workItemDtoModel = new LoadableModel<WorkItemDto>(false) {
@Override
protected WorkItemNewDto load() {
protected WorkItemDto load() {
return loadWorkItemDtoIfNecessary();
}
};
Expand All @@ -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())
Expand All @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down
32 changes: 16 additions & 16 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -127,7 +127,7 @@ public void onClick(AjaxRequestTarget target) {
mainForm.add(reject);
}

private boolean isSomeItemSelected(List<WorkItemNewDto> items, AjaxRequestTarget target) {
private boolean isSomeItemSelected(List<WorkItemDto> items, AjaxRequestTarget target) {
if (!items.isEmpty()) {
return true;
}
Expand All @@ -142,17 +142,17 @@ private WorkItemsTablePanel getWorkItemsPanel() {
}

private void approveOrRejectWorkItemsPerformed(AjaxRequestTarget target, boolean approve) {
List<WorkItemNewDto> WorkItemNewDtoList = getWorkItemsPanel().getSelectedWorkItems();
if (!isSomeItemSelected(WorkItemNewDtoList, target)) {
List<WorkItemDto> 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);
Expand All @@ -173,17 +173,17 @@ private void approveOrRejectWorkItemsPerformed(AjaxRequestTarget target, boolean
}

private void claimWorkItemsPerformed(AjaxRequestTarget target) {
List<WorkItemNewDto> WorkItemNewDtoList = getWorkItemsPanel().getSelectedWorkItems();
if (!isSomeItemSelected(WorkItemNewDtoList, target)) {
List<WorkItemDto> 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);
Expand All @@ -204,17 +204,17 @@ private void claimWorkItemsPerformed(AjaxRequestTarget target) {
}

private void releaseWorkItemsPerformed(AjaxRequestTarget target) {
List<WorkItemNewDto> WorkItemNewDtoList = getWorkItemsPanel().getSelectedWorkItems();
if (!isSomeItemSelected(WorkItemNewDtoList, target)) {
List<WorkItemDto> 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);
Expand Down
22 changes: 11 additions & 11 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
View file
Expand Up @@ -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;
Expand All @@ -28,7 +28,7 @@
/**
* @author mederly
*/
public class WorkItemPanel extends BasePanel<WorkItemNewDto> {
public class WorkItemPanel extends BasePanel<WorkItemDto> {

private static final Trace LOGGER = TraceManager.getTrace(WorkItemPanel.class);

Expand All @@ -42,21 +42,21 @@ public class WorkItemPanel extends BasePanel<WorkItemNewDto> {
private static final String ID_HISTORY = "history";
private static final String ID_APPROVER_COMMENT = "approverComment";

public WorkItemPanel(String id, IModel<WorkItemNewDto> model) {
public WorkItemPanel(String id, IModel<WorkItemDto> 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)));
}

}

0 comments on commit 36b1e10

Please sign in to comment.