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 'documentation/JAL-2325_release2101' into releases/Release_2_10_Branch
[jalview.git]
/
src
/
jalview
/
schemes
/
FollowerColourScheme.java
diff --git
a/src/jalview/schemes/FollowerColourScheme.java
b/src/jalview/schemes/FollowerColourScheme.java
index
da51e03
..
35be31b
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.8.2)
- * Copyright (C) 2014 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.
*
@@
-21,13
+21,13
@@
package jalview.schemes;
import jalview.analysis.Conservation;
package jalview.schemes;
import jalview.analysis.Conservation;
-
-import java.util.Hashtable;
+import jalview.datamodel.ProfilesI;
/**
* Colourscheme that takes its colours from some other colourscheme
/**
* Colourscheme that takes its colours from some other colourscheme
+ *
* @author jimp
* @author jimp
- *
+ *
*/
public class FollowerColourScheme extends ResidueColourScheme
{
*/
public class FollowerColourScheme extends ResidueColourScheme
{
@@
-40,9
+40,9
@@
public class FollowerColourScheme extends ResidueColourScheme
}
@Override
}
@Override
- public void setConsensus(Hashtable[] consensus)
+ public void setConsensus(ProfilesI consensus)
{
{
- if (colourScheme!=null)
+ if (colourScheme != null)
{
colourScheme.setConsensus(consensus);
}
{
colourScheme.setConsensus(consensus);
}
@@
-51,7
+51,7
@@
public class FollowerColourScheme extends ResidueColourScheme
@Override
public void setConservation(Conservation cons)
{
@Override
public void setConservation(Conservation cons)
{
- if (colourScheme!=null)
+ if (colourScheme != null)
{
colourScheme.setConservation(cons);
}
{
colourScheme.setConservation(cons);
}
@@
-60,7
+60,7
@@
public class FollowerColourScheme extends ResidueColourScheme
@Override
public void setConservationInc(int i)
{
@Override
public void setConservationInc(int i)
{
- if (colourScheme!=null)
+ if (colourScheme != null)
{
colourScheme.setConservationInc(i);
}
{
colourScheme.setConservationInc(i);
}