From 57a79326758b3d2695960e6636cd056b460ce756 Mon Sep 17 00:00:00 2001 From: Bane Stojkovic Date: Tue, 28 Mar 2023 16:54:00 +0200 Subject: [PATCH] Improve backup file date format --- diylc/diylc-core/lib/app-framework.jar | Bin 53946 -> 54092 bytes .../src/org/diylc/presenter/update.xml | 8 ++++++++ diylc/diylc-library/lib/app-framework.jar | Bin 53946 -> 54092 bytes diylc/diylc-swing/lib/app-framework.jar | Bin 53946 -> 54092 bytes .../plugins/autosave/AutoSavePlugin.java | 19 +++++++----------- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/diylc/diylc-core/lib/app-framework.jar b/diylc/diylc-core/lib/app-framework.jar index dd8ddb35725b2b7440d479843eb85862e16f41c0..713a14844bcf83a13458f7ef6b724f42a843c841 100644 GIT binary patch delta 5207 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 Vgx$}7-vRm-Y?2D;T03ru{{u)wt)u_| delta 5075 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 aS&iN2pRYgo<3D10KzfV@Y}|%>ivIwL*i4lG diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index 715bd201..7628475f 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -4326,6 +4326,14 @@ NEW_FEATURE Configurable max switch combination count for circuit analysis (using org.diylc.maxSwitchCombinations argument) + + IMPROVEMENT + Added resilience to the code that saves the configuration file to avoid it getting corrupted + + + IMPROVEMENT + When backing up the configuration file, append the current timestamp at the end instead of a '~' + BUG_FIX General application slowness when Inductor component is added to the drawing diff --git a/diylc/diylc-library/lib/app-framework.jar b/diylc/diylc-library/lib/app-framework.jar index dd8ddb35725b2b7440d479843eb85862e16f41c0..713a14844bcf83a13458f7ef6b724f42a843c841 100644 GIT binary patch delta 5207 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 Vgx$}7-vRm-Y?2D;T03ru{{u)wt)u_| delta 5075 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 aS&iN2pRYgo<3D10KzfV@Y}|%>ivIwL*i4lG diff --git a/diylc/diylc-swing/lib/app-framework.jar b/diylc/diylc-swing/lib/app-framework.jar index dd8ddb35725b2b7440d479843eb85862e16f41c0..713a14844bcf83a13458f7ef6b724f42a843c841 100644 GIT binary patch delta 5207 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 Vgx$}7-vRm-Y?2D;T03ru{{u)wt)u_| delta 5075 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 aS&iN2pRYgo<3D10KzfV@Y}|%>ivIwL*i4lG diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/autosave/AutoSavePlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/autosave/AutoSavePlugin.java index 68264a86..9154547f 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/autosave/AutoSavePlugin.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/autosave/AutoSavePlugin.java @@ -23,11 +23,10 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.text.DateFormat; -import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Arrays; import java.util.Comparator; -import java.util.Date; import java.util.EnumSet; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -129,15 +128,11 @@ public class AutoSavePlugin implements IPlugIn { name = name.substring(0, name.length() - 4); // append date and time - Date date = new Date(); - DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd-HHmmss"); - file = new File(AUTO_SAVE_PATH + File.separator + name + "." + dateFormat.format(date) + ".diy"); - // make sure that it doesn't already exist - int i = 2; - while (file.exists()) { - file = new File(AUTO_SAVE_PATH + File.separator + name + "." + dateFormat.format(date) + "-" + i + ".diy"); - i++; - } + String timestamp = LocalDateTime.now() + .format(DateTimeFormatter.ISO_LOCAL_DATE_TIME) + .substring(0, 19) + .replace(':', '-'); + file = new File(AUTO_SAVE_PATH + File.separator + name + "." + timestamp + ".diy"); return file.getAbsolutePath(); }