(cayenne) branch master updated: Modeler cleanup

[aadamchik]

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

asf-gitbox-commits 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 d58a665c4 Modeler cleanup
d58a665c4 is described below

commit d58a665c4a48def08d3462e31f4ac8ffa8de4e98
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Tue Apr 28 08:34:10 2026 -0400

    Modeler cleanup
---
 .../editor/datamap/dbimport/action/ModelerDbImportAction.java      | 6 +++---
 .../editor/datamap/dbimport/progress/DbImportProgressDialog.java}  | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/ModelerDbImportAction.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/ModelerDbImportAction.java
index 1c759b63a..705359259 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/ModelerDbImportAction.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/ModelerDbImportAction.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
 import org.apache.cayenne.modeler.project.DataMapOps;
-import org.apache.cayenne.modeler.toolkit.ProgressDialog;
+import 
org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.progress.DbImportProgressDialog;
 import org.apache.cayenne.modeler.ui.action.DBConnectionAwareAction;
 import org.apache.cayenne.modeler.ui.dbloadresult.DbLoadResultDialog;
 import 
org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportController;
@@ -143,7 +143,7 @@ public class ModelerDbImportAction extends 
DBConnectionAwareAction {
         private final ModelerDbLoaderContext context;
         private final JFrame frame;
         private final String title;
-        private ProgressDialog dialog;
+        private DbImportProgressDialog dialog;
         private Timer taskPollingTimer;
         private boolean finished;
 
@@ -194,7 +194,7 @@ public class ModelerDbImportAction extends 
DBConnectionAwareAction {
             }
 
             LOGGER.debug("task still in progress, will show progress 
dialog...");
-            this.dialog = new ProgressDialog(frame, "Progress...", title);
+            this.dialog = new DbImportProgressDialog(frame, "Progress...", 
title);
             this.dialog.getCancelButton().addActionListener(e -> 
setCanceled(true));
             updateProgress();
 
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProgressDialog.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/progress/DbImportProgressDialog.java
similarity index 92%
rename from 
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProgressDialog.java
rename to 
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/progress/DbImportProgressDialog.java
index d63e54600..716e5fd92 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProgressDialog.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/progress/DbImportProgressDialog.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.toolkit;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.progress;
 
 import com.jgoodies.forms.builder.PanelBuilder;
 import com.jgoodies.forms.layout.CellConstraints;
@@ -30,13 +30,13 @@ import java.awt.*;
 /**
  * A dialog rendering a progress bar.
  */
-public class ProgressDialog extends CayenneDialog {
+public class DbImportProgressDialog extends CayenneDialog {
 
     protected JProgressBar progressBar;
     protected JLabel statusLabel;
     protected JButton cancelButton;
 
-    public ProgressDialog(JFrame parent, String title, String message) {
+    public DbImportProgressDialog(JFrame parent, String title, String message) 
{
         super(parent, title, false);
 
         progressBar = new JProgressBar();
@@ -44,7 +44,6 @@ public class ProgressDialog extends CayenneDialog {
         JLabel messageLabel = new JLabel(message, SwingConstants.LEFT);
         cancelButton = new JButton("Cancel");
 
-        // assemble
         CellConstraints cc = new CellConstraints();
         FormLayout layout = new FormLayout("fill:max(250dlu;pref)", "p, 3dlu, 
p, 3dlu, p");
         PanelBuilder builder = new PanelBuilder(layout);