Author: pwang
Date: 2010-11-24 17:08:15 -0800 (Wed, 24 Nov 2010)
New Revision: 23017
Modified:
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/EnhancedSearchIndex.java
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/ui/EnhancedSearchPanel.java
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/util/AttributeFields.java
Log:
Some minor changes
Modified:
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/EnhancedSearchIndex.java
===================================================================
---
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/EnhancedSearchIndex.java
2010-11-25 00:02:43 UTC (rev 23016)
+++
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/EnhancedSearchIndex.java
2010-11-25 01:08:15 UTC (rev 23017)
@@ -81,10 +81,13 @@
// writer.setMaxFieldLength(MAX_FIELD_LENGTH);
// Add a document for each graph object - node and edge
- for (CyNode cyNode : network.getNodeList()) {
+ List<CyNode> nodeList = network.getNodeList();
+ for (CyNode cyNode : nodeList) {
writer.addDocument(createDocument(cyNode,
EnhancedSearch.NODE_TYPE, cyNode.getIndex()));
}
- for (CyEdge cyEdge : network.getEdgeList()) {
+
+ List<CyEdge> edgeList = network.getEdgeList();
+ for (CyEdge cyEdge : edgeList) {
writer.addDocument(createDocument(cyEdge,
EnhancedSearch.EDGE_TYPE, cyEdge.getIndex()));
}
Modified:
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
===================================================================
---
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
2010-11-25 00:02:43 UTC (rev 23016)
+++
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
2010-11-25 01:08:15 UTC (rev 23017)
@@ -115,10 +115,12 @@
}
// Display results
- for (CyNode n : network.getNodeList()) {
+ List<CyNode> nodeList = network.getNodeList();
+ for (CyNode n : nodeList) {
n.getCyRow().set("selected",false);
}
- for (CyEdge e : network.getEdgeList()) {
+ List<CyEdge> edgeList = network.getEdgeList();
+ for (CyEdge e : edgeList) {
e.getCyRow().set("selected",false);
}
Modified:
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/ui/EnhancedSearchPanel.java
===================================================================
---
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/ui/EnhancedSearchPanel.java
2010-11-25 00:02:43 UTC (rev 23016)
+++
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/ui/EnhancedSearchPanel.java
2010-11-25 01:08:15 UTC (rev 23017)
@@ -20,7 +20,8 @@
initComponents();
// Turn off this for now, we may need this later
- this.lbSearch.setVisible(false);
+ this.btnSearch.setVisible(false);
+ this.lbSearch.setVisible(true);
this.netmgr = netmgr;
this.tableMgr = tableMgr;
Modified:
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/util/AttributeFields.java
===================================================================
---
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/util/AttributeFields.java
2010-11-25 00:02:43 UTC (rev 23016)
+++
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/util/AttributeFields.java
2010-11-25 01:08:15 UTC (rev 23017)
@@ -78,12 +78,12 @@
//CyTable nodeCyDataTable =
network.getCyRow().getDataTable()..getNodeCyDataTables().get(CyNetwork.DEFAULT_ATTRS);
- CyTable nodeCyDataTable =
tableMgr.getTableMap(CyTableEntry.NODE, network).get(CyNetwork.DEFAULT_ATTRS);
+ CyTable nodeCyDataTable = (CyTable)
tableMgr.getTableMap(CyNode.class, network).get(CyNetwork.DEFAULT_ATTRS);
nodeColumnTypeMap = nodeCyDataTable.getColumnTypeMap();
//CyTable edgeCyDataTable =
network.getEdgeCyDataTables().get(CyNetwork.DEFAULT_ATTRS);
- CyTable edgeCyDataTable =
tableMgr.getTableMap(CyTableEntry.EDGE, network).get(CyNetwork.DEFAULT_ATTRS);
+ CyTable edgeCyDataTable = (CyTable)
tableMgr.getTableMap(CyEdge.class, network).get(CyNetwork.DEFAULT_ATTRS);
edgeColumnTypeMap = edgeCyDataTable.getColumnTypeMap();
@@ -100,7 +100,6 @@
fields[j] =
EnhancedSearchUtils.replaceWhitespace(fields[j]);
fields[j] = fields[j].toLowerCase();
}
-
}
@@ -118,5 +117,4 @@
return valueType;
}
-
}
--
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.
