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
JAL-2316 Unit testing, relax constraint that default url is in menu
[jalview.git]
/
src
/
jalview
/
urls
/
UrlLinkTableModel.java
diff --git
a/src/jalview/urls/UrlLinkTableModel.java
b/src/jalview/urls/UrlLinkTableModel.java
index
0605f02
..
a18341b
100644
(file)
--- a/
src/jalview/urls/UrlLinkTableModel.java
+++ b/
src/jalview/urls/UrlLinkTableModel.java
@@
-38,12
+38,12
@@
import javax.swing.table.AbstractTableModel;
public class UrlLinkTableModel extends AbstractTableModel
{
// local storage of data
public class UrlLinkTableModel extends AbstractTableModel
{
// local storage of data
- // use LinkedHashMap to guarantee ordering remains the same, as
- // we need to maintain a row/col mapping into the HashMap
private List<UrlLinkDisplay> data;
private List<UrlLinkDisplay> data;
+ // supplier of url data
private UrlProviderI dataProvider;
private UrlProviderI dataProvider;
+ // list of columns to display in table in correct order
private List<String> displayColumns;
// row in table which is currently the default
private List<String> displayColumns;
// row in table which is currently the default
@@
-83,6
+83,7
@@
public class UrlLinkTableModel extends AbstractTableModel
}
}
}
}
+ // set up listener which updates data source when table changes
this.addTableModelListener(new TableModelListener()
{
@Override
this.addTableModelListener(new TableModelListener()
{
@Override
@@
-129,14
+130,7
@@
public class UrlLinkTableModel extends AbstractTableModel
@Override
public void setValueAt(Object aValue, int rowIndex, int columnIndex)
{
@Override
public void setValueAt(Object aValue, int rowIndex, int columnIndex)
{
- if ((columnIndex == UrlLinkDisplay.SELECTED)
- && (rowIndex == defaultRow))
- {
- // Selected urls column: can't deselect default URL
- // refuse to edit: TODO show message box here
-
- }
- else if (columnIndex == UrlLinkDisplay.DEFAULT)
+ if (columnIndex == UrlLinkDisplay.DEFAULT)
{
// Default url column: exactly one row must always be true
if (rowIndex != defaultRow)
{
// Default url column: exactly one row must always be true
if (rowIndex != defaultRow)
@@
-150,11
+144,6
@@
public class UrlLinkTableModel extends AbstractTableModel
defaultRow = rowIndex;
data.get(rowIndex).setValue(columnIndex, aValue);
defaultRow = rowIndex;
data.get(rowIndex).setValue(columnIndex, aValue);
- // default row must also be selected
- if (!data.get(rowIndex).getIsSelected())
- {
- data.get(rowIndex).setValue(UrlLinkDisplay.SELECTED, true);
- }
fireTableRowsUpdated(rowIndex, rowIndex);
}
}
fireTableRowsUpdated(rowIndex, rowIndex);
}
}
@@
-188,6
+177,7
@@
public class UrlLinkTableModel extends AbstractTableModel
defaultRow--;
}
defaultRow--;
}
+ // fire update which will update data source
fireTableRowsDeleted(rowIndex, rowIndex);
}
fireTableRowsDeleted(rowIndex, rowIndex);
}
@@
-197,6
+187,8
@@
public class UrlLinkTableModel extends AbstractTableModel
UrlLinkDisplay u = new UrlLinkDisplay(name, name, url, true, false);
int index = data.size();
data.add(u);
UrlLinkDisplay u = new UrlLinkDisplay(name, name, url, true, false);
int index = data.size();
data.add(u);
+
+ // fire update which will update data source
fireTableRowsInserted(index, index);
return index;
}
fireTableRowsInserted(index, index);
return index;
}