From 85e8eaad9d2be96564aa32b7fd5182de0fbb4a6e Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 30 Jul 2009 10:54:56 +0000
Subject: [PATCH] Fix for issue 4157 (Control Panel does not display Mac OS menu bar in Browse Entries dialog)
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
index 3bc4754..a9baf5c 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
@@ -34,6 +34,7 @@
import java.awt.GridBagConstraints;
import java.awt.Insets;
import java.awt.Point;
+import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
@@ -159,8 +160,15 @@
public void toBeDisplayed(boolean visible)
{
super.toBeDisplayed(visible);
- ((GenericDialog)Utilities.getParentDialog(this)).
- getRootPane().setDefaultButton(null);
+ Window w = Utilities.getParentDialog(this);
+ if (w instanceof GenericDialog)
+ {
+ ((GenericDialog)w).getRootPane().setDefaultButton(null);
+ }
+ else if (w instanceof GenericFrame)
+ {
+ ((GenericFrame)w).getRootPane().setDefaultButton(null);
+ }
}
/**
--
Gitblit v1.10.0