From a8f5d8345278d27ddf5325d3977e460b86b6275f Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 27 Apr 2010 20:56:50 +0000
Subject: [PATCH] Fixing several issues with the Control Panel, the QuickSetup, Core server and Replication. Also improves unit, functional tests. More specifically this commit resolves the following open issues: 4385 - NPE when using ExtensibleMatch filter without a matching rule 4521 - dynamic lookup in attribut selection when selecting the sort order attribut while defining VLV index 4531 - Control Panel creates virtual static groups using groupOfURLs as objectclass 4533 - NullPointerException when configuring replication between 2 OpenDS 4539 - DSML Gateway - jaxb.properties Exception
---
opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java | 31 ++-----------------------------
1 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
index 778b8e8..045b026 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
@@ -41,7 +41,6 @@
import javax.swing.JFrame;
import javax.swing.RootPaneContainer;
import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
import javax.swing.WindowConstants;
import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
@@ -54,6 +53,7 @@
import org.opends.messages.AdminToolMessages;
import org.opends.quicksetup.Installation;
import org.opends.messages.Message;
+import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.args.ArgumentException;
@@ -207,34 +207,7 @@
private static void initLookAndFeel() throws Throwable
{
- if (SwingUtilities.isEventDispatchThread())
- {
- UIManager.setLookAndFeel(
- UIManager.getSystemLookAndFeelClassName());
- }
- else
- {
- final Throwable[] ts = {null};
- SwingUtilities.invokeAndWait(new Runnable()
- {
- public void run()
- {
- try
- {
- UIManager.setLookAndFeel(
- UIManager.getSystemLookAndFeelClassName());
- }
- catch (Throwable t)
- {
- ts[0] = t;
- }
- }
- });
- if (ts[0] != null)
- {
- throw ts[0];
- }
- }
+ UIFactory.initialize();
}
private void updateLocalOrRemotePanel(RootPaneContainer localOrRemote)
--
Gitblit v1.10.0