diff -r cec4c5d9c2d6 javafx-ui-common/src/com/sun/javafx/application/PlatformImpl.java --- a/javafx-ui-common/src/com/sun/javafx/application/PlatformImpl.java Tue Apr 23 11:26:02 2013 +1200 +++ b/javafx-ui-common/src/com/sun/javafx/application/PlatformImpl.java Tue Apr 23 14:04:36 2013 -0700 @@ -506,8 +506,7 @@ * name constants. */ public static void setPlatformUserAgentStylesheet(String stylesheetUrl) { - isModena = Application.STYLESHEET_MODENA.equals(stylesheetUrl); - isCaspian = Application.STYLESHEET_CASPIAN.equals(stylesheetUrl); + isModena = isCaspian = false; // check for command line override String overrideStylesheetUrl = AccessController.doPrivileged( @@ -519,6 +518,7 @@ if (overrideStylesheetUrl != null) stylesheetUrl = overrideStylesheetUrl; // check for named theme constants for modena and caspian if (Application.STYLESHEET_CASPIAN.equalsIgnoreCase(stylesheetUrl)) { + isCaspian = true; AccessController.doPrivileged( new PrivilegedAction() { @Override public Object run() { @@ -535,6 +535,7 @@ } }); } else if (Application.STYLESHEET_MODENA.equalsIgnoreCase(stylesheetUrl)) { + isModena = true; AccessController.doPrivileged( new PrivilegedAction() { @Override public Object run() { diff -r cec4c5d9c2d6 javafx-ui-common/src/javafx/application/Application.java --- a/javafx-ui-common/src/javafx/application/Application.java Tue Apr 23 11:26:02 2013 +1200 +++ b/javafx-ui-common/src/javafx/application/Application.java Tue Apr 23 14:04:36 2013 -0700 @@ -383,17 +383,6 @@ } private static String userAgentStylesheet = null; - static { - userAgentStylesheet = AccessController.doPrivileged( - new PrivilegedAction() { - public String run() { - return System.getProperty("javafx.application.userAgentStylesheet",null); - } - }); - if (userAgentStylesheet != null) { - StyleManager.getInstance().setDefaultUserAgentStylesheet(null, userAgentStylesheet); - } - } /** * Get the user agent stylesheet used by the whole application. This is