X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGUserDefinedColours.java;h=27a068c9338b5e58252dc91f379a802b91eb5b38;hb=c794c5033adeee182b03a5ea92c0a7495a29661f;hp=061b81485502f9f52de4d20f4b5873df5257e083;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java index 061b814..27a068c 100755 --- a/src/jalview/jbgui/GUserDefinedColours.java +++ b/src/jalview/jbgui/GUserDefinedColours.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -23,10 +23,25 @@ package jalview.jbgui; import jalview.gui.JvSwingUtils; import jalview.util.MessageManager; -import java.awt.*; -import java.awt.event.*; - -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JColorChooser; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.SwingConstants; import javax.swing.colorchooser.AbstractColorChooserPanel; /** @@ -59,7 +74,7 @@ public class GUserDefinedColours extends JPanel JLabel jLabel1 = new JLabel(); - protected JTextField schemeName = new JTextField(); + public JTextField schemeName = new JTextField(); BorderLayout borderLayout1 = new BorderLayout(); @@ -87,9 +102,11 @@ public class GUserDefinedColours extends JPanel protected JPanel casePanel = new JPanel(); - protected JCheckBox caseSensitive = new JCheckBox(); + public JCheckBox caseSensitive = new JCheckBox(); + + public JCheckBox lcaseColour = new JCheckBox(); - protected JButton lcaseColour = new JButton(); + protected List selectedButtons; /** * Creates a new GUserDefinedColours object. @@ -120,47 +137,52 @@ public class GUserDefinedColours extends JPanel gridLayout.setRows(5); okButton.setFont(new java.awt.Font("Verdana", 0, 11)); okButton.setText(MessageManager.getString("action.ok")); - okButton.addActionListener(new java.awt.event.ActionListener() + okButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - okButton_actionPerformed(e); + okButton_actionPerformed(); } }); applyButton.setFont(new java.awt.Font("Verdana", 0, 11)); applyButton.setText(MessageManager.getString("action.apply")); - applyButton.addActionListener(new java.awt.event.ActionListener() + applyButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - applyButton_actionPerformed(e); + applyButton_actionPerformed(); } }); loadbutton.setFont(new java.awt.Font("Verdana", 0, 11)); loadbutton.setText(MessageManager.getString("action.load_scheme")); - loadbutton.addActionListener(new java.awt.event.ActionListener() + loadbutton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - loadbutton_actionPerformed(e); + loadbutton_actionPerformed(); } }); savebutton.setFont(new java.awt.Font("Verdana", 0, 11)); savebutton.setText(MessageManager.getString("action.save_scheme")); - savebutton.addActionListener(new java.awt.event.ActionListener() + savebutton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - savebutton_actionPerformed(e); + savebutton_actionPerformed(); } }); cancelButton.setFont(JvSwingUtils.getLabelFont()); cancelButton.setText(MessageManager.getString("action.cancel")); - cancelButton.addActionListener(new java.awt.event.ActionListener() + cancelButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - cancelButton_actionPerformed(e); + cancelButton_actionPerformed(); } }); this.setBackground(new Color(212, 208, 223)); @@ -185,28 +207,23 @@ public class GUserDefinedColours extends JPanel label.setFont(new java.awt.Font("Verdana", Font.ITALIC, 10)); label.setOpaque(false); label.setPreferredSize(new Dimension(260, 34)); - label.setText(MessageManager.formatMessage( - "label.html_content", - new String[] - { MessageManager - .getString("label.save_colour_scheme_with_unique_name_added_to_colour_menu") })); + label.setText( + MessageManager.formatMessage("label.html_content", new String[] + { MessageManager.getString( + "label.save_colour_scheme_with_unique_name_added_to_colour_menu") })); caseSensitive.setText(MessageManager.getString("label.case_sensitive")); caseSensitive.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - caseSensitive_actionPerformed(e); + caseSensitive_actionPerformed(); } }); lcaseColour .setText(MessageManager.getString("label.lower_case_colour")); - lcaseColour.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - lcaseColour_actionPerformed(e); - } - }); + lcaseColour.setToolTipText( + MessageManager.getString("label.lower_case_tip")); saveLoadPanel.add(savebutton); saveLoadPanel.add(loadbutton); @@ -229,32 +246,33 @@ public class GUserDefinedColours extends JPanel jPanel4.add(panel1, java.awt.BorderLayout.CENTER); this.add(jPanel4, java.awt.BorderLayout.CENTER); this.add(colorChooser, java.awt.BorderLayout.EAST); - + AbstractColorChooserPanel[] choosers = colorChooser.getChooserPanels(); - // JAL-1360 larger JColorChooser in Java 7 overwrites AA panel; restrict to swatch picker only - if (choosers.length > 3) { - // Java 7 default has 5 options rather than 3 for choosing colours; keep the first only - colorChooser.setChooserPanels(new AbstractColorChooserPanel[]{choosers[0]}); + // JAL-1360 larger JColorChooser in Java 7 overwrites AA panel; restrict to + // swatch picker only + if (choosers.length > 3) + { + // Java 7 default has 5 options rather than 3 for choosing colours; keep + // the first only + colorChooser + .setChooserPanels(new AbstractColorChooserPanel[] + { choosers[0] }); } + + selectedButtons = new ArrayList(); } /** * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! */ - protected void okButton_actionPerformed(ActionEvent e) + protected void okButton_actionPerformed() { } /** * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! */ - protected void applyButton_actionPerformed(ActionEvent e) + protected void applyButton_actionPerformed() { } @@ -264,17 +282,11 @@ public class GUserDefinedColours extends JPanel * @param e * DOCUMENT ME! */ - protected void loadbutton_actionPerformed(ActionEvent e) + protected void loadbutton_actionPerformed() { } - /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! - */ - protected void savebutton_actionPerformed(ActionEvent e) + protected void savebutton_actionPerformed() { } @@ -284,16 +296,16 @@ public class GUserDefinedColours extends JPanel * @param e * DOCUMENT ME! */ - protected void cancelButton_actionPerformed(ActionEvent e) + protected void cancelButton_actionPerformed() { } - public void caseSensitive_actionPerformed(ActionEvent e) + public void caseSensitive_actionPerformed() { } - public void lcaseColour_actionPerformed(ActionEvent e) + public void lcaseColour_actionPerformed() { }