git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reconciled with develop
[jalview.git]
/
src
/
jalview
/
gui
/
FeatureTypeSettings.java
diff --git
a/src/jalview/gui/FeatureTypeSettings.java
b/src/jalview/gui/FeatureTypeSettings.java
index
c3887ff
..
f6b47c3
100644
(file)
--- a/
src/jalview/gui/FeatureTypeSettings.java
+++ b/
src/jalview/gui/FeatureTypeSettings.java
@@
-186,12
+186,12
@@
public class FeatureTypeSettings extends JalviewDialog
/*
* choice of what to colour by text (Label or attribute)
*/
/*
* choice of what to colour by text (Label or attribute)
*/
- private JComboBox<String> colourByTextCombo;
+ private JComboBox<Object> colourByTextCombo;
/*
* choice of what to colour by range (Score or attribute)
*/
/*
* choice of what to colour by range (Score or attribute)
*/
- private JComboBox<String> colourByRangeCombo;
+ private JComboBox<Object> colourByRangeCombo;
private JRadioButton andFilters;
private JRadioButton andFilters;
@@
-1121,10
+1121,10
@@
public class FeatureTypeSettings extends JalviewDialog
* @param withRange
* @param withText
*/
* @param withRange
* @param withText
*/
- protected JComboBox<String> populateAttributesDropdown(
+ protected JComboBox<Object> populateAttributesDropdown(
List<String[]> attNames, boolean withRange, boolean withText)
{
List<String[]> attNames, boolean withRange, boolean withText)
{
- List<String> displayAtts = new ArrayList<>();
+ List<Object> displayAtts = new ArrayList<>();
List<String> tooltips = new ArrayList<>();
if (withText)
List<String> tooltips = new ArrayList<>();
if (withText)
@@
-1160,7
+1160,7
@@
public class FeatureTypeSettings extends JalviewDialog
tooltips.add(desc == null ? "" : desc);
}
tooltips.add(desc == null ? "" : desc);
}
- JComboBox<String> attCombo = JvSwingUtils
+ JComboBox<Object> attCombo = JvSwingUtils
.buildComboWithTooltips(displayAtts, tooltips);
return attCombo;
.buildComboWithTooltips(displayAtts, tooltips);
return attCombo;
@@
-1340,7
+1340,7
@@
public class FeatureTypeSettings extends JalviewDialog
* drop-down choice of attribute, with description as a tooltip
* if we can obtain it
*/
* drop-down choice of attribute, with description as a tooltip
* if we can obtain it
*/
- JComboBox<String> attCombo = populateAttributesDropdown(attNames, true,
+ JComboBox<Object> attCombo = populateAttributesDropdown(attNames, true,
true);
String filterBy = setSelectedAttribute(attCombo, filter);
true);
String filterBy = setSelectedAttribute(attCombo, filter);
@@
-1478,7
+1478,7
@@
public class FeatureTypeSettings extends JalviewDialog
* @param attCombo
* @param filter
*/
* @param attCombo
* @param filter
*/
- private String setSelectedAttribute(JComboBox<String> attCombo,
+ private String setSelectedAttribute(JComboBox<Object> attCombo,
FeatureMatcherI filter)
{
String item = null;
FeatureMatcherI filter)
{
String item = null;
@@
-1695,7
+1695,7
@@
public class FeatureTypeSettings extends JalviewDialog
* @param valueField
* @param filterIndex
*/
* @param valueField
* @param filterIndex
*/
- protected boolean updateFilter(JComboBox<String> attCombo,
+ protected boolean updateFilter(JComboBox<Object> attCombo,
JComboBox<Condition> condCombo, JTextField valueField,
int filterIndex)
{
JComboBox<Condition> condCombo, JTextField valueField,
int filterIndex)
{