X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=0745b853e5f22cb0eb62eb1feb66f57a813bce8e;hb=a9177efb4097815d9a8031aa22700c61a7d6260a;hp=958ebcc4f0130cc7a609b0503c4c37472188a7e1;hpb=f6d1305378fa256a42caf7d284b13d5a084bc471;p=jalview.git diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 958ebcc..0745b85 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -4864,7 +4864,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, } mtch = idm.findAllIdMatches(pdbfn); } - FileFormatI type=null; + FileFormatI type = null; if (mtch != null) { try @@ -4882,7 +4882,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, } // File wasn't named like one of the sequences or wasn't a PDB // file. - filesnotmatched.add(new Object[] { file, protocol, type}); + filesnotmatched.add(new Object[] { file, protocol, type }); } } int assocfiles = 0; @@ -4936,7 +4936,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, */ for (Object[] o : filesmatched) { - filesnotmatched.add(new Object[] { o[0], o[1]}); + filesnotmatched.add(new Object[] { o[0], o[1] }); } } } @@ -4960,7 +4960,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, } for (Object[] fn : filesnotmatched) { - loadJalviewDataFile(fn[0], (DataSourceType) fn[1], (FileFormatI)fn[2], null); + loadJalviewDataFile(fn[0], (DataSourceType) fn[1], + (FileFormatI) fn[2], null); } } @@ -5854,6 +5855,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, } } alignPanel.validateAnnotationDimensions(true); + // TODO this triggers relayout of annotation panel - otherwise annotation + // label height is different to panel height + alignPanel.fontChanged(); alignPanel.alignmentChanged(); }