Author: ruschein
Date: 2011-02-01 09:01:55 -0800 (Tue, 01 Feb 2011)
New Revision: 23989
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/ApplyFilterThread.java
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/FilterUtil.java
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterSettingPanel.java
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/util/CyAttributesUtil.java
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/util/QuickFindImpl.java
Log:
Adpated to the new CyRow interface.
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/ApplyFilterThread.java
===================================================================
---
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/ApplyFilterThread.java
2011-02-01 16:58:16 UTC (rev 23988)
+++
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/ApplyFilterThread.java
2011-02-01 17:01:55 UTC (rev 23989)
@@ -121,7 +121,7 @@
Number value;
- if
(data.getDataTable().getColumn(theNumericFilter.getControllingAttribute().substring(5)).getType()
+ if
(data.getTable().getColumn(theNumericFilter.getControllingAttribute().substring(5)).getType()
== Double.class)
value =
data.get(theNumericFilter.getControllingAttribute().substring(5), Double.class);
else
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/FilterUtil.java
===================================================================
---
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/FilterUtil.java
2011-02-01 16:58:16 UTC (rev 23988)
+++
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/FilterUtil.java
2011-02-01 17:01:55 UTC (rev 23989)
@@ -125,7 +125,7 @@
return false;
}
CyNode node = nodes.get(0);
- return
node.getCyRow().getDataTable().getColumn(pAttribute) != null;
+ return node.getCyRow().getTable().getColumn(pAttribute)
!= null;
}
else if (pType == QuickFind.INDEX_EDGES) {
List<CyEdge> edges = network.getEdgeList();
@@ -133,7 +133,7 @@
return false;
}
CyEdge edge = edges.get(0);
- return
edge.getCyRow().getDataTable().getColumn(pAttribute) != null;
+ return edge.getCyRow().getTable().getColumn(pAttribute)
!= null;
}
return false;
}
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
===================================================================
---
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
2011-02-01 16:58:16 UTC (rev 23988)
+++
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
2011-02-01 17:01:55 UTC (rev 23989)
@@ -363,7 +363,7 @@
}
CyTableEntry tableEntry = entries.iterator().next();
- final Collection<CyColumn> columns =
tableEntry.getCyRow().getDataTable().getColumns();
+ final Collection<CyColumn> columns =
tableEntry.getCyRow().getTable().getColumns();
for (final CyColumn column : columns) {
// Show all attributes, with type of String or Number
Class<?> type = column.getType();
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterSettingPanel.java
===================================================================
---
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterSettingPanel.java
2011-02-01 16:58:16 UTC (rev 23988)
+++
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/view/FilterSettingPanel.java
2011-02-01 17:01:55 UTC (rev 23989)
@@ -210,7 +210,7 @@
CyTableEntry entry = entries.iterator().next();
CyRow row = entry.getCyRow();
- return row.getDataTable().getColumn(pAttribute).getType();
+ return row.getTable().getColumn(pAttribute).getType();
}
@@ -510,14 +510,14 @@
if (cyNetwork.getNodeCount() > 0) {
CyNode node = cyNetwork.getNode(0);
attributeType =
-
node.getCyRow().getDataTable().getColumn(pCtrlAttribute).getType();
+
node.getCyRow().getTable().getColumn(pCtrlAttribute).getType();
}
}
else if (pIndexType == QuickFind.INDEX_EDGES) {
if (cyNetwork.getEdgeCount() > 0) {
CyEdge edge = cyNetwork.getEdge(0);
attributeType =
-
edge.getCyRow().getDataTable().getColumn(pCtrlAttribute).getType();
+
edge.getCyRow().getTable().getColumn(pCtrlAttribute).getType();
}
}
//
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/util/CyAttributesUtil.java
===================================================================
---
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/util/CyAttributesUtil.java
2011-02-01 16:58:16 UTC (rev 23988)
+++
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/util/CyAttributesUtil.java
2011-02-01 17:01:55 UTC (rev 23989)
@@ -74,7 +74,7 @@
terms = new String[]
{String.valueOf(graphObject.getSUID())};
} else {
CyRow row = graphObject.getCyRow();
- Class<?> type =
row.getDataTable().getColumn(attributeKey).getType();
+ Class<?> type =
row.getTable().getColumn(attributeKey).getType();
boolean hasAttribute = type != null;
if (hasAttribute) {
@@ -192,7 +192,7 @@
}
for (CyTableEntry entry : entries) {
CyRow row = entry.getCyRow();
- Class<?> type =
row.getDataTable().getColumn(attributeName).getType();
+ Class<?> type =
row.getTable().getColumn(attributeName).getType();
if (row.get(attributeName, type) != null) {
return false;
}
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/util/QuickFindImpl.java
===================================================================
---
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/util/QuickFindImpl.java
2011-02-01 16:58:16 UTC (rev 23988)
+++
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/quickfind/util/QuickFindImpl.java
2011-02-01 17:01:55 UTC (rev 23989)
@@ -88,7 +88,7 @@
CyTable nodeTable = null;
CyNode node = network.getNodeList().iterator().next();
if (node != null) {
- nodeTable = node.getCyRow().getDataTable();
+ nodeTable = node.getCyRow().getTable();
}
if (controllingAttribute == null) {
@@ -205,13 +205,13 @@
if (node == null) {
return null;
}
- table = node.getCyRow().getDataTable();
+ table = node.getCyRow().getTable();
} else if (indexType == QuickFind.INDEX_EDGES){
CyEdge edge = cyNetwork.getEdgeList().iterator().next();
if (edge == null) {
return null;
}
- table = edge.getCyRow().getDataTable();
+ table = edge.getCyRow().getTable();
} else {
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.
