X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Futil%2FCsvParserWithLinesAsMap.java;h=8eb6e94636a44146c2e5c37a5b8aa526d9efd9fe;hb=3c1cdc594d954520b14646102b366290bdad58c7;hp=e7baabbf0b50d4b77dfaddf873a1917421820e3f;hpb=eebaa683a3c470ad22a5eaa5c32f816a2ea2cbbb;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java b/org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java index e7baabbf0..8eb6e9463 100644 --- a/org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java +++ b/org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java @@ -1,26 +1,9 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * 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.util; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.argeo.ArgeoException; - /** * CSV parser allowing to process lines as maps whose keys are the header * fields. @@ -30,19 +13,15 @@ public abstract class CsvParserWithLinesAsMap extends CsvParser { /** * Actually processes a line. * - * @param lineNumber - * the current line number, starts at 1 (the header, if header - * processing is enabled, the first lien otherwise) - * @param line - * the parsed tokens as a map whose keys are the header fields + * @param lineNumber the current line number, starts at 1 (the header, if header + * processing is enabled, the first lien otherwise) + * @param line the parsed tokens as a map whose keys are the header fields */ - protected abstract void processLine(Integer lineNumber, - Map line); + protected abstract void processLine(Integer lineNumber, Map line); - protected final void processLine(Integer lineNumber, List header, - List tokens) { + protected final void processLine(Integer lineNumber, List header, List tokens) { if (header == null) - throw new ArgeoException("Only CSV with header is supported"); + throw new IllegalArgumentException("Only CSV with header is supported"); Map line = new HashMap(); for (int i = 0; i < header.size(); i++) { String key = header.get(i);