OSDN > Developer > t_nakayama1971 > Chamber > ThoughtBase > Commit

ThoughtBase

(Original repository, No fork origin)

R/O
SSH
HTTPS

Commit

Commit MetaInfo

Revision	2480 (tree)
Time	2022-11-05 11:04:32
Author	t_nakayama1971

Log Message

(empty log message)

Change Summary

modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/DecimalCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/EmailCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/HanEisuCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/HanKatakanaCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/HankakuCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/LongNumeralCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/MojiReferenceCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/MonthCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/NumberCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/NumeralCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/PostcodeCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/TimeCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/TimestampCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/ZenKatakanaCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/attribute/ZenkakuCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/existence/BeingCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/existence/ElementCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/existence/EmptyCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/master/CodeCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/master/MasterCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/master/NoMasterCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/range/ByteRangeCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/range/LengthRangeCheck.java (diff)
modified: trunk/framework/pjWeb/src/main/java/project/check/range/NumeralRangeCheck.java (diff)

Incremental Difference

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/DecimalCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/DecimalCheck.java (revision 2480)

		@@ -59,7 +59,7 @@
59	59	*/
60	60	@Override
61	61	public void check(final String... items) {
62		- super.check(this.mid, this.params, items,
	62	+ check(this.mid, this.params, items,
63	63	val -> CheckUtil.isDecimal(val, this.number, this.decimal)
64	64	).ifPresent(this::throwKeepCheckException);
65	65	}

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/EmailCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/EmailCheck.java (revision 2480)

		@@ -41,7 +41,6 @@
41	41	*/
42	42	@Override
43	43	public void check(final String... items) {
44		- super.check(this.mid, this.params,
45		- items, CheckUtil::isEmailAddress).ifPresent(this::throwKeepCheckException);
	44	+ check(this.mid, this.params, items, CheckUtil::isEmailAddress).ifPresent(this::throwKeepCheckException);
46	45	}
47	46	}

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/HanEisuCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/HanEisuCheck.java (revision 2480)

		@@ -41,7 +41,6 @@
41	41	*/
42	42	@Override
43	43	public void check(final String... items) {
44		- super.check(this.mid, this.params,
45		- items, CheckUtil::isHanEisu).ifPresent(this::throwKeepCheckException);
	44	+ check(this.mid, this.params, items, CheckUtil::isHanEisu).ifPresent(this::throwKeepCheckException);
46	45	}
47	46	}

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/HanKatakanaCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/HanKatakanaCheck.java (revision 2480)

		@@ -41,7 +41,6 @@
41	41	*/
42	42	@Override
43	43	public void check(final String... items) {
44		- super.check(this.mid, this.params,
45		- items, CheckUtil::hasHanKana).ifPresent(this::throwKeepCheckException);
	44	+ check(this.mid, this.params, items, CheckUtil::hasHanKana).ifPresent(this::throwKeepCheckException);
46	45	}
47	46	}

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/HankakuCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/HankakuCheck.java (revision 2480)

		@@ -41,7 +41,6 @@
41	41	*/
42	42	@Override
43	43	public void check(final String... items) {
44		- super.check(this.mid, this.params,
45		- items, CheckUtil::isHankaku).ifPresent(this::throwKeepCheckException);
	44	+ check(this.mid, this.params, items, CheckUtil::isHankaku).ifPresent(this::throwKeepCheckException);
46	45	}
47	46	}

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/LongNumeralCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/LongNumeralCheck.java (revision 2480)

		@@ -45,8 +45,7 @@
45	45	*/
46	46	@Override
47	47	public void check(final String... items) {
48		- super.check(this.mid, this.params,
49		- items, CheckUtil::isLong).ifPresent(this::throwKeepCheckException);
	48	+ check(this.mid, this.params, items, CheckUtil::isLong).ifPresent(this::throwKeepCheckException);
50	49	}
51	50
52	51	/**

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/MojiReferenceCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/MojiReferenceCheck.java (revision 2480)

		@@ -69,8 +69,7 @@
69	69	*/
70	70	@Override
71	71	public void check(final String... items) {
72		- super.check(this.mid, this.params,
73		- items, this::isMojiReference).ifPresent(this::throwKeepCheckException);
	72	+ check(this.mid, this.params, items, this::isMojiReference).ifPresent(this::throwKeepCheckException);
74	73	}
75	74
76	75	/**

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/MonthCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/MonthCheck.java (revision 2480)

		@@ -41,7 +41,6 @@
41	41	*/
42	42	@Override
43	43	public void check(final String... items) {
44		- super.check(this.mid, this.params,
45		- items, CheckUtil::isDateTime).ifPresent(this::throwKeepCheckException);
	44	+ check(this.mid, this.params, items, CheckUtil::isDateTime).ifPresent(this::throwKeepCheckException);
46	45	}
47	46	}

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/NumberCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/NumberCheck.java (revision 2480)

		@@ -41,7 +41,6 @@
41	41	*/
42	42	@Override
43	43	public void check(final String... items) {
44		- super.check(this.mid, this.params,
45		- items, CheckUtil::isNumber).ifPresent(this::throwKeepCheckException);
	44	+ check(this.mid, this.params, items, CheckUtil::isNumber).ifPresent(this::throwKeepCheckException);
46	45	}
47	46	}

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/NumeralCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/NumeralCheck.java (revision 2480)

		@@ -45,8 +45,7 @@
45	45	*/
46	46	@Override
47	47	public void check(final String... items) {
48		- super.check(this.mid, this.params,
49		- items, CheckUtil::isInteger).ifPresent(this::throwKeepCheckException);
	48	+ check(this.mid, this.params, items, CheckUtil::isInteger).ifPresent(this::throwKeepCheckException);
50	49	}
51	50
52	51	/**

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/PostcodeCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/PostcodeCheck.java (revision 2480)

		@@ -41,7 +41,6 @@
41	41	*/
42	42	@Override
43	43	public void check(final String... items) {
44		- super.check(this.mid, this.params,
45		- items, CheckUtil::isPostcode).ifPresent(this::throwKeepCheckException);
	44	+ check(this.mid, this.params, items, CheckUtil::isPostcode).ifPresent(this::throwKeepCheckException);
46	45	}
47	46	}

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/TimeCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/TimeCheck.java (revision 2480)

		@@ -46,8 +46,7 @@
46	46	*/
47	47	@Override
48	48	public void check(final String... items) {
49		- super.check(this.mid, this.params,
50		- items, this::isTime).ifPresent(this::throwKeepCheckException);
	49	+ check(this.mid, this.params, items, this::isTime).ifPresent(this::throwKeepCheckException);
51	50	}
52	51
53	52	/**

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/TimestampCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/TimestampCheck.java (revision 2480)

		@@ -46,8 +46,7 @@
46	46	*/
47	47	@Override
48	48	public void check(final String... items) {
49		- super.check(this.mid, this.params,
50		- items, CheckUtil::isDateTime).ifPresent(this::throwKeepCheckException);
	49	+ check(this.mid, this.params, items, CheckUtil::isDateTime).ifPresent(this::throwKeepCheckException);
51	50	}
52	51
53	52	/**

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/ZenKatakanaCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/ZenKatakanaCheck.java (revision 2480)

		@@ -41,7 +41,6 @@
41	41	*/
42	42	@Override
43	43	public void check(final String... items) {
44		- super.check(this.mid, this.params,
45		- items, CheckUtil::isZenKatakana).ifPresent(this::throwKeepCheckException);
	44	+ check(this.mid, this.params, items, CheckUtil::isZenKatakana).ifPresent(this::throwKeepCheckException);
46	45	}
47	46	}

--- trunk/framework/pjWeb/src/main/java/project/check/attribute/ZenkakuCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/attribute/ZenkakuCheck.java (revision 2480)

		@@ -41,7 +41,6 @@
41	41	*/
42	42	@Override
43	43	public void check(final String... items) {
44		- super.check(this.mid, this.params,
45		- items, CheckUtil::isZenkaku).ifPresent(this::throwKeepCheckException);
	44	+ check(this.mid, this.params, items, CheckUtil::isZenkaku).ifPresent(this::throwKeepCheckException);
46	45	}
47	46	}

--- trunk/framework/pjWeb/src/main/java/project/check/existence/BeingCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/existence/BeingCheck.java (revision 2480)

		@@ -43,8 +43,7 @@
43	43	*/
44	44	@Override
45	45	public void check(final String... items) {
46		- super.check(this.mid, this.params, items,
47		- Predicate.not(val -> Objects.toString(val, "").isEmpty())
48		- ).ifPresent(this::throwKeepCheckException);
	46	+ check(this.mid, this.params, items, Predicate.not(val -> Objects.toString(val, "").isEmpty())).
	47	+ ifPresent(this::throwKeepCheckException);
49	48	}
50	49	}

--- trunk/framework/pjWeb/src/main/java/project/check/existence/ElementCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/existence/ElementCheck.java (revision 2480)

		@@ -51,7 +51,7 @@
51	51	*/
52	52	@Override
53	53	public void check(final String... items) {
54		- super.check(this.mid, this.params, items,
	54	+ check(this.mid, this.params, items,
55	55	val -> Objects.toString(val, "").isEmpty()
56	56	\|\| Stream.of(this.array).anyMatch(Predicate.isEqual(val))
57	57	).ifPresent(this::throwKeepCheckException);

--- trunk/framework/pjWeb/src/main/java/project/check/existence/EmptyCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/existence/EmptyCheck.java (revision 2480)

		@@ -42,7 +42,7 @@
42	42	*/
43	43	@Override
44	44	public void check(final String... items) {
45		- super.check(this.mid, this.params, items, val -> Objects.toString(val, "").isEmpty()
46		- ).ifPresent(this::throwKeepCheckException);
	45	+ check(this.mid, this.params, items, val -> Objects.toString(val, "").isEmpty()).
	46	+ ifPresent(this::throwKeepCheckException);
47	47	}
48	48	}

--- trunk/framework/pjWeb/src/main/java/project/check/master/CodeCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/master/CodeCheck.java (revision 2480)

		@@ -54,7 +54,7 @@
54	54	public void check(final String... items) {
55	55
56	56	final var ck = Factory.create(CodeKeeper.class);
57		- super.check(this.mid, this.params, items,
	57	+ check(this.mid, this.params, items,
58	58	val -> Objects.toString(val, "").isEmpty() \|\| ck.isValidCode(this.kubun, val)
59	59	).ifPresent(this::throwNoMoreCheckException);
60	60	}

--- trunk/framework/pjWeb/src/main/java/project/check/master/MasterCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/master/MasterCheck.java (revision 2480)

		@@ -42,8 +42,7 @@
42	42	ql.setSessionUser(getSessionUser());
43	43	ql.setQueryFile(this.query);
44	44
45		- super.check(this.mid, null, items,
46		- val -> Objects.toString(val, "").isEmpty() \|\| ql.search()
47		- ).ifPresent(this::throwNoMoreCheckException);
	45	+ check(this.mid, null, items, val -> Objects.toString(val, "").isEmpty() \|\| ql.search()).
	46	+ ifPresent(this::throwNoMoreCheckException);
48	47	}
49	48	}

--- trunk/framework/pjWeb/src/main/java/project/check/master/NoMasterCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/master/NoMasterCheck.java (revision 2480)

		@@ -42,7 +42,7 @@
42	42	ql.setSessionUser(getSessionUser());
43	43	ql.setQueryFile(this.query);
44	44
45		- super.check(this.mid, null, items,
	45	+ check(this.mid, null, items,
46	46	val -> Objects.toString(val, "").isEmpty() \|\| !ql.search()
47	47	).ifPresent(this::throwNoMoreCheckException);
48	48	}

--- trunk/framework/pjWeb/src/main/java/project/check/range/ByteRangeCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/range/ByteRangeCheck.java (revision 2480)

		@@ -65,7 +65,7 @@
65	65	@Override
66	66	public void check(final String... items) {
67	67	final var len = Math.min(this.maxlen, Integer.MAX_VALUE - 1);
68		- super.check(this.mid, this.params, items,
	68	+ check(this.mid, this.params, items,
69	69	val -> Objects.toString(val, "").isEmpty()
70	70	\|\| CheckUtil.isLessByte(val, len + 1, this.enc)
71	71	&& !CheckUtil.isLessByte(val, this.minlen, this.enc)

--- trunk/framework/pjWeb/src/main/java/project/check/range/LengthRangeCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/range/LengthRangeCheck.java (revision 2480)

		@@ -56,7 +56,7 @@
56	56	*/
57	57	@Override
58	58	public void check(final String... items) {
59		- super.check(this.mid, this.params, items,
	59	+ check(this.mid, this.params, items,
60	60	val -> Objects.toString(val, "").isEmpty()
61	61	\|\| this.minlen <= val.length() && val.length() <= this.maxlen
62	62	).ifPresent(this::throwKeepCheckException);

--- trunk/framework/pjWeb/src/main/java/project/check/range/NumeralRangeCheck.java (revision 2479)

+++ trunk/framework/pjWeb/src/main/java/project/check/range/NumeralRangeCheck.java (revision 2480)

		@@ -54,7 +54,7 @@
54	54	*/
55	55	@Override
56	56	public void check(final String... items) {
57		- super.check(this.mid, this.params, items,
	57	+ check(this.mid, this.params, items,
58	58	val -> {
59	59	final var num = NumberUtil.toLong(val);
60	60	return num == null \|\| this.minval <= num && num <= this.maxval;