X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=ede020c6101fd71d3c79968e9024763c3adb4123;hb=3d32993c37812a293d61b8cb746ac8a4f246bed0;hp=18382fbe4d9e9a96d257cc59fbfaac882bbf7bf6;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 18382fb..ede020c 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -18,321 +18,665 @@
  */
 package jalview.gui;
 
-import java.io.*;
-import java.util.*;
+import jalview.datamodel.*;
+
+import jalview.io.*;
+
+import jalview.jbgui.*;
+
+import jalview.schemes.*;
 
 import java.awt.*;
 import java.awt.event.*;
+
+import java.io.*;
+
+import java.util.*;
+
 import javax.swing.*;
 import javax.swing.event.*;
 
-import jalview.datamodel.*;
-import jalview.io.*;
-import jalview.jbgui.*;
-import jalview.schemes.*;
 
-public class UserDefinedColours
-    extends GUserDefinedColours implements ChangeListener
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class UserDefinedColours extends GUserDefinedColours
+    implements ChangeListener
 {
-  AlignmentPanel ap;
-  SequenceGroup seqGroup;
-  JButton selectedButton;
-  Vector oldColours = new Vector();
-  ColourSchemeI oldColourScheme;
-  JInternalFrame frame;
-
-  public UserDefinedColours(AlignmentPanel ap, SequenceGroup sg)
-  {
-    super();
-    frame = new JInternalFrame();
-    frame.setContentPane(this);
-    Desktop.addInternalFrame(frame, "User Defined Colours", 450, 530, false);
-
-    if (System.getProperty("os.name").startsWith("Mac"))
+    AlignmentPanel ap;
+    SequenceGroup seqGroup;
+    Vector selectedButtons;
+    ColourSchemeI oldColourScheme;
+    JInternalFrame frame;
+    MCview.PDBCanvas pdbcanvas;
+
+    /**
+     * Creates a new UserDefinedColours object.
+     *
+     * @param ap DOCUMENT ME!
+     * @param sg DOCUMENT ME!
+     */
+    public UserDefinedColours(AlignmentPanel ap, SequenceGroup sg)
     {
-      frame.setSize(450, 560);
-    }
+        super();
+        frame = new JInternalFrame();
+        frame.setContentPane(this);
+        Desktop.addInternalFrame(frame, "User Defined Colours", 720, 370, true);
 
-    if (sg != null)
-    {
-      frame.setTitle(frame.getTitle() + " (" + sg.getName() + ")");
-    }
+        if (System.getProperty("os.name").startsWith("Mac"))
+        {
+            frame.setSize(760, 370);
+        }
 
-    colorChooser.getSelectionModel().addChangeListener(this);
+        if (sg != null)
+        {
+            frame.setTitle(frame.getTitle() + " (" + sg.getName() + ")");
+        }
 
-    this.ap = ap;
-    seqGroup = sg;
+        colorChooser.getSelectionModel().addChangeListener(this);
 
-    if (seqGroup != null)
-    {
-      oldColourScheme = seqGroup.cs;
-    }
-    else
-    {
-      oldColourScheme = ap.av.getGlobalColourScheme();
-    }
+        this.ap = ap;
+        seqGroup = sg;
 
-    for (int i = 0; i < 20; i++)
-    {
-      makeButton(ResidueProperties.aa2Triplet.get(ResidueProperties.aa[i]) +
-                 "", ResidueProperties.aa[i]);
-    }
+        if (seqGroup != null)
+        {
+            oldColourScheme = seqGroup.cs;
+        }
+        else
+        {
+            oldColourScheme = ap.av.getGlobalColourScheme();
+        }
 
-    makeButton("B", "B");
-    makeButton("Z", "Z");
-    makeButton("X", "X");
-    makeButton("Gap", "'.','-',' '");
+        if (oldColourScheme instanceof UserColourScheme)
+        {
+              schemeName.setText( ( (UserColourScheme) oldColourScheme).getName());
+        }
+        for (int i = 0; i < 20; i++)
+        {
+            makeButton(ResidueProperties.aa2Triplet.get(ResidueProperties.aa[i]) +
+                "", ResidueProperties.aa[i]);
+        }
 
-    if (jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR") != null)
-    {
-      loadColours(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));
+        makeButton("B", "B");
+        makeButton("Z", "Z");
+        makeButton("X", "X");
+        makeButton("Gap", "-");
     }
-  }
 
-  public void stateChanged(ChangeEvent evt)
-  {
-    if (selectedButton != null)
+    public UserDefinedColours(MCview.PDBCanvas pdb, ColourSchemeI oldcs)
     {
-      selectedButton.setBackground(colorChooser.getColor());
-    }
-  }
+        super();
+        frame = new JInternalFrame();
+        frame.setContentPane(this);
+        Desktop.addInternalFrame(frame, "User Defined Colours", 720, 370, true);
+        pdbcanvas = pdb;
 
-  public void colourButtonPressed(MouseEvent e)
-  {
-    selectedButton = (JButton) e.getSource();
-    colorChooser.setColor(selectedButton.getBackground());
-  }
+        if (System.getProperty("os.name").startsWith("Mac"))
+        {
+            frame.setSize(760, 370);
+        }
 
-  void makeButton(String label, String aa)
-  {
-    final JButton button = new JButton();
-    Color col = Color.white;
+        colorChooser.getSelectionModel().addChangeListener(this);
 
-    try
-    {
-      col = oldColourScheme.findColour(aa, -1);
+        oldColourScheme = oldcs;
+
+        if (oldColourScheme instanceof UserColourScheme)
+        {
+              schemeName.setText( ( (UserColourScheme) oldColourScheme).getName());
+        }
+        for (int i = 0; i < 20; i++)
+        {
+            makeButton(ResidueProperties.aa2Triplet.get(ResidueProperties.aa[i]) +
+                "", ResidueProperties.aa[i]);
+        }
+
+        makeButton("B", "B");
+        makeButton("Z", "Z");
+        makeButton("X", "X");
+        makeButton("Gap", "-");
     }
-    catch (Exception ex)
+
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void stateChanged(ChangeEvent evt)
     {
+        if (selectedButtons != null)
+        {
+          JButton button;
+          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.setBackground(col);
-    oldColours.addElement(col);
-    button.setText(label);
-    button.setForeground(col.darker().darker().darker());
-    button.setFont(new java.awt.Font("Verdana", 1, 10));
-    button.addMouseListener(new java.awt.event.MouseAdapter()
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void colourButtonPressed(MouseEvent e)
     {
-      public void mouseClicked(MouseEvent e)
+      if(selectedButtons == null)
+        selectedButtons = new Vector();
+
+      JButton pressed = (JButton) e.getSource();
+
+      if(e.isShiftDown())
       {
-        colourButtonPressed(e);
-      }
-    });
+        JButton start, end = (JButton) e.getSource();
+        if(selectedButtons.size()>0)
+          start = (JButton)selectedButtons.elementAt(selectedButtons.size()-1);
+        else
+          start = (JButton) e.getSource();
+
+        int startIndex=0, endIndex=0;
+        for(int b=0; b<buttonPanel.getComponentCount(); b++)
+        {
+          if(buttonPanel.getComponent(b)==start)
+            startIndex = b;
+          if(buttonPanel.getComponent(b)==end)
+            endIndex = b;
+        }
 
-    buttonPanel.add(button, null);
-  }
+        if(startIndex > endIndex)
+        {
+          int temp = startIndex;
+          startIndex = endIndex;
+          endIndex = temp;
+        }
 
-  protected void okButton_actionPerformed(ActionEvent e)
-  {
-    applyButton_actionPerformed(null);
+        for(int b=startIndex; b<=endIndex; b++)
+        {
+          JButton button = (JButton)buttonPanel.getComponent(b);
+          if(!selectedButtons.contains(button))
+          {
+            button.setForeground(button.getBackground().brighter().brighter());
+            selectedButtons.add(button);
+          }
+        }
+      }
+      else if(!e.isControlDown())
+      {
+        for(int b=0; b<selectedButtons.size(); b++)
+        {
+          JButton button = (JButton)selectedButtons.elementAt(b);
+          button.setForeground(button.getBackground().darker().darker());
+        }
+        selectedButtons.clear();
+        pressed.setForeground( pressed.getBackground().brighter().brighter());
+        selectedButtons.addElement(pressed);
 
-    try
-    {
-      frame.setClosed(true);
+      }
+      else if(e.isControlDown())
+      {
+        if(selectedButtons.contains(pressed))
+        {
+          pressed.setForeground(pressed.getBackground().darker().darker());
+          selectedButtons.remove(pressed);
+        }
+        else
+        {
+          pressed.setForeground( pressed.getBackground().brighter().brighter());
+          selectedButtons.addElement(pressed);
+        }
+      }
+
+      if(selectedButtons.size()>0)
+      colorChooser.setColor( ((JButton)selectedButtons.elementAt(0)).getBackground());
     }
-    catch (Exception ex)
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param label DOCUMENT ME!
+     * @param aa DOCUMENT ME!
+     */
+    void makeButton(String label, String aa)
     {
-    }
-  }
+        final JButton button = new JButton();
+        Color col = Color.white;
 
-  protected void applyButton_actionPerformed(ActionEvent e)
-  {
-    Color[] newColours = new Color[24];
+        try
+        {
+            col = oldColourScheme.findColour(aa, -1);
+        }
+        catch (Exception ex)
+        {
+        //  ex.printStackTrace();
+        }
 
-    for (int i = 0; i < 24; i++)
-    {
-      JButton button = (JButton) buttonPanel.getComponent(i);
-      newColours[i] = button.getBackground();
+        button.setBackground(col);
+        button.setText(label);
+        button.setForeground(col.darker().darker().darker());
+        button.setFont(new java.awt.Font("Verdana", 1, 10));
+        button.addMouseListener(new java.awt.event.MouseAdapter()
+            {
+                public void mouseClicked(MouseEvent e)
+                {
+                    colourButtonPressed(e);
+                }
+            });
+
+        buttonPanel.add(button, null);
     }
 
-    UserColourScheme ucs = new UserColourScheme(newColours);
-    ucs.setThreshold(0);
-
-    if (seqGroup != null)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void okButton_actionPerformed(ActionEvent e)
     {
-      seqGroup.cs = ucs;
-      ap.repaint();
+        applyButton_actionPerformed(null);
+
+        try
+        {
+            frame.setClosed(true);
+        }
+        catch (Exception ex)
+        {
+        }
     }
-    else
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void applyButton_actionPerformed(ActionEvent e)
     {
-      ap.alignFrame.changeColour(ucs);
+        UserColourScheme ucs = getSchemeFromGUI();
+        ucs.setName(schemeName.getText());
+
+        if (seqGroup != null)
+        {
+            seqGroup.cs = ucs;
+            ap.repaint();
+        }
+        else if(ap!=null)
+        {
+            ap.alignFrame.changeColour(ucs);
+        }
+        else if(pdbcanvas!=null)
+        {
+          pdbcanvas.pdb.setColours(ucs);
+          pdbcanvas.updateSeqColours();
+        }
     }
-  }
-
-  protected void loadbutton_actionPerformed(ActionEvent e)
-  {
-    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");
-
-    int value = chooser.showOpenDialog(this);
-
-    if (value == JalviewFileChooser.APPROVE_OPTION)
-    {
-      File choice = chooser.getSelectedFile();
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());
-      jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR",
-                                    choice.getPath());
 
-      Color[] colors = loadColours(choice.getAbsolutePath());
+    UserColourScheme getSchemeFromGUI()
+    {
+      Color[] newColours = new Color[24];
 
-      for (int i = 0; i < colors.length; i++)
+      for (int i = 0; i < 24; i++)
       {
         JButton button = (JButton) buttonPanel.getComponent(i);
-        button.setBackground(colors[i]);
+        newColours[i] = button.getBackground();
       }
-    }
-  }
 
-  public static UserColourScheme loadDefaultColours()
-  {
-    if (jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR") != null)
-    {
-      return loadDefaultColours(jalview.bin.Cache.getProperty(
-          "USER_DEFINED_COLOUR"));
-    }
-    else
-    {
-      return null;
-    }
-  }
+      UserColourScheme ucs = new UserColourScheme(newColours);
+      if(ap!=null)
+        ucs.setThreshold(0, ap.av.getIgnoreGapsConsensus());
 
-  public static UserColourScheme loadDefaultColours(String file)
-  {
-    UserColourScheme ucs = null;
-    Color[] cols = loadColours(file);
 
-    if (cols != null)
-    {
-      ucs = new UserColourScheme(cols);
-      ucs.setThreshold(0);
+      return ucs;
     }
 
-    return ucs;
-  }
 
-  static Color[] loadColours(String file)
-  {
-    Color[] newColours = null;
 
-    try
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void loadbutton_actionPerformed(ActionEvent e)
     {
-      InputStreamReader in = new InputStreamReader(new FileInputStream(
-          file), "UTF-8");
+        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");
 
-      jalview.binding.JalviewUserColours ucs = new jalview.binding.
-          JalviewUserColours();
-      ucs = (jalview.binding.JalviewUserColours) ucs.unmarshal(in);
+        int value = chooser.showOpenDialog(this);
 
-      newColours = new Color[ucs.getColourCount()];
+        if (value == JalviewFileChooser.APPROVE_OPTION)
+        {
+            File choice = chooser.getSelectedFile();
+            jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());
+            String defaultColours = jalview.bin.Cache.getDefault("USER_DEFINED_COLOURS",
+                choice.getPath());
+            if (defaultColours.indexOf(choice.getPath()) == -1)
+              defaultColours = defaultColours.concat("|").concat(choice.getPath());
 
-      for (int i = 0; i < 24; i++)
-      {
-        newColours[i] = new Color(Integer.parseInt(
-            ucs.getColour(i).getRGB(), 16));
-      }
+            jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", defaultColours);
+
+
+            UserColourScheme ucs = loadColours(choice.getAbsolutePath());
+            Color[] colors = ucs.getColours();
+            schemeName.setText(ucs.getName());
+
+            for (int i = 0; i < colors.length; i++)
+            {
+                JButton button = (JButton) buttonPanel.getComponent(i);
+                button.setBackground(colors[i]);
+            }
+        }
     }
-    catch (Exception ex)
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public static UserColourScheme loadDefaultColours()
     {
-      System.out.println("Error loading UserColourFile " + file);
-    }
+        UserColourScheme ret = null;
 
-    return newColours;
-  }
+        String colours = jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS");
+        if ( colours != null )
+        {
+          if(colours.indexOf("|")>-1)
+            colours = colours.substring(0, colours.indexOf("|"));
 
-  protected void savebutton_actionPerformed(ActionEvent e)
-  {
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
-        getProperty(
-            "LAST_DIRECTORY"), new String[]
-        {"jc"},
-        new String[]
-        {"Jalview User Colours"}, "Jalview User Colours");
+          ret = loadColours(colours);
+        }
 
-    chooser.setFileView(new jalview.io.JalviewFileView());
-    chooser.setDialogTitle("Save colour scheme");
-    chooser.setToolTipText("Save");
+        if(ret == null)
+        {
+          Color[] newColours = new Color[24];
+          for (int i = 0; i < 24; i++)
+          {
+            newColours[i] = Color.white;
+          }
+          ret =  new UserColourScheme(newColours);
+        }
 
-    int value = chooser.showSaveDialog(this);
+        return ret;
+    }
 
-    if (value == JalviewFileChooser.APPROVE_OPTION)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param file DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    static UserColourScheme loadColours(String file)
     {
-      String choice = chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice);
+         UserColourScheme ucs = null;
+         Color[]  newColours = null;
+
+        try
+        {
+            InputStreamReader in = new InputStreamReader(new FileInputStream(
+                        file), "UTF-8");
 
-      jalview.binding.JalviewUserColours ucs = new jalview.binding.
-          JalviewUserColours();
+              jalview.schemabinding.version2.JalviewUserColours jucs
+                  = new jalview.schemabinding.version2.JalviewUserColours();
 
-      try
-      {
-        PrintWriter out = new PrintWriter(new OutputStreamWriter(
-            new FileOutputStream(choice), "UTF-8"));
+              org.exolab.castor.xml.Unmarshaller unmar
+                  = new org.exolab.castor.xml.Unmarshaller(jucs);
+              jucs = (jalview.schemabinding.version2.JalviewUserColours) unmar.unmarshal( in );
+
+              newColours = new Color[jucs.getColourCount()];
 
-        for (int i = 0; i < 24; i++)
+            for (int i = 0; i < 24; i++)
+            {
+              newColours[i] = new Color(Integer.parseInt(
+                  jucs.getColour(i).getRGB(), 16));
+            }
+            if (newColours != null)
+            {
+              ucs = new UserColourScheme(newColours);
+              ucs.setName( jucs.getSchemeName() );
+            }
+
+        }
+        catch (Exception ex)
         {
-          JButton button = (JButton) buttonPanel.getComponent(i);
-          jalview.binding.Colour col = new jalview.binding.Colour();
-          col.setName(button.getText());
-          col.setRGB(jalview.util.Format.getHexString(
-              button.getBackground()));
-          ucs.addColour(col);
+            //Could be Archive Jalview format
+            try{
+              InputStreamReader in = new InputStreamReader(new FileInputStream(
+                  file), "UTF-8");
+
+              jalview.binding.JalviewUserColours jucs
+                  = new jalview.binding.JalviewUserColours();
+
+              jucs = (jalview.binding.JalviewUserColours) 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));
+              }
+              if (newColours != null)
+              {
+                ucs = new UserColourScheme(newColours);
+                ucs.setName(jucs.getSchemeName());
+              }
+            }catch(Exception ex2)
+            { ex2.printStackTrace(); }
+
+            if(newColours==null)
+              System.out.println("Error loading User ColourFile\n"+ex);
         }
 
-        ucs.marshal(out);
-        out.close();
+       return ucs;
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    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);
+        return;
       }
-      catch (Exception ex)
+
+      if(userColourSchemes!=null && userColourSchemes.containsKey(schemeName.getText()) )
       {
-        ex.printStackTrace();
+        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);
+        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");
+
+        chooser.setFileView(new jalview.io.JalviewFileView());
+        chooser.setDialogTitle("Save colour scheme");
+        chooser.setToolTipText("Save");
+
+        int value = chooser.showSaveDialog(this);
 
-  protected void cancelButton_actionPerformed(ActionEvent e)
-  {
-    Color[] newColours = new Color[24];
+        if (value == JalviewFileChooser.APPROVE_OPTION)
+        {
+            String choice = chooser.getSelectedFile().getPath();
+            String defaultColours = jalview.bin.Cache.getDefault("USER_DEFINED_COLOURS", choice);
+            if(defaultColours.indexOf(choice)==-1)
+            {
+              if(defaultColours.length()>0)
+                defaultColours = defaultColours.concat("|");
+              defaultColours = defaultColours.concat(choice);
+            }
+
+            userColourSchemes.put(schemeName.getText(), getSchemeFromGUI());
+
+            ap.alignFrame.updateUserColourMenu();
+
+            jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", defaultColours);
+
+            jalview.binding.JalviewUserColours ucs = new jalview.binding.JalviewUserColours();
+            ucs.setSchemeName(schemeName.getText());
+            try
+            {
+                PrintWriter out = new PrintWriter(new OutputStreamWriter(
+                            new FileOutputStream(choice), "UTF-8"));
+
+                for (int i = 0; i < 24; i++)
+                {
+                    JButton button = (JButton) buttonPanel.getComponent(i);
+                    jalview.binding.Colour col = new jalview.binding.Colour();
+                    col.setName(button.getText());
+                    col.setRGB(jalview.util.Format.getHexString(
+                            button.getBackground()));
+                    ucs.addColour(col);
+                }
+
+                ucs.marshal(out);
+                out.close();
+            }
+            catch (Exception ex)
+            {
+                ex.printStackTrace();
+            }
+        }
+    }
 
-    for (int i = 0; i < 24; i++)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void cancelButton_actionPerformed(ActionEvent e)
     {
-      newColours[i] = (Color) oldColours.elementAt(i);
-      buttonPanel.getComponent(i).setBackground(newColours[i]);
+      if (ap != null)
+      {
+        if (seqGroup != null)
+        {
+          seqGroup.cs = oldColourScheme;
+        }
+        else if (ap != null)
+        {
+          ap.av.setGlobalColourScheme(oldColourScheme);
+        }
+        ap.repaint();
+      }
+
+      if(pdbcanvas!=null)
+      {
+        pdbcanvas.pdb.setColours(oldColourScheme);
+      }
+
+        try
+        {
+            frame.setClosed(true);
+        }
+        catch (Exception ex)
+        {
+        }
     }
 
-    UserColourScheme ucs = new UserColourScheme(newColours);
 
-    if (seqGroup != null)
+    static Hashtable userColourSchemes;
+
+    public static Hashtable getUserColourSchemes()
     {
-      seqGroup.cs = ucs;
+      return userColourSchemes;
     }
-    else
+
+    public static void initUserColourSchemes(String files)
     {
-      ap.av.setGlobalColourScheme(ucs);
-    }
+      userColourSchemes = new Hashtable();
 
-    ap.repaint();
+      if(files==null || files.length()==0)
+        return;
 
-    try
-    {
-      frame.setClosed(true);
+
+      // In case colours can't be loaded, we'll remove them
+      // from the default list here.
+      StringBuffer coloursFound = new StringBuffer();
+      StringTokenizer st = new StringTokenizer(files, "|");
+      while (st.hasMoreElements())
+      {
+        String file = st.nextToken();
+        try
+        {
+          UserColourScheme ucs = loadColours(file);
+          if (ucs != null)
+          {
+            if (coloursFound.length() > 0)
+              coloursFound.append("|");
+            coloursFound.append(file);
+            userColourSchemes.put(ucs.getName(), ucs);
+          }
+        }
+        catch (Exception ex)
+        {
+          System.out.println("Error loading User ColourFile\n" + ex);
+        }
+      }
+      if (!files.equals(coloursFound.toString()))
+      {
+        if (coloursFound.toString().length() > 1)
+          jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS",
+                                        coloursFound.toString());
+        else
+          jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");
+      }
     }
-    catch (Exception ex)
+
+    public static void removeColourFromDefaults(String target)
     {
+      // The only way to find colours by name is to load them in
+      // In case colours can't be loaded, we'll remove them
+      // from the default list here.
+
+      userColourSchemes = new Hashtable();
+
+      StringBuffer coloursFound = new StringBuffer();
+      StringTokenizer st = new StringTokenizer(
+           jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS"), "|");
+
+      while (st.hasMoreElements())
+      {
+        String file = st.nextToken();
+        try
+        {
+          UserColourScheme ucs = loadColours(file);
+          if (ucs != null && !ucs.getName().equals(target))
+          {
+            if (coloursFound.length() > 0)
+              coloursFound.append("|");
+            coloursFound.append(file);
+            userColourSchemes.put(ucs.getName(), ucs);
+          }
+        }
+        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());
+      else
+        jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");
+
     }
-  }
 }