String fileName, JarOutputStream jout)
{
+ // BH: Question: What is this Dataset for, as it seems to
+ // duplicate the actual XML file data.
+
for (String dssids : dsses.keySet())
{
AlignFrame _af = dsses.get(dssids);
{
jarentry = jin.getNextJarEntry();
}
-
- if (jarentry != null && jarentry.getName().endsWith(".xml"))
+ String name = (jarentry == null ? null : jarentry.getName());
+ if (name != null && name.endsWith(".xml")
+ // The question here is what to do with the two
+ // .xml files in the jvp file. They are identical?
+ // && name.indexOf(" Dataset for ") < 0 // BH 2019.05.21
+ )
{
JAXBContext jc = JAXBContext
.newInstance("jalview.xml.binding.jalview");
{
if (ds.getCodonFrames() != null)
{
- Desktop.getStructureSelectionManager()
+ Desktop.getInstance().getStructureSelectionManager()
.registerMappings(ds.getCodonFrames());
}
}
{
entry.setProperty(prop.getName(), prop.getValue());
}
- Desktop.getStructureSelectionManager().registerPDBEntry(entry);
+ Desktop.getInstance().getStructureSelectionManager()
+ .registerPDBEntry(entry);
// adds PDBEntry to datasequence's set (since Jalview 2.10)
if (al.getSequenceAt(i).getDatasetSequence() != null)
{
viewport.setViewName(view.getViewName());
af.setInitialTabVisible();
}
- af.setBounds(safeInt(view.getXpos()), safeInt(view.getYpos()),
- safeInt(view.getWidth()), safeInt(view.getHeight()));
+ int x = safeInt(view.getXpos());
+ int y = safeInt(view.getYpos());
+ int w = safeInt(view.getWidth());
+ int h = safeInt(view.getHeight());
+ // // BH we cannot let the title bar go off the top
+ // if (Platform.isJS())
+ // {
+ // x = Math.max(50 - w, x);
+ // y = Math.max(0, y);
+ // }
+
+ af.setBounds(x, y, w, h);
// startSeq set in af.alignPanel.updateLayout below
af.alignPanel.updateLayout();
ColourSchemeI cs = null;