import jalview.datamodel.SearchResults;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
+import jalview.schemes.Colour;
import jalview.schemes.FeatureColour;
import jalview.schemes.UserColourScheme;
+import jalview.util.ColorUtils;
import jalview.util.MessageManager;
import java.awt.BorderLayout;
{
Color col = JColorChooser.showDialog(Desktop.desktop,
MessageManager.getString("label.select_feature_colour"),
- fcol.getColour());
+ ColorUtils.getColor(fcol.getColour()));
if (col != null)
{
- fcol = new FeatureColour(col);
- updateColourButton(bigPanel, colour, new FeatureColour(col));
+ fcol = new FeatureColour(new Colour(col));
+ updateColourButton(bigPanel, colour, fcol);
}
}
else
FeatureColourI col = getFeatureStyle(name.getText());
if (col == null)
{
- col = new FeatureColour(UserColourScheme
- .createColourFromName(name.getText()));
+ col = new FeatureColour(new Colour(UserColourScheme
+ .createColourFromName(name.getText())));
}
oldcol = fcol = col;
updateColourButton(bigPanel, colour, col);
* update the amend feature button dependent on the given style
*
* @param bigPanel
+ * @param colour
* @param col
+<<<<<<< HEAD
+=======
* @param col
+>>>>>>> refs/heads/develop
*/
protected void updateColourButton(JPanel bigPanel, JLabel colour,
FeatureColourI col)
if (col.isSimpleColour())
{
- colour.setBackground(col.getColour());
+ colour.setBackground(ColorUtils.getColor(col.getColour()));
}
else
{