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
JAL-4048 fix disappearing sequence IDs, and non-positional feature descriptions
[jalview.git]
/
src
/
jalview
/
viewmodel
/
seqfeatures
/
IdColumns.java
diff --git
a/src/jalview/viewmodel/seqfeatures/IdColumns.java
b/src/jalview/viewmodel/seqfeatures/IdColumns.java
index
2f113f2
..
b375941
100644
(file)
--- a/
src/jalview/viewmodel/seqfeatures/IdColumns.java
+++ b/
src/jalview/viewmodel/seqfeatures/IdColumns.java
@@
-148,13
+148,14
@@
public class IdColumns
ColumnCell cell = null;
if (col != null)
{
ColumnCell cell = null;
if (col != null)
{
+ SequenceI dseq = seq;
+ while (dseq.getDatasetSequence() != null)
+ {
+ dseq = dseq.getDatasetSequence();
+ }
if (col == STRUCTURES_NUM)
{
if (col == STRUCTURES_NUM)
{
- while (seq.getDatasetSequence() != null)
- {
- seq = seq.getDatasetSequence();
- }
- Vector pdbE = seq.getAllPDBEntries();
+ Vector pdbE = dseq.getAllPDBEntries();
if (pdbE == null)
{
return null;
if (pdbE == null)
{
return null;
@@
-163,7
+164,7
@@
public class IdColumns
}
if (col.featureTypeName != null)
{
}
if (col.featureTypeName != null)
{
- List<SequenceFeature> np = seq.getFeatures()
+ List<SequenceFeature> np = dseq.getFeatures()
.getNonPositionalFeatures(col.featureTypeName);
if (np != null)
{
.getNonPositionalFeatures(col.featureTypeName);
if (np != null)
{
@@
-183,7
+184,7
@@
public class IdColumns
}
if (col.DbRefName != null)
{
}
if (col.DbRefName != null)
{
- for (DBRefEntryI dbr : seq.getDBRefs())
+ for (DBRefEntryI dbr : dseq.getDBRefs())
{
if (dbr.getSource().equals(col.DbRefName))
{
{
if (dbr.getSource().equals(col.DbRefName))
{