Added new soap message for exceptions, added log to track system flow

openefsa · Jan 22, 2018 · 88eb4a7 · 88eb4a7
1 parent 91366d9
commit 88eb4a7
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 82 deletions.
diff --git a/compat/tablesSchema.1.1.2.xlsx b/compat/tablesSchema.1.1.2.xlsx
diff --git a/config/appConfig.xml b/config/appConfig.xml
@@ -3,7 +3,7 @@
 <properties>
 <comment>Application configuration</comment>
 <entry key="Application.Name">EFSA TSE data submission tool</entry> <!-- main title of the application -->
-<entry key="Application.Version">1.1.0</entry> <!-- version of the application that will displayed after the application name -->
+<entry key="Application.Version">1.1.2</entry> <!-- version of the application that will displayed after the application name -->
 <entry key="Db.MinRequiredVersion">1.1.0</entry> <!-- version of the database needed -->
 <entry key="Application.Icon">app-icon.png</entry> <!-- application icon (in the icon folder) -->
 <entry key="TechnicalSupport.Email">[email protected]</entry> <!-- email which will be displayed in occasion of serious errors (when the unique possibility is to contact EFSA) -->

diff --git a/config/env.xml b/config/env.xml
@@ -3,4 +3,5 @@
 <properties>
 <comment>Production/test configuration</comment>
 <entry key="Environment.Production">YES</entry>
+<entry key="Console.Level">VERBOSE</entry> <!-- NONE/INFO/VERBOSE -->
 </properties>
diff --git a/config/proxyConfig.xml b/config/proxyConfig.xml
diff --git a/doc/messages.xlsx b/doc/messages.xlsx
diff --git a/src/tse_config/CustomStrings.java b/src/tse_config/CustomStrings.java
@@ -6,6 +6,7 @@ public class CustomStrings {
 
 	public static final String PREDEFINED_RESULTS_FILE = AppPaths.CONFIG_FOLDER + "predefinedResults.xlsx";
 	public static final String PREFERENCE_FOLDER = "preferences" + System.getProperty("file.separator");
+	public static final String LOG_FOLDER = "logs" + System.getProperty("file.separator");
 
 	// sheets names
 	public static final String RESULT_SHEET = "AnalyticalResults";

diff --git a/src/tse_config/GeneralWarnings.java b/src/tse_config/GeneralWarnings.java
@@ -5,7 +5,7 @@
 import org.eclipse.swt.widgets.Shell;
 
 import app_config.PropertiesReader;
-import exception_manager.ExceptionConverter;
+import converter.ExceptionConverter;
 import i18n_messages.TSEMessages;
 import message.SendMessageErrorType;
 import message.SendMessageException;

diff --git a/src/tse_main/MainMenu.java b/src/tse_main/MainMenu.java
@@ -17,6 +17,7 @@
 import org.xml.sax.SAXException;
 
 import app_config.PropertiesReader;
+import global_utils.Warnings;
 import i18n_messages.TSEMessages;
 import message.MessageConfigBuilder;
 import message_creator.OperationType;
@@ -234,6 +235,7 @@ public void widgetSelected(SelectionEvent arg0) {
 					downloader.download();
 				} catch (MySOAPException e) {
 					e.printStackTrace();
+					Warnings.showSOAPWarning(shell, e);
 				}
 			}
 		});