CAY-2918 Remove OGNL Binding Architecture from CayenneModeler

getting rid of "bindToProperty"

Author: andrus

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/EncodingSelector.java

@@ -20,21 +20,20 @@
 
 package org.apache.cayenne.modeler.dialog.pref;
 
-import java.awt.Component;
+import org.apache.cayenne.modeler.util.CayenneController;
+import org.apache.cayenne.swing.BindingBuilder;
+import org.apache.cayenne.swing.ObjectBinding;
+import org.apache.cayenne.util.Util;
+
+import javax.swing.*;
+import java.awt.*;
 import java.beans.PropertyChangeListener;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStreamWriter;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Vector;
 
-import javax.swing.DefaultComboBoxModel;
-
-import org.apache.cayenne.modeler.util.CayenneController;
-import org.apache.cayenne.swing.BindingBuilder;
-import org.apache.cayenne.swing.ObjectBinding;
-import org.apache.cayenne.util.Util;
-
 /**
  * A controller for stream encoding picker component.
  * 
@@ -122,6 +121,7 @@ protected Vector supportedEncodings(String platformEncoding) {
         return charsets;
     }
 
+    @Override
     public void bindingUpdated(String expression, Object newValue) {
         if (ENCODING_PROPERTY_BINDING.equals(expression)) {
             this.encoding = (newValue != null) ? newValue.toString() : null;

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferences.java

@@ -22,8 +22,10 @@
 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;
 
 import java.awt.*;
 import java.util.HashMap;
@@ -51,8 +53,6 @@ public class GeneralPreferences extends CayenneController {
 
 	protected Preferences preferences;
 
-	protected ObjectBinding encodingBinding;
-
 	public GeneralPreferences(PreferenceDialog parentController) {
 		super(parentController);
 		this.view = new GeneralPreferencesView();
@@ -62,10 +62,6 @@ public GeneralPreferences(PreferenceDialog parentController) {
 			this.editor = (CayennePreferenceEditor) editor;
 			this.view.setEnabled(true);
 			initBindings();
-
-			encodingBinding.updateView();
-			view.getAutoLoadProject().setSelected(autoLoadProjectPreference);
-			view.getDeletePrompt().setSelected(deletePromptPreference);
 		} else {
 			this.view.setEnabled(false);
 		}
@@ -86,13 +82,14 @@ protected void initBindings() {
 
 		// build child controllers...
 		EncodingSelector encodingSelector = new EncodingSelector(this, view.getEncodingSelector());
-
-		// create bindings...
-		BindingBuilder builder = new BindingBuilder(getApplication().getBindingFactory(), this);
-		this.encodingBinding = builder.bindToProperty(encodingSelector, "encoding", EncodingSelector.ENCODING_PROPERTY_BINDING);
+		encodingSelector.addPropertyChangeListener(EncodingSelector.ENCODING_PROPERTY_BINDING,
+				evt -> setEncoding((String) evt.getNewValue()));
+		encodingSelector.bindingUpdated(EncodingSelector.ENCODING_PROPERTY_BINDING, encoding);
 
 		view.getAutoLoadProject().addActionListener(e -> setAutoLoadProject(view.getAutoLoadProject().isSelected()));
 		view.getDeletePrompt().addActionListener(e -> setDeletePrompt(view.getDeletePrompt().isSelected()));
+		view.getAutoLoadProject().setSelected(autoLoadProjectPreference);
+		view.getDeletePrompt().setSelected(deletePromptPreference);
 	}
 
 	public String getEncoding() {

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

@@ -73,20 +73,6 @@ public BindingFactory getFactory() {
         return factory;
     }
 
-    /**
-     * Binds to an instance of BoundComponent.
-     * 
-     * @since 1.2
-     */
-    public ObjectBinding bindToProperty(
-            BoundComponent component,
-            String property,
-            String boundProperty) {
-        ObjectBinding binding = factory
-                .bindToProperty(component, property, boundProperty);
-        return initBinding(binding, delegate);
-    }
-
     public ObjectBinding bindToStateChange(AbstractButton button, String property) {
         ObjectBinding binding = factory.bindToStateChange(button, property);
         return initBinding(binding, delegate);

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

@@ -57,14 +57,6 @@ public ObjectBinding bindToTable(
         return prepareBinding(binding);
     }
 
-    public ObjectBinding bindToProperty(
-            BoundComponent component,
-            String property,
-            String boundProperty) {
-        PropertyBinding binding = new PropertyBinding(component, property, boundProperty);
-        return prepareBinding(binding);
-    }
-
     /**
      * Binds to AbstractButton item state change events. Most common AbstractButton
      * subclasses are JButton, JCheckBox, JRadioButton.