| Revision | 165 (tree) |
|---|---|
| Time | 2015-12-21 20:46:32 |
| Author | t_nakayama1971 |
(empty log message)
| @@ -66,7 +66,7 @@ | ||
| 66 | 66 | * @return 文字列 |
| 67 | 67 | */ |
| 68 | 68 | public String string(final String key) { |
| 69 | - checkSize(key); | |
| 69 | + checkIndex(key); | |
| 70 | 70 | return ModelUtil.getValueAsString(this.model, key, this.index); |
| 71 | 71 | } |
| 72 | 72 |
| @@ -77,7 +77,7 @@ | ||
| 77 | 77 | * @return 数値 |
| 78 | 78 | */ |
| 79 | 79 | public <T extends Number> T number(final String key) { |
| 80 | - checkSize(key); | |
| 80 | + checkIndex(key); | |
| 81 | 81 | return Factory.cast(this.model.getNumberArray(key)[this.index]); |
| 82 | 82 | } |
| 83 | 83 |
| @@ -88,7 +88,7 @@ | ||
| 88 | 88 | * @return 日時 |
| 89 | 89 | */ |
| 90 | 90 | public <T extends Date> T date(final String key) { |
| 91 | - checkSize(key); | |
| 91 | + checkIndex(key); | |
| 92 | 92 | return Factory.cast(this.model.getDateArray(key)[this.index]); |
| 93 | 93 | } |
| 94 | 94 |
| @@ -98,7 +98,7 @@ | ||
| 98 | 98 | * @return 真偽値 |
| 99 | 99 | */ |
| 100 | 100 | public Boolean bool(final String key) { |
| 101 | - checkSize(key); | |
| 101 | + checkIndex(key); | |
| 102 | 102 | return this.model.getBooleanArray(key)[this.index]; |
| 103 | 103 | } |
| 104 | 104 |
| @@ -155,7 +155,7 @@ | ||
| 155 | 155 | * @param val 値 |
| 156 | 156 | */ |
| 157 | 157 | public void set(final String key, final String val) { |
| 158 | - checkSize(key); | |
| 158 | + checkIndex(key); | |
| 159 | 159 | String[] vals = this.model.getStringArray(key); |
| 160 | 160 | vals[this.index] = val; |
| 161 | 161 | } |
| @@ -166,7 +166,7 @@ | ||
| 166 | 166 | * @param val 値 |
| 167 | 167 | */ |
| 168 | 168 | public void set(final String key, final Number val) { |
| 169 | - checkSize(key); | |
| 169 | + checkIndex(key); | |
| 170 | 170 | Number[] vals = this.model.getNumberArray(key); |
| 171 | 171 | vals[this.index] = val; |
| 172 | 172 | } |
| @@ -177,7 +177,7 @@ | ||
| 177 | 177 | * @param val 値 |
| 178 | 178 | */ |
| 179 | 179 | public void set(final String key, final Date val) { |
| 180 | - checkSize(key); | |
| 180 | + checkIndex(key); | |
| 181 | 181 | Date[] vals = this.model.getDateArray(key); |
| 182 | 182 | vals[this.index] = val; |
| 183 | 183 | } |
| @@ -188,7 +188,7 @@ | ||
| 188 | 188 | * @param val 値 |
| 189 | 189 | */ |
| 190 | 190 | public void set(final String key, final Boolean val) { |
| 191 | - checkSize(key); | |
| 191 | + checkIndex(key); | |
| 192 | 192 | Boolean[] vals = this.model.getBooleanArray(key); |
| 193 | 193 | vals[this.index] = val; |
| 194 | 194 | } |
| @@ -197,10 +197,10 @@ | ||
| 197 | 197 | * 配列長確認 |
| 198 | 198 | * @param key 項目名 |
| 199 | 199 | */ |
| 200 | - private void checkSize(final String key) { | |
| 201 | - if (this.model.getArraySize(key) != this.size) { | |
| 202 | - throw new LogicalException("Invalid Length.[" | |
| 203 | - + key + ":" + this.model.getArraySize(key) + "(" + this.size + ")]"); | |
| 200 | + private void checkIndex(final String key) { | |
| 201 | + if (this.model.getArraySize(key) <= this.index) { | |
| 202 | + throw new LogicalException("Invalid Index.[size of " | |
| 203 | + + key + ":" + this.model.getArraySize(key) + " index:" + this.index + "]"); | |
| 204 | 204 | } |
| 205 | 205 | } |
| 206 | 206 |