Refactored to align diff Controller superclass with "straight"

The source / target / extractor scheme now is a bit cleaner and more
flexible. And the code is easier to understand if the same pattern is
used for solving the same thing.

src/main/java/com/insightfullogic/honest_profiler/ports/javafx/controller/AbstractProfileDiffViewController.java

@@ -2,17 +2,18 @@
 
 import static com.insightfullogic.honest_profiler.ports.javafx.util.FxUtil.addProfileNr;
 import static com.insightfullogic.honest_profiler.ports.javafx.util.FxUtil.createColoredLabelContainer;
+import static javafx.beans.binding.Bindings.createObjectBinding;
 import static javafx.geometry.Pos.CENTER;
 
 import java.util.function.Function;
 
 import com.insightfullogic.honest_profiler.core.aggregation.result.ItemType;
 import com.insightfullogic.honest_profiler.ports.javafx.model.ProfileContext;
 
+import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.TableColumn;
@@ -41,12 +42,17 @@
  */
 public abstract class AbstractProfileDiffViewController<T, U> extends AbstractViewController<U>
 {
+    // Instance Properties
+
     private ProfileContext baseContext;
     private ProfileContext newContext;
 
     private ObjectProperty<T> baseTarget;
     private ObjectProperty<T> newTarget;
-    private Function<ProfileContext, ObservableValue<T>> targetExtractor;
+    private ObjectBinding<T> baseSourceBinding;
+    private ObjectBinding<T> newSourceBinding;
+
+    // FXML Implementation
 
     /**
      * This method must be called by subclasses in their FXML initialize(). It provides the extraction function which
@@ -58,18 +64,117 @@ public abstract class AbstractProfileDiffViewController<T, U> extends AbstractVi
      * @param quickFilterButton the button used to apply the quick filter
      * @param quickFilterText the TextField providing the value for the quick filter
      */
-    protected void initialize(Function<ProfileContext, ObservableValue<T>> targetExtractor,
-        Button filterButton, Button quickFilterButton, TextField quickFilterText, ItemType type)
+    @Override
+    protected void initialize(Button filterButton, Button quickFilterButton,
+        TextField quickFilterText, ItemType type)
     {
         super.initialize(filterButton, quickFilterButton, quickFilterText, type);
 
-        this.targetExtractor = targetExtractor;
         baseTarget = new SimpleObjectProperty<>();
         newTarget = new SimpleObjectProperty<>();
         baseTarget.addListener((property, oldValue, newValue) -> refresh());
         newTarget.addListener((property, oldValue, newValue) -> refresh());
     }
 
+    // Instance Accessors
+
+    /**
+     * Returns the {@link ProfileContext} for the baseline target. The name has been shortened to unclutter code in
+     * subclasses.
+     *
+     * @return the {@link ProfileContext} encapsulating the baseline target.
+     */
+    protected ProfileContext baseCtx()
+    {
+        return baseContext;
+    }
+
+    /**
+     * Returns the {@link ProfileContext} for the target which will be compared against the baseline. The name has been
+     * shortened to unclutter code in subclasses.
+     *
+     * @return the {@link ProfileContext} encapsulating the target being compared against the baseline.
+     */
+    protected ProfileContext newCtx()
+    {
+        return newContext;
+    }
+
+    /**
+     * Returns the current baseline target instance.
+     *
+     * @return the current baseline target instance
+     */
+    protected T getBaseTarget()
+    {
+        return baseTarget.get();
+    }
+
+    /**
+     * Returns the current "new" target instance.
+     *
+     * @return the current "new" target instance
+     */
+    protected T getNewTarget()
+    {
+        return newTarget.get();
+    }
+
+    /**
+     * Sets the {@link ProfileContext}s encapsulating the baseline target and the target being compared against it.
+     *
+     * @param profileContext the {@link ProfileContext}s encapsulating the baseline target and the target being compared
+     *            against it
+     */
+    public void setProfileContexts(ProfileContext baseContext, ProfileContext newContext)
+    {
+        this.baseContext = baseContext;
+        this.newContext = newContext;
+    }
+
+    // Source-Target Binding
+
+    /**
+     * Set the source object the target data structure T will be extracted from, and the function which extracts the
+     * target data structure T from the source.
+     *
+     * @param source the source providing the target data structure
+     * @param targetExtractor a function which extracts the target from the source object
+     */
+    public void bind(ObjectProperty<? extends Object> baseSource,
+        ObjectProperty<? extends Object> newSource, Function<Object, T> targetExtractor)
+    {
+        baseSourceBinding = createObjectBinding(
+            () -> targetExtractor.apply(baseSource.get()),
+            baseSource);
+        newSourceBinding = createObjectBinding(
+            () -> targetExtractor.apply(newSource.get()),
+            newSource);
+    }
+
+    // Activation
+
+    /**
+     * Binds the local target {@link Property}s to the target {@link Property}s in the {@link ProfileContext}s, using
+     * the target extractor function. The net effect is that the controller will start tracking changes to the target
+     * instances in the {@link ProfileContext}.
+     */
+    public void activate()
+    {
+        baseTarget.bind(baseSourceBinding);
+        newTarget.bind(newSourceBinding);
+    }
+
+    /**
+     * Unbinds the local target {@link Property}s. The controller no longer tracks changes to the target
+     * {@link Property}s in the {@link ProfileContext}s.
+     */
+    public void deactivate()
+    {
+        baseTarget.unbind();
+        newTarget.unbind();
+    }
+
     // UI Helper Methods
 
     @Override
@@ -90,11 +195,11 @@ protected <C> void setColumnHeader(C column, String title, ProfileContext profil
 
         if (column instanceof TreeTableColumn<?, ?>)
         {
-            reconfigure((TreeTableColumn<?, ?>) column, null, header, width, width + 5);
+            reconfigure((TreeTableColumn<?, ?>)column, null, header, width, width + 5);
         }
         else
         {
-            reconfigure((TableColumn<?, ?>) column, null, header, width, width + 5);
+            reconfigure((TableColumn<?, ?>)column, null, header, width, width + 5);
         }
     }
 
@@ -127,83 +232,4 @@ private double calculateWidth(HBox box)
         width += box.getPadding().getLeft() + box.getPadding().getRight();
         return width;
     }
-
-    // Activation
-
-    /**
-     * Binds the local target {@link Property}s to the target {@link Property}s in the {@link ProfileContext}s, using
-     * the target extractor function. The net effect is that the controller will start tracking changes to the target
-     * instances in the {@link ProfileContext}.
-     */
-    public void activate()
-    {
-        baseTarget.bind(targetExtractor.apply(baseContext));
-        newTarget.bind(targetExtractor.apply(newContext));
-    }
-
-    /**
-     * Unbinds the local target {@link Property}s. The controller no longer tracks changes to the target
-     * {@link Property}s in the {@link ProfileContext}s.
-     */
-    public void deactivate()
-    {
-        baseTarget.unbind();
-        newTarget.unbind();
-    }
-
-    // Accessors
-
-    /**
-     * Returns the {@link ProfileContext} for the baseline target. The name has been shortened to unclutter code in
-     * subclasses.
-     *
-     * @return the {@link ProfileContext} encapsulating the baseline target.
-     */
-    protected ProfileContext baseCtx()
-    {
-        return baseContext;
-    }
-
-    /**
-     * Returns the {@link ProfileContext} for the target which will be compared against the baseline. The name has been
-     * shortened to unclutter code in subclasses.
-     *
-     * @return the {@link ProfileContext} encapsulating the target being compared against the baseline.
-     */
-    protected ProfileContext newCtx()
-    {
-        return newContext;
-    }
-
-    /**
-     * Returns the current baseline target instance.
-     *
-     * @return the current baseline target instance
-     */
-    protected T getBaseTarget()
-    {
-        return baseTarget.get();
-    }
-
-    /**
-     * Returns the current "new" target instance.
-     *
-     * @return the current "new" target instance
-     */
-    protected T getNewTarget()
-    {
-        return newTarget.get();
-    }
-
-    /**
-     * Sets the {@link ProfileContext}s encapsulating the baseline target and the target being compared against it.
-     *
-     * @param profileContext the {@link ProfileContext}s encapsulating the baseline target and the target being compared
-     *            against it
-     */
-    public void setProfileContexts(ProfileContext baseContext, ProfileContext newContext)
-    {
-        this.baseContext = baseContext;
-        this.newContext = newContext;
-    }
 }

src/main/java/com/insightfullogic/honest_profiler/ports/javafx/controller/AbstractProfileViewController.java

@@ -42,7 +42,7 @@ public abstract class AbstractProfileViewController<T, U> extends AbstractViewCo
 
     private ObjectBinding<T> sourceBinding;
 
-    // Class Methods
+    // FXML Implementation
 
     /**
      * This method must be called by subclasses in their FXML initialize(). It passes on the controller-local UI nodes

src/main/java/com/insightfullogic/honest_profiler/ports/javafx/controller/FlatDiffViewController.java

@@ -43,9 +43,9 @@
 import static com.insightfullogic.honest_profiler.ports.javafx.util.ResourceUtil.INFO_TABLE_FLATDIFF;
 import static com.insightfullogic.honest_profiler.ports.javafx.util.report.ReportUtil.writeFlatProfileDiffCsv;
 
-import com.insightfullogic.honest_profiler.core.aggregation.AggregationProfile;
 import com.insightfullogic.honest_profiler.core.aggregation.result.diff.DiffEntry;
 import com.insightfullogic.honest_profiler.core.aggregation.result.diff.FlatDiff;
+import com.insightfullogic.honest_profiler.core.aggregation.result.straight.Flat;
 import com.insightfullogic.honest_profiler.ports.javafx.model.ProfileContext;
 import com.insightfullogic.honest_profiler.ports.javafx.util.report.ReportUtil;
 import com.insightfullogic.honest_profiler.ports.javafx.view.cell.MethodNameTableCell;
@@ -58,7 +58,7 @@
 import javafx.scene.control.TextField;
 
 public class FlatDiffViewController
-    extends AbstractProfileDiffViewController<AggregationProfile, DiffEntry<String>>
+    extends AbstractProfileDiffViewController<Flat<String>, DiffEntry<String>>
 {
     @FXML
     private Button filterButton;
@@ -130,7 +130,6 @@ protected void initialize()
         diff = new FlatDiff<>();
 
         super.initialize(
-            profileContext -> profileContext.profileProperty(),
             filterButton,
             quickFilterButton,
             quickFilterText,
@@ -184,11 +183,11 @@ private void initializeTable()
         cfgTimeDiffCol(totalTimeDiff, "totalTimeDiff", getText(COLUMN_TOTAL_TIME_DIFF));
     }
 
-    private void updateDiff(AggregationProfile profile, boolean base)
+    private void updateDiff(Flat<String> flat, boolean base)
     {
-        if (profile != null)
+        if (flat != null)
         {
-            diff.set(profile.getFlat(), base);
+            diff.set(flat, base);
             diffTable.getItems().clear();
             diffTable.getItems().addAll(diff.filter(getFilterSpecification()).getData());
         }

src/main/java/com/insightfullogic/honest_profiler/ports/javafx/controller/FlatViewController.java

@@ -87,6 +87,8 @@ public class FlatViewController extends AbstractProfileViewController<Flat<Strin
 
     private ObservableList<Entry<String>> flatProfile;
 
+    // FXML Implementation
+
     @Override
     @FXML
     protected void initialize()
@@ -102,6 +104,8 @@ protected void initialize()
         initializeTable();
     }
 
+    // Accessors
+
     @Override
     public void setProfileContext(ProfileContext profileContext)
     {

src/main/java/com/insightfullogic/honest_profiler/ports/javafx/controller/ProfileDiffRootController.java

@@ -20,6 +20,8 @@
 
 import static com.insightfullogic.honest_profiler.ports.javafx.ViewType.FLAT;
 import static com.insightfullogic.honest_profiler.ports.javafx.ViewType.TREE;
+import static com.insightfullogic.honest_profiler.ports.javafx.util.BindUtil.FLAT_EXTRACTOR;
+import static com.insightfullogic.honest_profiler.ports.javafx.util.BindUtil.TREE_EXTRACTOR;
 import static com.insightfullogic.honest_profiler.ports.javafx.util.ConversionUtil.getStringConverterForType;
 import static com.insightfullogic.honest_profiler.ports.javafx.util.ResourceUtil.INFO_CHOICE_VIEWTYPE;
 import static com.insightfullogic.honest_profiler.ports.javafx.util.ResourceUtil.INFO_LABEL_BASESOURCE;
@@ -73,7 +75,12 @@ public void setProfileContexts(ProfileContext baseContext, ProfileContext newCon
         newSourceLabel.setText(newContext.getName());
 
         flatController.setProfileContexts(baseContext, newContext);
+        flatController
+            .bind(baseContext.profileProperty(), newContext.profileProperty(), FLAT_EXTRACTOR);
+
         treeController.setProfileContexts(baseContext, newContext);
+        treeController
+            .bind(baseContext.profileProperty(), newContext.profileProperty(), TREE_EXTRACTOR);
 
         viewChoice.setConverter(getStringConverterForType(ViewType.class));
         viewChoice.getItems().addAll(FLAT, TREE);

src/main/java/com/insightfullogic/honest_profiler/ports/javafx/controller/ProfileRootController.java

@@ -20,6 +20,9 @@
 
 import static com.insightfullogic.honest_profiler.ports.javafx.ViewType.FLAT;
 import static com.insightfullogic.honest_profiler.ports.javafx.model.ProfileContext.ProfileMode.LIVE;
+import static com.insightfullogic.honest_profiler.ports.javafx.util.BindUtil.FLAME_EXTRACTOR;
+import static com.insightfullogic.honest_profiler.ports.javafx.util.BindUtil.FLAT_EXTRACTOR;
+import static com.insightfullogic.honest_profiler.ports.javafx.util.BindUtil.TREE_EXTRACTOR;
 import static com.insightfullogic.honest_profiler.ports.javafx.util.ConversionUtil.getStringConverterForType;
 import static com.insightfullogic.honest_profiler.ports.javafx.util.ResourceUtil.CONTENT_LABEL_PROFILESAMPLECOUNT;
 import static com.insightfullogic.honest_profiler.ports.javafx.util.ResourceUtil.INFO_BUTTON_COMPARE;
@@ -35,8 +38,6 @@
 
 import java.util.List;
 
-import com.insightfullogic.honest_profiler.core.aggregation.AggregationProfile;
-import com.insightfullogic.honest_profiler.core.profiles.FlameGraph;
 import com.insightfullogic.honest_profiler.ports.javafx.ViewType;
 import com.insightfullogic.honest_profiler.ports.javafx.model.ApplicationContext;
 import com.insightfullogic.honest_profiler.ports.javafx.model.ProfileContext;
@@ -99,17 +100,13 @@ public void setProfileContext(ProfileContext prCtx)
         this.profileContext = prCtx;
 
         flatController.setProfileContext(prCtx);
-        flatController.bind(
-            prCtx.profileProperty(),
-            o -> o == null ? null : ((AggregationProfile)o).getFlat());
+        flatController.bind(prCtx.profileProperty(), FLAT_EXTRACTOR);
 
         treeController.setProfileContext(prCtx);
-        treeController.bind(
-            prCtx.profileProperty(),
-            o -> o == null ? null : ((AggregationProfile)o).getTree());
+        treeController.bind(prCtx.profileProperty(), TREE_EXTRACTOR);
 
         flameController.setProfileContext(prCtx);
-        flameController.bind(prCtx.flameGraphProperty(), o -> (FlameGraph)o);
+        flameController.bind(prCtx.flameGraphProperty(), FLAME_EXTRACTOR);
 
         prCtx.profileProperty().addListener(
             (property, oldValue, newValue) -> profileSampleCount.setText(