Ticket #2117: 2117.patch

modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/gradient/GradientPicker.java

@@ -612 +612 @@
 
                         @Override
                         protected GradientPreviewPanel create() {
-                                GradientPreviewPanel res = new GradientPreviewPanel();
+                                GradientPreviewPanel res = new SophieGradientPreviewPanel();
                                 res.setMultiThumbModel(thumbSlider().get().getModel());
                                 res.setBorder(BorderFactory.createEtchedBorder());
                                 res.setPreferredSize(new Dimension(130, 130));

modules/org.sophie2.main.app.halos/src/main/java/org/sophie2/main/app/halos/huds/gradient/SophieGradientPreviewPanel.java

@@ +1 @@
+package org.sophie2.main.app.halos.huds.gradient;
+
+import org.apache.batik.ext.awt.MultipleGradientPaint;
+import org.jdesktop.swingx.color.GradientPreviewPanel;
+import org.sophie2.base.commons.util.ImmGradient;
+import org.sophie2.core.logging.SophieLog;
+
+/**
+ * Class for the gradient preview. Used only to catch the exception from the 
+ * {@link GradientPreviewPanel#getGradient()} method when the two points
+ * are equal.
+ * 
+ * @author diana
+ *
+ */
+public class SophieGradientPreviewPanel extends GradientPreviewPanel{
+
+        private static final long serialVersionUID = -8287150527672235602L;
+        private MultipleGradientPaint lastGradient = 
+                ImmGradient.DEFAULT_GRADIENT.getGradientPaint();
+        
+        @Override
+         public MultipleGradientPaint getGradient() {
+                try {
+                        this.lastGradient = super.getGradient();
+                        return this.lastGradient;
+                } catch (IllegalArgumentException e){
+                        SophieLog.debug(e);
+                        return this.lastGradient;
+                }
+        }
+}