Author: jgao
Date: 2012-03-22 14:57:55 -0700 (Thu, 22 Mar 2012)
New Revision: 28620
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/NetworkMergeFrame.java
Log:
network-merge: fixed bug for selecting edge column table
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-22 20:52:23 UTC (rev 28619)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MergeAttributeTable.java
2012-03-22 21:57:55 UTC (rev 28620)
@@ -36,6 +36,13 @@
package org.cytoscape.network.merge.internal.ui;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.*;
+import javax.swing.*;
+import javax.swing.table.*;
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTable;
@@ -43,30 +50,6 @@
import org.cytoscape.network.merge.internal.model.MatchingAttribute;
import org.cytoscape.network.merge.internal.util.ColumnType;
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.Vector;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumSet;
-
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.Component;
-import java.awt.Color;
-
-import javax.swing.JLabel;
-import javax.swing.JTable;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.JOptionPane;
-import javax.swing.table.JTableHeader;
-import javax.swing.JComboBox;
-import javax.swing.table.TableColumn;
-import javax.swing.DefaultCellEditor;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.DefaultTableCellRenderer;
-
/**
* Table for customizing attribute mapping from original netowrks
* to resulting network
@@ -113,12 +96,12 @@
CyNetwork net = model.getNetork(col);
CyTable table = attributeMapping.getCyTable(net);
Vector<String> colNames = new Vector<String>();
- for (CyColumn cyCol : table.getColumns()) {
- String colName = cyCol.getName();
- if (!colName.equals("SUID") && !colName.equals("selected")) {
- colNames.add(colName);
- }
+ for (CyColumn cyCol : table.getColumns()) {
+ String colName = cyCol.getName();
+ if (!colName.equals("SUID") && !colName.equals("selected")) {
+ colNames.add(colName);
}
+ }
colNames.add(nullAttr);
return colNames;
}
@@ -144,36 +127,36 @@
private DefaultTableCellRenderer defaultRenderer = new
DefaultTableCellRenderer();
private ComboBoxTableCellRenderer comboBoxRenderer = new
ComboBoxTableCellRenderer(attrs);
- //@Override
+ @Override
public Component getTableCellRendererComponent(
- JTable table, Object value,
- boolean isSelected, boolean hasFocus,
- int row, int column) {
+ JTable table, Object value,
+ boolean isSelected, boolean hasFocus,
+ int row, int column) {
- if (row<(isNode?1:0)) {//TODO Cytoscape3
- JLabel label = (JLabel)
defaultRenderer.getTableCellRendererComponent(table, value, isSelected,
hasFocus, row, column);
- label.setBackground(Color.LIGHT_GRAY);
- label.setToolTipText("Change this in
the matching node table above");
- return label;
+ if (row<(isNode?1:0)) {//TODO Cytoscape3
+ JLabel label = (JLabel)
defaultRenderer.getTableCellRendererComponent(table, value, isSelected,
hasFocus, row, column);
+ label.setBackground(Color.LIGHT_GRAY);
+ label.setToolTipText("Change this in the
matching node table above");
+ return label;
+ } else {
+ Component renderer =
comboBoxRenderer.getTableCellRendererComponent(table, value, isSelected,
hasFocus, row, column);
+ if (isSelected) {
+
renderer.setForeground(table.getSelectionForeground());
+
renderer.setBackground(table.getSelectionBackground());
} else {
- Component renderer =
comboBoxRenderer.getTableCellRendererComponent(table, value, isSelected,
hasFocus, row, column);
- if (isSelected) {
-
renderer.setForeground(table.getSelectionForeground());
-
renderer.setBackground(table.getSelectionBackground());
- } else {
-
renderer.setForeground(table.getForeground());
-
renderer.setBackground(table.getBackground());
- }
- return renderer;
+
renderer.setForeground(table.getForeground());
+
renderer.setBackground(table.getBackground());
}
- }
+ return renderer;
+ }
+ }
});
} else if (this.isColumnMergedNetwork(i)) {
column.setCellRenderer(new TableCellRenderer() {
private DefaultTableCellRenderer defaultRenderer = new
DefaultTableCellRenderer();
- //@Override
+ @Override
public Component getTableCellRendererComponent(
JTable table, Object value,
boolean isSelected, boolean hasFocus,
@@ -537,8 +520,6 @@
//if (attributeMapping.getOriginalAttribute(netID,
iAttr)==null) return;
attributeMapping.removeOriginalAttribute(net, iAttr);
} else {
- String mergedAttr =
attributeMapping.getMergedAttribute(iAttr);
-
attributeMapping.setOriginalAttribute(net, v,
iAttr);// set the v
}
fireTableDataChanged();
@@ -554,7 +535,7 @@
}
private void resetNetworks() {
- networks = new
ArrayList<CyNetwork>(matchingAttribute.getNetworkSet());
+ networks = new
ArrayList<CyNetwork>(attributeMapping.getNetworkSet());
//TODO: sort networks maybe alphabetically
}
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
2012-03-22 20:52:23 UTC (rev 28619)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
2012-03-22 21:57:55 UTC (rev 28620)
@@ -644,7 +644,7 @@
mergeEdgeAttributePanel.setLayout(new
BoxLayout(mergeEdgeAttributePanel, BoxLayout.LINE_AXIS));
- mergeEdgeAttributeTable = new
MergeAttributeTable(edgeAttributeMapping,matchingAttribute);
+ mergeEdgeAttributeTable = new
MergeAttributeTable(edgeAttributeMapping);
mergeEdgeAttributeScrollPane.setViewportView(mergeEdgeAttributeTable);
mergeEdgeAttributePanel.add(mergeEdgeAttributeScrollPane);
--
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.
