midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restore broken silent setup

This commit is contained in:
Carlos Ruiz 2007-02-27 07:42:52 +00:00
parent c351c199cc
commit 479bc28b99
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/src/org/compiere/install/SilentSetup.java
View File

@ -28,7 +28,7 @@ public class SilentSetup {
return; return;
} }
// Ini.setShowLicenseDialog(false); Ini.setShowLicenseDialog(false);
ConfigurationData data = new ConfigurationData(null); ConfigurationData data = new ConfigurationData(null);
if (!data.load()) return; if (!data.load()) return;
if (!data.test()) if (!data.test())

21
looks/src/org/compiere/util/Ini.java
View File

@ -280,6 +280,7 @@ public final class Ini implements Serializable
{ {
log.config(filename); log.config(filename);
firstTime = true; firstTime = true;
if (isShowLicenseDialog())
if (!IniDialog.accept()) if (!IniDialog.accept())
System.exit(-1); System.exit(-1);
} }
@ -515,6 +516,8 @@ public final class Ini implements Serializable
private static boolean s_client = true; private static boolean s_client = true;
/** IsClient Internal marker */ /** IsClient Internal marker */
private static boolean s_loaded = false; private static boolean s_loaded = false;
/** Show license dialog for first time **/
private static boolean s_license_dialog = true;
/** /**
* Are we in Client Mode ? * Are we in Client Mode ?
@ -534,6 +537,24 @@ public final class Ini implements Serializable
s_client = client; s_client = client;
} // setClient } // 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? * Are the properties loaded?
* @return true if properties loaded. * @return true if properties loaded.