merge of '47f3a51a7017f1141b9ba7ea01faa1e621324955'

and 'fab379ac654f8f643b8b29203a50cb68c76c181b'
This commit is contained in:
walking
2011-02-12 11:31:41 +00:00
6 changed files with 62 additions and 14 deletions

View File

@@ -55,19 +55,14 @@ public class Main {
* Main method launching the application.
*/
public static void beginStartup(String[] args) {
boolean wasHeadless = Boolean.valueOf(System.getProperty("java.awt.headless")).booleanValue();
if(wasHeadless) {
System.setProperty("java.awt.headless", "false");
}
boolean headless_check = true;
try {
// X permissions error is a java.lang.InternalError (a Throwable)
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
headless_check = ge.isHeadlessInstance();
} catch (Throwable t) {}
if (wasHeadless)
System.setProperty("java.awt.headless", "true");
if (headless_check) {
String headless = RouterManager.getRouterContext().getProperty("router.isHeadless");
boolean isHeadless = Boolean.parseBoolean(headless);
if(isHeadless) {
return;
}
}
catch(Exception e) {
return;
}
try {