Author: jgao
Date: 2012-03-21 14:00:45 -0700 (Wed, 21 Mar 2012)
New Revision: 28606
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MatchNodeTable.java
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MergeAttributeTable.java
Log:
network-merge: bug fixed before hitting the button merge
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MatchNodeTable.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MatchNodeTable.java
2012-03-21 18:55:41 UTC (rev 28605)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MatchNodeTable.java
2012-03-21 21:00:45 UTC (rev 28606)
@@ -97,7 +97,6 @@
public void fireTableStructureChanged() {
model.fireTableStructureChanged();
setColumnEditorAndCellRenderer();
- //setCellRenderer();
}
private class MatchNodeTableModel extends AbstractTableModel {
@@ -125,7 +124,7 @@
@Override
public Object getValueAt(int row, int col) {
- return
matchingAttribute.getAttributeForMatching(networks.get(col));
+ return
matchingAttribute.getAttributeForMatching(networks.get(col)).getName();
}
@Override
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MergeAttributeTable.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MergeAttributeTable.java
2012-03-21 18:55:41 UTC (rev 28605)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MergeAttributeTable.java
2012-03-21 21:00:45 UTC (rev 28606)
@@ -153,11 +153,7 @@
if (row<(isNode?1:0)) {//TODO Cytoscape3
JLabel label = (JLabel)
defaultRenderer.getTableCellRendererComponent(table, value, isSelected,
hasFocus, row, column);
label.setBackground(Color.LIGHT_GRAY);
- if (row==0) {
- label.setToolTipText("Change
this in the matching node table above");
- } else {
- label.setToolTipText("Reserved
by system");
- }
+ label.setToolTipText("Change this in
the matching node table above");
return label;
} else {
Component renderer =
comboBoxRenderer.getTableCellRendererComponent(table, value, isSelected,
hasFocus, row, column);
@@ -425,8 +421,8 @@
return null;
}
- //@Override
- public String getValueAt(final int row, final int col) {
+ @Override
+ public Object getValueAt(final int row, final int col) {
final int iAttr = row; //TODO used in Cytoscape3
if (row==getRowCount()-1) {
@@ -442,7 +438,7 @@
}
if (isColumnMergedType(col)) {
- return
attributeMapping.getMergedAttributeType(iAttr).toString();
+ return attributeMapping.getMergedAttributeType(iAttr);
}
return null;
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
