From ccf6e4d9f75b6d44695590aeb1331f5b787c0003 Mon Sep 17 00:00:00 2001 From: Harald Wolff Date: Thu, 13 Oct 2016 08:29:17 +0200 Subject: [PATCH] WIP161013 --- src/org/hwo/pulscounter/ExportSetting.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/org/hwo/pulscounter/ExportSetting.java b/src/org/hwo/pulscounter/ExportSetting.java index b194c35..654efea 100644 --- a/src/org/hwo/pulscounter/ExportSetting.java +++ b/src/org/hwo/pulscounter/ExportSetting.java @@ -17,6 +17,10 @@ import org.hwo.interactiveobjects.ObjectEditorUI; import org.hwo.models.TableMapper.TableColumn; import org.hwo.pulscounter.ui.ExportSettingsEditorDialog; +import static org.hwo.logging.Logging.*; +import static org.hwo.logging.LogLevel.*; + + @ObjectEditorUI(editor=ExportSettingsEditorDialog.class) @ConfigurableObject public class ExportSetting { @@ -118,11 +122,15 @@ public class ExportSetting { Calendar c = Calendar.getInstance(); c.setTime(d); - return filename + filename = filename .replaceAll("\\%S", String.format("%d", ss.getDeviceSerial())) .replaceAll("\\%Y", String.format("%04d", new Integer(c.get(Calendar.YEAR)))) .replaceAll("\\%M", String.format("%02d", new Integer(c.get(Calendar.MONTH)+1))) .replaceAll("\\%D", String.format("%02d", new Integer(c.get(Calendar.DAY_OF_MONTH)))); + + log(DEBUG, "exportFileName for Snapshot %s from [%s: %04d-%02d-%02d %02d:%02d:%02d] is %s", ss, ss.getDeviceSerial(), c.get(Calendar.YEAR), c.get(Calendar.MONTH), c.get(Calendar.DAY_OF_MONTH), c.get(Calendar.HOUR_OF_DAY), c.get(Calendar.MINUTE), c.get(Calendar.SECOND),filename); + return filename; + } public void export(){