diff --git a/src/main/java/org/codelibs/fess/crud/pager/BsJobLogPager.java b/src/main/java/org/codelibs/fess/crud/pager/BsJobLogPager.java deleted file mode 100644 index 71d87a9d3..000000000 --- a/src/main/java/org/codelibs/fess/crud/pager/BsJobLogPager.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Copyright 2009-2015 the CodeLibs Project and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -package org.codelibs.fess.crud.pager; - -import java.io.Serializable; -import java.util.List; - -public abstract class BsJobLogPager implements Serializable { - private static final long serialVersionUID = 1L; - - public static final int DEFAULT_PAGE_SIZE = 20; - - public static final int DEFAULT_CURRENT_PAGE_NUMBER = 1; - - private int allRecordCount; - - private int allPageCount; - - private boolean existPrePage; - - private boolean existNextPage; - - private List pageNumberList; - - private int pageSize; - - private int currentPageNumber; - - public String id; - - public String jobName; - - public String jobStatus; - - public String target; - - public String scriptType; - - public String startTime; - - public void clear() { - pageSize = getDefaultPageSize(); - currentPageNumber = getDefaultCurrentPageNumber(); - - id = null; - jobName = null; - jobStatus = null; - target = null; - scriptType = null; - startTime = null; - - } - - protected int getDefaultPageSize() { - return DEFAULT_PAGE_SIZE; - } - - protected int getDefaultCurrentPageNumber() { - return DEFAULT_CURRENT_PAGE_NUMBER; - } - - public int getAllRecordCount() { - return allRecordCount; - } - - public void setAllRecordCount(final int allRecordCount) { - this.allRecordCount = allRecordCount; - } - - public int getAllPageCount() { - return allPageCount; - } - - public void setAllPageCount(final int allPageCount) { - this.allPageCount = allPageCount; - } - - public boolean isExistPrePage() { - return existPrePage; - } - - public void setExistPrePage(final boolean existPrePage) { - this.existPrePage = existPrePage; - } - - public boolean isExistNextPage() { - return existNextPage; - } - - public void setExistNextPage(final boolean existNextPage) { - this.existNextPage = existNextPage; - } - - public int getPageSize() { - if (pageSize <= 0) { - pageSize = getDefaultPageSize(); - } - return pageSize; - } - - public void setPageSize(final int pageSize) { - this.pageSize = pageSize; - } - - public int getCurrentPageNumber() { - if (currentPageNumber <= 0) { - currentPageNumber = getDefaultCurrentPageNumber(); - } - return currentPageNumber; - } - - public void setCurrentPageNumber(final int currentPageNumber) { - this.currentPageNumber = currentPageNumber; - } - - public List getPageNumberList() { - return pageNumberList; - } - - public void setPageNumberList(final List pageNumberList) { - this.pageNumberList = pageNumberList; - } -} diff --git a/src/main/java/org/codelibs/fess/pager/JobLogPager.java b/src/main/java/org/codelibs/fess/pager/JobLogPager.java index 503074f2f..17b129422 100644 --- a/src/main/java/org/codelibs/fess/pager/JobLogPager.java +++ b/src/main/java/org/codelibs/fess/pager/JobLogPager.java @@ -16,23 +16,125 @@ package org.codelibs.fess.pager; +import java.util.List; + import org.codelibs.fess.Constants; -import org.codelibs.fess.crud.pager.BsJobLogPager; -public class JobLogPager extends BsJobLogPager { +public class JobLogPager { - private static final long serialVersionUID = 1L; + public static final int DEFAULT_PAGE_SIZE = 20; + + public static final int DEFAULT_CURRENT_PAGE_NUMBER = 1; + + private int allRecordCount; + + private int allPageCount; + + private boolean existPrePage; + + private boolean existNextPage; + + private List pageNumberList; + + private int pageSize; + + private int currentPageNumber; + + public String id; + + public String jobName; + + public String jobStatus; + + public String target; + + public String scriptType; + + public String startTime; + + public void clear() { + pageSize = getDefaultPageSize(); + currentPageNumber = getDefaultCurrentPageNumber(); + + id = null; + jobName = null; + jobStatus = null; + target = null; + scriptType = null; + startTime = null; + + } + + protected int getDefaultCurrentPageNumber() { + return DEFAULT_CURRENT_PAGE_NUMBER; + } + + public int getAllRecordCount() { + return allRecordCount; + } + + public void setAllRecordCount(final int allRecordCount) { + this.allRecordCount = allRecordCount; + } + + public int getAllPageCount() { + return allPageCount; + } + + public void setAllPageCount(final int allPageCount) { + this.allPageCount = allPageCount; + } + + public boolean isExistPrePage() { + return existPrePage; + } + + public void setExistPrePage(final boolean existPrePage) { + this.existPrePage = existPrePage; + } + + public boolean isExistNextPage() { + return existNextPage; + } + + public void setExistNextPage(final boolean existNextPage) { + this.existNextPage = existNextPage; + } + + public int getPageSize() { + if (pageSize <= 0) { + pageSize = getDefaultPageSize(); + } + return pageSize; + } + + public void setPageSize(final int pageSize) { + this.pageSize = pageSize; + } + + public int getCurrentPageNumber() { + if (currentPageNumber <= 0) { + currentPageNumber = getDefaultCurrentPageNumber(); + } + return currentPageNumber; + } + + public void setCurrentPageNumber(final int currentPageNumber) { + this.currentPageNumber = currentPageNumber; + } + + public List getPageNumberList() { + return pageNumberList; + } + + public void setPageNumberList(final List pageNumberList) { + this.pageNumberList = pageNumberList; + } public JobLogPager() { super(); } - @Override - public void clear() { - super.clear(); - } - - @Override protected int getDefaultPageSize() { return Constants.DEFAULT_ADMIN_PAGE_SIZE; }