public AnnotationPanel(AlignmentPanel ap)
{
- MAC = new jalview.util.Platform().isAMac();
+ MAC = jalview.util.Platform.isAMac();
ToolTipManager.sharedInstance().registerComponent(this);
ToolTipManager.sharedInstance().setInitialDelay(0);
if (evt.getActionCommand().equals(REMOVE))
{
- for (int i = 0; i < av.getColumnSelection().size(); i++)
+ for (int sel : av.getColumnSelection().getSelected())
{
- anot[av.getColumnSelection().columnAt(i)] = null;
+ anot[sel] = null;
}
}
else if (evt.getActionCommand().equals(LABEL))
{
- String exMesg = collectAnnotVals(anot, av.getColumnSelection(), LABEL);
+ String exMesg = collectAnnotVals(anot, LABEL);
String label = JOptionPane.showInputDialog(this,
MessageManager.getString("label.enter_label"), exMesg);
aa[activeRow].hasText = true;
}
- for (int i = 0; i < av.getColumnSelection().size(); i++)
+ for (int index : av.getColumnSelection().getSelected())
{
- int index = av.getColumnSelection().columnAt(i);
-
if (!av.getColumnSelection().isVisible(index))
{
continue;
else if (evt.getActionCommand().equals(COLOUR))
{
Color col = JColorChooser.showDialog(this,
- MessageManager.getString("label.select_foreground_colour"), Color.black);
+ MessageManager.getString("label.select_foreground_colour"),
+ Color.black);
- for (int i = 0; i < av.getColumnSelection().size(); i++)
+ for (int index : av.getColumnSelection().getSelected())
{
- int index = av.getColumnSelection().columnAt(i);
-
if (!av.getColumnSelection().isVisible(index))
{
continue;
aa[activeRow].showAllColLabels = true;
}
}
- for (int i = 0; i < av.getColumnSelection().size(); i++)
+ for (int index : av.getColumnSelection().getSelected())
{
- int index = av.getColumnSelection().columnAt(i);
-
if (!av.getColumnSelection().isVisible(index))
{
continue;
anot[index] = new Annotation(label, "", type, 0);
}
-
anot[index].secondaryStructure = type != 'S' ? type : label
.length() == 0 ? ' ' : label.charAt(0);
anot[index].displayCharacter = label;
return;
}
- private String collectAnnotVals(Annotation[] anot,
- ColumnSelection columnSelection, String label2)
+ private String collectAnnotVals(Annotation[] anot, String label2)
{
String collatedInput = "";
String last = "";
ColumnSelection viscols = av.getColumnSelection();
// TODO: refactor and save av.getColumnSelection for efficiency
- for (int i = 0; i < columnSelection.size(); i++)
+ for (int index : viscols.getSelected())
{
- int index = columnSelection.columnAt(i);
// always check for current display state - just in case
if (!viscols.isVisible(index))
{
&& aa[row].annotations[res].description != null
&& aa[row].annotations[res].description.length() > 0)
{
- this.setToolTipText(JvSwingUtils
- .wrapTooltip(true, aa[row].annotations[res].description));
+ this.setToolTipText(JvSwingUtils.wrapTooltip(true,
+ aa[row].annotations[res].description));
}
else
{
{
try
{
- image = new BufferedImage(imgWidth, ap.getAnnotationPanel().getHeight(),
- BufferedImage.TYPE_INT_RGB);
+ image = new BufferedImage(imgWidth, ap.getAnnotationPanel()
+ .getHeight(), BufferedImage.TYPE_INT_RGB);
} catch (OutOfMemoryError oom)
{
try