X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSplitFrame.java;h=777e307e2d1b68b8525767f7d1b2de1d8341c571;hb=483ecb5e4541537778844529cc93204f9124b68d;hp=cbad1483559545da60fb674319273431d1f58e2a;hpb=37de9310bec3501cbc6381e0c3dcb282fcaad812;p=jalview.git diff --git a/src/jalview/appletgui/SplitFrame.java b/src/jalview/appletgui/SplitFrame.java index cbad148..777e307 100644 --- a/src/jalview/appletgui/SplitFrame.java +++ b/src/jalview/appletgui/SplitFrame.java @@ -87,7 +87,8 @@ public class SplitFrame extends EmbmenuFrame * Compute cDNA consensus on protein alignment */ protein.initComplementConsensus(); - AlignmentViewPanel ap = topAlignment.isNucleotide() ? bottomFrame.alignPanel + AlignmentViewPanel ap = topAlignment.isNucleotide() + ? bottomFrame.alignPanel : topFrame.alignPanel; protein.updateConsensus(ap); @@ -118,7 +119,8 @@ public class SplitFrame extends EmbmenuFrame { AlignmentViewport cdna = topFrame.getAlignViewport().getAlignment() .isNucleotide() ? topFrame.viewport : bottomFrame.viewport; - AlignmentViewport protein = cdna == topFrame.viewport ? bottomFrame.viewport + AlignmentViewport protein = cdna == topFrame.viewport + ? bottomFrame.viewport : topFrame.viewport; /* @@ -132,14 +134,14 @@ public class SplitFrame extends EmbmenuFrame if (w1 != w3) { Dimension d = topFrame.alignPanel.idPanel.idCanvas.getSize(); - topFrame.alignPanel.idPanel.idCanvas.setSize(new Dimension(w3, - d.height)); + topFrame.alignPanel.idPanel.idCanvas + .setSize(new Dimension(w3, d.height)); } if (w2 != w3) { Dimension d = bottomFrame.alignPanel.idPanel.idCanvas.getSize(); - bottomFrame.alignPanel.idPanel.idCanvas.setSize(new Dimension(w3, - d.height)); + bottomFrame.alignPanel.idPanel.idCanvas + .setSize(new Dimension(w3, d.height)); } /* @@ -165,8 +167,8 @@ public class SplitFrame extends EmbmenuFrame private void addAlignFrameComponents(AlignFrame af, Panel panel) { panel.setLayout(new BorderLayout()); - Panel menuPanel = af - .makeEmbeddedPopupMenu(af.getMenuBar(), true, false); + Panel menuPanel = af.makeEmbeddedPopupMenu(af.getMenuBar(), true, + false); panel.add(menuPanel, BorderLayout.NORTH); panel.add(af.statusBar, BorderLayout.SOUTH); panel.add(af.alignPanel, BorderLayout.CENTER); @@ -185,9 +187,9 @@ public class SplitFrame extends EmbmenuFrame createSplitFrameWindow(embedded, applet); validate(); topFrame.alignPanel.adjustAnnotationHeight(); - topFrame.alignPanel.paintAlignment(true); + topFrame.alignPanel.paintAlignment(true, true); bottomFrame.alignPanel.adjustAnnotationHeight(); - bottomFrame.alignPanel.paintAlignment(true); + bottomFrame.alignPanel.paintAlignment(true, true); } /** @@ -209,8 +211,8 @@ public class SplitFrame extends EmbmenuFrame this.add(outermost); int width = Math.max(topFrame.frameWidth, bottomFrame.frameWidth); int height = topFrame.frameHeight + bottomFrame.frameHeight; - jalview.bin.JalviewLite - .addFrame(this, this.getTitle(), width, height); + jalview.bin.JalviewLite.addFrame(this, this.getTitle(), width, + height); } }