Author: jgao
Date: 2012-03-21 09:22:10 -0700 (Wed, 21 Mar 2012)
New Revision: 28603
Modified:
core3/impl/trunk/network-merge-impl/pom.xml
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/model/AttributeMappingImpl.java
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
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/util/ColumnType.java
Log:
network-merge: fixed several bugs... still not working yet
Modified: core3/impl/trunk/network-merge-impl/pom.xml
===================================================================
--- core3/impl/trunk/network-merge-impl/pom.xml 2012-03-21 12:23:41 UTC (rev
28602)
+++ core3/impl/trunk/network-merge-impl/pom.xml 2012-03-21 16:22:10 UTC (rev
28603)
@@ -9,7 +9,7 @@
<artifactId>network-merge-impl</artifactId>
<packaging>bundle</packaging>
- <name>Advanced Network Merge</name>
+ <name>CyMerge</name>
<properties>
<bundle.symbolicName>org.cytoscape.network-merge-impl</bundle.symbolicName>
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/model/AttributeMappingImpl.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/model/AttributeMappingImpl.java
2012-03-21 12:23:41 UTC (rev 28602)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/model/AttributeMappingImpl.java
2012-03-21 16:22:10 UTC (rev 28603)
@@ -382,13 +382,18 @@
@Override
public void addNetwork(final CyNetwork net, CyTable table) {
- if (net==null) {
+ if (net==null || table==null) {
throw new java.lang.NullPointerException();
}
+ cyTables.put(net, table);
+
final List<String> attributeNames = new ArrayList<String>();
for (CyColumn col : table.getColumns()) {
- attributeNames.add(col.getName());
+ String colName = col.getName();
+ if (!colName.equals("SUID")) { //skip SUID
+ attributeNames.add(col.getName());
+ }
}
Collections.sort(attributeNames);
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 12:23:41 UTC (rev 28602)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MatchNodeTable.java
2012-03-21 16:22:10 UTC (rev 28603)
@@ -77,10 +77,15 @@
CyTable table = net.getDefaultNodeTable();
CyColumn[] cols = table.getColumns().toArray(new CyColumn[0]);
- JComboBox comboBox = new JComboBox(cols);
+ String[] colNames = new String[cols.length];
+ for (int j=0; j<cols.length; j++) {
+ colNames[j] = cols[j].getName();
+ }
+
+ JComboBox comboBox = new JComboBox(colNames);
column.setCellEditor(new DefaultCellEditor(comboBox));
- ComboBoxTableCellRenderer comboRenderer = new
ComboBoxTableCellRenderer(cols);
+ ComboBoxTableCellRenderer comboRenderer = new
ComboBoxTableCellRenderer(colNames);
column.setCellRenderer(comboRenderer);
}
}
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 12:23:41 UTC (rev 28602)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/MergeAttributeTable.java
2012-03-21 16:22:10 UTC (rev 28603)
@@ -425,9 +425,7 @@
//@Override
public int getRowCount() {
- int n = attributeMapping.getSizeMergedAttributes();
- //n = n+1; // +1: add an empty row in the end (TODO: use this one
in Cytoscape3.0)
- n = n+3; //TODO REMOVE in Cytoscape3.0
+ int n = attributeMapping.getSizeMergedAttributes()+1; // +1: add
an empty row in the end
return attributeMapping.getSizeNetwork()==0?0:n;
}
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/util/ColumnType.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/util/ColumnType.java
2012-03-21 12:23:41 UTC (rev 28602)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/util/ColumnType.java
2012-03-21 16:22:10 UTC (rev 28603)
@@ -103,7 +103,7 @@
}
public static ColumnType getType(CyColumn col) {
- Class<?> type = col.getClass();
+ Class<?> type = col.getType();
if (List.class.isAssignableFrom(type)) {
return listTypes.get(col.getListElementType());
} else {
--
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.
