Update license headers

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.jcr / src / main / java / org / argeo / jcr / tabular / JcrTabularRowIterator.java

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularRowIterator.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularRowIterator.java
index 8223e1d4830d2c5c76995022890ccb23d66b8192..46c7fb85620ef55d050aed2f575f10fee391fde4 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularRowIterator.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/tabular/JcrTabularRowIterator.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.jcr.tabular;
 
 import java.io.InputStream;
@@ -39,7 +54,6 @@ public class JcrTabularRowIterator implements TabularRowIterator {
 
        public JcrTabularRowIterator(Node tableNode) {
                try {
-                       Node contentNode = tableNode.getNode(Property.JCR_CONTENT);
                        for (NodeIterator it = tableNode.getNodes(); it.hasNext();) {
                                Node node = it.nextNode();
                                if (node.isNodeType(ArgeoTypes.ARGEO_COLUMN)) {
@@ -48,13 +62,9 @@ public class JcrTabularRowIterator implements TabularRowIterator {
                                        TabularColumn tc = new TabularColumn(node.getProperty(
                                                        Property.JCR_TITLE).getString(), type);
                                        header.add(tc);
-                                       // } else if (node.getName().equals(Property.JCR_CONTENT)) {
-                                       // contentNode = node;
                                }
                        }
-                       // should not happen since content is mandatory
-                       assert contentNode != null;
-
+                       Node contentNode = tableNode.getNode(Property.JCR_CONTENT);
                        if (contentNode.isNodeType(ArgeoTypes.ARGEO_CSV)) {
                                textLines = new ArrayBlockingQueue<List<String>>(1000);
                                csvParser = new CsvParser() {
@@ -168,4 +178,8 @@ public class JcrTabularRowIterator implements TabularRowIterator {
                return currentRowNumber;
        }
 
+       public List<TabularColumn> getHeader() {
+               return header;
+       }
+
 }