(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 d1ebb9cc0 Modeler cleanup
d1ebb9cc0 is described below

commit d1ebb9cc00e27ee7a6e4c0e6bd3828c50675c8b9
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Tue Apr 28 08:32:18 2026 -0400

    Modeler cleanup
---
 .../cayenne/modeler/ui/action/ProjectOpener.java   |  2 +-
 .../{ => project}/overwrite/OverwriteDialog.java   | 31 +++++++++-------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ProjectOpener.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ProjectOpener.java
index 66e960002..1b1e86716 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ProjectOpener.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ProjectOpener.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.ui.action;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.ui.overwrite.OverwriteDialog;
+import org.apache.cayenne.modeler.ui.project.overwrite.OverwriteDialog;
 import org.apache.cayenne.modeler.util.FileFilters;
 import org.apache.cayenne.project.Project;
 import org.slf4j.Logger;
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/overwrite/OverwriteDialog.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/overwrite/OverwriteDialog.java
similarity index 73%
rename from 
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/overwrite/OverwriteDialog.java
rename to 
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/overwrite/OverwriteDialog.java
index 01926de8a..68a4a4b7d 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/overwrite/OverwriteDialog.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/overwrite/OverwriteDialog.java
@@ -17,37 +17,34 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.ui.overwrite;
+package org.apache.cayenne.modeler.ui.project.overwrite;
 
-import java.awt.Component;
+import javax.swing.*;
+import java.awt.*;
 import java.io.File;
 
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-
-
 public class OverwriteDialog {
 
     private static final String SELECT_ANOTHER = "Select Another";
     private static final String OVERWRITE = "Overwrite";
     private static final String CANCEL = "Cancel";
-    private static final String[] OPTIONS = new String[] {
-            SELECT_ANOTHER, OVERWRITE, CANCEL
-    };
 
-    protected File file;
-    protected Component parent;
-    protected String result = CANCEL;
+    private final File file;
+    private final Component parent;
+    private String result;
 
     public OverwriteDialog(File file, Component parent) {
         this.file = file;
         this.parent = parent;
+        this.result = CANCEL;
     }
 
     public void show() {
-        JOptionPane pane = new JOptionPane("Do you want to overwrite an 
existing file: "
-                + file, JOptionPane.QUESTION_MESSAGE);
-        pane.setOptions(OPTIONS);
+        String message = "Do you want to overwrite the existing file: " + file;
+        JOptionPane pane = new JOptionPane(message, 
JOptionPane.QUESTION_MESSAGE);
+        pane.setOptions(new String[]{
+                SELECT_ANOTHER, OVERWRITE, CANCEL
+        });
 
         JDialog dialog = pane.createDialog(parent, "File exists");
         dialog.setVisible(true);
@@ -63,8 +60,4 @@ public class OverwriteDialog {
     public boolean shouldOverwrite() {
         return OVERWRITE.equals(result);
     }
-
-    public boolean shouldCancel() {
-        return result == null || CANCEL.equals(result);
-    }
 }