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 develop to Release_2_8_3_Branch
[jalview.git]
/
src
/
jalview
/
viewmodel
/
seqfeatures
/
FeatureRendererModel.java
diff --git
a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
index
c7cee04
..
674f3d1
100644
(file)
--- a/
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
+++ b/
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
@@
-247,12
+247,6
@@
public abstract class FeatureRendererModel implements
ArrayList<SequenceFeature> tmp = new ArrayList<SequenceFeature>();
SequenceFeature[] features = sequence.getSequenceFeatures();
ArrayList<SequenceFeature> tmp = new ArrayList<SequenceFeature>();
SequenceFeature[] features = sequence.getSequenceFeatures();
- while (features == null && sequence.getDatasetSequence() != null)
- {
- sequence = sequence.getDatasetSequence();
- features = sequence.getSequenceFeatures();
- }
-
if (features != null)
{
for (int i = 0; i < features.length; i++)
if (features != null)
{
for (int i = 0; i < features.length; i++)
@@
-329,9
+323,7
@@
public abstract class FeatureRendererModel implements
for (int i = 0; i < alignment.getHeight(); i++)
{
SequenceI asq = alignment.getSequenceAt(i);
for (int i = 0; i < alignment.getHeight(); i++)
{
SequenceI asq = alignment.getSequenceAt(i);
- SequenceI dasq = asq.getDatasetSequence();
- SequenceFeature[] features = dasq != null ? dasq
- .getSequenceFeatures() : asq.getSequenceFeatures();
+ SequenceFeature[] features = asq.getSequenceFeatures();
if (features == null)
{
if (features == null)
{