#5987: Use the currently active dialog as the presenter parent.

Author: rkeen-siemens

platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java

@@ -252,12 +252,16 @@ public void showDialog () {
                         presenter = new NbPresenter(descriptor, NbPresenter.currentModalDialog, true);
                     }
                 } else {
-                    Window w = KeyboardFocusManager.getCurrentKeyboardFocusManager ().getActiveWindow ();
-                    Frame f = w instanceof Frame ? (Frame) w : WindowManager.getDefault().getMainWindow();
+                    Window w = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
                     if (noParent) {
-                        f = null;
+                        presenter = new NbPresenter(descriptor, (Frame) null, true);
+                    } else if (w instanceof Frame) {
+                        presenter = new NbPresenter(descriptor, (Frame) w, true);
+                    } else if (w instanceof Dialog) {
+                        presenter = new NbPresenter(descriptor, (Dialog) w, true);
+                    } else {
+                        presenter = new NbPresenter(descriptor, WindowManager.getDefault().getMainWindow(), true);
                     }
-                    presenter = new NbPresenter(descriptor, f, true);
                 }
             }
 

platform/core.windows/test/unit/src/org/netbeans/core/windows/services/DialogDisplayerImplTest.java

@@ -23,6 +23,7 @@
 import java.awt.Dialog;
 import java.awt.EventQueue;
 import java.awt.Frame;
+import java.awt.KeyboardFocusManager;
 import java.awt.Window;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
@@ -86,6 +87,11 @@ protected void tearDown() throws Exception {
             NbPresenter.currentModalDialog.dispose();
             NbPresenter.currentModalDialog = null;
         }
+        Window w = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
+        if (w != null) {
+            w.setVisible(false);
+            w.dispose();
+        }
         super.tearDown();
     }
 
@@ -347,6 +353,22 @@ public void testParent() {
         assertEquals(frame, dlg.getOwner());
     }
 
+    @RandomlyFails
+    public void testNestedDialogParent() throws Exception {
+        Frame f = null;
+        Dialog owner = new Dialog(f);
+        postInAwtAndWaitOutsideAwt(() -> owner.setVisible(true));
+        assertShowing("Owner is invisible", true, owner);
+
+        child = new JButton();
+        final NotifyDescriptor nd = new NotifyDescriptor.Message(child);
+        postInAwtAndWaitOutsideAwt(() -> DialogDisplayer.getDefault().notify(nd));
+
+        assertShowing("Child is invisible", true, child);
+        Window w = SwingUtilities.windowForComponent(child);
+        assertSame("Window parent is not owner", owner, w.getParent());
+    }
+
     static void postInAwtAndWaitOutsideAwt (final Runnable run) throws Exception {
         // pendig to better implementation
         SwingUtilities.invokeLater (run);