You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/07/21 19:57:46 UTC

(cayenne) branch master updated: CAY-2982 Modeler: when upgrading projects allow upgraders to send outcome messages

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 42ec961d2 CAY-2982 Modeler: when upgrading projects allow upgraders to send outcome messages
42ec961d2 is described below

commit 42ec961d222dedc2433851b1b1188d0c6c3d8dc6
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Tue Jul 21 21:48:28 2026 +0200

    CAY-2982 Modeler: when upgrading projects allow upgraders to send outcome messages
    
    attempt at layout
---
 .../cayenne/modeler/ui/action/OpenProjectAction.java   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/OpenProjectAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/OpenProjectAction.java
index e4ad6f95b..e1714fe7e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/OpenProjectAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/OpenProjectAction.java
@@ -195,9 +195,25 @@ public class OpenProjectAction extends AppAction {
     }
 
     private void showPostUpgradeMessages(List<String> messages) {
+        JTextArea messageText = new JTextArea(String.join("\n\n", messages));
+        messageText.setEditable(false);
+        messageText.setLineWrap(true);
+        messageText.setWrapStyleWord(true);
+        messageText.setRows(8);
+        messageText.setColumns(60);
+
+        JScrollPane messageScroll = new JScrollPane(
+                messageText,
+                ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
+                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+
+        JPanel messagePanel = new JPanel(new BorderLayout(0, 10));
+        messagePanel.add(new JLabel("The project was upgraded, but some manual steps are required:"), BorderLayout.NORTH);
+        messagePanel.add(messageScroll, BorderLayout.CENTER);
+
         JOptionPane.showMessageDialog(
                 app.getFrame(),
-                "The project was upgraded, but some manual steps are required:\n\n" + String.join("\n\n", messages),
+                messagePanel,
                 "Manual Steps Required",
                 JOptionPane.INFORMATION_MESSAGE);
     }