Author: oriol
Date: 2013-01-24 10:19:10 -0800 (Thu, 24 Jan 2013)
New Revision: 31083
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/JoinTablesTask.java
Log:
Fixing bug #1698. Checking if columns list is really different to change it
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/JoinTablesTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/JoinTablesTask.java
2013-01-24 18:17:49 UTC (rev 31082)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/JoinTablesTask.java
2013-01-24 18:19:10 UTC (rev 31083)
@@ -95,8 +95,11 @@
}
public void setDataTypeOptions(ListSingleSelection<TableType> options) {
- columnList =
getColumns(name2RootMap.get(rootNetworkList.getSelectedValue()),
+ ListSingleSelection<String> tempList =
getColumns(name2RootMap.get(rootNetworkList.getSelectedValue()),
dataTypeOptions.getSelectedValue(),
CyRootNetwork.SHARED_ATTRS);
+
if(!columnList.getPossibleValues().containsAll(tempList.getPossibleValues())
+ || columnList.getPossibleValues().size() !=
tempList.getPossibleValues().size())
+ columnList = tempList;
}
public ListSingleSelection<String> rootNetworkList;
@@ -107,8 +110,11 @@
}
public void setRootNetworkList(ListSingleSelection<String> roots) {
- columnList =
getColumns(name2RootMap.get(rootNetworkList.getSelectedValue()),
+ ListSingleSelection<String> tempList =
getColumns(name2RootMap.get(rootNetworkList.getSelectedValue()),
dataTypeOptions.getSelectedValue(),
CyRootNetwork.SHARED_ATTRS);
+
if(!columnList.getPossibleValues().containsAll(tempList.getPossibleValues())
+ || columnList.getPossibleValues().size() !=
tempList.getPossibleValues().size())
+ columnList = tempList;
}
public ListSingleSelection<String> columnList;
--
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].
Visit this group at http://groups.google.com/group/cytoscape-cvs?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.
