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
[jalview.git]
/
src
/
jalview
/
io
/
JSONFile.java
diff --git
a/src/jalview/io/JSONFile.java
b/src/jalview/io/JSONFile.java
index
9e94d91
..
5cd09a1
100644
(file)
--- a/
src/jalview/io/JSONFile.java
+++ b/
src/jalview/io/JSONFile.java
@@
-482,7
+482,6
@@
public class JSONFile extends AlignFile implements ComplexAlignFile
seqMap.put(seqUniqueId, seq);
}
seqMap.put(seqUniqueId, seq);
}
-
parseFeatures(jsonSeqArray);
for (Iterator<JSONObject> seqGrpIter = seqGrpJsonArray.iterator(); seqGrpIter
parseFeatures(jsonSeqArray);
for (Iterator<JSONObject> seqGrpIter = seqGrpJsonArray.iterator(); seqGrpIter
@@
-521,8
+520,7
@@
public class JSONFile extends AlignFile implements ComplexAlignFile
}
}
SequenceGroup seqGrp = new SequenceGroup(grpSeqs, grpName, null,
}
}
SequenceGroup seqGrp = new SequenceGroup(grpSeqs, grpName, null,
- displayBoxes, displayText, colourText,
- startRes, endRes);
+ displayBoxes, displayText, colourText, startRes, endRes);
seqGrp.cs = ColourSchemeMapper.getJalviewColourScheme(colourScheme,
seqGrp);
seqGrp.setShowNonconserved(showNonconserved);
seqGrp.cs = ColourSchemeMapper.getJalviewColourScheme(colourScheme,
seqGrp);
seqGrp.setShowNonconserved(showNonconserved);