/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
else if (evt.getClickCount() == 2)
{
fr.ap.alignFrame.avc.markColumnsContainingFeatures(
- evt.isShiftDown(),
+ evt.isAltDown(),evt.isShiftDown() || evt.isMetaDown(), evt.isMetaDown(),
(String) table.getValueAt(selectedRow, 0));
}
}
}
}
});
-
+ table.setToolTipText("<html>"+JvSwingUtils
+ .wrapTooltip("Click/drag feature types up or down to change render order.<br/>Double click to select columns containing feature in alignment/current selection<br/>Pressing Alt will select columns outside features rather than inside<br/>Pressing Shift to modify current selection (rather than clear current selection)<br/>Press CTRL or Command/Meta to toggle columns in/outside features<br/>")+"</html>");
scrollPane.setViewportView(table);
dassourceBrowser = new DasSourceBrowser(this);
@Override
public void actionPerformed(ActionEvent arg0)
{
- fr.ap.alignFrame.avc.markColumnsContainingFeatures(false, type);
+ fr.ap.alignFrame.avc.markColumnsContainingFeatures(false, false, false, type);
}
});
JMenuItem clearCols = new JMenuItem(MessageManager.getString("label.select_columns_not_containing"));
@Override
public void actionPerformed(ActionEvent arg0)
{
- fr.ap.alignFrame.avc.markColumnsContainingFeatures(true, type);
+ fr.ap.alignFrame.avc.markColumnsContainingFeatures(true, false, false, type);
}
});
men.add(selCols);
private String[] getDisplayedFeatureGroups()
{
String[] gps = null;
+ ArrayList<String> _gps = new ArrayList<String>();
if (fr != null)
{
if (fr.featureGroups != null)
{
Iterator en = fr.featureGroups.keySet().iterator();
- gps = new String[fr.featureColours.size()];
int g = 0;
boolean valid = false;
while (en.hasNext())
if (on != null && on.booleanValue())
{
valid = true;
- gps[g++] = gp;
+ _gps.add(gp);
}
}
- while (g < gps.length)
- {
- gps[g++] = null;
- }
if (!valid)
{
return null;
+ } else {
+ gps = new String[_gps.size()];
+ _gps.toArray(gps);
}
}
}