CAY-2918 Remove OGNL Binding Architecture from CayenneModeler

getting rid of "bindToTextField"

Author: andrus

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/ActionBinding.java

@@ -30,7 +30,7 @@
  */
 public abstract class BindingBase implements ObjectBinding {
 
-    private Object compiled;
+    private final Object compiled;
 
     protected Object context;
     protected String expression;

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BeanActionBinding.java

@@ -128,16 +128,6 @@ public ObjectBinding bindToComboSelection(
         return initBinding(binding, getActionDelegate(action));
     }
 
-    public ObjectBinding bindToTextArea(JTextArea component, String property) {
-        ObjectBinding binding = factory.bindToTextArea(component, property);
-        return initBinding(binding, delegate);
-    }
-
-    public ObjectBinding bindToTextField(JTextField component, String property) {
-        ObjectBinding binding = factory.bindToTextField(component, property);
-        return initBinding(binding, delegate);
-    }
-
     public ObjectBinding bindToCheckBox(JCheckBox component, String property) {
         ObjectBinding binding = factory.bindToCheckBox(component, property);
         return initBinding(binding, delegate);

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingBase.java

@@ -23,12 +23,12 @@
  * Defines an API of a delegate notified by bindings whenever values are pushed from the
  * view to the model. The value of delegate is that it allows to track changes to the
  * model properties that themselves do not fire property change events.
- * 
+ *
  */
 public interface BindingDelegate {
 
     /**
      * Called by a binding to notify that a model value was updated.
      */
-    public void modelUpdated(ObjectBinding binding, Object oldValue, Object newValue);
+    void modelUpdated(ObjectBinding binding, Object oldValue, Object newValue);
 }

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingBuilder.java

@@ -23,19 +23,11 @@
 
 public class BindingException extends CayenneRuntimeException {
 
-    public BindingException() {
-        super();
-    }
-
     public BindingException(String messageFormat, Object... messageArgs) {
         super(messageFormat, messageArgs);
     }
 
     public BindingException(String messageFormat, Throwable cause, Object... messageArgs) {
         super(messageFormat, cause, messageArgs);
     }
-
-    public BindingException(Throwable cause) {
-        super(cause);
-    }
 }

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingDelegate.java

@@ -19,9 +19,8 @@
 
 package org.apache.cayenne.swing;
 
-import java.awt.Component;
-
 import javax.swing.*;
+import java.awt.*;
 
 /**
  * A factory for a number of common bindings.
@@ -75,33 +74,6 @@ public ObjectBinding bindToStateChange(AbstractButton button, String property) {
         return prepareBinding(binding);
     }
 
-    /**
-     * Binds to AbstractButton action events. Most common AbstractButton subclasses are
-     * JButton, JCheckBox, JRadioButton.
-     */
-    public ObjectBinding bindToAction(AbstractButton button, String action) {
-        ActionBinding binding = new ActionBinding(button, action);
-        return prepareBinding(binding);
-    }
-
-    /**
-     * Binds to a generic component. Action events support is discovered via
-     * introspection. If component class does not define action events, an exception is
-     * thrown.
-     */
-    public ObjectBinding bindToAction(Component component, String action) {
-        BeanActionBinding binding = new BeanActionBinding(component, action);
-        return prepareBinding(binding);
-    }
-
-    public ObjectBinding bindToAction(
-            BoundComponent component,
-            String action,
-            String boundExpression) {
-        ActionBinding binding = new ActionBinding(component, action, boundExpression);
-        return prepareBinding(binding);
-    }
-
     public ObjectBinding bindToComboSelection(
             JComboBox component,
             String property,
@@ -113,19 +85,6 @@ public ObjectBinding bindToComboSelection(
         return prepareBinding(binding);
     }
 
-    public ObjectBinding bindToTextArea(JTextArea component, String property) {
-        TextBinding binding = new TextBinding(component, property);
-        return prepareBinding(binding);
-    }
-
-    /**
-     * Creates a binding that updates a property on text field text changes.
-     */
-    public ObjectBinding bindToTextField(JTextField component, String property) {
-        TextBinding binding = new TextBinding(component, property);
-        return prepareBinding(binding);
-    }
-
     public ObjectBinding bindToCheckBox(JCheckBox component, String property) {
         CheckBoxBinding binding = new CheckBoxBinding(component, property);
         return prepareBinding(binding);

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingException.java

@@ -18,11 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.swing;
 
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JCheckBox;
+import javax.swing.*;
+import java.awt.*;
 
 /**
  * A generic adapter that binds a check box to a bean property.
@@ -36,12 +33,9 @@ public CheckBoxBinding(JCheckBox checkBox, String propertyExpression) {
         super(propertyExpression);
         this.checkBox = checkBox;
 
-        this.checkBox.addActionListener(new ActionListener()
-        {
-            public void actionPerformed(final ActionEvent event) {
-                if (!modelUpdateDisabled) {
-                    updateModel();
-                }
+        this.checkBox.addActionListener(event -> {
+            if (!modelUpdateDisabled) {
+                updateModel();
             }
         });
     }

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BindingFactory.java

@@ -18,15 +18,9 @@
  ****************************************************************/
 package org.apache.cayenne.swing;
 
-import java.awt.Component;
-
-import javax.swing.BorderFactory;
-import javax.swing.Icon;
-import javax.swing.JLabel;
-import javax.swing.JTable;
+import javax.swing.*;
 import javax.swing.table.DefaultTableCellRenderer;
-
-import org.apache.cayenne.swing.components.image.FilteredIconFactory;
+import java.awt.*;
 
 public class ImageRendererColumn extends DefaultTableCellRenderer {
 

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/CheckBoxBinding.java

@@ -20,11 +20,10 @@
 
 package org.apache.cayenne.swing;
 
+import javax.swing.*;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.JTable;
-
 /**
  * A builder for a JTable binding.
  * 
@@ -34,10 +33,6 @@ public class TableBindingBuilder {
     protected BindingBuilder helper;
     protected List columns;
 
-    public TableBindingBuilder(BindingFactory factory, Object context) {
-        this(new BindingBuilder(factory, context));
-    }
-
     public TableBindingBuilder(BindingBuilder helper) {
         this.helper = helper;
     }