This is an automated email from the ASF dual-hosted git repository.
aadamchik 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 fb7f0a8fb CAY-2918 Remove OGNL Binding Architecture from CayenneModeler
fb7f0a8fb is described below
commit fb7f0a8fb683745f8405c0ae871949ac76bf3710
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sun Apr 12 15:45:08 2026 -0400
CAY-2918 Remove OGNL Binding Architecture from CayenneModeler
getting rid of "bindToCheckBox"
---
.../modeler/dialog/pref/GeneralPreferences.java | 36 +++++--------
.../org/apache/cayenne/swing/BindingBuilder.java | 5 --
.../org/apache/cayenne/swing/BindingFactory.java | 5 --
.../org/apache/cayenne/swing/CheckBoxBinding.java | 62 ----------------------
4 files changed, 13 insertions(+), 95 deletions(-)
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferences.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferences.java
index c3bd40bd6..c679ec3cb 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferences.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferences.java
@@ -19,17 +19,17 @@
package org.apache.cayenne.modeler.dialog.pref;
-import java.awt.Component;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.prefs.Preferences;
-
import org.apache.cayenne.modeler.util.CayenneController;
import org.apache.cayenne.pref.CayennePreferenceEditor;
import org.apache.cayenne.pref.PreferenceEditor;
import org.apache.cayenne.swing.BindingBuilder;
import org.apache.cayenne.swing.ObjectBinding;
+import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.prefs.Preferences;
+
public class GeneralPreferences extends CayenneController {
public static final String AUTO_LOAD_PROJECT_PREFERENCE =
"autoLoadProject";
@@ -52,8 +52,6 @@ public class GeneralPreferences extends CayenneController {
protected Preferences preferences;
protected ObjectBinding encodingBinding;
- protected ObjectBinding autoLoadProjectBinding;
- protected ObjectBinding deletePromptBinding;
public GeneralPreferences(PreferenceDialog parentController) {
super(parentController);
@@ -66,13 +64,14 @@ public class GeneralPreferences extends CayenneController {
initBindings();
encodingBinding.updateView();
- autoLoadProjectBinding.updateView();
- deletePromptBinding.updateView();
+
view.getAutoLoadProject().setSelected(autoLoadProjectPreference);
+
view.getDeletePrompt().setSelected(deletePromptPreference);
} else {
this.view.setEnabled(false);
}
}
+ @Override
public Component getView() {
return view;
}
@@ -91,8 +90,9 @@ public class GeneralPreferences extends CayenneController {
// create bindings...
BindingBuilder builder = new
BindingBuilder(getApplication().getBindingFactory(), this);
this.encodingBinding = builder.bindToProperty(encodingSelector,
"encoding", EncodingSelector.ENCODING_PROPERTY_BINDING);
- this.autoLoadProjectBinding =
builder.bindToCheckBox(view.getAutoLoadProject(), "autoLoadProject");
- this.deletePromptBinding =
builder.bindToCheckBox(view.getDeletePrompt(), "deletePrompt");
+
+ view.getAutoLoadProject().addActionListener(e ->
setAutoLoadProject(view.getAutoLoadProject().isSelected()));
+ view.getDeletePrompt().addActionListener(e ->
setDeletePrompt(view.getDeletePrompt().isSelected()));
}
public String getEncoding() {
@@ -104,22 +104,12 @@ public class GeneralPreferences extends CayenneController
{
this.encoding = encoding;
}
- public boolean getAutoLoadProject() {
- return autoLoadProjectPreference;
- }
-
- public void setAutoLoadProject(boolean autoLoadProject) {
-
+ private void setAutoLoadProject(boolean autoLoadProject) {
addChangedBooleanPreferences(AUTO_LOAD_PROJECT_PREFERENCE,
autoLoadProject);
this.autoLoadProjectPreference = autoLoadProject;
}
- public boolean getDeletePrompt() {
- return deletePromptPreference;
- }
-
- public void setDeletePrompt(boolean deletePrompt) {
-
+ private void setDeletePrompt(boolean deletePrompt) {
addChangedBooleanPreferences(DELETE_PROMPT_PREFERENCE,
deletePrompt);
this.deletePromptPreference = deletePrompt;
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingBuilder.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingBuilder.java
index 04ca79a9d..f4e92117d 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingBuilder.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingBuilder.java
@@ -128,11 +128,6 @@ public class BindingBuilder {
return initBinding(binding, getActionDelegate(action));
}
- public ObjectBinding bindToCheckBox(JCheckBox component, String property) {
- ObjectBinding binding = factory.bindToCheckBox(component, property);
- return initBinding(binding, delegate);
- }
-
protected ObjectBinding initBinding(ObjectBinding binding, BindingDelegate
delegate) {
binding.setDelegate(delegate);
binding.setContext(context);
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingFactory.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingFactory.java
index 16b002955..258a7fa8d 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingFactory.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingFactory.java
@@ -85,11 +85,6 @@ public class BindingFactory {
return prepareBinding(binding);
}
- public ObjectBinding bindToCheckBox(JCheckBox component, String property) {
- CheckBoxBinding binding = new CheckBoxBinding(component, property);
- return prepareBinding(binding);
- }
-
/**
* Configures binding with factory default settings.
*/
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/CheckBoxBinding.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/CheckBoxBinding.java
deleted file mode 100644
index 7c1b009db..000000000
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/CheckBoxBinding.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.swing;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * A generic adapter that binds a check box to a bean property.
- *
- */
-public class CheckBoxBinding extends BindingBase {
-
- protected JCheckBox checkBox;
-
- public CheckBoxBinding(JCheckBox checkBox, String propertyExpression) {
- super(propertyExpression);
- this.checkBox = checkBox;
-
- this.checkBox.addActionListener(event -> {
- if (!modelUpdateDisabled) {
- updateModel();
- }
- });
- }
-
- public Component getView() {
- return checkBox;
- }
-
- public void updateView() {
- Boolean value = (Boolean) getValue();
-
- modelUpdateDisabled = true;
- try {
- checkBox.setSelected(value.booleanValue());
- }
- finally {
- modelUpdateDisabled = false;
- }
- }
-
- protected void updateModel() {
- setValue(Boolean.valueOf(checkBox.isSelected()));
- }
-}
