/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
* of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import java.io.*;
-import java.util.*;
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
-import jalview.datamodel.*;
-import jalview.io.*;
-import jalview.jbgui.*;
-import jalview.schemes.*;
+import jalview.api.structures.JalviewStructureDisplayI;
+import jalview.datamodel.SequenceGroup;
+import jalview.io.JalviewFileChooser;
+import jalview.jbgui.GUserDefinedColours;
+import jalview.schemes.ColourSchemeI;
+import jalview.schemes.ResidueProperties;
+import jalview.schemes.UserColourScheme;
+import jalview.util.ColorUtils;
+import jalview.util.MessageManager;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+
+import javax.swing.JButton;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision$
+ * This panel allows the user to assign colours to Amino Acid residue codes, and
+ * save the colour scheme.
+ *
+ * @author Andrew Waterhouse
+ * @author Mungo Carstairs
*/
-public class UserDefinedColours
- extends GUserDefinedColours implements ChangeListener
+public class UserDefinedColours extends GUserDefinedColours implements
+ ChangeListener
{
+ private static final int MY_FRAME_HEIGHT = 420;
+
+ private static final int MY_FRAME_WIDTH = 810;
+
+ private static final int MY_FRAME_WIDTH_CASE_SENSITIVE = 970;
+
AlignmentPanel ap;
+
SequenceGroup seqGroup;
- Vector selectedButtons;
+
+ ArrayList<JButton> selectedButtons;
+
ColourSchemeI oldColourScheme;
+
JInternalFrame frame;
- AppJmol jmol;
- Vector upperCaseButtons;
- Vector lowerCaseButtons;
+
+ JalviewStructureDisplayI jmol;
+
+ ArrayList<JButton> upperCaseButtons;
+
+ ArrayList<JButton> lowerCaseButtons;
/**
* Creates a new UserDefinedColours object.
- *
- * @param ap DOCUMENT ME!
- * @param sg DOCUMENT ME!
+ *
+ * @param ap
+ * DOCUMENT ME!
+ * @param sg
+ * DOCUMENT ME!
*/
public UserDefinedColours(AlignmentPanel ap, SequenceGroup sg)
{
if (oldColourScheme instanceof UserColourScheme)
{
- schemeName.setText( ( (UserColourScheme) oldColourScheme).getName());
- if ( ( (UserColourScheme) oldColourScheme).getLowerCaseColours() != null)
+ schemeName.setText(((UserColourScheme) oldColourScheme).getName());
+ if (((UserColourScheme) oldColourScheme).getLowerCaseColours() != null)
{
caseSensitive.setSelected(true);
lcaseColour.setEnabled(true);
showFrame();
}
- public UserDefinedColours(AppJmol jmol, ColourSchemeI oldcs)
+ public UserDefinedColours(JalviewStructureDisplayI jmol,
+ ColourSchemeI oldcs)
{
super();
this.jmol = jmol;
if (oldColourScheme instanceof UserColourScheme)
{
- schemeName.setText( ( (UserColourScheme) oldColourScheme).getName());
+ schemeName.setText(((UserColourScheme) oldColourScheme).getName());
}
resetButtonPanel(false);
colorChooser.getSelectionModel().addChangeListener(this);
frame = new JInternalFrame();
frame.setContentPane(this);
- Desktop.addInternalFrame(frame, "User Defined Colours", 720, 370, true);
+ Desktop.addInternalFrame(frame,
+ MessageManager.getString("label.user_defined_colours"),
+ MY_FRAME_WIDTH, MY_FRAME_HEIGHT, true);
if (seqGroup != null)
{
frame.setTitle(frame.getTitle() + " (" + seqGroup.getName() + ")");
}
-
- if (new jalview.util.Platform().isAMac())
- {
- frame.setSize(760, 370);
- }
}
void resetButtonPanel(boolean caseSensitive)
if (upperCaseButtons == null)
{
- upperCaseButtons = new Vector();
+ upperCaseButtons = new ArrayList<JButton>();
}
JButton button;
}
else
{
- label = ResidueProperties.aa2Triplet.get
- (ResidueProperties.aa[i]).toString();
+ label = ResidueProperties.aa2Triplet.get(ResidueProperties.aa[i])
+ .toString();
}
- button = makeButton(label,
- ResidueProperties.aa[i],
- upperCaseButtons, i);
+ button = makeButton(label, ResidueProperties.aa[i], upperCaseButtons,
+ i);
buttonPanel.add(button);
}
if (lowerCaseButtons == null)
{
- lowerCaseButtons = new Vector();
+ lowerCaseButtons = new ArrayList<JButton>();
}
for (int i = 0; i < 20; i++)
{
int row = i / cols + 1;
int index = (row * cols) + i;
- button = makeButton(
- ResidueProperties.aa[i].toLowerCase(),
- ResidueProperties.aa[i].toLowerCase(),
- lowerCaseButtons,
- i);
+ button = makeButton(ResidueProperties.aa[i].toLowerCase(),
+ ResidueProperties.aa[i].toLowerCase(), lowerCaseButtons, i);
buttonPanel.add(button, index);
}
buttonPanel.add(makeButton("x", "x", lowerCaseButtons, 22));
}
+ // JAL-1360 widen the frame dynamically to accommodate case-sensitive AA
+ // codes
+ if (this.frame != null)
+ {
+ int newWidth = caseSensitive ? MY_FRAME_WIDTH_CASE_SENSITIVE
+ : MY_FRAME_WIDTH;
+ this.frame.setSize(newWidth, this.frame.getHeight());
+ }
+
buttonPanel.validate();
validate();
}
/**
* DOCUMENT ME!
- *
- * @param evt DOCUMENT ME!
+ *
+ * @param evt
+ * DOCUMENT ME!
*/
+ @Override
public void stateChanged(ChangeEvent evt)
{
if (selectedButtons != null)
{
JButton button = null;
+ final Color newColour = colorChooser.getColor();
for (int i = 0; i < selectedButtons.size(); i++)
{
- button = (JButton) selectedButtons.elementAt(i);
- button.setBackground(colorChooser.getColor());
- button.setForeground(button.getBackground().brighter().brighter().
- brighter());
+ button = selectedButtons.get(i);
+ button.setBackground(newColour);
+ button.setForeground(ColorUtils.brighterThan(newColour));
}
if (button == lcaseColour)
{
for (int i = 0; i < lowerCaseButtons.size(); i++)
{
- button = (JButton) lowerCaseButtons.elementAt(i);
- button.setBackground(colorChooser.getColor());
- button.setForeground(button.getBackground().brighter().brighter().
- brighter());
+ button = lowerCaseButtons.get(i);
+ button.setBackground(newColour);
+ button.setForeground(ColorUtils.brighterThan(button
+ .getBackground()));
}
}
}
}
/**
- * DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ * Performs actions when a residue button is clicked. This manages the button
+ * selection set (highlighted by brighter foreground text).
+ * <p>
+ * On select button(s) with Ctrl/click or Shift/click: set button foreground
+ * text to brighter than background.
+ * <p>
+ * On unselect button(s) with Ctrl/click on selected, or click to release
+ * current selection: reset foreground text to darker than background.
+ * <p>
+ * Simple click: clear selection (resetting foreground to darker); set clicked
+ * button foreground to brighter
+ * <p>
+ * Finally, synchronize the colour chooser to the colour of the first button
+ * in the selected set.
+ *
+ * @param e
*/
public void colourButtonPressed(MouseEvent e)
{
if (selectedButtons == null)
{
- selectedButtons = new Vector();
+ selectedButtons = new ArrayList<JButton>();
}
JButton pressed = (JButton) e.getSource();
JButton start, end = (JButton) e.getSource();
if (selectedButtons.size() > 0)
{
- start = (JButton) selectedButtons.elementAt(selectedButtons.size() - 1);
+ start = selectedButtons.get(selectedButtons.size() - 1);
}
else
{
JButton button = (JButton) buttonPanel.getComponent(b);
if (!selectedButtons.contains(button))
{
- button.setForeground(button.getBackground().brighter().brighter());
+ button.setForeground(ColorUtils.brighterThan(button
+ .getBackground()));
selectedButtons.add(button);
}
}
{
for (int b = 0; b < selectedButtons.size(); b++)
{
- JButton button = (JButton) selectedButtons.elementAt(b);
- button.setForeground(button.getBackground().darker().darker());
+ JButton button = selectedButtons.get(b);
+ button.setForeground(ColorUtils.darkerThan(button.getBackground()));
}
selectedButtons.clear();
- pressed.setForeground(pressed.getBackground().brighter().brighter());
- selectedButtons.addElement(pressed);
+ pressed.setForeground(ColorUtils.brighterThan(pressed.getBackground()));
+ selectedButtons.add(pressed);
}
else if (e.isControlDown())
{
if (selectedButtons.contains(pressed))
{
- pressed.setForeground(pressed.getBackground().darker().darker());
+ pressed.setForeground(ColorUtils.darkerThan(pressed.getBackground()));
selectedButtons.remove(pressed);
}
else
{
- pressed.setForeground(pressed.getBackground().brighter().brighter());
- selectedButtons.addElement(pressed);
+ pressed.setForeground(ColorUtils.brighterThan(pressed
+ .getBackground()));
+ selectedButtons.add(pressed);
}
}
if (selectedButtons.size() > 0)
{
- colorChooser.setColor( ( (JButton) selectedButtons.elementAt(0)).
- getBackground());
+ colorChooser.setColor((selectedButtons.get(0)).getBackground());
}
}
/**
* DOCUMENT ME!
- *
- * @param label DOCUMENT ME!
- * @param aa DOCUMENT ME!
+ *
+ * @param label
+ * DOCUMENT ME!
+ * @param aa
+ * DOCUMENT ME!
*/
- JButton makeButton(String label,
- String aa,
- Vector caseSensitiveButtons,
- int buttonIndex)
+ JButton makeButton(String label, String aa,
+ ArrayList<JButton> caseSensitiveButtons, int buttonIndex)
{
final JButton button;
Color col;
if (buttonIndex < caseSensitiveButtons.size())
{
- button = (JButton) caseSensitiveButtons.elementAt(buttonIndex);
+ button = caseSensitiveButtons.get(buttonIndex);
col = button.getBackground();
}
else
button = new JButton();
button.addMouseListener(new java.awt.event.MouseAdapter()
{
+ @Override
public void mouseClicked(MouseEvent e)
{
colourButtonPressed(e);
}
});
- caseSensitiveButtons.addElement(button);
+ caseSensitiveButtons.add(button);
col = Color.white;
-
- try
+ if (oldColourScheme != null)
{
- col = oldColourScheme.findColour(aa.charAt(0), -1);
+ try
+ {
+ col = oldColourScheme.findColour(aa.charAt(0), -1, null);
+ } catch (Exception ex)
+ {
+ }
}
- catch (Exception ex)
- {}
}
if (caseSensitive.isSelected())
button.setMargin(new java.awt.Insets(2, 14, 2, 14));
}
+ button.setOpaque(true); // required for the next line to have effect
button.setBackground(col);
button.setText(label);
- button.setForeground(col.darker().darker().darker());
+ button.setForeground(ColorUtils.darkerThan(col));
button.setFont(new java.awt.Font("Verdana", Font.BOLD, 10));
return button;
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void okButton_actionPerformed(ActionEvent e)
{
- applyButton_actionPerformed(null);
-
- try
- {
- frame.setClosed(true);
- }
- catch (Exception ex)
- {
- }
+ //Check if the user have done any selection
+ boolean showWarning = (upperCaseButtons==null) ||
+ ((upperCaseButtons!=null) && (upperCaseButtons.size()==0)) ||
+ (lowerCaseButtons==null) ||
+ ((lowerCaseButtons!=null) && (lowerCaseButtons.size()==0));
+ if (showWarning){
+ JOptionPane.showMessageDialog(Desktop.desktop,
+ MessageManager.getString("label.no_colour_selection_in_scheme"),MessageManager.getString("label.no_colour_selection_warn"),
+ JOptionPane.WARNING_MESSAGE);
+
+ }else{
+ applyButton_actionPerformed(null);
+
+ try
+ {
+ frame.setClosed(true);
+ } catch (Exception ex)
+ {
+ }
+ }
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void applyButton_actionPerformed(ActionEvent e)
{
- UserColourScheme ucs = getSchemeFromButtons();
+ //Check if the user have done any selection
+ boolean showWarning = (upperCaseButtons==null) ||
+ ((upperCaseButtons!=null) && (upperCaseButtons.size()==0)) ||
+ (lowerCaseButtons==null) ||
+ ((lowerCaseButtons!=null) && (lowerCaseButtons.size()==0));
+ if (showWarning){
+ JOptionPane.showMessageDialog(Desktop.desktop,
+ MessageManager.getString("label.no_colour_selection_in_scheme"),MessageManager.getString("label.no_colour_selection_warn"),
+ JOptionPane.WARNING_MESSAGE);
+
+ }
+ UserColourScheme ucs = getSchemeFromButtons();
ucs.setName(schemeName.getText());
if (seqGroup != null)
Color[] newColours = new Color[24];
- for (int i = 0; i < 24; i++)
- {
- JButton button = (JButton) upperCaseButtons.elementAt(i);
- newColours[i] = button.getBackground();
+ int length = upperCaseButtons.size();
+ if (length<24){
+ int i = 0;
+ for (JButton btn:upperCaseButtons){
+ newColours[i] = btn.getBackground();
+ i++;
+ }
+ }else{
+ for (int i = 0; i < 24; i++){
+ JButton button = upperCaseButtons.get(i);
+ newColours[i] = button.getBackground();
+ }
}
UserColourScheme ucs = new UserColourScheme(newColours);
if (caseSensitive.isSelected())
{
newColours = new Color[23];
- for (int i = 0; i < 23; i++)
- {
- JButton button = (JButton) lowerCaseButtons.elementAt(i);
- newColours[i] = button.getBackground();
+ length = lowerCaseButtons.size();
+ if (length<23){
+ int i = 0;
+ for (JButton btn:lowerCaseButtons){
+ newColours[i] = btn.getBackground();
+ i++;
+ }
+ }else{
+ for (int i = 0; i < 23; i++){
+ JButton button = lowerCaseButtons.get(i);
+ newColours[i] = button.getBackground();
+ }
}
ucs.setLowerCaseColours(newColours);
}
if (ap != null)
{
- ucs.setThreshold(0, ap.av.getIgnoreGapsConsensus());
+ ucs.setThreshold(0, ap.av.isIgnoreGapsConsensus());
}
return ucs;
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void loadbutton_actionPerformed(ActionEvent e)
{
- upperCaseButtons = new Vector();
- lowerCaseButtons = new Vector();
-
- JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
- getProperty(
- "LAST_DIRECTORY"), new String[]
- {"jc"},
- new String[]
- {"Jalview User Colours"}, "Jalview User Colours");
+ upperCaseButtons = new ArrayList<JButton>();
+ lowerCaseButtons = new ArrayList<JButton>();
+
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+ { "jc" }, new String[]
+ { "Jalview User Colours" }, "Jalview User Colours");
chooser.setFileView(new jalview.io.JalviewFileView());
- chooser.setDialogTitle("Load colour scheme");
- chooser.setToolTipText("Load");
+ chooser.setDialogTitle(MessageManager
+ .getString("label.load_colour_scheme"));
+ chooser.setToolTipText(MessageManager.getString("action.load"));
int value = chooser.showOpenDialog(this);
File choice = chooser.getSelectedFile();
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());
String defaultColours = jalview.bin.Cache.getDefault(
- "USER_DEFINED_COLOURS",
- choice.getPath());
+ "USER_DEFINED_COLOURS", choice.getPath());
if (defaultColours.indexOf(choice.getPath()) == -1)
{
- defaultColours = defaultColours.concat("|").concat(choice.getPath());
+ defaultColours = defaultColours.concat("|")
+ .concat(choice.getPath());
}
jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", defaultColours);
resetButtonPanel(true);
for (int i = 0; i < lowerCaseButtons.size(); i++)
{
- JButton button = (JButton) lowerCaseButtons.elementAt(i);
+ JButton button = lowerCaseButtons.get(i);
button.setBackground(ucs.getLowerCaseColours()[i]);
}
for (int i = 0; i < upperCaseButtons.size(); i++)
{
- JButton button = (JButton) upperCaseButtons.elementAt(i);
+ JButton button = upperCaseButtons.get(i);
button.setBackground(colors[i]);
}
/**
* DOCUMENT ME!
- *
+ *
* @return DOCUMENT ME!
*/
public static UserColourScheme loadDefaultColours()
/**
* DOCUMENT ME!
- *
- * @param file DOCUMENT ME!
- *
+ *
+ * @param file
+ * DOCUMENT ME!
+ *
* @return DOCUMENT ME!
*/
static UserColourScheme loadColours(String file)
Color[] newColours = null;
try
{
- InputStreamReader in = new InputStreamReader(new FileInputStream(
- file), "UTF-8");
+ InputStreamReader in = new InputStreamReader(
+ new FileInputStream(file), "UTF-8");
- jalview.schemabinding.version2.JalviewUserColours jucs
- = new jalview.schemabinding.version2.JalviewUserColours();
+ jalview.schemabinding.version2.JalviewUserColours jucs = new jalview.schemabinding.version2.JalviewUserColours();
- org.exolab.castor.xml.Unmarshaller unmar
- = new org.exolab.castor.xml.Unmarshaller(jucs);
- jucs = (jalview.schemabinding.version2.JalviewUserColours) unmar.
- unmarshal(in);
+ org.exolab.castor.xml.Unmarshaller unmar = new org.exolab.castor.xml.Unmarshaller(
+ jucs);
+ jucs = (jalview.schemabinding.version2.JalviewUserColours) unmar
+ .unmarshal(in);
newColours = new Color[24];
name = jucs.getColour(i).getName();
if (ResidueProperties.aa3Hash.containsKey(name))
{
- index = ( (Integer) ResidueProperties.aa3Hash.get(name)).intValue();
+ index = ((Integer) ResidueProperties.aa3Hash.get(name))
+ .intValue();
}
else
{
lowerCase = new Color[23];
}
caseSensitive = true;
- lowerCase[index] = new Color(Integer.parseInt(
- jucs.getColour(i).getRGB(), 16));
+ lowerCase[index] = new Color(Integer.parseInt(jucs.getColour(i)
+ .getRGB(), 16));
}
else
{
- newColours[index] = new Color(Integer.parseInt(
- jucs.getColour(i).getRGB(), 16));
+ newColours[index] = new Color(Integer.parseInt(jucs.getColour(i)
+ .getRGB(), 16));
}
}
}
}
- }
- catch (Exception ex)
+ } catch (Exception ex)
{
- //Could be Archive Jalview format
+ // Could be Archive Jalview format
try
{
InputStreamReader in = new InputStreamReader(new FileInputStream(
- file), "UTF-8");
+ file), "UTF-8");
- jalview.binding.JalviewUserColours jucs
- = new jalview.binding.JalviewUserColours();
+ jalview.binding.JalviewUserColours jucs = new jalview.binding.JalviewUserColours();
- jucs = (jalview.binding.JalviewUserColours) jucs.unmarshal(in);
+ jucs = jucs.unmarshal(in);
newColours = new Color[jucs.getColourCount()];
for (int i = 0; i < 24; i++)
{
- newColours[i] = new Color(Integer.parseInt(
- jucs.getColour(i).getRGB(), 16));
+ newColours[i] = new Color(Integer.parseInt(jucs.getColour(i)
+ .getRGB(), 16));
}
if (newColours != null)
{
ucs = new UserColourScheme(newColours);
ucs.setName(jucs.getSchemeName());
}
- }
- catch (Exception ex2)
+ } catch (Exception ex2)
{
ex2.printStackTrace();
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void savebutton_actionPerformed(ActionEvent e)
{
if (schemeName.getText().trim().length() < 1)
{
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
- "User colour scheme must have a name!",
- "No name for colour scheme",
- JOptionPane.WARNING_MESSAGE);
+ JOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager
+ .getString("label.user_colour_scheme_must_have_name"),
+ MessageManager.getString("label.no_name_colour_scheme"),
+ JOptionPane.WARNING_MESSAGE);
return;
}
- if (userColourSchemes != null &&
- userColourSchemes.containsKey(schemeName.getText()))
+ if (userColourSchemes != null
+ && userColourSchemes.containsKey(schemeName.getText()))
{
int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
- "Colour scheme " + schemeName.getText() + " exists."
- + "\nContinue saving colour scheme as " + schemeName.getText() + "?",
- "Duplicate scheme name", JOptionPane.YES_NO_OPTION);
+ MessageManager.formatMessage(
+ "label.colour_scheme_exists_overwrite", new Object[]
+ { schemeName.getText(), schemeName.getText() }),
+ MessageManager.getString("label.duplicate_scheme_name"),
+ JOptionPane.YES_NO_OPTION);
if (reply != JOptionPane.YES_OPTION)
{
return;
userColourSchemes.remove(schemeName.getText());
}
- JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
- getProperty(
- "LAST_DIRECTORY"), new String[]
- {"jc"},
- new String[]
- {"Jalview User Colours"}, "Jalview User Colours");
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+ { "jc" }, new String[]
+ { "Jalview User Colours" }, "Jalview User Colours");
chooser.setFileView(new jalview.io.JalviewFileView());
- chooser.setDialogTitle("Save colour scheme");
- chooser.setToolTipText("Save");
+ chooser.setDialogTitle(MessageManager.getString("label.save_colour_scheme"));
+ chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
{
String choice = chooser.getSelectedFile().getPath();
String defaultColours = jalview.bin.Cache.getDefault(
- "USER_DEFINED_COLOURS", choice);
+ "USER_DEFINED_COLOURS", choice);
if (defaultColours.indexOf(choice) == -1)
{
if (defaultColours.length() > 0)
jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", defaultColours);
- jalview.schemabinding.version2.JalviewUserColours ucs
- = new jalview.schemabinding.version2.JalviewUserColours();
+ jalview.schemabinding.version2.JalviewUserColours ucs = new jalview.schemabinding.version2.JalviewUserColours();
ucs.setSchemeName(schemeName.getText());
try
{
PrintWriter out = new PrintWriter(new OutputStreamWriter(
- new FileOutputStream(choice), "UTF-8"));
+ new FileOutputStream(choice), "UTF-8"));
for (int i = 0; i < buttonPanel.getComponentCount(); i++)
{
JButton button = (JButton) buttonPanel.getComponent(i);
- jalview.schemabinding.version2.Colour col
- = new jalview.schemabinding.version2.Colour();
+ jalview.schemabinding.version2.Colour col = new jalview.schemabinding.version2.Colour();
col.setName(button.getText());
- col.setRGB(jalview.util.Format.getHexString(
- button.getBackground()));
+ col.setRGB(jalview.util.Format.getHexString(button
+ .getBackground()));
ucs.addColour(col);
}
ucs.marshal(out);
out.close();
- }
- catch (Exception ex)
+ } catch (Exception ex)
{
ex.printStackTrace();
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void cancelButton_actionPerformed(ActionEvent e)
{
if (ap != null)
try
{
frame.setClosed(true);
- }
- catch (Exception ex)
+ } catch (Exception ex)
{
}
}
coloursFound.append(file);
userColourSchemes.put(ucs.getName(), ucs);
}
- }
- catch (Exception ex)
+ } catch (Exception ex)
{
System.out.println("Error loading User ColourFile\n" + ex);
}
if (coloursFound.toString().length() > 1)
{
jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS",
- coloursFound.toString());
+ coloursFound.toString());
}
else
{
- jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");
+ jalview.bin.Cache.applicationProperties
+ .remove("USER_DEFINED_COLOURS");
}
}
}
StringBuffer coloursFound = new StringBuffer();
StringTokenizer st = new StringTokenizer(
- jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS"), "|");
+ jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS"), "|");
while (st.hasMoreElements())
{
coloursFound.append(file);
userColourSchemes.put(ucs.getName(), ucs);
}
- }
- catch (Exception ex)
+ } catch (Exception ex)
{
System.out.println("Error loading User ColourFile\n" + ex);
}
if (coloursFound.toString().length() > 1)
{
jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS",
- coloursFound.toString());
+ coloursFound.toString());
}
else
{
- jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");
+ jalview.bin.Cache.applicationProperties
+ .remove("USER_DEFINED_COLOURS");
}
}
+ @Override
public void caseSensitive_actionPerformed(ActionEvent e)
{
resetButtonPanel(caseSensitive.isSelected());
lcaseColour.setEnabled(caseSensitive.isSelected());
}
+ @Override
public void lcaseColour_actionPerformed(ActionEvent e)
{
if (selectedButtons == null)
{
- selectedButtons = new Vector();
+ selectedButtons = new ArrayList<JButton>();
}
else
{
}
selectedButtons.add(lcaseColour);
}
-
}
git://source.jalview.org / jalview.git / blobdiff