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 remote-tracking branch 'origin/develop' into bug/JAL-2591
[jalview.git]
/
src
/
jalview
/
datamodel
/
AlignedCodonFrame.java
diff --git
a/src/jalview/datamodel/AlignedCodonFrame.java
b/src/jalview/datamodel/AlignedCodonFrame.java
index
326cc4e
..
4fbfd62
100644
(file)
--- a/
src/jalview/datamodel/AlignedCodonFrame.java
+++ b/
src/jalview/datamodel/AlignedCodonFrame.java
@@
-93,8
+93,8
@@
public class AlignedCodonFrame
return (this.fromSeq == that.fromSeq || (this.fromSeq != null
&& that.fromSeq != null
&& this.fromSeq.getDatasetSequence() != null && this.fromSeq
return (this.fromSeq == that.fromSeq || (this.fromSeq != null
&& that.fromSeq != null
&& this.fromSeq.getDatasetSequence() != null && this.fromSeq
- .getDatasetSequence() == that.fromSeq
- .getDatasetSequence())) && this.mapping.equals(that.mapping);
+ .getDatasetSequence() == that.fromSeq.getDatasetSequence()))
+ && this.mapping.equals(that.mapping);
}
public SequenceI getFromSeq()
}
public SequenceI getFromSeq()
@@
-301,7
+301,7
@@
public class AlignedCodonFrame
* where highlighted regions go
*/
public void markMappedRegion(SequenceI seq, int index,
* where highlighted regions go
*/
public void markMappedRegion(SequenceI seq, int index,
- SearchResults results)
+ SearchResultsI results)
{
int[] codon;
SequenceI ds = seq.getDatasetSequence();
{
int[] codon;
SequenceI ds = seq.getDatasetSequence();
@@
-719,8
+719,8
@@
public class AlignedCodonFrame
}
/**
}
/**
- * Returns the first mapping found that is between 'fromSeq' and 'toSeq', or null
- * if none found
+ * Returns the first mapping found that is between 'fromSeq' and 'toSeq', or
+ * null if none found
*
* @param fromSeq
* aligned or dataset sequence
*
* @param fromSeq
* aligned or dataset sequence