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 'develop' into features/JAL-2446NCList
[jalview.git]
/
src
/
jalview
/
gui
/
ColourMenuHelper.java
diff --git
a/src/jalview/gui/ColourMenuHelper.java
b/src/jalview/gui/ColourMenuHelper.java
index
52abfe1
..
19ad939
100644
(file)
--- a/
src/jalview/gui/ColourMenuHelper.java
+++ b/
src/jalview/gui/ColourMenuHelper.java
@@
-3,6
+3,7
@@
package jalview.gui;
import jalview.bin.Cache;
import jalview.datamodel.AnnotatedCollectionI;
import jalview.schemes.ColourSchemeI;
import jalview.bin.Cache;
import jalview.datamodel.AnnotatedCollectionI;
import jalview.schemes.ColourSchemeI;
+import jalview.schemes.ColourSchemeLoader;
import jalview.schemes.ColourSchemes;
import jalview.schemes.ResidueColourScheme;
import jalview.schemes.UserColourScheme;
import jalview.schemes.ColourSchemes;
import jalview.schemes.ResidueColourScheme;
import jalview.schemes.UserColourScheme;
@@
-77,7
+78,7
@@
public class ColourMenuHelper
/*
* scan registered colour schemes (built-in or user-defined
/*
* scan registered colour schemes (built-in or user-defined
- * and add them to the menu (in the order they were added)
+ * and add them to the menu (in the order they were registered)
*/
Iterable<ColourSchemeI> colourSchemes = ColourSchemes.getInstance()
.getColourSchemes();
*/
Iterable<ColourSchemeI> colourSchemes = ColourSchemes.getInstance()
.getColourSchemes();
@@
-258,7
+259,7
@@
public class ColourMenuHelper
{
try
{
{
try
{
- UserColourScheme ucs = ColourSchemes.loadColourScheme(file);
+ UserColourScheme ucs = ColourSchemeLoader.loadColourScheme(file);
if (ucs != null
&& ColourSchemes.getInstance().nameExists(ucs.getName()))
{
if (ucs != null
&& ColourSchemes.getInstance().nameExists(ucs.getName()))
{