From a556301d2ab36140be981169c82fee473b16e1ea Mon Sep 17 00:00:00 2001 From: frauzufall Date: Thu, 13 Aug 2020 08:50:28 +0200 Subject: [PATCH] TableIOOptions: Parser of type Function instead of Function --- .../java/org/scijava/table/io/ColumnTableIOOptions.java | 4 ++-- src/main/java/org/scijava/table/io/TableIOOptions.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/scijava/table/io/ColumnTableIOOptions.java b/src/main/java/org/scijava/table/io/ColumnTableIOOptions.java index 8976240..2eda6e5 100644 --- a/src/main/java/org/scijava/table/io/ColumnTableIOOptions.java +++ b/src/main/java/org/scijava/table/io/ColumnTableIOOptions.java @@ -47,7 +47,7 @@ ColumnTableIOOptions formatter(Function formatter) { return setValue(formatterKey, formatter); } - ColumnTableIOOptions parser(Function parser) { + ColumnTableIOOptions parser(Function parser) { return setValue(parserKey, parser); } @@ -57,7 +57,7 @@ public Function formatter() { return getValueOrDefault(formatterKey, String::valueOf); } - public Function parser() { + public Function parser() { return getValueOrDefault(parserKey, String::valueOf); } } diff --git a/src/main/java/org/scijava/table/io/TableIOOptions.java b/src/main/java/org/scijava/table/io/TableIOOptions.java index 41c7ff5..22f0c5c 100644 --- a/src/main/java/org/scijava/table/io/TableIOOptions.java +++ b/src/main/java/org/scijava/table/io/TableIOOptions.java @@ -135,7 +135,7 @@ public TableIOOptions guessParser(boolean guessParser) { /** * @param parser Parser to use when converting table entries into data objects. */ - public TableIOOptions parser(Function parser) { + public TableIOOptions parser(Function parser) { guessParser(false); return setValue(parserKey, parser); } @@ -188,7 +188,7 @@ public TableIOOptions columnFormatter(int column, Function forma return this; } - private Function getParser(Class type) { + private Function getParser(Class type) { if(type.equals(String.class)) return String::valueOf; if(type.equals(Double.class)) return Double::valueOf; if(type.equals(Float.class)) return Float::valueOf; @@ -266,7 +266,7 @@ public boolean guessParser() { /** * @return Parser to use when converting table entries into data objects. */ - public Function parser() { + public Function parser() { return getValueOrDefault(parserKey, String::valueOf); }