From 479bc28b992f1b74f49d75b88453a00eac8de07e Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 27 Feb 2007 07:42:52 +0000 Subject: [PATCH] restore broken silent setup --- .../src/org/compiere/install/SilentSetup.java | 2 +- looks/src/org/compiere/util/Ini.java | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/install/src/org/compiere/install/SilentSetup.java b/install/src/org/compiere/install/SilentSetup.java index 2a2d7604ac..30fec7412c 100644 --- a/install/src/org/compiere/install/SilentSetup.java +++ b/install/src/org/compiere/install/SilentSetup.java @@ -28,7 +28,7 @@ public class SilentSetup { return; } - // Ini.setShowLicenseDialog(false); + Ini.setShowLicenseDialog(false); ConfigurationData data = new ConfigurationData(null); if (!data.load()) return; if (!data.test()) diff --git a/looks/src/org/compiere/util/Ini.java b/looks/src/org/compiere/util/Ini.java index 612fd91a0f..3605d480a3 100644 --- a/looks/src/org/compiere/util/Ini.java +++ b/looks/src/org/compiere/util/Ini.java @@ -280,6 +280,7 @@ public final class Ini implements Serializable { log.config(filename); firstTime = true; + if (isShowLicenseDialog()) if (!IniDialog.accept()) System.exit(-1); } @@ -515,6 +516,8 @@ public final class Ini implements Serializable private static boolean s_client = true; /** IsClient Internal marker */ private static boolean s_loaded = false; + /** Show license dialog for first time **/ + private static boolean s_license_dialog = true; /** * Are we in Client Mode ? @@ -534,6 +537,24 @@ public final class Ini implements Serializable s_client = client; } // setClient + /** + * Set show license dialog for new setup + * @param b + */ + public static void setShowLicenseDialog(boolean b) + { + s_license_dialog = b; + } + + /** + * Is show license dialog for new setup + * @return boolean + */ + public static boolean isShowLicenseDialog() + { + return s_license_dialog; + } + /** * Are the properties loaded? * @return true if properties loaded.