Fix: update UI upon load color scale

Michael P Schroeder · Michael P Schroeder · commit 106d20371e8e · 2014-10-27T15:32:20.000+01:00
diff --git a/changelog.md b/changelog.md
@@ -15,7 +15,7 @@ Gitools 2.2.2
 * Bugfix: Numeric header sorting
 * Non-0 event function for linear numeric (color) scale
 * Numeric Header value formatter
-
+* Update color scale load in numeric header wizard
 
 Gitools 2.2.1
 -------------------------------------------------------------
diff --git a/org.gitools.heatmap/src/main/java/org/gitools/heatmap/header/HeatmapDecoratorHeader.java b/org.gitools.heatmap/src/main/java/org/gitools/heatmap/header/HeatmapDecoratorHeader.java
@@ -29,7 +29,6 @@
 import org.gitools.heatmap.decorator.DetailsDecoration;
 import org.gitools.heatmap.decorator.impl.LinearDecorator;
 import org.gitools.matrix.filter.AnnotationFunction;
-import org.gitools.utils.formatter.HeatmapTextFormatter;
 import org.gitools.utils.formatter.ITextFormatter;
 import org.gitools.utils.formatter.ScientificHeatmapTextFormatter;
 
@@ -106,6 +105,7 @@ public Decorator getDecorator() {
 
     public void setDecorator(Decorator decorator) {
         this.decorator = decorator;
+        firePropertyChange(this.PROPERTY_DECORATOR, decorator, null);
     }
 
     public List<String> getAnnotationLabels() {
diff --git a/org.gitools.heatmap/src/main/java/org/gitools/heatmap/header/HeatmapHeader.java b/org.gitools.heatmap/src/main/java/org/gitools/heatmap/header/HeatmapHeader.java
@@ -49,6 +49,7 @@ public abstract class HeatmapHeader extends Model {
     public static final String PROPERTY_DESCRIPTION = "description";
     public static final String PROPERTY_DESCRIPTION_URL = "descriptionUrl";
     public static final String PROPERTY_VALUE_URL = "valueUrl";
+    public static final String PROPERTY_DECORATOR = "decorator";
 
     @XmlElement
     private String title;
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/heatmap/header/wizard/heatmapheader/ColorScalePage.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/heatmap/header/wizard/heatmapheader/ColorScalePage.java
@@ -27,6 +27,7 @@
 import com.jgoodies.binding.value.ValueModel;
 import org.gitools.heatmap.decorator.Decorator;
 import org.gitools.heatmap.header.HeatmapDecoratorHeader;
+import org.gitools.heatmap.header.HeatmapHeader;
 import org.gitools.ui.app.decorators.SaveDecoratorDialog;
 import org.gitools.ui.app.heatmap.panel.settings.layer.decorators.DecoratorPanelContainer;
 import org.gitools.ui.app.heatmap.panel.settings.layer.decorators.DecoratorPanels;
@@ -36,6 +37,8 @@
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 public class ColorScalePage extends AbstractWizardPage {
     private JPanel mainPanel;
@@ -49,8 +52,8 @@ public ColorScalePage(final HeatmapDecoratorHeader header) {
         super();
 
         // Bind color scale controls
-        DecoratorPanels decorators = new DecoratorPanels();
-        DecoratorPanelContainer decoratorsPanels = (DecoratorPanelContainer) this.decoratorPanels;
+        final DecoratorPanels decorators = new DecoratorPanels();
+        final DecoratorPanelContainer decoratorsPanels = (DecoratorPanelContainer) this.decoratorPanels;
 
         final ValueModel decoratorModel = new AbstractValueModel() {
             @Override
@@ -64,12 +67,26 @@ public void setValue(Object newValue) {
             }
         };
 
-        decoratorsPanels.init(decorators, decoratorModel);
+ /*       decoratorsPanels.init(decorators, decoratorModel);
 
         Bindings.bind(decoratorPanelSelector, new SelectionInList<>(
                 decorators,
                 decoratorsPanels.getCurrentPanelModel()
-        ));
+        ));     */
+
+        PropertyChangeListener listener = new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                decoratorsPanels.init(decorators, decoratorModel);
+
+                Bindings.bind(decoratorPanelSelector, new SelectionInList<>(
+                        decorators,
+                        decoratorsPanels.getCurrentPanelModel()
+                ));
+            }
+        };
+        listener.propertyChange(null);
+        header.addPropertyChangeListener(HeatmapHeader.PROPERTY_DECORATOR, listener);
 
         colorScaleSave.setCursor(new Cursor(Cursor.HAND_CURSOR));
         colorScaleSave.addMouseListener(new MouseAdapter() {
