import jalview.io.JalviewFileView;
import jalview.jbgui.GPreferences;
import jalview.jbgui.GSequenceLink;
-import jalview.schemes.ColourSchemeProperty;
+import jalview.schemes.ColourSchemeI;
+import jalview.schemes.ColourSchemes;
+import jalview.schemes.ResidueColourScheme;
import jalview.urls.UrlLinkTableModel;
import jalview.urls.api.UrlProviderFactoryI;
import jalview.urls.api.UrlProviderI;
/*
* Set Colours tab defaults
*/
- for (int i = ColourSchemeProperty.FIRST_COLOUR; i <= ColourSchemeProperty.LAST_COLOUR; i++)
+ protColour.addItem(ResidueColourScheme.NONE);
+ nucColour.addItem(ResidueColourScheme.NONE);
+ for (ColourSchemeI cs : ColourSchemes.getInstance().getColourSchemes())
{
- protColour.addItem(ColourSchemeProperty.getColourName(i));
- nucColour.addItem(ColourSchemeProperty.getColourName(i));
+ String name = cs.getSchemeName();
+ protColour.addItem(name);
+ nucColour.addItem(name);
}
- String oldProp = Cache.getDefault(DEFAULT_COLOUR, "None");
+ String oldProp = Cache.getDefault(DEFAULT_COLOUR,
+ ResidueColourScheme.NONE);
String newProp = Cache.getDefault(DEFAULT_COLOUR_PROT, null);
protColour.setSelectedItem(newProp != null ? newProp : oldProp);
newProp = Cache.getDefault(DEFAULT_COLOUR_NUC, null);
List<RowSorter.SortKey> sortKeys = new ArrayList<>();
UrlLinkTableModel m = (UrlLinkTableModel) linkUrlTable.getModel();
- sortKeys.add(new RowSorter.SortKey(m.getDefaultColumn(),
+ sortKeys.add(new RowSorter.SortKey(m.getPrimaryColumn(),
SortOrder.DESCENDING));
sortKeys.add(new RowSorter.SortKey(m.getSelectedColumn(),
SortOrder.DESCENDING));
// set up radio buttons
int onClickCol = ((UrlLinkTableModel) linkUrlTable.getModel())
- .getDefaultColumn();
+ .getPrimaryColumn();
String onClickName = linkUrlTable.getColumnName(onClickCol);
linkUrlTable.getColumn(onClickName).setCellRenderer(
new RadioButtonRenderer());
useProxy.setSelected(Cache.getDefault("USE_PROXY", false));
useProxy_actionPerformed(); // make sure useProxy is correctly initialised
- proxyServerTB.setEnabled(useProxy.isSelected());
- proxyPortTB.setEnabled(useProxy.isSelected());
proxyServerTB.setText(Cache.getDefault("PROXY_SERVER", ""));
proxyPortTB.setText(Cache.getDefault("PROXY_PORT", ""));
}
Cache.applicationProperties.setProperty("DEFAULT_URL",
- sequenceUrlLinks.getDefaultUrlId());
+ sequenceUrlLinks.getPrimaryUrlId());
Cache.applicationProperties.setProperty("USE_PROXY",
Boolean.toString(useProxy.isSelected()));
if (format != null)
{
Cache.applicationProperties.setProperty("DEFAULT_FILE_FORMAT",
- format.toString());
+ format.getName());
}
startupFileTextfield.setText(chooser.getSelectedFile()
.getAbsolutePath());
return;
}
- link.setName(linkUrlTable.getValueAt(index, 0).toString());
- link.setURL(linkUrlTable.getValueAt(index, 1).toString());
+ int nameCol = ((UrlLinkTableModel) linkUrlTable.getModel())
+ .getNameColumn();
+ int urlCol = ((UrlLinkTableModel) linkUrlTable.getModel())
+ .getUrlColumn();
+ String oldName = linkUrlTable.getValueAt(index, nameCol).toString();
+ link.setName(oldName);
+ link.setURL(linkUrlTable.getValueAt(index, urlCol).toString());
boolean valid = false;
while (!valid)
{
if (link.checkValid())
{
- if (((UrlLinkTableModel) linkUrlTable.getModel())
- .isUniqueName(link.getName()))
+ if ((oldName.equals(link.getName()))
+ || (((UrlLinkTableModel) linkUrlTable.getModel())
+ .isUniqueName(link.getName())))
{
- linkUrlTable.setValueAt(link.getName(), index, 0);
- linkUrlTable.setValueAt(link.getURL(), index, 1);
+ linkUrlTable.setValueAt(link.getName(), index, nameCol);
+ linkUrlTable.setValueAt(link.getURL(), index, urlCol);
valid = true;
}
else