moparisthebest
/
filebot
mirror of https://github.com/mitb-archive/filebot
1
0
Fork 0
Code Issues Releases Wiki Activity

* cleanup

This commit is contained in:
Reinhard Pointner 2011-11-04 01:51:33 +00:00
parent 786370601b
commit 0e885c12f8
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/net/sourceforge/filebot/Analytics.java
View File

@ -102,7 +102,7 @@ public class Analytics {
GraphicsDevice[] display = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices();
config.setScreenResolution(getScreenResolution(display));
config.setColorDepth(getColorDepth(display));
} catch (Throwable e) {
} catch (Exception e) {
Logger.getLogger(Analytics.class.getName()).finest("Headless: " + e.getMessage());
config.setScreenResolution("80x25");
config.setColorDepth("1");
@ -142,11 +142,18 @@ public class Analytics {
private static String getUserLanguage() {
String language = System.getProperty("user.language");
// user region or country
String region = System.getProperty("user.region");
if (region == null)
region = System.getProperty("user.country");
return System.getProperty("user.language") + "-" + region;
// return language string user language with or without user region
if (region == null)
return language;
return language + "-" + region;
}
@ -161,7 +168,7 @@ public class Analytics {
screenHeight += dm.getHeight();
}
if (screenHeight <= 0 && screenWidth <= 0)
if (screenHeight <= 0 || screenWidth <= 0)
throw new HeadlessException("Illegal screen size");
return screenWidth + "x" + screenHeight;
@ -172,12 +179,13 @@ public class Analytics {
if (display[0] == null)
throw new HeadlessException();
String colorDepth = "" + display[0].getDisplayMode().getBitDepth();
StringBuilder sb = new StringBuilder();
sb.append(display[0].getDisplayMode().getBitDepth());
for (int i = 1; i < display.length; i++) {
colorDepth += ", " + display[i].getDisplayMode().getBitDepth();
sb.append(", ").append(display[i].getDisplayMode().getBitDepth());
}
return colorDepth;
return sb.toString();
}