X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=cdac5b4a82884c512877ebb9d902962c0c5540dc;hb=85d8faf004199c5cc63773d7d4643143d16600da;hp=6bfe4bd167207310af5db01b126e185b3b568323;hpb=34348a4079b425ce7fda3eb75e5e6a2b62cf16b9;p=jalview.git
diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 6bfe4bd..cdac5b4 100644
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
@@ -32,6 +34,7 @@ import jalview.datamodel.*;
import jalview.jbgui.*;
import jalview.schemes.*;
import jalview.structure.StructureSelectionManager;
+import jalview.util.MessageManager;
/**
* DOCUMENT ME!
@@ -422,16 +425,19 @@ public class AlignmentPanel extends GAlignmentPanel implements
protected void validateAnnotationDimensions(boolean adjustPanelHeight)
{
int height = annotationPanel.adjustPanelHeight();
-
- int theight = av.getCharHeight() * (av.getAlignment().getHeight() + (!av.hasHiddenRows() ? 0 : av.getAlignment().getHiddenSequences().getSize()));
- float sscaling = (float) (theight/(1.0*theight+height));
- float ascaling=(float)(height*1.0/alignFrame.getHeight());
+
+ int theight = av.getCharHeight()
+ * (av.getAlignment().getHeight() + (!av.hasHiddenRows() ? 0
+ : av.getAlignment().getHiddenSequences().getSize()));
+ float sscaling = (float) (theight / (1.0 * theight + height));
+ float ascaling = (float) (height * 1.0 / alignFrame.getHeight());
int rheight = alignFrame.getHeight() - height - av.getCharHeight();
if (adjustPanelHeight)
{
- // NOTE: this logic is different in the applet. Need a better algorithm to define behaviour
+ // NOTE: this logic is different in the applet. Need a better algorithm to
+ // define behaviour
// try and set height according to alignment
- if (ascaling>0 && sscaling < 0.5)
+ if (ascaling > 0 && sscaling < 0.5)
{
// if the alignment is too big then
// default is 0.5 split
@@ -439,10 +445,11 @@ public class AlignmentPanel extends GAlignmentPanel implements
}
else
{
- // if space for more than one sequence row left when annotation is fully displayed then set height to annotation height
- // otherwise, leave at least two lines of sequence shown.
- height = (rheight>av.getCharHeight()) ? height : (-av.getCharHeight() * 3
- + (int) (alignFrame.getHeight() * (1 - sscaling)));
+ // if space for more than one sequence row left when annotation is fully
+ // displayed then set height to annotation height
+ // otherwise, leave at least two lines of sequence shown.
+ height = (rheight > av.getCharHeight()) ? height
+ : (-av.getCharHeight() * 3 + (int) (alignFrame.getHeight() * (1 - sscaling)));
}
}
else
@@ -703,7 +710,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
seqPanel.seqCanvas.fastPaint(scrollX, scrollY);
scalePanel.repaint();
- if (av.getShowAnnotation() && scrollX!=0)
+ if (av.getShowAnnotation() && scrollX != 0)
{
annotationPanel.fastPaint(scrollX);
}
@@ -1109,13 +1116,11 @@ public class AlignmentPanel extends GAlignmentPanel implements
void makeAlignmentImage(int type, File file)
{
long progress = System.currentTimeMillis();
- boolean headless = (System.getProperty("java.awt.headless") != null
- && System.getProperty("java.awt.headless").equals("true"));
+ boolean headless = (System.getProperty("java.awt.headless") != null && System
+ .getProperty("java.awt.headless").equals("true"));
if (alignFrame != null && !headless)
{
- alignFrame.setProgressBar("Saving "
- + (type == jalview.util.ImageMaker.PNG ? "PNG image"
- : "EPS file"), progress);
+ alignFrame.setProgressBar(MessageManager.formatMessage("status.saving_file", new String[]{(type == jalview.util.ImageMaker.PNG ? MessageManager.getString("label.png_image") : MessageManager.getString("label.eps_file"))}), progress);
}
try
{
@@ -1202,7 +1207,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
{
if (alignFrame != null && !headless)
{
- alignFrame.setProgressBar("Export complete.", progress);
+ alignFrame.setProgressBar(MessageManager.getString("status.export_complete"), progress);
}
}
}