0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename pagers

Browse source 
BoostDoc, FileAuth, PathMap, ReqHeader, Scheduler, WebAuth
This commit is contained in:
Keiichi Watanabe 2015-11-30 23:35:27 +09:00
parent 2045950c51
commit 141525eec1
18 changed files with 73 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/app/pager/BoostDocumentRulePager.java → src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java
View file

@ -20,7 +20,7 @@ import java.util.List;
import org.codelibs.fess.Constants;
public class BoostDocumentRulePager implements Serializable {
public class BoostDocPager implements Serializable {
private static final long serialVersionUID = 1L;
public static final int DEFAULT_CURRENT_PAGE_NUMBER = 1;

4
src/main/java/org/codelibs/fess/app/pager/FileAuthenticationPager.java → src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java
View file

@ -20,7 +20,7 @@ import java.util.List;
import org.codelibs.fess.Constants;
public class FileAuthenticationPager implements Serializable {
public class FileAuthPager implements Serializable {
private static final long serialVersionUID = 1L;
@ -140,7 +140,7 @@ public class FileAuthenticationPager implements Serializable {
this.pageNumberList = pageNumberList;
}
public FileAuthenticationPager() {
public FileAuthPager() {
super();
}

4
src/main/java/org/codelibs/fess/app/pager/PathMappingPager.java → src/main/java/org/codelibs/fess/app/pager/PathMapPager.java
View file

@ -20,7 +20,7 @@ import java.util.List;
import org.codelibs.fess.Constants;
public class PathMappingPager implements Serializable {
public class PathMapPager implements Serializable {
private static final long serialVersionUID = 1L;
@ -143,7 +143,7 @@ public class PathMappingPager implements Serializable {
this.pageNumberList = pageNumberList;
}
public PathMappingPager() {
public PathMapPager() {
super();
}

4
src/main/java/org/codelibs/fess/app/pager/RequestHeaderPager.java → src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java
View file

@ -20,7 +20,7 @@ import java.util.List;
import org.codelibs.fess.Constants;
public class RequestHeaderPager implements Serializable {
public class ReqHeaderPager implements Serializable {
private static final long serialVersionUID = 1L;
@ -140,7 +140,7 @@ public class RequestHeaderPager implements Serializable {
this.pageNumberList = pageNumberList;
}
public RequestHeaderPager() {
public ReqHeaderPager() {
super();
}

4
src/main/java/org/codelibs/fess/app/pager/ScheduledJobPager.java → src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java
View file

@ -20,7 +20,7 @@ import java.util.List;
import org.codelibs.fess.Constants;
public class ScheduledJobPager implements Serializable {
public class SchedulerPager implements Serializable {
private static final long serialVersionUID = 1L;
@ -155,7 +155,7 @@ public class ScheduledJobPager implements Serializable {
this.pageNumberList = pageNumberList;
}
public ScheduledJobPager() {
public SchedulerPager() {
super();
}

4
src/main/java/org/codelibs/fess/app/pager/WebAuthenticationPager.java → src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java
View file

@ -20,7 +20,7 @@ import java.util.List;
import org.codelibs.fess.Constants;
public class WebAuthenticationPager implements Serializable {
public class WebAuthPager implements Serializable {
private static final long serialVersionUID = 1L;
@ -140,7 +140,7 @@ public class WebAuthenticationPager implements Serializable {
this.pageNumberList = pageNumberList;
}
public WebAuthenticationPager() {
public WebAuthPager() {
super();
}

6
src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
View file

@ -23,7 +23,7 @@ import javax.annotation.Resource;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.BoostDocumentRulePager;
import org.codelibs.fess.app.pager.BoostDocPager;
import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB;
import org.codelibs.fess.es.config.exbhv.BoostDocumentRuleBhv;
import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
@ -41,7 +41,7 @@ public class BoostDocumentRuleService implements Serializable {
@Resource
protected FessConfig fessConfig;
public List<BoostDocumentRule> getBoostDocumentRuleList(final BoostDocumentRulePager boostDocumentRulePager) {
public List<BoostDocumentRule> getBoostDocumentRuleList(final BoostDocPager boostDocumentRulePager) {
final PagingResultBean<BoostDocumentRule> boostDocumentRuleList = boostDocumentRuleBhv.selectPage(cb -> {
cb.paging(boostDocumentRulePager.getPageSize(), boostDocumentRulePager.getCurrentPageNumber());
@ -79,7 +79,7 @@ public class BoostDocumentRuleService implements Serializable {
}
protected void setupListCondition(final BoostDocumentRuleCB cb, final BoostDocumentRulePager boostDocumentRulePager) {
protected void setupListCondition(final BoostDocumentRuleCB cb, final BoostDocPager boostDocumentRulePager) {
if (boostDocumentRulePager.id != null) {
cb.query().docMeta().setId_Equal(boostDocumentRulePager.id);
}

6
src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
View file

@ -23,7 +23,7 @@ import javax.annotation.Resource;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.FileAuthenticationPager;
import org.codelibs.fess.app.pager.FileAuthPager;
import org.codelibs.fess.es.config.cbean.FileAuthenticationCB;
import org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv;
import org.codelibs.fess.es.config.exentity.FileAuthentication;
@ -41,7 +41,7 @@ public class FileAuthenticationService implements Serializable {
super();
}
public List<FileAuthentication> getFileAuthenticationList(final FileAuthenticationPager fileAuthenticationPager) {
public List<FileAuthentication> getFileAuthenticationList(final FileAuthPager fileAuthenticationPager) {
final PagingResultBean<FileAuthentication> fileAuthenticationList = fileAuthenticationBhv.selectPage(cb -> {
cb.paging(fileAuthenticationPager.getPageSize(), fileAuthenticationPager.getCurrentPageNumber());
@ -79,7 +79,7 @@ public class FileAuthenticationService implements Serializable {
}
protected void setupListCondition(final FileAuthenticationCB cb, final FileAuthenticationPager fileAuthenticationPager) {
protected void setupListCondition(final FileAuthenticationCB cb, final FileAuthPager fileAuthenticationPager) {
if (fileAuthenticationPager.id != null) {
cb.query().docMeta().setId_Equal(fileAuthenticationPager.id);
}

6
src/main/java/org/codelibs/fess/app/service/PathMappingService.java
View file

@ -24,7 +24,7 @@ import javax.annotation.Resource;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.PathMappingPager;
import org.codelibs.fess.app.pager.PathMapPager;
import org.codelibs.fess.es.config.cbean.PathMappingCB;
import org.codelibs.fess.es.config.exbhv.PathMappingBhv;
import org.codelibs.fess.es.config.exentity.PathMapping;
@ -38,7 +38,7 @@ public class PathMappingService implements Serializable {
@Resource
protected PathMappingBhv pathMappingBhv;
public List<PathMapping> getPathMappingList(final PathMappingPager pathMappingPager) {
public List<PathMapping> getPathMappingList(final PathMapPager pathMappingPager) {
final PagingResultBean<PathMapping> pathMappingList = pathMappingBhv.selectPage(cb -> {
cb.paging(pathMappingPager.getPageSize(), pathMappingPager.getCurrentPageNumber());
@ -84,7 +84,7 @@ public class PathMappingService implements Serializable {
});
}
protected void setupListCondition(final PathMappingCB cb, final PathMappingPager pathMappingPager) {
protected void setupListCondition(final PathMappingCB cb, final PathMapPager pathMappingPager) {
if (pathMappingPager.id != null) {
cb.query().docMeta().setId_Equal(pathMappingPager.id);
}

6
src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
View file

@ -23,7 +23,7 @@ import javax.annotation.Resource;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.RequestHeaderPager;
import org.codelibs.fess.app.pager.ReqHeaderPager;
import org.codelibs.fess.es.config.cbean.RequestHeaderCB;
import org.codelibs.fess.es.config.exbhv.RequestHeaderBhv;
import org.codelibs.fess.es.config.exentity.RequestHeader;
@ -41,7 +41,7 @@ public class RequestHeaderService implements Serializable {
super();
}
public List<RequestHeader> getRequestHeaderList(final RequestHeaderPager requestHeaderPager) {
public List<RequestHeader> getRequestHeaderList(final ReqHeaderPager requestHeaderPager) {
final PagingResultBean<RequestHeader> requestHeaderList = requestHeaderBhv.selectPage(cb -> {
cb.paging(requestHeaderPager.getPageSize(), requestHeaderPager.getCurrentPageNumber());
@ -79,7 +79,7 @@ public class RequestHeaderService implements Serializable {
}
protected void setupListCondition(final RequestHeaderCB cb, final RequestHeaderPager requestHeaderPager) {
protected void setupListCondition(final RequestHeaderCB cb, final ReqHeaderPager requestHeaderPager) {
if (requestHeaderPager.id != null) {
cb.query().docMeta().setId_Equal(requestHeaderPager.id);
}

6
src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
View file

@ -23,7 +23,7 @@ import javax.annotation.Resource;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.ScheduledJobPager;
import org.codelibs.fess.app.pager.SchedulerPager;
import org.codelibs.fess.es.config.cbean.ScheduledJobCB;
import org.codelibs.fess.es.config.exbhv.ScheduledJobBhv;
import org.codelibs.fess.es.config.exentity.ScheduledJob;
@ -42,7 +42,7 @@ public class ScheduledJobService implements Serializable {
super();
}
public List<ScheduledJob> getScheduledJobList(final ScheduledJobPager scheduledJobPager) {
public List<ScheduledJob> getScheduledJobList(final SchedulerPager scheduledJobPager) {
final PagingResultBean<ScheduledJob> scheduledJobList = scheduledJobBhv.selectPage(cb -> {
cb.paging(scheduledJobPager.getPageSize(), scheduledJobPager.getCurrentPageNumber());
@ -74,7 +74,7 @@ public class ScheduledJobService implements Serializable {
@Resource
protected JobScheduler jobScheduler;
protected void setupListCondition(final ScheduledJobCB cb, final ScheduledJobPager scheduledJobPager) {
protected void setupListCondition(final ScheduledJobCB cb, final SchedulerPager scheduledJobPager) {
if (scheduledJobPager.id != null) {
cb.query().docMeta().setId_Equal(scheduledJobPager.id);
}

6
src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
View file

@ -23,7 +23,7 @@ import javax.annotation.Resource;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.WebAuthenticationPager;
import org.codelibs.fess.app.pager.WebAuthPager;
import org.codelibs.fess.es.config.cbean.WebAuthenticationCB;
import org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv;
import org.codelibs.fess.es.config.exentity.WebAuthentication;
@ -41,7 +41,7 @@ public class WebAuthenticationService implements Serializable {
super();
}
public List<WebAuthentication> getWebAuthenticationList(final WebAuthenticationPager webAuthenticationPager) {
public List<WebAuthentication> getWebAuthenticationList(final WebAuthPager webAuthenticationPager) {
final PagingResultBean<WebAuthentication> webAuthenticationList = webAuthenticationBhv.selectPage(cb -> {
cb.paging(webAuthenticationPager.getPageSize(), webAuthenticationPager.getCurrentPageNumber());
@ -79,7 +79,7 @@ public class WebAuthenticationService implements Serializable {
}
protected void setupListCondition(final WebAuthenticationCB cb, final WebAuthenticationPager webAuthenticationPager) {
protected void setupListCondition(final WebAuthenticationCB cb, final WebAuthPager webAuthenticationPager) {
if (webAuthenticationPager.id != null) {
cb.query().docMeta().setId_Equal(webAuthenticationPager.id);
}

20
src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.web.admin.boostdoc;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.BoostDocumentRulePager;
import org.codelibs.fess.app.pager.BoostDocPager;
import org.codelibs.fess.app.service.BoostDocumentRuleService;
import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
@ -42,7 +42,7 @@ public class AdminBoostdocAction extends FessAdminAction {
@Resource
private BoostDocumentRuleService boostDocumentRuleService;
@Resource
private BoostDocumentRulePager boostDocumentRulePager;
private BoostDocPager boostDocPager;
@Resource
private SystemHelper systemHelper;
@ -66,9 +66,9 @@ public class AdminBoostdocAction extends FessAdminAction {
@Execute
public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
pageNumber.ifPresent(num -> {
boostDocumentRulePager.setCurrentPageNumber(pageNumber.get());
boostDocPager.setCurrentPageNumber(pageNumber.get());
}).orElse(() -> {
boostDocumentRulePager.setCurrentPageNumber(0);
boostDocPager.setCurrentPageNumber(0);
});
return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> {
searchPaging(data, form);
@ -77,7 +77,7 @@ public class AdminBoostdocAction extends FessAdminAction {
@Execute
public HtmlResponse search(final SearchForm form) {
copyBeanToBean(form, boostDocumentRulePager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
copyBeanToBean(form, boostDocPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> {
searchPaging(data, form);
});
@ -85,17 +85,17 @@ public class AdminBoostdocAction extends FessAdminAction {
@Execute
public HtmlResponse reset(final SearchForm form) {
boostDocumentRulePager.clear();
boostDocPager.clear();
return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> {
searchPaging(data, form);
});
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocumentRulePager)); // page navi
data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocPager)); // page navi
// restore from pager
copyBeanToBean(boostDocumentRulePager, form, op -> op.include("id"));
copyBeanToBean(boostDocPager, form, op -> op.include("id"));
}
// ===================================================================================
@ -256,10 +256,10 @@ public class AdminBoostdocAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> {
data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocumentRulePager));
data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocPager));
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(boostDocumentRulePager, form, op -> op.include("id"));
copyBeanToBean(boostDocPager, form, op -> op.include("id"));
});
});
}

4
src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
View file

@ -24,7 +24,7 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.FileAuthenticationPager;
import org.codelibs.fess.app.pager.FileAuthPager;
import org.codelibs.fess.app.service.FileAuthenticationService;
import org.codelibs.fess.app.service.FileConfigService;
import org.codelibs.fess.app.web.CrudMode;
@ -54,7 +54,7 @@ public class AdminFileauthAction extends FessAdminAction {
@Resource
private FileAuthenticationService fileAuthenticationService;
@Resource
private FileAuthenticationPager fileAuthenticationPager;
private FileAuthPager fileAuthenticationPager;
@Resource
private SystemHelper systemHelper;

20
src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.web.admin.pathmap;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.PathMappingPager;
import org.codelibs.fess.app.pager.PathMapPager;
import org.codelibs.fess.app.service.PathMappingService;
import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
@ -45,7 +45,7 @@ public class AdminPathmapAction extends FessAdminAction {
@Resource
private PathMappingService pathMappingService;
@Resource
private PathMappingPager pathMappingPager;
private PathMapPager pathMapPager;
@Resource
private SystemHelper systemHelper;
@ -69,9 +69,9 @@ public class AdminPathmapAction extends FessAdminAction {
@Execute
public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
pageNumber.ifPresent(num -> {
pathMappingPager.setCurrentPageNumber(pageNumber.get());
pathMapPager.setCurrentPageNumber(pageNumber.get());
}).orElse(() -> {
pathMappingPager.setCurrentPageNumber(0);
pathMapPager.setCurrentPageNumber(0);
});
return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> {
searchPaging(data, form);
@ -80,7 +80,7 @@ public class AdminPathmapAction extends FessAdminAction {
@Execute
public HtmlResponse search(final SearchForm form) {
copyBeanToBean(form, pathMappingPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
copyBeanToBean(form, pathMapPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> {
searchPaging(data, form);
});
@ -88,17 +88,17 @@ public class AdminPathmapAction extends FessAdminAction {
@Execute
public HtmlResponse reset(final SearchForm form) {
pathMappingPager.clear();
pathMapPager.clear();
return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> {
searchPaging(data, form);
});
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("pathMappingItems", pathMappingService.getPathMappingList(pathMappingPager)); // page navi
data.register("pathMappingItems", pathMappingService.getPathMappingList(pathMapPager)); // page navi
// restore from pager
copyBeanToBean(pathMappingPager, form, op -> op.include("id"));
copyBeanToBean(pathMapPager, form, op -> op.include("id"));
}
// ===================================================================================
@ -258,10 +258,10 @@ public class AdminPathmapAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> {
data.register("pathMappingItems", pathMappingService.getPathMappingList(pathMappingPager)); // page navi
data.register("pathMappingItems", pathMappingService.getPathMappingList(pathMapPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(pathMappingPager, form, op -> op.include("id"));
copyBeanToBean(pathMapPager, form, op -> op.include("id"));
});
});
}

20
src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
View file

@ -24,7 +24,7 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.RequestHeaderPager;
import org.codelibs.fess.app.pager.ReqHeaderPager;
import org.codelibs.fess.app.service.RequestHeaderService;
import org.codelibs.fess.app.service.WebConfigService;
import org.codelibs.fess.app.web.CrudMode;
@ -55,7 +55,7 @@ public class AdminReqheaderAction extends FessAdminAction {
@Resource
private RequestHeaderService requestHeaderService;
@Resource
private RequestHeaderPager requestHeaderPager;
private ReqHeaderPager reqHeaderPager;
@Resource
protected WebConfigService webConfigService;
@Resource
@ -81,9 +81,9 @@ public class AdminReqheaderAction extends FessAdminAction {
@Execute
public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
pageNumber.ifPresent(num -> {
requestHeaderPager.setCurrentPageNumber(pageNumber.get());
reqHeaderPager.setCurrentPageNumber(pageNumber.get());
}).orElse(() -> {
requestHeaderPager.setCurrentPageNumber(0);
reqHeaderPager.setCurrentPageNumber(0);
});
return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> {
searchPaging(data, form);
@ -92,7 +92,7 @@ public class AdminReqheaderAction extends FessAdminAction {
@Execute
public HtmlResponse search(final SearchForm form) {
copyBeanToBean(form, requestHeaderPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
copyBeanToBean(form, reqHeaderPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> {
searchPaging(data, form);
});
@ -100,18 +100,18 @@ public class AdminReqheaderAction extends FessAdminAction {
@Execute
public HtmlResponse reset(final SearchForm form) {
requestHeaderPager.clear();
reqHeaderPager.clear();
return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> {
searchPaging(data, form);
});
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(requestHeaderPager)); // page navi
data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(reqHeaderPager)); // page navi
data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
// restore from pager
copyBeanToBean(requestHeaderPager, form, op -> op.include("id"));
copyBeanToBean(reqHeaderPager, form, op -> op.include("id"));
}
// ===================================================================================
@ -299,11 +299,11 @@ public class AdminReqheaderAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> {
data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(requestHeaderPager)); // page navi
data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(reqHeaderPager)); // page navi
data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(requestHeaderPager, form, op -> op.include("id"));
copyBeanToBean(reqHeaderPager, form, op -> op.include("id"));
});
});
}

4
src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.web.admin.scheduler;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.ScheduledJobPager;
import org.codelibs.fess.app.pager.SchedulerPager;
import org.codelibs.fess.app.service.ScheduledJobService;
import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
@ -48,7 +48,7 @@ public class AdminSchedulerAction extends FessAdminAction {
@Resource
private ScheduledJobService scheduledJobService;
@Resource
private ScheduledJobPager scheduledJobPager;
private SchedulerPager scheduledJobPager;
@Resource
private SystemHelper systemHelper;
@Resource

20
src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
View file

@ -24,7 +24,7 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.WebAuthenticationPager;
import org.codelibs.fess.app.pager.WebAuthPager;
import org.codelibs.fess.app.service.WebAuthenticationService;
import org.codelibs.fess.app.service.WebConfigService;
import org.codelibs.fess.app.web.CrudMode;
@ -54,7 +54,7 @@ public class AdminWebauthAction extends FessAdminAction {
@Resource
private WebAuthenticationService webAuthenticationService;
@Resource
private WebAuthenticationPager webAuthenticationPager;
private WebAuthPager webAuthPager;
@Resource
private SystemHelper systemHelper;
@ -81,9 +81,9 @@ public class AdminWebauthAction extends FessAdminAction {
@Execute
public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
pageNumber.ifPresent(num -> {
webAuthenticationPager.setCurrentPageNumber(pageNumber.get());
webAuthPager.setCurrentPageNumber(pageNumber.get());
}).orElse(() -> {
webAuthenticationPager.setCurrentPageNumber(0);
webAuthPager.setCurrentPageNumber(0);
});
return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> {
searchPaging(data, form);
@ -92,7 +92,7 @@ public class AdminWebauthAction extends FessAdminAction {
@Execute
public HtmlResponse search(final SearchForm form) {
copyBeanToBean(form, webAuthenticationPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
copyBeanToBean(form, webAuthPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> {
searchPaging(data, form);
});
@ -100,17 +100,17 @@ public class AdminWebauthAction extends FessAdminAction {
@Execute
public HtmlResponse reset(final SearchForm form) {
webAuthenticationPager.clear();
webAuthPager.clear();
return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> {
searchPaging(data, form);
});
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthenticationPager)); // page navi
data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthPager)); // page navi
data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
// restore from pager
copyBeanToBean(webAuthenticationPager, form, op -> op.include("id"));
copyBeanToBean(webAuthPager, form, op -> op.include("id"));
}
// ===================================================================================
@ -298,11 +298,11 @@ public class AdminWebauthAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> {
data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthenticationPager)); // page navi
data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthPager)); // page navi
data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(webAuthenticationPager, form, op -> op.include("id"));
copyBeanToBean(webAuthPager, form, op -> op.include("id"));
});
});
}