From 5ddf530c7885142775ad0e62f32459182e252804 Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 11 Jan 2018 13:35:39 +0000 Subject: [PATCH] CCM NG: Reenabled Pagninator in Folder Browser git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5192 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/ui/folder/FolderBrowser.java | 16 ++++++------ .../FolderBrowserTableModelBuilder.java | 25 +++++++------------ .../cms/ui/folder/FolderManipulator.java | 22 ++++++++-------- 3 files changed, 28 insertions(+), 35 deletions(-) diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowser.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowser.java index 55baafb23..abe4d03e4 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowser.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowser.java @@ -105,7 +105,7 @@ public class FolderBrowser extends Table { private StringParameter atozFilterParameter = null; private StringParameter filterParameter = null; private FolderManipulator folderManipulator; -// private Paginator paginator; + private Paginator paginator; // private FolderManipulator.FilterForm filterForm; private long folderSize; @@ -227,13 +227,13 @@ public class FolderBrowser extends Table { return folderSize; } -// protected Paginator getPaginator() { -// return paginator; -// } -// -// protected void setPaginator(final Paginator paginator) { -// this.paginator = paginator; -// } + protected Paginator getPaginator() { + return paginator; + } + + protected void setPaginator(final Paginator paginator) { + this.paginator = paginator; + } protected String getFilter(final PageState state) { return (String) state.getValue(filterParameter); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserTableModelBuilder.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserTableModelBuilder.java index e00e9903e..9ac9fb939 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserTableModelBuilder.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserTableModelBuilder.java @@ -60,7 +60,7 @@ class FolderBrowserTableModelBuilder return Table.EMPTY_MODEL; } else { folderBrowser.getRowSelectionModel().clearSelection(state); -// final Paginator paginator = folderBrowser.getPaginator(); + final Paginator paginator = folderBrowser.getPaginator(); final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final FolderBrowserController controller = cdiUtil .findBean(FolderBrowserController.class); @@ -78,8 +78,8 @@ class FolderBrowserTableModelBuilder orderDirection = folderBrowser.getSortDirection(state); } final String atozFilter = folderBrowser.getAtoZfilter(state); -// final int first = paginator.getFirst(state); -// final int pageSize = paginator.getPageSize(state); + final int first = paginator.getFirst(state); + final int pageSize = paginator.getPageSize(state); final String filterTerm; if (filter != null && !filter.trim().isEmpty()) { @@ -96,23 +96,16 @@ class FolderBrowserTableModelBuilder if (filterTerm == null) { rows = controller.getObjectRows(folder, orderBy, - orderDirection); -// rows = controller.getObjectRows(folder, -// orderBy, -// orderDirection, -// first - 1, -// pageSize); + orderDirection, + first - 1, + pageSize); } else { rows = controller.getObjectRows(folder, filterTerm, orderBy, - orderDirection); -// rows = controller.getObjectRows(folder, -// filterTerm, -// orderBy, -// orderDirection, -// first - 1, -// pageSize); + orderDirection, + first - 1, + pageSize); } LOGGER.debug("Retrieve table rows in {} ms.", diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderManipulator.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderManipulator.java index 049573999..22b3c75dd 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderManipulator.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderManipulator.java @@ -883,7 +883,7 @@ public class FolderManipulator extends SimpleContainer implements private static final String ITEM_VIEW = "itemView"; private final FolderBrowser folderBrowser; -// private final Paginator paginator; + private final Paginator paginator; private final OptionGroup checkboxGroup; private final SingleSelect actionSelect; private final Submit submit; @@ -904,11 +904,11 @@ public class FolderManipulator extends SimpleContainer implements folderBrowser.setFilterParameter(filterParam); // folderBrowser.setFilterForm(filterForm); folderBrowser.setFolderManipulator(FolderManipulator.this); -// paginator = new Paginator( -// new FolderBrowserPaginationModelBuilder(folderBrowser), -// CMSConfig.getConfig().getFolderBrowseListSize()); -// folderBrowser.setPaginator(paginator); -// panel.add(paginator); + paginator = new Paginator( + new FolderBrowserPaginationModelBuilder(folderBrowser), + CMSConfig.getConfig().getFolderBrowseListSize()); + folderBrowser.setPaginator(paginator); + panel.add(paginator); panel.add(folderBrowser); LOGGER.debug("Adding filter form..."); @@ -966,17 +966,17 @@ public class FolderManipulator extends SimpleContainer implements return folderBrowser; } -// public Paginator getPaginator() { -// return paginator; -// } + public Paginator getPaginator() { + return paginator; + } @Override public void reset(final PageState state) { checkboxGroup.setValue(state, null); actionSelect.setValue(state, null); -// paginator.reset(state); - //state.setValue(m_aToZfilter, null); + paginator.reset(state); +// state.setValue(m_aToZfilter, null); state.setValue(filterParam, null); filterForm.getFilterField().setValue(state, null); }