Commit: 2467 - ThoughtBase (svn)

Commit MetaInfo

• Revision: 2467 (tree)
• Time: 2022-10-20 19:36:20
• Author: t_nakayama1971

Log Message

(empty log message)

Change Summary

• modified: trunk/framework/pjWeb/src/main/java/project/web/generic/master/UpdateAction.java

Incremental Difference

--- trunk/framework/pjWeb/src/main/java/project/web/generic/master/UpdateAction.java	(revision 2466)
+++ trunk/framework/pjWeb/src/main/java/project/web/generic/master/UpdateAction.java	(revision 2467)
@@ -1,6 +1,7 @@
 package project.web.generic.master;
 
 import java.sql.Types;
+import java.util.ArrayList;
 
 import core.config.Factory;
 import core.util.bean.CamelCase;
@@ -8,6 +9,7 @@
 import online.annotation.SessionExit;
 import online.annotation.SessionReserved;
 import online.context.check.InputCheck;
+import online.context.check.ItemCheck;
 import online.struts.action.BrowseAction;
 import online.struts.action.UniForm;
 import project.check.TopMessage;
@@ -88,20 +90,15 @@
 	public String update(final UniForm model) {
 
 		// テーブル情報取得
-		final var dmd = Factory.create(DBMetaData.class);
-		final var info = dmd.getColumnInfo(this.table);
+		final var info = Factory.create(DBMetaData.class).getColumnInfo(this.table);
 
 		// 入力チェック
-		final var ro = InstanceFactory.create(RecordOperate.class, model);
 		final var ic = InstanceFactory.create(InputCheck.class, model);
 		ic.onError(new TopMessage("ZZ000000005"));
 		for (final var ent : info.entrySet()) {
 			final var name = CamelCase.convert(ent.getKey());
-			if (!ID.equals(name) && !ro.isMaintenance(name)) {
-				addChecks(name, ent.getValue(), ic);
-			}
+			ic.add(name, getChecks(model, name, ent.getValue()));
 		}
-
 		ic.add("FooCheck", new HankakuCheck());
 		ic.add("FooCheck2", new HankakuCheck());
 		ic.populate();
@@ -142,31 +139,38 @@
 	}
 
 	/**
-	 * 入力チェック追加
+	 * 入力チェック取得
 	 *
+	 * @param model 汎用モデル
 	 * @param name 項目名
 	 * @param info テーブル情報
-	 * @param ic 入力チェッカー
+	 * @return 入力チェック
 	 */
-	private void addChecks(final String name, final DBColumnInfo info, final InputCheck ic) {
-		// 必須入力
-		if (info.isNotNull()) {
-			ic.add(name, new MustCheck("ZZ000000006", info.getComment()));
+	private ItemCheck[] getChecks(final UniForm model, final String name, final DBColumnInfo info) {
+
+		final var checks = new ArrayList<ItemCheck>();
+
+		final var ro = InstanceFactory.create(RecordOperate.class, model);
+		if (!ID.equals(name) && !ro.isMaintenance(name)) {
+			// 必須入力
+			if (info.isNotNull()) {
+				checks.add(new MustCheck("ZZ000000006", info.getComment()));
+			}
+			// タイプと長さ
+			if (info.getType() == Types.CHAR) {
+				checks.add(new HanEisuCheck("ZZ000000007", info.getComment()));
+				checks.add(new LengthRangeCheck(0, info.getSize(), "ZZ000000008", info.getComment()));
+			} else if (info.getType() == Types.VARCHAR) {
+				checks.add(new LengthRangeCheck(0, info.getSize(), "ZZ000000009", info.getComment()));
+			} else if (info.getType() == Types.DATE) {
+				checks.add(new DateCheck("ZZ000000010", info.getComment()));
+			} else if (info.getType() == Types.TIMESTAMP) {
+				checks.add(new TimestampCheck("ZZ000000011", info.getComment()));
+			} else {
+				checks.add(new DecimalCheck(info.getSize(), info.getScale(), "ZZ000000012", info.getComment()));
+			}
 		}
 
-		// タイプと長さ
-		if (info.getType() == Types.CHAR) {
-			ic.add(name, new HanEisuCheck("ZZ000000007", info.getComment()));
-			ic.add(name, new LengthRangeCheck(0, info.getSize(), "ZZ000000008", info.getComment()));
-		} else if (info.getType() == Types.VARCHAR) {
-			ic.add(name, new LengthRangeCheck(0, info.getSize(), "ZZ000000009", info.getComment()));
-		} else if (info.getType() == Types.DATE) {
-			ic.add(name, new DateCheck("ZZ000000010", info.getComment()));
-		} else if (info.getType() == Types.TIMESTAMP) {
-			ic.add(name, new TimestampCheck("ZZ000000011", info.getComment()));
-		} else {
-			ic.add(name, new DecimalCheck(
-					info.getSize(), info.getScale(), "ZZ000000012", info.getComment()));
-		}
+		return checks.toArray(ItemCheck[]::new);
 	}
 }