From 358de8292351521454ec574913da64f55c29302f Mon Sep 17 00:00:00 2001 From: Alessandro Iezzi Date: Wed, 30 Nov 2022 16:54:34 +0100 Subject: Change package --- .../alessandroiezzi/commons/page/PageAdapter.java | 172 --------------------- .../commons/page/PageChangeListener.java | 26 ---- .../it/alessandroiezzi/util/page/PageAdapter.java | 172 +++++++++++++++++++++ .../util/page/PageChangeListener.java | 26 ++++ .../commons/page/PageAdapterUnitTest.java | 1 + 5 files changed, 199 insertions(+), 198 deletions(-) delete mode 100644 src/main/java/it/alessandroiezzi/commons/page/PageAdapter.java delete mode 100644 src/main/java/it/alessandroiezzi/commons/page/PageChangeListener.java create mode 100644 src/main/java/it/alessandroiezzi/util/page/PageAdapter.java create mode 100644 src/main/java/it/alessandroiezzi/util/page/PageChangeListener.java diff --git a/src/main/java/it/alessandroiezzi/commons/page/PageAdapter.java b/src/main/java/it/alessandroiezzi/commons/page/PageAdapter.java deleted file mode 100644 index b5857ef..0000000 --- a/src/main/java/it/alessandroiezzi/commons/page/PageAdapter.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright (C) 2022 Alessandro Iezzi - * - * This file is part of commons-page. - * - * commons-page is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * commons-page is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with commons-page. If not, see . - */ - -package it.alessandroiezzi.commons.page; - -import it.alessandroiezzi.util.*; - -import java.util.*; -import java.util.function.*; - -public class PageAdapter implements Pages { - private final List elements; - private final int pageSize; - private int pageNumber; - private PageChangeListener pageChangeListener; - boolean pageChanged = false; - private Page currentPage; - - public PageAdapter(List elements) { - this(elements, 15); - } - - public PageAdapter(List elements, int pageSize) { - this.elements = elements; - this.pageSize = pageSize; - this.pageNumber = 0; - } - - @Override - public Page firstPage() { - return toPage(0); - } - - @Override - public Page previousPage() { - return toPage(pageNumber - 1); - } - - @Override - public Page nextPage() { - return toPage(pageNumber + 1); - } - - @Override - public Page lastPage() { - return toPage(getTotalPages() - 1); - } - - @Override - public Page toPage(int page) { - if (page < 0) { - page = 0; - } else if (page >= getTotalPages()) { - page = getTotalPages() - 1; - } - - int totalElements = getNumberOfElements(); - int startIndex = page * pageSize; - if (startIndex > totalElements) { - startIndex = totalElements; - } - - int count = startIndex + pageSize; - if (count > totalElements) { - count = totalElements; - } - - pageChanged = page != pageNumber; - pageNumber = page; - List subElements = elements.subList(startIndex, count); - currentPage = Page.of(subElements, pageSize); - - if (pageChangeListener != null && pageChanged) { - pageChangeListener.pageChanged(new ArrayList<>(subElements), pageSize); - } - - return currentPage; - } - - @Override - public Page getCurrentPage() { - return currentPage; - } - - @Override - public int getCurrentPageNumber() { - return pageNumber; - } - - @Override - public List getContent() { - return getCurrentPage().getContent(); - } - - @Override - public int getPageSize() { - return pageSize; - } - - @Override - public int getNumberOfElements() { - return elements.size(); - } - - @Override - public void addElement(T element) { - elements.add(element); - } - - @Override - public void removeElement(T element) { - elements.remove(element); - } - - @Override - public void removeElementIf(Predicate predicate) { - elements.removeIf(predicate); - } - - @Override - public int getTotalPages() { - double pages = (double) getNumberOfElements() / (double) getPageSize(); - int pagesInt = (int) pages; - - if (pages > pagesInt) - pagesInt++; - - return pagesInt; - } - - @Override - public void addPageChangeListener(PageChangeListener pageChangeListener) { - this.pageChangeListener = pageChangeListener; - } - - @Override - public List getAllElements() { - return elements; - } - - @Override - public boolean isPageChanged() { - return pageChanged; - } - - @Override - public int from() { - return (pageNumber * pageSize) + 1; - } - - @Override - public int to() { - int currentSize = getContent().size(); - return currentSize < pageSize ? getNumberOfElements() : (pageNumber + 1) * currentSize; - } -} diff --git a/src/main/java/it/alessandroiezzi/commons/page/PageChangeListener.java b/src/main/java/it/alessandroiezzi/commons/page/PageChangeListener.java deleted file mode 100644 index a489ddc..0000000 --- a/src/main/java/it/alessandroiezzi/commons/page/PageChangeListener.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2022 Alessandro Iezzi - * - * This file is part of commons-page. - * - * commons-page is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * commons-page is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with commons-page. If not, see . - */ - -package it.alessandroiezzi.commons.page; - -import java.util.*; - -public interface PageChangeListener { - void pageChanged(List elements, int pageSize); -} diff --git a/src/main/java/it/alessandroiezzi/util/page/PageAdapter.java b/src/main/java/it/alessandroiezzi/util/page/PageAdapter.java new file mode 100644 index 0000000..ab2e343 --- /dev/null +++ b/src/main/java/it/alessandroiezzi/util/page/PageAdapter.java @@ -0,0 +1,172 @@ +/* + * Copyright (C) 2022 Alessandro Iezzi + * + * This file is part of commons-page. + * + * commons-page is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * commons-page is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with commons-page. If not, see . + */ + +package it.alessandroiezzi.util.page; + +import it.alessandroiezzi.util.*; + +import java.util.*; +import java.util.function.*; + +public class PageAdapter implements Pages { + private final List elements; + private final int pageSize; + private int pageNumber; + private PageChangeListener pageChangeListener; + boolean pageChanged = false; + private Page currentPage; + + public PageAdapter(List elements) { + this(elements, 15); + } + + public PageAdapter(List elements, int pageSize) { + this.elements = elements; + this.pageSize = pageSize; + this.pageNumber = 0; + } + + @Override + public Page firstPage() { + return toPage(0); + } + + @Override + public Page previousPage() { + return toPage(pageNumber - 1); + } + + @Override + public Page nextPage() { + return toPage(pageNumber + 1); + } + + @Override + public Page lastPage() { + return toPage(getTotalPages() - 1); + } + + @Override + public Page toPage(int page) { + if (page < 0) { + page = 0; + } else if (page >= getTotalPages()) { + page = getTotalPages() - 1; + } + + int totalElements = getNumberOfElements(); + int startIndex = page * pageSize; + if (startIndex > totalElements) { + startIndex = totalElements; + } + + int count = startIndex + pageSize; + if (count > totalElements) { + count = totalElements; + } + + pageChanged = page != pageNumber; + pageNumber = page; + List subElements = elements.subList(startIndex, count); + currentPage = Page.of(subElements, pageSize); + + if (pageChangeListener != null && pageChanged) { + pageChangeListener.pageChanged(new ArrayList<>(subElements), pageSize); + } + + return currentPage; + } + + @Override + public Page getCurrentPage() { + return currentPage; + } + + @Override + public int getCurrentPageNumber() { + return pageNumber; + } + + @Override + public List getContent() { + return getCurrentPage().getContent(); + } + + @Override + public int getPageSize() { + return pageSize; + } + + @Override + public int getNumberOfElements() { + return elements.size(); + } + + @Override + public void addElement(T element) { + elements.add(element); + } + + @Override + public void removeElement(T element) { + elements.remove(element); + } + + @Override + public void removeElementIf(Predicate predicate) { + elements.removeIf(predicate); + } + + @Override + public int getTotalPages() { + double pages = (double) getNumberOfElements() / (double) getPageSize(); + int pagesInt = (int) pages; + + if (pages > pagesInt) + pagesInt++; + + return pagesInt; + } + + @Override + public void addPageChangeListener(PageChangeListener pageChangeListener) { + this.pageChangeListener = pageChangeListener; + } + + @Override + public List getAllElements() { + return elements; + } + + @Override + public boolean isPageChanged() { + return pageChanged; + } + + @Override + public int from() { + return (pageNumber * pageSize) + 1; + } + + @Override + public int to() { + int currentSize = getContent().size(); + return currentSize < pageSize ? getNumberOfElements() : (pageNumber + 1) * currentSize; + } +} diff --git a/src/main/java/it/alessandroiezzi/util/page/PageChangeListener.java b/src/main/java/it/alessandroiezzi/util/page/PageChangeListener.java new file mode 100644 index 0000000..35c0642 --- /dev/null +++ b/src/main/java/it/alessandroiezzi/util/page/PageChangeListener.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2022 Alessandro Iezzi + * + * This file is part of commons-page. + * + * commons-page is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * commons-page is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with commons-page. If not, see . + */ + +package it.alessandroiezzi.util.page; + +import java.util.*; + +public interface PageChangeListener { + void pageChanged(List elements, int pageSize); +} diff --git a/src/test/java/it/alessandroiezzi/commons/page/PageAdapterUnitTest.java b/src/test/java/it/alessandroiezzi/commons/page/PageAdapterUnitTest.java index 65b880d..fced04a 100644 --- a/src/test/java/it/alessandroiezzi/commons/page/PageAdapterUnitTest.java +++ b/src/test/java/it/alessandroiezzi/commons/page/PageAdapterUnitTest.java @@ -19,6 +19,7 @@ package it.alessandroiezzi.commons.page; +import it.alessandroiezzi.util.page.*; import org.junit.*; import java.util.*; -- cgit v1.2.3