From faddbfa0145695a91a8b35af979c7a3776d333d4 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Mon, 29 Mar 2021 15:47:29 +0200 Subject: [PATCH 1/2] strip prefix "Default" from class names --- .../main/java/org/lucares/pdbui/CsvReaderSettings.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/CsvReaderSettings.java b/pdb-ui/src/main/java/org/lucares/pdbui/CsvReaderSettings.java index 1657978..d32a979 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/CsvReaderSettings.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/CsvReaderSettings.java @@ -11,8 +11,16 @@ import org.lucares.utils.Preconditions; public final class CsvReaderSettings { + public static String stripPrefixDefault(final String value) { + if (value.startsWith("Default")) { + return value.replaceFirst("Default", ""); + } + return value; + } + public enum PostProcessors { - LOWER_CASE(String::toLowerCase), STRIP(String::trim); + LOWER_CASE(String::toLowerCase), STRIP(String::trim), + STRIP_PREFIX_DEFAULT(CsvReaderSettings::stripPrefixDefault); private final Function function; From e410bcb3b3bc9bdd0750865746412c439bb7c7b4 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Mon, 29 Mar 2021 15:48:08 +0200 Subject: [PATCH 2/2] revert accidential commit --- .../src/main/java/org/lucares/recommind/logs/Plotter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java b/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java index 1c62c63..f3ad073 100644 --- a/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java +++ b/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java @@ -26,6 +26,7 @@ import org.lucares.pdb.plot.api.AggregatorCollection; import org.lucares.pdb.plot.api.Limit; import org.lucares.pdb.plot.api.PlotSettings; import org.lucares.performance.db.PerformanceDb; +import org.lucares.utils.file.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -142,7 +143,7 @@ public class Plotter { } catch (final IOException e) { throw new InternalPlottingException("Plotting failed: " + e.getMessage(), e); } finally { - // XXX TODO revert: FileUtils.delete(tmpDir); + FileUtils.delete(tmpDir); LOGGER.trace("done plot"); } }