Cleanup
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cc896322 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cc896322 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cc896322 Branch: refs/heads/2_0_X Commit: cc896322095694bb799083ce7a5692f831c94c0e Parents: fd93a2c Author: Francesco Chicchiriccò <[email protected]> Authored: Thu Jul 12 14:08:30 2018 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Thu Jul 12 14:08:30 2018 +0200 ---------------------------------------------------------------------- .../client/console/approvals/ApprovalDirectoryPanel.java | 4 ---- .../panels/ConnInstanceHistoryConfDirectoryPanel.java | 7 +------ .../console/panels/ResourceHistoryConfDirectoryPanel.java | 7 +------ .../client/console/tasks/ExecutionsDirectoryPanel.java | 9 +-------- .../syncope/client/console/tasks/TaskDirectoryPanel.java | 8 -------- 5 files changed, 3 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/cc896322/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java index f6bd095..7722202 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java @@ -32,7 +32,6 @@ import org.apache.syncope.client.console.commons.DirectoryDataProvider; import org.apache.syncope.client.console.panels.DirectoryPanel; import org.apache.syncope.client.console.rest.UserWorkflowRestClient; import org.apache.syncope.client.console.approvals.ApprovalDirectoryPanel.ApprovalProvider; -import org.apache.syncope.client.console.commons.SortableDataProviderComparator; import org.apache.syncope.client.console.layout.FormLayoutInfoUtils; import org.apache.syncope.client.console.layout.UserFormLayoutInfo; import org.apache.syncope.client.console.pages.BasePage; @@ -257,15 +256,12 @@ public class ApprovalDirectoryPanel private static final long serialVersionUID = -2311716167583335852L; - private final SortableDataProviderComparator<WorkflowFormTO> comparator; - private final UserWorkflowRestClient restClient = new UserWorkflowRestClient(); public ApprovalProvider(final int paginatorRows) { super(paginatorRows); setSort("createTime", SortOrder.ASCENDING); - comparator = new SortableDataProviderComparator<>(this); } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/cc896322/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnInstanceHistoryConfDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnInstanceHistoryConfDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnInstanceHistoryConfDirectoryPanel.java index 836c12b..ecf6ef4 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnInstanceHistoryConfDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnInstanceHistoryConfDirectoryPanel.java @@ -213,14 +213,10 @@ public abstract class ConnInstanceHistoryConfDirectoryPanel extends DirectoryPan public Iterator<ConnInstanceHistoryConfTO> iterator(final long first, final long count) { final List<ConnInstanceHistoryConfTO> configurations = restClient.list(entityKey); - Collections.sort(configurations, getComparator()); + Collections.sort(configurations, comparator); return configurations.iterator(); } - public SortableDataProviderComparator<ConnInstanceHistoryConfTO> getComparator() { - return comparator; - } - @Override public long size() { return restClient.list(entityKey).size(); @@ -230,6 +226,5 @@ public abstract class ConnInstanceHistoryConfDirectoryPanel extends DirectoryPan public IModel<ConnInstanceHistoryConfTO> model(final ConnInstanceHistoryConfTO object) { return new CompoundPropertyModel<>(object); } - } } http://git-wip-us.apache.org/repos/asf/syncope/blob/cc896322/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceHistoryConfDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceHistoryConfDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceHistoryConfDirectoryPanel.java index 972d9da..e28c6d7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceHistoryConfDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceHistoryConfDirectoryPanel.java @@ -214,14 +214,10 @@ public abstract class ResourceHistoryConfDirectoryPanel extends DirectoryPanel< public Iterator<ResourceHistoryConfTO> iterator(final long first, final long count) { final List<ResourceHistoryConfTO> configurations = restClient.list(entityKey); - Collections.sort(configurations, getComparator()); + Collections.sort(configurations, comparator); return configurations.iterator(); } - public SortableDataProviderComparator<ResourceHistoryConfTO> getComparator() { - return comparator; - } - @Override public long size() { return restClient.list(entityKey).size(); @@ -231,6 +227,5 @@ public abstract class ResourceHistoryConfDirectoryPanel extends DirectoryPanel< public IModel<ResourceHistoryConfTO> model(final ResourceHistoryConfTO object) { return new CompoundPropertyModel<>(object); } - } } http://git-wip-us.apache.org/repos/asf/syncope/blob/cc896322/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java index 1c2cab1..b153a5b 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java @@ -25,7 +25,6 @@ import java.util.List; import org.apache.syncope.client.console.SyncopeConsoleSession; import org.apache.syncope.client.console.commons.Constants; import org.apache.syncope.client.console.commons.DirectoryDataProvider; -import org.apache.syncope.client.console.commons.SortableDataProviderComparator; import org.apache.syncope.client.console.pages.BasePage; import org.apache.syncope.client.console.panels.DirectoryPanel; import org.apache.syncope.client.console.panels.AjaxDataTablePanel; @@ -169,21 +168,15 @@ public abstract class ExecutionsDirectoryPanel private static final long serialVersionUID = 8943636537120648961L; - private final SortableDataProviderComparator<ExecTO> comparator; - private final String taskKey; public ExecProvider(final String taskKey, final int paginatorRows) { super(paginatorRows); + this.taskKey = taskKey; - comparator = new SortableDataProviderComparator<>(this); setSort("end", SortOrder.DESCENDING); } - public SortableDataProviderComparator<ExecTO> getComparator() { - return comparator; - } - @Override public Iterator<ExecTO> iterator(final long first, final long count) { int page = ((int) first / paginatorRows); http://git-wip-us.apache.org/repos/asf/syncope/blob/cc896322/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java index 56a17a9..35aabff 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java @@ -19,7 +19,6 @@ package org.apache.syncope.client.console.tasks; import org.apache.syncope.client.console.commons.DirectoryDataProvider; -import org.apache.syncope.client.console.commons.SortableDataProviderComparator; import org.apache.syncope.client.console.commons.TaskDataProvider; import org.apache.syncope.client.console.panels.DirectoryPanel; import org.apache.syncope.client.console.panels.AjaxDataTablePanel; @@ -70,22 +69,15 @@ public abstract class TaskDirectoryPanel<T extends TaskTO> private static final long serialVersionUID = -20112718133295756L; - private final SortableDataProviderComparator<T> comparator; - private final TaskType id; public TasksProvider(final int paginatorRows, final TaskType id) { super(paginatorRows); setSort("key", SortOrder.ASCENDING); - this.comparator = new SortableDataProviderComparator<>(this); this.id = id; } - public SortableDataProviderComparator<T> getComparator() { - return comparator; - } - @Override public long size() { return restClient.count(id);
