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 'feature/JAL-3187linkedFeatures' into feature/JAL-3251biotypedMappings
[jalview.git]
/
src
/
jalview
/
schemes
/
ColourSchemeProperty.java
diff --git
a/src/jalview/schemes/ColourSchemeProperty.java
b/src/jalview/schemes/ColourSchemeProperty.java
index
fc92cd9
..
2d5b23d
100755
(executable)
--- a/
src/jalview/schemes/ColourSchemeProperty.java
+++ b/
src/jalview/schemes/ColourSchemeProperty.java
@@
-20,6
+20,7
@@
*/
package jalview.schemes;
*/
package jalview.schemes;
+import jalview.api.AlignViewportI;
import jalview.datamodel.AnnotatedCollectionI;
import jalview.util.ColorUtils;
import jalview.datamodel.AnnotatedCollectionI;
import jalview.util.ColorUtils;
@@
-75,7
+76,8
@@
public class ColourSchemeProperty
* @param name
* @return
*/
* @param name
* @return
*/
- public static ColourSchemeI getColourScheme(AnnotatedCollectionI forData,
+ public static ColourSchemeI getColourScheme(AlignViewportI view,
+ AnnotatedCollectionI forData,
String name)
{
if (ResidueColourScheme.NONE.equalsIgnoreCase(name))
String name)
{
if (ResidueColourScheme.NONE.equalsIgnoreCase(name))
@@
-89,6
+91,7
@@
public class ColourSchemeProperty
* create a new instance of it
*/
ColourSchemeI scheme = ColourSchemes.getInstance().getColourScheme(name,
* create a new instance of it
*/
ColourSchemeI scheme = ColourSchemes.getInstance().getColourScheme(name,
+ view,
forData, null);
if (scheme != null)
{
forData, null);
if (scheme != null)
{