X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FUserDefinedColours.java;h=88098a9f17fdfe840dd87320d4d190107d40c65a;hb=74b531f56bbaad5c5e06a4744980256fe8110923;hp=342c065261eeb7ca1280c7d8739a0ad8fd5200ee;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java index 342c065..88098a9 100644 --- a/src/jalview/appletgui/UserDefinedColours.java +++ b/src/jalview/appletgui/UserDefinedColours.java @@ -20,9 +20,10 @@ */ package jalview.appletgui; +import jalview.api.FeatureColourI; import jalview.datamodel.SequenceGroup; import jalview.schemes.ColourSchemeI; -import jalview.schemes.GraduatedColor; +import jalview.schemes.FeatureColour; import jalview.schemes.ResidueProperties; import jalview.schemes.UserColourScheme; import jalview.util.MessageManager; @@ -44,11 +45,13 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.AdjustmentEvent; import java.awt.event.AdjustmentListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.util.Vector; public class UserDefinedColours extends Panel implements ActionListener, - AdjustmentListener + AdjustmentListener, FocusListener { AlignmentPanel ap; @@ -57,7 +60,7 @@ public class UserDefinedColours extends Panel implements ActionListener, Button selectedButton; - Vector oldColours = new Vector(); + Vector oldColours = new Vector(); ColourSchemeI oldColourScheme; @@ -73,7 +76,7 @@ public class UserDefinedColours extends Panel implements ActionListener, String originalLabel; - Object originalColour; + FeatureColourI originalColour; int R = 0, G = 0, B = 0; @@ -115,7 +118,7 @@ public class UserDefinedColours extends Panel implements ActionListener, public UserDefinedColours(FeatureRenderer fr, Frame alignframe) { caller = fr; - originalColour = fr.colourPanel.getBackground(); + originalColour = new FeatureColour(fr.colourPanel.getBackground()); originalLabel = "Feature Colour"; setForDialog("Select Feature Colour", alignframe); setTargetColour(fr.colourPanel.getBackground()); @@ -132,21 +135,21 @@ public class UserDefinedColours extends Panel implements ActionListener, * * @param caller * - handles events - * @param col1 + * @param col * - original colour * @param alignframe * - the parent Frame for the dialog * @param title * - window title */ - public UserDefinedColours(Component caller, Color col1, Frame alignframe, + public UserDefinedColours(Component caller, Color col, Frame alignframe, String title) { this.caller = caller; - originalColour = col1; + originalColour = new FeatureColour(col); originalLabel = title; setForDialog(title, alignframe); - setTargetColour(col1); + setTargetColour(col); dialog.setVisible(true); } @@ -159,7 +162,7 @@ public class UserDefinedColours extends Panel implements ActionListener, */ public UserDefinedColours(Object caller, String label, Color colour) { - this(caller, label, colour, colour); + this(caller, label, new FeatureColour(colour), colour); } /** @@ -170,13 +173,13 @@ public class UserDefinedColours extends Panel implements ActionListener, * @param graduatedColor */ public UserDefinedColours(FeatureSettings me, String type, - GraduatedColor graduatedColor) + FeatureColourI graduatedColor) { - this(me, type, graduatedColor, graduatedColor.getMaxColor()); + this(me, type, graduatedColor, graduatedColor.getMaxColour()); } - private UserDefinedColours(Object caller, String label, Object ocolour, - Color colour) + private UserDefinedColours(Object caller, String label, + FeatureColourI ocolour, Color colour) { this.caller = caller; originalColour = ocolour; @@ -187,7 +190,8 @@ public class UserDefinedColours extends Panel implements ActionListener, setTargetColour(colour); okcancelPanel.setBounds(new Rectangle(0, 113, 400, 35)); - frame.setTitle(MessageManager.getString("label.user_defined_colours") + " - " + label); + frame.setTitle(MessageManager.getString("label.user_defined_colours") + + " - " + label); frame.setSize(420, 200); } @@ -206,7 +210,9 @@ public class UserDefinedColours extends Panel implements ActionListener, // // not 1.1 compatible! // dialog = new Dialog(((JVDialog)alignframe), title, true); // } else { - throw new Error(MessageManager.getString("label.error_unsupported_owwner_user_colour_scheme")); + throw new Error( + MessageManager + .getString("label.error_unsupported_owwner_user_colour_scheme")); } dialog.add(this); @@ -223,34 +229,37 @@ public class UserDefinedColours extends Panel implements ActionListener, } + @Override public void actionPerformed(ActionEvent evt) { - if (evt.getSource() == okButton) + final Object source = evt.getSource(); + if (source == okButton) { okButton_actionPerformed(); } - else if (evt.getSource() == applyButton) + else if (source == applyButton) { applyButton_actionPerformed(); } - else if (evt.getSource() == cancelButton) + else if (source == cancelButton) { cancelButton_actionPerformed(); } - else if (evt.getSource() == rText) + else if (source == rText) { rText_actionPerformed(); } - else if (evt.getSource() == gText) + else if (source == gText) { gText_actionPerformed(); } - else if (evt.getSource() == bText) + else if (source == bText) { bText_actionPerformed(); } } + @Override public void adjustmentValueChanged(AdjustmentEvent evt) { if (evt.getSource() == rScroller) @@ -414,6 +423,7 @@ public class UserDefinedColours extends Panel implements ActionListener, button.setFont(new java.awt.Font("Verdana", 1, 10)); button.addMouseListener(new java.awt.event.MouseAdapter() { + @Override public void mousePressed(MouseEvent e) { colourButtonPressed(e); @@ -445,7 +455,8 @@ public class UserDefinedColours extends Panel implements ActionListener, { if (caller instanceof FeatureSettings) { - ((FeatureSettings) caller).setUserColour(originalLabel, getColor()); + ((FeatureSettings) caller).setUserColour(originalLabel, + new FeatureColour(getColor())); } else if (caller instanceof AnnotationColourChooser) { @@ -462,7 +473,8 @@ public class UserDefinedColours extends Panel implements ActionListener, } else if (caller instanceof FeatureRenderer) { - ((FeatureRenderer) caller).colourPanel.updateColor(getColor()); + ((FeatureRenderer) caller).colourPanel + .updateColor(new FeatureColour(getColor())); } else if (caller instanceof FeatureColourChooser) { @@ -531,12 +543,12 @@ public class UserDefinedColours extends Panel implements ActionListener, if (originalLabel.equals("Min Colour")) { ((AnnotationColourChooser) caller) - .minColour_actionPerformed((Color) originalColour); + .minColour_actionPerformed(originalColour.getColour()); } else { ((AnnotationColourChooser) caller) - .maxColour_actionPerformed((Color) originalColour); + .maxColour_actionPerformed(originalColour.getColour()); } } else if (caller instanceof FeatureRenderer) @@ -550,12 +562,12 @@ public class UserDefinedColours extends Panel implements ActionListener, if (originalLabel.indexOf("inimum") > -1) { ((FeatureColourChooser) caller) - .minColour_actionPerformed((Color) originalColour); + .minColour_actionPerformed(originalColour.getColour()); } else { ((FeatureColourChooser) caller) - .maxColour_actionPerformed((Color) originalColour); + .maxColour_actionPerformed(originalColour.getColour()); } } if (dialog != null) @@ -570,7 +582,7 @@ public class UserDefinedColours extends Panel implements ActionListener, Color[] newColours = new Color[24]; for (int i = 0; i < 24; i++) { - newColours[i] = (Color) oldColours.elementAt(i); + newColours[i] = oldColours.elementAt(i); buttonPanel.getComponent(i).setBackground(newColours[i]); } @@ -664,6 +676,7 @@ public class UserDefinedColours extends Panel implements ActionListener, rText.setText("0 "); rText.setBounds(new Rectangle(156, 27, 53, 19)); rText.addActionListener(this); + rText.addFocusListener(this); label4.setAlignment(Label.RIGHT); label4.setText("G"); label4.setBounds(new Rectangle(15, 56, 20, 15)); @@ -678,6 +691,7 @@ public class UserDefinedColours extends Panel implements ActionListener, gText.setText("0 "); gText.setBounds(new Rectangle(156, 52, 53, 20)); gText.addActionListener(this); + gText.addFocusListener(this); label5.setAlignment(Label.RIGHT); label5.setText("B"); label5.setBounds(new Rectangle(14, 82, 20, 15)); @@ -692,12 +706,16 @@ public class UserDefinedColours extends Panel implements ActionListener, bText.setText("0 "); bText.setBounds(new Rectangle(157, 78, 52, 20)); bText.addActionListener(this); + bText.addFocusListener(this); target.setBackground(Color.black); target.setBounds(new Rectangle(229, 26, 134, 79)); this.add(okcancelPanel, null); okcancelPanel.add(okButton, null); okcancelPanel.add(applyButton, null); okcancelPanel.add(cancelButton, null); + this.add(rText); + this.add(gText); + this.add(bText); this.add(buttonPanel, null); this.add(target, null); this.add(gScroller); @@ -706,9 +724,40 @@ public class UserDefinedColours extends Panel implements ActionListener, this.add(label5); this.add(label4); this.add(label1); - this.add(gText); - this.add(rText); - this.add(bText); + } + + @Override + public void focusGained(FocusEvent e) + { + // noop + } + + /** + * This method applies any change to an RGB value if the user tabs out of the + * field instead of pressing Enter + */ + @Override + public void focusLost(FocusEvent e) + { + Component c = e.getComponent(); + if (c == rText) + { + rText_actionPerformed(); + } + else + { + if (c == gText) + { + gText_actionPerformed(); + } + else + { + if (c == bText) + { + bText_actionPerformed(); + } + } + } } }