From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 14 Dec 2004 14:51:11 +0000 (+0000)
Subject: Allow userdefined colours for groups
X-Git-Tag: Release_2_0~829
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f44e5d441ae27d834b3a5096060ac8b5df5c5c9c;p=jalview.git

Allow userdefined colours for groups
---

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 4928189..458a6be 100755
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -364,6 +364,13 @@ frame.setMaximizable(false);
 
   protected void userDefinedColour_actionPerformed(ActionEvent e)
   {
+    JInternalFrame frame = new JInternalFrame();
+    UserDefinedColours chooser = new UserDefinedColours( frame, seqPanel.parent, getGroup());
+    frame.setContentPane(chooser);
+    Desktop.addInternalFrame(frame,"User defined colours", 450,540 );
+    frame.setResizable(false);
+    frame.setIconifiable(false);
+    frame.setMaximizable(false);
 
   }
 
@@ -389,8 +396,7 @@ frame.setMaximizable(false);
   {
     SequenceGroup sg = getGroup();
 
-    Alignment al = (Alignment)av.getAlignment();
-    Conservation c = new Conservation("Group", al.cons,
+    Conservation c = new Conservation("Group",
                           ResidueProperties.propHash, 3, sg.sequences, sg.getStartRes(),
                           sg.getEndRes() );