CAY-2918 Remove OGNL Binding Architecture from CayenneModeler

andrus · andrus · commit 54f74b1d5916 · 2026-04-12T14:04:05.000-04:00
getting rid of "bindToAction"
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowser.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowser.java
@@ -21,7 +21,6 @@
 package org.apache.cayenne.modeler.dialog;
 
 import org.apache.cayenne.modeler.util.CayenneController;
-import org.apache.cayenne.swing.BindingBuilder;
 import org.apache.cayenne.validation.ValidationFailure;
 import org.apache.cayenne.validation.ValidationResult;
 
@@ -44,10 +43,7 @@ public ValidationResultBrowser(CayenneController parent) {
     }
 
     protected void initController() {
-        BindingBuilder builder = new BindingBuilder(
-                getApplication().getBindingFactory(),
-                this);
-        builder.bindToAction(view.getCloseButton(), "closeDialogAction()");
+        view.getCloseButton().addActionListener(e -> closeDialogAction());
     }
 
     public Component getView() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java
@@ -38,7 +38,6 @@
 import org.apache.cayenne.modeler.undo.InferRelationshipsUndoableEdit;
 import org.apache.cayenne.modeler.util.CayenneController;
 import org.apache.cayenne.modeler.util.NameGeneratorPreferences;
-import org.apache.cayenne.swing.BindingBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -105,14 +104,10 @@ public void startup() {
     }
 
     protected void initBindings() {
-        BindingBuilder builder = new BindingBuilder(
-                getApplication().getBindingFactory(),
-                this);
-
-        builder.bindToAction(view.getCancelButton(), "cancelAction()");
-        builder.bindToAction(view.getGenerateButton(), "generateAction()");
-        builder.bindToAction(this, "entitySelectedAction()", SELECTED_PROPERTY);
-        builder.bindToAction(view.getStrategyCombo(), "strategyComboAction()");
+        view.getCancelButton().addActionListener(e -> cancelAction());
+        view.getGenerateButton().addActionListener(e -> generateAction());
+        addPropertyChangeListener(SELECTED_PROPERTY, evt -> entitySelectedAction());
+        view.getStrategyCombo().addActionListener(e -> strategyComboAction());
     }
 
     public void entitySelectedAction() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsTabController.java
@@ -52,7 +52,7 @@ protected void initBindings() {
         BindingBuilder builder = new BindingBuilder(
                 getApplication().getBindingFactory(),
                 this);
-        builder.bindToAction(view.getCheckAll(), "checkAllAction()");
+        view.getCheckAll().addActionListener(e -> checkAllAction());
 
         TableBindingBuilder tableBuilder = new TableBindingBuilder(builder);
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/LockingUpdateController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/LockingUpdateController.java
@@ -30,7 +30,6 @@
 import org.apache.cayenne.map.event.RelationshipEvent;
 import org.apache.cayenne.modeler.ProjectController;
 import org.apache.cayenne.modeler.util.CayenneController;
-import org.apache.cayenne.swing.BindingBuilder;
 
 public class LockingUpdateController extends CayenneController {
 
@@ -63,12 +62,8 @@ public Component getView() {
     }
 
     protected void initBindings() {
-        BindingBuilder builder = new BindingBuilder(
-                getApplication().getBindingFactory(),
-                this);
-
-        builder.bindToAction(view.getCancelButton(), "cancelAction()");
-        builder.bindToAction(view.getUpdateButton(), "updateAction()");
+        view.getCancelButton().addActionListener(e -> cancelAction());
+        view.getUpdateButton().addActionListener(e -> updateAction());
     }
 
     public void cancelAction() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizard.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizard.java
@@ -96,9 +96,9 @@ protected void initBindings() {
 
 		dataSourceBinding = builder.bindToComboSelection(view.getDataSources(), "dataSourceKey");
 
-		builder.bindToAction(view.getCancelButton(), "cancelAction()");
-		builder.bindToAction(view.getOkButton(), "okAction()");
-		builder.bindToAction(view.getConfigButton(), "dataSourceConfigAction()");
+		view.getCancelButton().addActionListener(e -> cancelAction());
+		view.getOkButton().addActionListener(e -> okAction());
+		view.getConfigButton().addActionListener(e -> dataSourceConfigAction());
 	}
 
 	private void initDataSourceListener() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/DBGeneratorOptions.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/DBGeneratorOptions.java
@@ -142,9 +142,9 @@ protected void initController() {
                 "generatorDefaults.dropTables",
                 "refreshSQLAction()");
 
-        builder.bindToAction(view.getGenerateButton(), "generateSchemaAction()");
-        builder.bindToAction(view.getSaveSqlButton(), "storeSQLAction()");
-        builder.bindToAction(view.getCancelButton(), "closeAction()");
+        view.getGenerateButton().addActionListener(e -> generateSchemaAction());
+        view.getSaveSqlButton().addActionListener(e -> storeSQLAction());
+        view.getCancelButton().addActionListener(e -> closeAction());
 
         // refresh SQL if different tables were selected
         view.getTabs().addChangeListener(new ChangeListener() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorController.java
@@ -42,7 +42,7 @@
 
 /**
  */
-@SuppressWarnings("unused") // methods are used in bindings by name
+@SuppressWarnings("unused") // setTable(), included, problem are referenced by name in TableBindingBuilder column expressions
 public class TableSelectorController extends CayenneController {
 
     protected TableSelectorView view;
@@ -136,7 +136,7 @@ protected void initController() {
                 getApplication().getBindingFactory(),
                 this);
 
-        builder.bindToAction(view.getCheckAll(), "checkAllAction()");
+        view.getCheckAll().addActionListener(e -> checkAllAction());
 
         TableBindingBuilder tableBuilder = new TableBindingBuilder(builder);
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java
@@ -129,9 +129,9 @@ protected void initController() {
 
         sqlBinding = builder.bindToTextArea(view.getSql(), "textForSQL");
 
-        builder.bindToAction(view.getGenerateButton(), "generateSchemaAction()");
-        builder.bindToAction(view.getSaveSqlButton(), "storeSQLAction()");
-        builder.bindToAction(view.getCancelButton(), "closeAction()");
+        view.getGenerateButton().addActionListener(e -> generateSchemaAction());
+        view.getSaveSqlButton().addActionListener(e -> storeSQLAction());
+        view.getCancelButton().addActionListener(e -> closeAction());
 
         // refresh SQL if different tables were selected
         view.getTabs().addChangeListener(new ChangeListener() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
@@ -25,7 +25,6 @@
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.util.CayenneController;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.swing.BindingBuilder;
 import org.apache.cayenne.swing.ObjectBinding;
 
 import javax.swing.DefaultCellEditor;
@@ -151,12 +150,8 @@ public void tableSelectedAction() {
     // ------ other stuff ------
 
     protected void initController() {
-        final BindingBuilder builder = new BindingBuilder(
-                getApplication().getBindingFactory(),
-                this);
-
-        builder.bindToAction(view.getCheckAll(), "checkAllAction()");
-        builder.bindToAction(view.getReverseAll(), "reverseAllAction()");
+        view.getCheckAll().addActionListener(e -> checkAllAction());
+        view.getReverseAll().addActionListener(e -> reverseAllAction());
 
         final TableModel model = new MergerTokenTableModel(this);
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
@@ -39,7 +39,6 @@
 import org.apache.cayenne.modeler.util.EntityTreeModel;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
-import org.apache.cayenne.swing.BindingBuilder;
 import org.apache.cayenne.util.CayenneMapEntry;
 
 import javax.swing.DefaultComboBoxModel;
@@ -179,10 +178,9 @@ private void initController(ObjAttribute attr) {
 						attr,
 						ObjectInfo.COMMENT));
 
-		BindingBuilder builder = new BindingBuilder(getApplication().getBindingFactory(), this);
-		builder.bindToAction(view.getCancelButton(), "closeAction()");
-		builder.bindToAction(view.getSelectPathButton(), "setPath(true)");
-		builder.bindToAction(view.getSaveButton(), "saveMapping()");
+		view.getCancelButton().addActionListener(e -> closeAction());
+		view.getSelectPathButton().addActionListener(e -> setPath(true));
+		view.getSaveButton().addActionListener(e -> saveMapping());
 
 		/*
 		 * set filter for ObjAttributePathBrowser
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceCreator.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceCreator.java
@@ -31,7 +31,6 @@
 import org.apache.cayenne.modeler.util.AdapterMapping;
 import org.apache.cayenne.modeler.util.CayenneController;
 import org.apache.cayenne.modeler.util.DbAdapterInfo;
-import org.apache.cayenne.swing.BindingBuilder;
 
 /**
  */
@@ -72,11 +71,8 @@ public Component getView() {
     }
 
     protected void initBindings() {
-        BindingBuilder builder = new BindingBuilder(
-                getApplication().getBindingFactory(),
-                this);
-        builder.bindToAction(view.getCancelButton(), "cancelAction()");
-        builder.bindToAction(view.getOkButton(), "okAction()");
+        view.getCancelButton().addActionListener(e -> cancelAction());
+        view.getOkButton().addActionListener(e -> okAction());
     }
 
     public void okAction() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceDuplicator.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceDuplicator.java
@@ -26,7 +26,6 @@
 
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
 import org.apache.cayenne.modeler.util.CayenneController;
-import org.apache.cayenne.swing.BindingBuilder;
 
 /**
  */
@@ -62,11 +61,8 @@ public Component getView() {
     }
 
     protected void initBindings() {
-        BindingBuilder builder = new BindingBuilder(
-                getApplication().getBindingFactory(),
-                this);
-        builder.bindToAction(view.getCancelButton(), "cancelAction()");
-        builder.bindToAction(view.getOkButton(), "okAction()");
+        view.getCancelButton().addActionListener(e -> cancelAction());
+        view.getOkButton().addActionListener(e -> okAction());
     }
 
     public void okAction() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java
@@ -95,10 +95,10 @@ public Component getView() {
 
 	protected void initBindings() {
 		BindingBuilder builder = new BindingBuilder(getApplication().getBindingFactory(), this);
-		builder.bindToAction(view.getAddDataSource(), "newDataSourceAction()");
-		builder.bindToAction(view.getDuplicateDataSource(), "duplicateDataSourceAction()");
-		builder.bindToAction(view.getRemoveDataSource(), "removeDataSourceAction()");
-		builder.bindToAction(view.getTestDataSource(), "testDataSourceAction()");
+		view.getAddDataSource().addActionListener(e -> newDataSourceAction());
+		view.getDuplicateDataSource().addActionListener(e -> duplicateDataSourceAction());
+		view.getRemoveDataSource().addActionListener(e -> removeDataSourceAction());
+		view.getTestDataSource().addActionListener(e -> testDataSourceAction());
 
 		builder.bindToComboSelection(view.getDataSources(), "dataSourceKey");
 	}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CgenArtefactSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CgenArtefactSelectorController.java
@@ -74,7 +74,7 @@ public Component getView() {
     }
 
     protected void initBindings() {
-        builder.bindToAction(checkBoxHeader, "checkAllAction()");
+        checkBoxHeader.addActionListener(e -> checkAllAction());
         TableBindingBuilder tableBuilder = new TableBindingBuilder(builder);
 
         tableBuilder.addColumn(
@@ -134,7 +134,6 @@ public void classSelectedAction() {
      * An action that updates entity check boxes in response to the Select All state
      * change.
      */
-    @SuppressWarnings("unused")
     public void checkAllAction() {
         if (getParentController().updateSelection(checkBoxHeader.isSelected() ? o -> true : o -> false)) {
             tableBinding.updateView();
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CgenConfigController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CgenConfigController.java
@@ -27,7 +27,6 @@
 import org.apache.cayenne.modeler.pref.FSPath;
 import org.apache.cayenne.modeler.util.CayenneController;
 import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.swing.BindingBuilder;
 import org.apache.cayenne.util.Util;
 
 import javax.swing.JButton;
@@ -53,7 +52,7 @@ public CgenConfigController(CgenController parent) {
         this.view = new CgenConfigPanel(getParentController());
         isEditorOpen = false;
         initListeners();
-        initBindings(new BindingBuilder(getApplication().getBindingFactory(), this));
+        initBindings();
     }
 
 
@@ -110,9 +109,8 @@ protected void initListeners() {
                 new TemplateEditorController(this, TemplateType.DATAMAP_SUPERCLASS).startupAction());
     }
 
-    private void initBindings(BindingBuilder bindingBuilder) {
-        JButton outputSelect = getView().getSelectOutputFolder();
-        bindingBuilder.bindToAction(outputSelect, "selectOutputFolderAction()");
+    private void initBindings() {
+        getView().getSelectOutputFolder().addActionListener(e -> selectOutputFolderAction());
     }
 
     protected CgenController getParentController() {
@@ -234,7 +232,6 @@ private void setToolTipText(JButton button) {
      * An action method that pops up a file chooser dialog to pick the
      * generation directory.
      */
-    @SuppressWarnings("unused")
     public void selectOutputFolderAction() {
 
         TextAdapter outputFolder = getView().getOutputFolder();
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CgenController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CgenController.java
@@ -46,7 +46,6 @@
 import org.apache.cayenne.modeler.event.ProjectSavedEvent;
 import org.apache.cayenne.modeler.util.CayenneController;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.swing.BindingBuilder;
 import org.apache.cayenne.tools.ToolsInjectorBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -148,11 +147,10 @@ public CgenPane getView() {
     }
 
     protected void initBindings() {
-        BindingBuilder builder = new BindingBuilder(getApplication().getBindingFactory(), this);
-        builder.bindToAction(view.getGenerateButton(), "generateAction()");
-        builder.bindToAction(view.getAddConfigBtn(), "addConfigAction()");
-        builder.bindToAction(view.getEditConfigBtn(), "editConfigAction()");
-        builder.bindToAction(view.getRemoveConfigBtn(), "removeConfigAction()");
+        view.getGenerateButton().addActionListener(e -> generateAction());
+        view.getAddConfigBtn().addActionListener(e -> addConfigAction());
+        view.getEditConfigBtn().addActionListener(e -> editConfigAction());
+        view.getRemoveConfigBtn().addActionListener(e -> removeConfigAction());
         generatorSelectedAction();
     }
 
@@ -162,7 +160,6 @@ public void generatorSelectedAction() {
         classesSelector.classSelectedAction();
     }
 
-    @SuppressWarnings("unused")
     public void generateAction() {
         ClassGenerationAction generator = new ToolsInjectorBuilder()
                 .addModule(binder
@@ -191,7 +188,6 @@ public void generateAction() {
         }
     }
 
-    @SuppressWarnings("unused")
     public void addConfigAction() {
         String name = JOptionPane.showInputDialog(
                 view,
@@ -213,7 +209,6 @@ public void addConfigAction() {
         }
     }
 
-    @SuppressWarnings("unused")
     public void editConfigAction() {
         String name = JOptionPane.showInputDialog(
                 view,
@@ -234,7 +229,6 @@ public void editConfigAction() {
         }
     }
 
-    @SuppressWarnings("unused")
     public void removeConfigAction() {
         int result = JOptionPane.showConfirmDialog(
                 view,
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/TemplateEditorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/TemplateEditorController.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
