(cayenne) branch master updated: CAY-2820 Remove `server` from the components naming - refactor class renaming dialog as we don't have server/client classes

[ntimofeev]

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

ntimofeev 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 6c75e99d3 CAY-2820 Remove `server` from the components naming  - 
refactor class renaming dialog as we don't have server/client classes
6c75e99d3 is described below

commit 6c75e99d3d7f3bbf02c688c5ba705ac176db1738
Author: stariy95 <stari...@gmail.com>
AuthorDate: Fri Nov 24 17:08:07 2023 +0400

    CAY-2820 Remove `server` from the components naming
     - refactor class renaming dialog as we don't have server/client classes
---
 .../modeler/dialog/objentity/ClassNameUpdater.java | 14 +++++-------
 .../dialog/objentity/ClassNameUpdaterView.java     | 25 +++++++---------------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ClassNameUpdater.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ClassNameUpdater.java
index 5833f1dd3..6e15c33c6 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ClassNameUpdater.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ClassNameUpdater.java
@@ -69,9 +69,8 @@ public class ClassNameUpdater extends CayenneController {
         if (askForUpdate) {
             // start dialog
             view = new ClassNameUpdaterView();
-            view.getServerClass().setVisible(true);
-            view.getServerClass().setSelected(true);
-            view.getServerClass().setText("Change Class Name to '" + 
suggestedName + "'");
+            view.getClassName()
+                    .setText("Update class name to " + suggestedName + " to 
match current entity name?");
 
             initBindings(suggestedName);
 
@@ -114,14 +113,11 @@ public class ClassNameUpdater extends CayenneController {
         return DataMap.getNameWithPackage(pkg, entityName);
     }
 
-    protected void initBindings(final String suggestedServerName) {
+    protected void initBindings(final String suggestedName) {
 
         view.getUpdateButton().addActionListener(e -> {
-            if (view.getServerClass().isSelected()) {
-                entity.setClassName(suggestedServerName);
-                updatePerformed = true;
-            }
-
+            entity.setClassName(suggestedName);
+            updatePerformed = true;
             view.dispose();
         });
 
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ClassNameUpdaterView.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ClassNameUpdaterView.java
index 07b3d3a72..a4a3b0486 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ClassNameUpdaterView.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ClassNameUpdaterView.java
@@ -17,15 +17,14 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.modeler.dialog.objentity;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
 
 import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JDialog;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Container;
@@ -33,30 +32,22 @@ import java.awt.FlowLayout;
 
 public class ClassNameUpdaterView extends JDialog {
 
-    protected JCheckBox serverClass;
-
+    protected JLabel className;
     protected JButton updateButton;
     protected JButton cancelButton;
 
     public ClassNameUpdaterView() {
-
-        serverClass = new JCheckBox();
-
-        // make invisible by default
-        serverClass.setVisible(false);
-
+        className = new JLabel("Update class name to _______________________ 
to match current entity name?");
         updateButton = new JButton("Update");
         cancelButton = new JButton("Cancel");
 
         getRootPane().setDefaultButton(updateButton);
-        // assemble
 
+        // assemble
         FormLayout layout = new FormLayout("left:200dlu", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
         builder.setDefaultDialogBorder();
-
-        builder.append("Update class name to match current entity name?");
-        builder.append(serverClass);
+        builder.append(className);
 
         JPanel buttons = new JPanel(new FlowLayout(FlowLayout.RIGHT));
         buttons.add(cancelButton);
@@ -64,14 +55,14 @@ public class ClassNameUpdaterView extends JDialog {
 
         Container contentPane = getContentPane();
         contentPane.setLayout(new BorderLayout());
-        contentPane.add(builder.getPanel(), BorderLayout.CENTER);
+        contentPane.add(className, BorderLayout.CENTER);
         contentPane.add(buttons, BorderLayout.SOUTH);
 
         setTitle("Update Entity Class Name");
     }
 
-    public JCheckBox getServerClass() {
-        return serverClass;
+    public JLabel getClassName() {
+        return className;
     }
 
     public JButton getCancelButton() {