INTEGRATION: CWS jl18 (1.4.12); FILE MERGED

2005/03/17 17:01:31 jl 1.4.12.2: #44608#
2005/03/17 15:29:00 jl 1.4.12.1: #44608# do not call getDefaultToolkit on Windows 98

jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java

@@ -26,13 +26,27 @@ public class JREProperties
                     bNoAccess = true;
             }
 
+            //Find out on what operation system we are running. On Windows 98
+            //we must not call getDefaultToolkit, because the office may freeze
+            //#i44608.
+            boolean bW98 = false;
+            String os = System.getProperty("os.name");
+
+            if (os != null)
+            {
+                os = os.trim();
+                if (os.equalsIgnoreCase("Windows 98") ||
+                    os.indexOf("Windows 98") != -1)
+                    bW98 = true;
+            }
+
             //We need to be able to switch this part off because
             //it causes an exception if the DISPLAY variable has
             //a false value. Setting the noaccessibility argument
             //can be done by providing a sunjavaplugin.ini with
             //the bootstrap parameter JFW_PLUGIN_NO_NOT_CHECK_ACCESSIBILITY
             //set to "1"
-            if (bNoAccess == false)
+            if (bNoAccess == false && ! bW98)
             {
                 try{
                     //This line is needed to get the accessibility properties