| Revision | 168 (tree) |
|---|---|
| Time | 2015-12-23 16:27:37 |
| Author | t_nakayama1971 |
(empty log message)
| @@ -53,7 +53,7 @@ | ||
| 53 | 53 | if (String.class.isInstance(property)) { |
| 54 | 54 | if (base == null || ViewMap.class.isInstance(base)) { |
| 55 | 55 | return doViewMap(context, base, property); |
| 56 | - } else if (Band.class.isInstance(base)) { | |
| 56 | + } else if (ViewBand.class.isInstance(base)) { | |
| 57 | 57 | return doBand(context, base, property); |
| 58 | 58 | } |
| 59 | 59 | } |
| @@ -74,7 +74,7 @@ | ||
| 74 | 74 | String key = String.class.cast(property); |
| 75 | 75 | if ("band".equals(key)) { |
| 76 | 76 | context.setPropertyResolved(true); |
| 77 | - return new Band(map); | |
| 77 | + return new ViewBand(map); | |
| 78 | 78 | } else if (page.getAttributesScope(key) == 0 || map.containsKey(key)) { |
| 79 | 79 | context.setPropertyResolved(true); |
| 80 | 80 | return map.get(key); |
| @@ -92,9 +92,9 @@ | ||
| 92 | 92 | */ |
| 93 | 93 | private Object doBand(final ELContext context, final Object base, final Object property) { |
| 94 | 94 | context.setPropertyResolved(true); |
| 95 | - ViewMap map = Band.class.cast(base).getViewMap(); | |
| 95 | + ViewMap map = ViewBand.class.cast(base).getViewMap(); | |
| 96 | 96 | if (ViewMap.class.isInstance(map.get(property))) { |
| 97 | - return new Band(ViewMap.class.cast(map.get(property))); | |
| 97 | + return new ViewBand(ViewMap.class.cast(map.get(property))); | |
| 98 | 98 | } |
| 99 | 99 | return new BandList(map, String.class.cast(property)); |
| 100 | 100 | } |
| @@ -138,7 +138,7 @@ | ||
| 138 | 138 | * |
| 139 | 139 | * @author Tadashi Nakayama |
| 140 | 140 | */ |
| 141 | - private static final class Band { | |
| 141 | + private static final class ViewBand { | |
| 142 | 142 | /** ViewMap */ |
| 143 | 143 | private final ViewMap vm; |
| 144 | 144 |
| @@ -146,7 +146,7 @@ | ||
| 146 | 146 | * コンストラクタ |
| 147 | 147 | * @param val ViewMap |
| 148 | 148 | */ |
| 149 | - Band(final ViewMap val) { | |
| 149 | + ViewBand(final ViewMap val) { | |
| 150 | 150 | this.vm = val; |
| 151 | 151 | } |
| 152 | 152 |