Make PreferenceDialog modal to properly sort in a multi-dialog flow

Author: stariy95

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java

@@ -207,7 +207,7 @@ private void dataSourceConfigClicked() {
         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 @@ private void dataSourceConfigClicked() {
     }
 
     private void classPathConfigAction() {
-        new PreferenceDialog(app, app.getFrame()).showClassPathEditorAction();
+        new PreferenceDialog(app, this).showClassPathEditorAction();
         refreshDataSources();
     }
 

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();