From 4874b6f0375b090c38cfaea9196dbcbb36ebbe8c Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 20 Sep 2007 19:04:22 +0000
Subject: [PATCH] Fix for 2318.

---
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
index f0b345d..f472037 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
@@ -28,6 +28,7 @@
 package org.opends.quicksetup.ui;
 
 import org.opends.messages.Message;
+
 import static org.opends.messages.QuickSetupMessages.*;
 
 import java.awt.Color;
@@ -42,6 +43,8 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.HashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.swing.*;
 import javax.swing.text.JTextComponent;
@@ -68,6 +71,8 @@
 
   private static String parentPackagePath;
 
+  private static final Logger LOG = Logger.getLogger(UIFactory.class.getName());
+
   /**
    * Specifies the horizontal insets between buttons.
    */
@@ -526,12 +531,20 @@
       new HashMap<IconType, ImageIcon>();
 
   static {
-    UIManager.put("OptionPane.background",
-            getColor(INFO_OPTIONPANE_BACKGROUND_COLOR.get()));
-    UIManager.put("Panel.background",
-            getColor(INFO_PANEL_BACKGROUND_COLOR.get()));
-    UIManager.put("ComboBox.background",
-            getColor(INFO_COMBOBOX_BACKGROUND_COLOR.get()));
+    try
+    {
+      UIManager.put("OptionPane.background",
+          getColor(INFO_OPTIONPANE_BACKGROUND_COLOR.get()));
+      UIManager.put("Panel.background",
+          getColor(INFO_PANEL_BACKGROUND_COLOR.get()));
+      UIManager.put("ComboBox.background",
+          getColor(INFO_COMBOBOX_BACKGROUND_COLOR.get()));
+    }
+    catch (Throwable t)
+    {
+      // This might occur when we do not get the display
+      LOG.log(Level.WARNING, "Error updating UIManager: "+t, t);
+    }
   }
 
   /**

--
Gitblit v1.10.0