OSDN > Developer > t_nakayama1971 > Chamber > ThoughtBase > Commit

ThoughtBase

(Original repository, No fork origin)

R/O
SSH
HTTPS

Commit

Commit MetaInfo

Revision	1725 (tree)
Time	2018-08-29 23:45:34
Author	t_nakayama1971

Log Message

(empty log message)

Change Summary

modified: trunk/framework/pjWeb/src/online/struts/action/BrowseAction.java (diff)
modified: trunk/framework/pjWeb/src/online/struts/action/PerformAction.java (diff)
modified: trunk/framework/pjWeb/src/online/struts/action/RestAction.java (diff)
modified: trunk/framework/pjWeb/src/online/struts/chain/command/RequestCommand.java (diff)
modified: trunk/framework/pjWeb/src/project/web/DownloadAction.java (diff)
modified: trunk/framework/pjWeb/src/project/web/auth/LogonAction.java (diff)
modified: trunk/framework/pjWeb/src/project/web/generic/csv/CsvAction.java (diff)
modified: trunk/framework/pjWeb/src/project/web/job/DownloadJobFile.java (diff)

Incremental Difference

--- trunk/framework/pjWeb/src/online/struts/action/BrowseAction.java (revision 1724)

+++ trunk/framework/pjWeb/src/online/struts/action/BrowseAction.java (revision 1725)

		@@ -38,7 +38,7 @@
38	38	* @return 処理結果
39	39	*/
40	40	@Override
41		- public default String perform(final RequestMapping mapping, final UniForm uf,
	41	+ default String perform(final RequestMapping mapping, final UniForm uf,
42	42	final HttpServletRequest request, final HttpServletResponse response) {
43	43	try {
44	44	// 実処理

--- trunk/framework/pjWeb/src/online/struts/action/PerformAction.java (revision 1724)

+++ trunk/framework/pjWeb/src/online/struts/action/PerformAction.java (revision 1725)

		@@ -36,7 +36,7 @@
36	36	* javax.servlet.http.HttpServletResponse)
37	37	*/
38	38	@Override
39		- public default ActionForward execute(final ActionMapping mapping, final ActionForm form,
	39	+ default ActionForward execute(final ActionMapping mapping, final ActionForm form,
40	40	final HttpServletRequest request, final HttpServletResponse response) {
41	41	if (!RequestMapping.class.isInstance(mapping)) {
42	42	LogManager.getLogger().error(mapping);

		@@ -70,6 +70,6 @@
70	70	* @param response HttpServletResponseオブジェクト
71	71	* @return 処理結果
72	72	*/
73		- public abstract String perform(RequestMapping mapping, UniForm uf,
	73	+ String perform(RequestMapping mapping, UniForm uf,
74	74	HttpServletRequest request, HttpServletResponse response);
75	75	}

--- trunk/framework/pjWeb/src/online/struts/action/RestAction.java (revision 1724)

+++ trunk/framework/pjWeb/src/online/struts/action/RestAction.java (revision 1725)

		@@ -31,7 +31,7 @@
31	31	* javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
32	32	*/
33	33	@Override
34		- public default String perform(final RequestMapping mapping, final UniForm uf,
	34	+ default String perform(final RequestMapping mapping, final UniForm uf,
35	35	final HttpServletRequest request, final HttpServletResponse response) {
36	36
37	37	FilterUtil.setNoRedirect(request);

--- trunk/framework/pjWeb/src/online/struts/chain/command/RequestCommand.java (revision 1724)

+++ trunk/framework/pjWeb/src/online/struts/chain/command/RequestCommand.java (revision 1725)

		@@ -23,7 +23,7 @@
23	23	* #execute(org.apache.struts.chain.contexts.ActionContext)
24	24	*/
25	25	@Override
26		- public default Processing execute(final ActionContext<String, Object> context) {
	26	+ default Processing execute(final ActionContext<String, Object> context) {
27	27	// キャスト
28	28	if (!ServletActionContext.class.isInstance(context)) {
29	29	throw new IllegalStateException(String.valueOf(context));

		@@ -51,7 +51,7 @@
51	51	* @param sac コンテキスト
52	52	* @return 例外が発生していた場合 true を返す。
53	53	*/
54		- public static boolean isException(final ServletActionContext sac) {
	54	+ static boolean isException(final ServletActionContext sac) {
55	55	return sac.getRequest().getAttribute(Globals.EXCEPTION_KEY) != null;
56	56	}
57	57

		@@ -62,7 +62,7 @@
62	62	* @param cls 確認クラス
63	63	* @return 初回の場合 true を返す。
64	64	*/
65		- public static boolean isFirst(final ServletActionContext sac,
	65	+ static boolean isFirst(final ServletActionContext sac,
66	66	final Class<? extends ActionCommand<String, Object, ActionContext<String, Object>>> cls) {
67	67	final var clazz = cls.getName();
68	68	if (sac.getRequest().getAttribute(clazz) == null) {

		@@ -80,6 +80,5 @@
80	80	* @param uf 汎用フォーム
81	81	* @return 処理結果
82	82	*/
83		- public abstract Processing command(
84		- ServletActionContext sac, RequestMapping mapping, UniForm uf);
	83	+ Processing command(ServletActionContext sac, RequestMapping mapping, UniForm uf);
85	84	}

--- trunk/framework/pjWeb/src/project/web/DownloadAction.java (revision 1724)

+++ trunk/framework/pjWeb/src/project/web/DownloadAction.java (revision 1725)

		@@ -30,7 +30,7 @@
30	30	* @param request HttpServletRequestオブジェクト
31	31	* @param response HttpServletResponseオブジェクト
32	32	*/
33		- public default void setHttpHeader(final String fname, final String name,
	33	+ default void setHttpHeader(final String fname, final String name,
34	34	final HttpServletRequest request, final HttpServletResponse response) {
35	35	// レスポンスヘッダ設定
36	36	final var mime = request.getServletContext().getMimeType(fname);

		@@ -55,7 +55,7 @@
55	55	* @param model UniModel
56	56	* @return CSVヘッダ必要時 true を返す。
57	57	*/
58		- public default boolean needsTitle(final UniModel model) {
	58	+ default boolean needsTitle(final UniModel model) {
59	59	return "present".equalsIgnoreCase(model.getString("header"));
60	60	}
61	61

		@@ -65,7 +65,7 @@
65	65	* @param val ヘッダ有無フラグ
66	66	* @return CSVヘッダ文字列
67	67	*/
68		- public default String toCsvHeaderQuery(final boolean val) {
	68	+ default String toCsvHeaderQuery(final boolean val) {
69	69	return val ? "header=present" : "header=absent";
70	70	}
71	71

		@@ -76,7 +76,7 @@
76	76	* @param request リクエスト
77	77	* @return ダウンロード名
78	78	*/
79		- public default String toDownloadName(final String name, final HttpServletRequest request) {
	79	+ default String toDownloadName(final String name, final HttpServletRequest request) {
80	80
81	81	final Function<String, String> sjis = s -> {
82	82	final String nm = MojiUtil.correctGarbled(s, MojiUtil.CHARSET_W31J);

--- trunk/framework/pjWeb/src/project/web/auth/LogonAction.java (revision 1724)

+++ trunk/framework/pjWeb/src/project/web/auth/LogonAction.java (revision 1725)

		@@ -34,7 +34,7 @@
34	34	* @param uf 汎用フォーム
35	35	* @param session セションオブジェクト
36	36	*/
37		- public default void setLogonInfoToSession(final SessionInfo li,
	37	+ default void setLogonInfoToSession(final SessionInfo li,
38	38	final UniForm uf, final HttpSession session) {
39	39	// ログオン時間
40	40	session.setAttribute(TAG_LOGON_TIME, li.getLogonDateTime());

--- trunk/framework/pjWeb/src/project/web/generic/csv/CsvAction.java (revision 1724)

+++ trunk/framework/pjWeb/src/project/web/generic/csv/CsvAction.java (revision 1725)

		@@ -50,7 +50,7 @@
50	50	* @param model 汎用モデル
51	51	* @return 選択結果
52	52	*/
53		- public default boolean select(final String query, final UniForm model) {
	53	+ default boolean select(final String query, final UniForm model) {
54	54	final var ql = InstanceFactory.create(QueryService.class, model);
55	55	ql.setQueryFile(query);
56	56	final var ret = ql.search();

		@@ -65,7 +65,7 @@
65	65	* @param model 汎用モデル
66	66	* @return 処理件数
67	67	*/
68		- public default int update(final String query, final UniForm model) {
	68	+ default int update(final String query, final UniForm model) {
69	69	final var ql = InstanceFactory.create(UpdateService.class, model);
70	70	ql.setQueryFile(query);
71	71	try {

		@@ -83,7 +83,7 @@
83	83	* @param model 汎用モデル
84	84	* @param item サイズ判定項目名
85	85	*/
86		- public default void updateArray(final String query, final UniForm model, final String item) {
	86	+ default void updateArray(final String query, final UniForm model, final String item) {
87	87	final var ql = InstanceFactory.create(UpdateService.class, model);
88	88	ql.setQueryFile(query);
89	89	try {

		@@ -103,7 +103,7 @@
103	103	* @param model 汎用モデル
104	104	* @return スキーマ名
105	105	*/
106		- public default String getSchema(final UniForm model) {
	106	+ default String getSchema(final UniForm model) {
107	107	if (select("project.svc.generic.csv.extract.SelectQuery", model)) {
108	108	return model.getString("SchemaName");
109	109	}

		@@ -116,7 +116,7 @@
116	116	* @param model 汎用モデル
117	117	* @return クエリビルダ
118	118	*/
119		- public default QueryBuilder getQueryBuilder(final UniForm model) {
	119	+ default QueryBuilder getQueryBuilder(final UniForm model) {
120	120	final var qb = new QueryBuilder(model.getString(QUERY_FROM),
121	121	model.getString(QUERY_WHERE), model.getStringArray(ITEM_VALUE),
122	122	model.getStringArray(ITEM_LABEL));

--- trunk/framework/pjWeb/src/project/web/job/DownloadJobFile.java (revision 1724)

+++ trunk/framework/pjWeb/src/project/web/job/DownloadJobFile.java (revision 1725)

		@@ -44,7 +44,7 @@
44	44	* @param request HttpServletRequestオブジェクト
45	45	* @return 処理結果
46	46	*/
47		- public default String get(final UniForm uf,
	47	+ default String get(final UniForm uf,
48	48	final HttpServletResponse response, final HttpServletRequest request) {
49	49
50	50	final var ic = InstanceFactory.create(InputCheck.class, uf);

		@@ -89,7 +89,7 @@
89	89	* @param job ジョブ情報
90	90	* @return ダウンロード可能の場合 true を返す。
91	91	*/
92		- public abstract boolean canDownload(UniForm model, Job job);
	92	+ boolean canDownload(UniForm model, Job job);
93	93
94	94	/**
95	95	* ファイルダウンロード処理

		@@ -99,7 +99,7 @@
99	99	* @param request HttpServletRequestオブジェクト
100	100	* @param response HttpServletResponseオブジェクト
101	101	*/
102		- public abstract void fileDownload(Job job, JobFile finfo,
	102	+ void fileDownload(Job job, JobFile finfo,
103	103	HttpServletRequest request, HttpServletResponse response);
104	104
105	105	/**

		@@ -108,7 +108,7 @@
108	108	* @param jobseq ジョブ連番
109	109	* @return ジョブ情報
110	110	*/
111		- public static Job getJobInfo(final Number jobseq) {
	111	+ static Job getJobInfo(final Number jobseq) {
112	112	if (jobseq != null) {
113	113	try (var conn = JdbcSource.getConnection()) {
114	114	final var js = Factory.create(JobStatus.class);

		@@ -126,7 +126,7 @@
126	126	* @param fileseq ファイル連番
127	127	* @return ファイル情報
128	128	*/
129		- public static JobFile getFileInfo(
	129	+ static JobFile getFileInfo(
130	130	final Number jobseq, final Number dtlseq, final Number fileseq) {
131	131	if (jobseq == null) {
132	132	return null;