X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAnnotationColourChooser.java;h=f4992177c1494dc1c1f6d6c8ae37e7c0b7b69419;hb=4059c82f431d3f98931b290d9a72da2a54a0fc95;hp=d49a4b6e70277e24eb7d9cd6863ab6b749c3c043;hpb=59c22b05925dd3b4d148c1ce0e43eea12bc64ba7;p=jalview.git

diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java
index d49a4b6..f499217 100755
--- a/src/jalview/gui/AnnotationColourChooser.java
+++ b/src/jalview/gui/AnnotationColourChooser.java
@@ -1,6 +1,6 @@
 /*
 * Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+* Copyright (C) 2006 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
@@ -49,7 +49,8 @@ public class AnnotationColourChooser
       for (int g = 0; g < allGroups.size(); g++)
       {
         sg = (SequenceGroup) allGroups.get(g);
-        oldgroupColours.put(sg, sg.cs);
+        if(sg.cs!=null)
+          oldgroupColours.put(sg, sg.cs);
       }
     }
     this.av = av;
@@ -319,7 +320,6 @@ public class AnnotationColourChooser
       slider.setValue( (int) (currentAnnotation.threshold.value * 1000));
       thresholdValue.setText(currentAnnotation.threshold.value + "");
       slider.setMajorTickSpacing( (int) (range / 10f));
-      slider.setMinorTickSpacing( (int) (range / 100f));
       slider.setEnabled(true);
       thresholdValue.setEnabled(true);
       adjusting = false;