git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 136c079 7c89d99)
Merge branch 'features/JAL-2446NCList' into spikes/mungo
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Sat, 24 Jun 2017 10:31:51 +0000 (11:31 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Sat, 24 Jun 2017 10:31:51 +0000 (11:31 +0100)
Conflicts:
help/html/releases.html
src/jalview/datamodel/BinarySequence.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
src/jalview/datamodel/features/FeatureStore.java
src/jalview/datamodel/features/NCList.java
src/jalview/datamodel/features/NCNode.java
src/jalview/datamodel/features/SequenceFeatures.java
src/jalview/gui/SeqCanvas.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/schemes/ClustalxColourScheme.java
src/jalview/urls/UrlLinkDisplay.java
test/jalview/datamodel/AlignmentTest.java
test/jalview/datamodel/SequenceTest.java
test/jalview/datamodel/features/FeatureStoreTest.java
test/jalview/datamodel/features/SequenceFeaturesTest.java
test/jalview/urls/UrlLinkDisplayTest.java

1  2 
src/jalview/datamodel/BinarySequence.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/datamodel/BinarySequence.java
index b7e15a6,477f4a7..5789b2b
--- 1/src/jalview/datamodel/BinarySequence.java
--- 2/src/jalview/datamodel/BinarySequence.java
+++ b/src/jalview/datamodel/BinarySequence.java
@@@ -69,8 -69,8 +69,7 @@@ public class BinarySequence extends Seq
    {
      int nores = (isNa) ? ResidueProperties.maxNucleotideIndex
              : ResidueProperties.maxProteinIndex;
--
-     dbinary = new double[getSequence().length * nores];
+     dbinary = new double[getLength() * nores];
  
      return nores;
    }