git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Release_2_9_0b1_Branch' of https://source.jalview.org/git/jalview.git...
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
2829aad
..
a83438c
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-1,5
+1,5
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
* Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
* Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
@@
-2415,7
+2415,6
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
}
}
}
-
/**
* DOCUMENT ME!
*
/**
* DOCUMENT ME!
*
@@
-3517,6
+3516,11
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
cs.setConservationInc(SliderPanel.setConservationSlider(alignPanel,
cs, "Background"));
}
cs.setConservationInc(SliderPanel.setConservationSlider(alignPanel,
cs, "Background"));
}
+ if (cs instanceof TCoffeeColourScheme)
+ {
+ tcoffeeColour.setEnabled(true);
+ tcoffeeColour.setSelected(true);
+ }
}
viewport.setGlobalColourScheme(cs);
}
viewport.setGlobalColourScheme(cs);