changeset 6096:6e99ce505860

Merge double fix for Virtual Columns
author Andre Heinecke <aheinecke@intevation.de>
date Fri, 24 May 2013 18:53:35 +0200 (2013-05-24)
parents 0f3ca851d204 (current diff) 4b634935a2ad (diff)
children a02d27da17ca
files artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java
diffstat 1 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java	Fri May 24 18:53:05 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java	Fri May 24 18:53:35 2013 +0200
@@ -536,17 +536,15 @@
         }
 
         protected void fillResult(
-            ResultData result,
-            ResultData rd,
-            int        index,
-            int size,
+            ResultData      result,
+            ResultData      rd,
+            int             index,
+            int             size,
             XPathExpression expr,
-            QName returnType
+            QName           returnType
         ) {
-            List<Object []> rows = rd.getRows();
             String [] origColumns = rd.getColumnLabels();
-            for (int i = 0, R = rows.size(); i < R; ++i) {
-                Object [] row = rows.get(i);
+            for (Object [] row: rd.getRows()) {
                 frames.enter();
                 try {
                     frames.put(origColumns, row);

http://dive4elements.wald.intevation.org