From f2caf0c9fce6d3640daf0e4a974ae18fa67281f5 Mon Sep 17 00:00:00 2001
From: bancika <bancika@Bancika-PC>
Date: Wed, 16 Sep 2020 10:21:21 +0200
Subject: [PATCH] log config at start

---
 .../src/org/diylc/common/IPlugInPort.java     |  2 +-
 .../src/org/diylc/presenter/update.xml        |  8 ++++----
 .../src/org/diylc/DIYLCStarter.java           | 20 +++++++++++++++++++
 .../src/org/diylc/swing/gui/MainFrame.java    |  4 ++--
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/diylc/diylc-core/src/org/diylc/common/IPlugInPort.java b/diylc/diylc-core/src/org/diylc/common/IPlugInPort.java
index a7287893..de1e43a6 100644
--- a/diylc/diylc-core/src/org/diylc/common/IPlugInPort.java
+++ b/diylc/diylc-core/src/org/diylc/common/IPlugInPort.java
@@ -66,7 +66,7 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
   public static final String SNAP_TO_KEY = "snapTo";
   public static final String CONTINUOUS_CREATION_KEY = "continuousCreation";
   public static final String AUTO_EDIT_KEY = "autoEdit";
-  public static final String ABNORMAL_EXIT_KEY = "abnormalExit";
+//  public static final String ABNORMAL_EXIT_KEY = "abnormalExit";
   public static final String HEARTBEAT = "heartbeat";
   public static final String WHEEL_ZOOM_KEY = "wheelZoom";
   public static final String OUTLINE_KEY = "outline";
diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index 18e32d3d..ec4fb45c 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -3170,6 +3170,10 @@
 					<changeType>NEW_FEATURE</changeType>
 					<description>Added keyboard shortcuts for zoom in and out using standard Ctrl and +/- key combination and Ctrl+0 to reset to 100%</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>NEW_FEATURE</changeType>
+					<description>On MacOS the app registers to open .DIY files</description>
+				</org.diylc.appframework.update.Change>	
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>Improved rendering precision, especially when using metric units</description>
@@ -3186,10 +3190,6 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>Shorten donation label when the window is smaller</description>
 				</org.diylc.appframework.update.Change>			
-				<org.diylc.appframework.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>On MacOS the app registers to open .DIY files</description>
-				</org.diylc.appframework.update.Change>	
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>Allow rotate and mirror actions on Pin Header component</description>
diff --git a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java
index 341dff19..aa7c76c4 100644
--- a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java
+++ b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java
@@ -22,10 +22,12 @@ import java.awt.FontFormatException;
 import java.awt.GraphicsEnvironment;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.net.URL;
 import java.util.List;
 import java.util.Properties;
 
+import javax.activity.InvalidActivityException;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
@@ -101,6 +103,24 @@ public class DIYLCStarter {
     LOG.debug("OS: " + System.getProperty("os.name") + " " + System.getProperty("os.version"));
 
     LOG.info("Starting DIYLC with working directory " + System.getProperty("user.dir"));
+    
+    LOG.info("Configuration dump start.");
+    // log configuration
+    Field[] fields = IPlugInPort.class.getFields();
+    for (Field f : fields) {
+      if (f.getType() != String.class || !f.getName().toUpperCase().equals(f.getName()))
+        continue;
+      try {
+          String key = (String) f.get(null);
+          Object configValue = ConfigurationManager.getInstance().readObject(key, null);
+          if (configValue != null && (configValue.getClass() == Boolean.class || configValue.getClass() == String.class)) {
+              LOG.info(key + " = " + configValue);
+          }
+      } catch (Exception e) {      
+        LOG.info("Error logging for field: " + f.getName());
+      }
+    }
+    LOG.info("Configuration dump end.");
 
     try {
       UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
diff --git a/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java b/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java
index c76235bc..83cf48fb 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java
@@ -157,7 +157,7 @@ public class MainFrame extends JFrame implements ISwingUI {
           return;
         }
         if (presenter.allowFileAction()) {
-          ConfigurationManager.getInstance().writeValue(IPlugInPort.ABNORMAL_EXIT_KEY, false);
+          //ConfigurationManager.getInstance().writeValue(IPlugInPort.ABNORMAL_EXIT_KEY, false);
           dispose();
           presenter.dispose();
           LOG.info("Closing the app");
@@ -172,7 +172,7 @@ public class MainFrame extends JFrame implements ISwingUI {
           return;
         }
         if (presenter.allowFileAction()) {
-          ConfigurationManager.getInstance().writeValue(IPlugInPort.ABNORMAL_EXIT_KEY, false);
+          //ConfigurationManager.getInstance().writeValue(IPlugInPort.ABNORMAL_EXIT_KEY, false);
           dispose();
           presenter.dispose();
           LOG.info("Closing the app");