X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=6810fed9e16f47ff76cbcf78dbf4b3b9d5cd5224;hb=cca50cb3aee94f3ed1a5e504d45b8d8b665f8c5b;hp=2a2acfb848283672276ef29ddf6779f2c4da45dc;hpb=d053a3c980cf4318b9a19a255f9fc870e74de989;p=jalview.git
diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 2a2acfb..6810fed 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -1,24 +1,29 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * 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;
import java.awt.*;
import java.awt.image.*;
+import java.util.List;
+
import javax.swing.*;
import jalview.datamodel.*;
@@ -47,7 +52,7 @@ public class IdCanvas extends JPanel
boolean fastPaint = false;
- java.util.Vector searchResults;
+ List searchResults;
FontMetrics fm;
@@ -55,7 +60,7 @@ public class IdCanvas extends JPanel
AnnotationPanel ap;
- Font idfont;
+ private Font idfont;
/**
* Creates a new IdCanvas object.
@@ -114,7 +119,7 @@ public class IdCanvas extends JPanel
gg.setColor(Color.black);
}
- if (av.rightAlignIds)
+ if (av.isRightAlignIds())
{
xPos = panelWidth
- fm.stringWidth(s.getDisplayId(av.getShowJVSuffix())) - 4;
@@ -242,15 +247,15 @@ public class IdCanvas extends JPanel
{
if (av.seqNameItalics)
{
- idfont = new Font(av.getFont().getName(), Font.ITALIC, av.getFont()
- .getSize());
+ setIdfont(new Font(av.getFont().getName(), Font.ITALIC, av.getFont()
+ .getSize()));
}
else
{
- idfont = av.getFont();
+ setIdfont(av.getFont());
}
- gg.setFont(idfont);
+ gg.setFont(getIdfont());
fm = gg.getFontMetrics();
if (av.antiAlias)
@@ -274,7 +279,7 @@ public class IdCanvas extends JPanel
int annotationHeight = 0;
- if (av.showAnnotation)
+ if (av.isShowAnnotation())
{
if (ap == null)
{
@@ -311,13 +316,13 @@ public class IdCanvas extends JPanel
}
else
{
- gg.setFont(idfont);
+ gg.setFont(getIdfont());
}
drawIdString(gg, s, i, 0, ypos);
}
- if (labels != null && av.showAnnotation)
+ if (labels != null && av.isShowAnnotation())
{
gg.translate(0, ypos + (alheight * av.charHeight));
labels.drawComponent(gg, getWidth());
@@ -378,7 +383,7 @@ public class IdCanvas extends JPanel
String string = sequence.getDisplayId(av.getShowJVSuffix());
- if (av.rightAlignIds)
+ if (av.isRightAlignIds())
{
xPos = panelWidth - fm.stringWidth(string) - 4;
}
@@ -469,19 +474,29 @@ public class IdCanvas extends JPanel
}
else
{
- gg.setFont(idfont);
+ gg.setFont(getIdfont());
}
}
/**
* DOCUMENT ME!
*
- * @param found
+ * @param list
* DOCUMENT ME!
*/
- public void setHighlighted(java.util.Vector found)
+ public void setHighlighted(List list)
{
- searchResults = found;
+ searchResults = list;
repaint();
}
+
+ public Font getIdfont()
+ {
+ return idfont;
+ }
+
+ public void setIdfont(Font idfont)
+ {
+ this.idfont = idfont;
+ }
}