• R/O
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision162 (tree)
Time2015-12-14 23:08:33
Authort_nakayama1971

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/framework/pjWeb/WEB-INF/src/online/struts/chain/command/ViewProcessor.java (revision 161)
+++ trunk/framework/pjWeb/WEB-INF/src/online/struts/chain/command/ViewProcessor.java (revision 162)
@@ -169,12 +169,12 @@
169169 private void setItemValues(final UniForm to, final UniForm from, final RequestMapping rm) {
170170 ActionParameter ap = from.getActionParameter();
171171 if (ap.isRollbacked() || from.isReverse()) {
172- Set<String> rb = rm.getNoRollbackSet(ap.getAid());
172+ Set<String> set = rm.getExclusionSet(ap.getAid());
173173 to.putAll(from);
174- ap.setParameterTo(to, rb);
174+ ap.setParameterTo(to, set);
175175
176176 from.copyValueTo(to, from.getRollbackTo());
177- ap.setParameterTo(to.getModel(from.getRollbackTo()), rb);
177+ ap.setParameterTo(to.getModel(from.getRollbackTo()), set);
178178 } else {
179179 ap.setParameterTo(to);
180180 to.putAll(from);
--- trunk/framework/pjWeb/WEB-INF/src/online/struts/mapping/RequestMapping.java (revision 161)
+++ trunk/framework/pjWeb/WEB-INF/src/online/struts/mapping/RequestMapping.java (revision 162)
@@ -24,7 +24,7 @@
2424 import online.model.annotation.Aid;
2525 import online.model.annotation.Gid;
2626 import online.model.annotation.NoTransaction;
27-import online.model.annotation.NoRollback;
27+import online.model.annotation.NoRevert;
2828 import online.model.annotation.SessionEntry;
2929 import online.model.annotation.SessionExit;
3030 import online.model.annotation.SessionReserved;
@@ -237,14 +237,14 @@
237237 }
238238
239239 /**
240- * Rollback対象外ノテーション付項目名集合取得
240+ * 戻し対象外ノテーション付項目名集合取得
241241 * @param aid アクションID
242- * @return Rollback対象外アノテーション付項目名集合
242+ * @return 戻し対象外アノテーション付項目名集合
243243 */
244- public Set<String> getNoRollbackSet(final String aid) {
244+ public Set<String> getExclusionSet(final String aid) {
245245 Class<? extends Action> cls = getActionClass();
246- Set<String> ret = getFieldSet(cls, NoRollback.class);
247- NoRollback rb = getAnnotation(cls, aid, NoRollback.class);
246+ Set<String> ret = getFieldSet(cls, NoRevert.class);
247+ NoRevert rb = getAnnotation(cls, aid, NoRevert.class);
248248 if (rb != null) {
249249 ret.addAll(Arrays.asList(rb.value()));
250250 }
--- trunk/framework/fwOnline/src/online/model/annotation/NoRollback.java (revision 161)
+++ trunk/framework/fwOnline/src/online/model/annotation/NoRollback.java (nonexistent)
@@ -1,21 +0,0 @@
1-package online.model.annotation;
2-
3-import java.lang.annotation.Documented;
4-import java.lang.annotation.ElementType;
5-import java.lang.annotation.Retention;
6-import java.lang.annotation.RetentionPolicy;
7-import java.lang.annotation.Target;
8-
9-/**
10- * ロールバック対象外アノテーション
11- *
12- * @author Tadashi Nakayama
13- * @version 1.0.0
14- */
15-@Documented
16-@Retention(RetentionPolicy.RUNTIME)
17-@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD })
18-public @interface NoRollback {
19- /** 項目名 */
20- String[] value() default "[]";
21-}
--- trunk/framework/fwOnline/src/online/model/annotation/NoRevert.java (nonexistent)
+++ trunk/framework/fwOnline/src/online/model/annotation/NoRevert.java (revision 162)
@@ -0,0 +1,21 @@
1+package online.model.annotation;
2+
3+import java.lang.annotation.Documented;
4+import java.lang.annotation.ElementType;
5+import java.lang.annotation.Retention;
6+import java.lang.annotation.RetentionPolicy;
7+import java.lang.annotation.Target;
8+
9+/**
10+ * 戻し対象外アノテーション
11+ *
12+ * @author Tadashi Nakayama
13+ * @version 1.0.0
14+ */
15+@Documented
16+@Retention(RetentionPolicy.RUNTIME)
17+@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD })
18+public @interface NoRevert {
19+ /** 項目名 */
20+ String[] value() default "[]";
21+}