(cayenne) branch master updated: Make PreferenceDialog modal to properly sort in a multi-dialog flow

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

stariy95 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new 4fb1de8b8 Make PreferenceDialog modal to properly sort in a 
multi-dialog flow
4fb1de8b8 is described below

commit 4fb1de8b8fb14736df4c48b351f42f42c45429a9
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Fri May 29 14:08:38 2026 +0400

    Make PreferenceDialog modal to properly sort in a multi-dialog flow
---
 .../org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java    | 4 ++--
 .../org/apache/cayenne/modeler/ui/preferences/PreferenceDialog.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
index 726b37cd2..9386a18ef 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
@@ -207,7 +207,7 @@ public class DataSourceDialog extends ProjectDialog {
         DBConnectors registry = app.getDbConnectors();
         java.util.Set<String> before = new 
java.util.HashSet<>(registry.getAll().keySet());
 
-        new PreferenceDialog(app, 
app.getFrame()).showDBConnectorEditorAction(dataSourceKey);
+        new PreferenceDialog(app, 
this).showDBConnectorEditorAction(dataSourceKey);
 
         // auto-select any newly-added DataSource (last new wins, matching 
prior commit-order behavior)
         for (String name : registry.getAll().keySet()) {
@@ -219,7 +219,7 @@ public class DataSourceDialog extends ProjectDialog {
     }
 
     private void classPathConfigAction() {
-        new PreferenceDialog(app, app.getFrame()).showClassPathEditorAction();
+        new PreferenceDialog(app, this).showClassPathEditorAction();
         refreshDataSources();
     }
 
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialog.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialog.java
index e230ca028..6a3641a68 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialog.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialog.java
@@ -79,7 +79,7 @@ public class PreferenceDialog extends AppDialog {
     private final MorePrefsPanel morePrefs;
 
     public PreferenceDialog(Application app, Window owner) {
-        super(app, owner, "Edit Preferences", ModalityType.MODELESS);
+        super(app, owner, "Edit Preferences", ModalityType.APPLICATION_MODAL);
 
         this.menu = new JList<>();
         this.detailLayout = new CardLayout();