From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 3 Dec 2018 10:41:37 +0000 (+0000)
Subject: JAL-3167 end cell editing on cancel in colour chooser
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~361^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2c4c05767f8b17d32d9c2093c5a152c3b19f4292;p=jalview.git

JAL-3167 end cell editing on cancel in colour chooser
---

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 3cd6c21..b82cf86 100644
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -1739,13 +1739,20 @@ public class FeatureSettings extends JPanel
            * simple colour chooser
            */
           String ttl = MessageManager.getString("label.select_colour");
-          ColourChooserListener listener = new ColourChooserListener() {
+          ColourChooserListener listener = new ColourChooserListener() 
+          {
             @Override
             public void colourSelected(Color c)
             {
               currentColor = new FeatureColour(c);
               me.table.setValueAt(currentColor, rowSelected, COLOUR_COLUMN);
+              fireEditingStopped();
             }
+			@Override
+			public void cancel() 
+			{
+	          fireEditingStopped();
+			}
           };
           JalviewColourChooser.showColourChooser(button,  ttl,  currentColor.getColour(), listener);
         }
@@ -1761,7 +1768,6 @@ public class FeatureSettings extends JPanel
             chooser.requestFocus();
           }
           chooser.addActionListener(this);
-          // Make the renderer reappear.
           fireEditingStopped();
         }
       }