git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b718dc5
)
JAL-2154 register any new dataset codon frames only when all data imported
author
Jim Procter
<jprocter@issues.jalview.org>
Fri, 29 Jul 2016 14:02:03 +0000
(15:02 +0100)
committer
Jim Procter
<jprocter@issues.jalview.org>
Fri, 29 Jul 2016 14:02:03 +0000
(15:02 +0100)
src/jalview/gui/Jalview2XML.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/Jalview2XML.java
b/src/jalview/gui/Jalview2XML.java
index
094fa7a
..
3e1359d
100644
(file)
--- a/
src/jalview/gui/Jalview2XML.java
+++ b/
src/jalview/gui/Jalview2XML.java
@@
-2349,6
+2349,7
@@
public class Jalview2XML
initSeqRefs();
}
AlignFrame af = null, _af = null;
initSeqRefs();
}
AlignFrame af = null, _af = null;
+ IdentityHashMap<AlignmentI, AlignmentI> importedDatasets = new IdentityHashMap<AlignmentI, AlignmentI>();
Map<String, AlignFrame> gatherToThisFrame = new HashMap<String, AlignFrame>();
final String file = jprovider.getFilename();
try
Map<String, AlignFrame> gatherToThisFrame = new HashMap<String, AlignFrame>();
final String file = jprovider.getFilename();
try
@@
-2383,6
+2384,9
@@
public class Jalview2XML
{
gatherToThisFrame.put(af.viewport.getSequenceSetId(), af);
}
{
gatherToThisFrame.put(af.viewport.getSequenceSetId(), af);
}
+ // Save dataset to register mappings once all resolved
+ importedDatasets.put(af.viewport.getAlignment().getDataset(),
+ af.viewport.getAlignment().getDataset());
}
}
entryCount++;
}
}
entryCount++;
@@
-2456,7
+2460,14
@@
public class Jalview2XML
}
restoreSplitFrames();
}
restoreSplitFrames();
-
+ for (AlignmentI ds : importedDatasets.keySet())
+ {
+ if (ds.getCodonFrames() != null)
+ {
+ StructureSelectionManager.getStructureSelectionManager(
+ Desktop.instance).registerMappings(ds.getCodonFrames());
+ }
+ }
if (errorMessage != null)
{
reportErrors();
if (errorMessage != null)
{
reportErrors();