X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequence.java;fp=src%2Fjalview%2Fdatamodel%2FSequence.java;h=68c8c5006dc24e94e86c1da347034e5190041b97;hb=bc02849268c0a7ffda386ec00658b3411029b5e5;hp=29d114de1ba8b7522c5ae5001955fab4abf6d013;hpb=ef267f8a326a60585a6c36e864d68a1a19617d2e;p=jalview.git diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java index 29d114d..68c8c50 100755 --- a/src/jalview/datamodel/Sequence.java +++ b/src/jalview/datamodel/Sequence.java @@ -22,6 +22,7 @@ package jalview.datamodel; import jalview.analysis.AlignSeq; import jalview.api.DBRefEntryI; +import jalview.util.Comparison; import jalview.util.DBRefUtils; import jalview.util.MapList; import jalview.util.StringUtils; @@ -1013,12 +1014,12 @@ public class Sequence extends ASequence implements SequenceI { if (seq == this) { - throw new Error( + throw new IllegalArgumentException( "Implementation Error: self reference passed to SequenceI.setDatasetSequence"); } if (seq != null && seq.getDatasetSequence() != null) { - throw new Error( + throw new IllegalArgumentException( "Implementation error: cascading dataset sequences are not allowed."); } datasetSequence = seq; @@ -1117,6 +1118,10 @@ public class Sequence extends ASequence implements SequenceI private long _seqhash = 0; + /** + * Answers false if the sequence is more than 85% nucleotide (ACGTU), else + * true + */ @Override public boolean isProtein() { @@ -1127,7 +1132,7 @@ public class Sequence extends ASequence implements SequenceI if (_seqhash != sequence.hashCode()) { _seqhash = sequence.hashCode(); - _isNa=jalview.util.Comparison.isNucleotide(new SequenceI[] { this }); + _isNa = Comparison.isNucleotide(this); } return !_isNa; };