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 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
[jalview.git]
/
src
/
jalview
/
schemes
/
FollowerColourScheme.java
diff --git
a/src/jalview/schemes/FollowerColourScheme.java
b/src/jalview/schemes/FollowerColourScheme.java
index
d9fed3c
..
57c19e5
100644
(file)
--- a/
src/jalview/schemes/FollowerColourScheme.java
+++ b/
src/jalview/schemes/FollowerColourScheme.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-20,9
+20,11
@@
*/
package jalview.schemes;
*/
package jalview.schemes;
-import jalview.analysis.Conservation;
+import jalview.datamodel.AnnotatedCollectionI;
+import jalview.datamodel.SequenceCollectionI;
+import jalview.datamodel.SequenceI;
-import java.util.Hashtable;
+import java.util.Map;
/**
* Colourscheme that takes its colours from some other colourscheme
/**
* Colourscheme that takes its colours from some other colourscheme
@@
-33,7
+35,7
@@
import java.util.Hashtable;
public class FollowerColourScheme extends ResidueColourScheme
{
public class FollowerColourScheme extends ResidueColourScheme
{
- protected ColourSchemeI colourScheme;
+ private ColourSchemeI colourScheme;
public ColourSchemeI getBaseColour()
{
public ColourSchemeI getBaseColour()
{
@@
-41,30
+43,30
@@
public class FollowerColourScheme extends ResidueColourScheme
}
@Override
}
@Override
- public void setConsensus(Hashtable[] consensus)
+ public String getSchemeName()
{
{
- if (colourScheme != null)
- {
- colourScheme.setConsensus(consensus);
- }
+ return "Follower";
}
}
+ /**
+ * Returns a new instance of this colour scheme with which the given data may
+ * be coloured
+ */
@Override
@Override
- public void setConservation(Conservation cons)
+ public ColourSchemeI getInstance(AnnotatedCollectionI coll,
+ Map<SequenceI, SequenceCollectionI> hrs)
{
{
- if (colourScheme != null)
- {
- colourScheme.setConservation(cons);
- }
+ return new FollowerColourScheme();
}
}
- @Override
- public void setConservationInc(int i)
+ protected ColourSchemeI getColourScheme()
+ {
+ return colourScheme;
+ }
+
+ protected void setColourScheme(ColourSchemeI colourScheme)
{
{
- if (colourScheme != null)
- {
- colourScheme.setConservationInc(i);
- }
+ this.colourScheme = colourScheme;
}
}
}
}