Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java @ 6096:6e99ce505860
Merge double fix for Virtual Columns
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Fri, 24 May 2013 18:53:35 +0200 |
| parents | 16027599b2a9 4b634935a2ad |
| children | a02d27da17ca |
comparison
equal
deleted
inserted
replaced
| 6095:0f3ca851d204 | 6096:6e99ce505860 |
|---|---|
| 534 fillResult(result, rd, index, columns.length, expr, returnType); | 534 fillResult(result, rd, index, columns.length, expr, returnType); |
| 535 return result; | 535 return result; |
| 536 } | 536 } |
| 537 | 537 |
| 538 protected void fillResult( | 538 protected void fillResult( |
| 539 ResultData result, | 539 ResultData result, |
| 540 ResultData rd, | 540 ResultData rd, |
| 541 int index, | 541 int index, |
| 542 int size, | 542 int size, |
| 543 XPathExpression expr, | 543 XPathExpression expr, |
| 544 QName returnType | 544 QName returnType |
| 545 ) { | 545 ) { |
| 546 List<Object []> rows = rd.getRows(); | |
| 547 String [] origColumns = rd.getColumnLabels(); | 546 String [] origColumns = rd.getColumnLabels(); |
| 548 for (int i = 0, R = rows.size(); i < R; ++i) { | 547 for (Object [] row: rd.getRows()) { |
| 549 Object [] row = rows.get(i); | |
| 550 frames.enter(); | 548 frames.enter(); |
| 551 try { | 549 try { |
| 552 frames.put(origColumns, row); | 550 frames.put(origColumns, row); |
| 553 Object value = expr.evaluate(EVAL_DOCUMENT, returnType); | 551 Object value = expr.evaluate(EVAL_DOCUMENT, returnType); |
| 554 Object [] copy = Arrays.copyOf(row, size); | 552 Object [] copy = Arrays.copyOf(row, size); |