Allow userdefined colours for groups

[jalview.git] / src / jalview / gui / PopupMenu.java

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