changeset 1483:bd31b30a5b21 jdk7-b66

6857870: Regression tests are failing with ExceptionInInitializerError Reviewed-by: art
author dcherepanov
date Thu, 23 Jul 2009 11:30:49 +0400
parents f88379effbcf
children 11a8f0936228
files src/windows/classes/sun/awt/windows/WToolkit.java
diffstat 1 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/classes/sun/awt/windows/WToolkit.java	Tue Jul 21 23:23:57 2009 -0700
+++ b/src/windows/classes/sun/awt/windows/WToolkit.java	Thu Jul 23 11:30:49 2009 +0400
@@ -886,14 +886,12 @@
      * this should be done in lazilyLoadDesktopProperty() only.
      */
     protected synchronized void initializeDesktopProperties() {
-        desktopProperties.put("DnD.Autoscroll.initialDelay",     Integer.valueOf(50));
-        desktopProperties.put("DnD.Autoscroll.interval",         Integer.valueOf(50));
-
-        try {
-            desktopProperties.put("Shell.shellFolderManager",
-                                  Class.forName("sun.awt.shell.Win32ShellFolderManager2"));
-        } catch (ClassNotFoundException ex) {
-        }
+        desktopProperties.put("DnD.Autoscroll.initialDelay",
+                              Integer.valueOf(50));
+        desktopProperties.put("DnD.Autoscroll.interval",
+                              Integer.valueOf(50));
+        desktopProperties.put("Shell.shellFolderManager",
+                              "sun.awt.shell.Win32ShellFolderManager2");
     }
 
     /*