| Revision | 162 (tree) |
|---|---|
| Time | 2015-12-14 23:08:33 |
| Author | t_nakayama1971 |
(empty log message)
| @@ -169,12 +169,12 @@ | ||
| 169 | 169 | private void setItemValues(final UniForm to, final UniForm from, final RequestMapping rm) { |
| 170 | 170 | ActionParameter ap = from.getActionParameter(); |
| 171 | 171 | if (ap.isRollbacked() || from.isReverse()) { |
| 172 | - Set<String> rb = rm.getNoRollbackSet(ap.getAid()); | |
| 172 | + Set<String> set = rm.getExclusionSet(ap.getAid()); | |
| 173 | 173 | to.putAll(from); |
| 174 | - ap.setParameterTo(to, rb); | |
| 174 | + ap.setParameterTo(to, set); | |
| 175 | 175 | |
| 176 | 176 | from.copyValueTo(to, from.getRollbackTo()); |
| 177 | - ap.setParameterTo(to.getModel(from.getRollbackTo()), rb); | |
| 177 | + ap.setParameterTo(to.getModel(from.getRollbackTo()), set); | |
| 178 | 178 | } else { |
| 179 | 179 | ap.setParameterTo(to); |
| 180 | 180 | to.putAll(from); |
| @@ -24,7 +24,7 @@ | ||
| 24 | 24 | import online.model.annotation.Aid; |
| 25 | 25 | import online.model.annotation.Gid; |
| 26 | 26 | import online.model.annotation.NoTransaction; |
| 27 | -import online.model.annotation.NoRollback; | |
| 27 | +import online.model.annotation.NoRevert; | |
| 28 | 28 | import online.model.annotation.SessionEntry; |
| 29 | 29 | import online.model.annotation.SessionExit; |
| 30 | 30 | import online.model.annotation.SessionReserved; |
| @@ -237,14 +237,14 @@ | ||
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | /** |
| 240 | - * Rollback対象外ノテーション付項目名集合取得 | |
| 240 | + * 戻し対象外ノテーション付項目名集合取得 | |
| 241 | 241 | * @param aid アクションID |
| 242 | - * @return Rollback対象外アノテーション付項目名集合 | |
| 242 | + * @return 戻し対象外アノテーション付項目名集合 | |
| 243 | 243 | */ |
| 244 | - public Set<String> getNoRollbackSet(final String aid) { | |
| 244 | + public Set<String> getExclusionSet(final String aid) { | |
| 245 | 245 | 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); | |
| 248 | 248 | if (rb != null) { |
| 249 | 249 | ret.addAll(Arrays.asList(rb.value())); |
| 250 | 250 | } |
| @@ -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 | -} |
| @@ -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 | +} |