Author: pwang
Date: 2012-01-11 11:56:45 -0800 (Wed, 11 Jan 2012)
New Revision: 27981
Modified:
core3/impl/trunk/search-impl/src/main/java/org/cytoscape/search/internal/EnhancedSearchPlugin.java
core3/impl/trunk/search-impl/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
Log:
Fixed a bug
Modified:
core3/impl/trunk/search-impl/src/main/java/org/cytoscape/search/internal/EnhancedSearchPlugin.java
===================================================================
---
core3/impl/trunk/search-impl/src/main/java/org/cytoscape/search/internal/EnhancedSearchPlugin.java
2012-01-11 19:43:13 UTC (rev 27980)
+++
core3/impl/trunk/search-impl/src/main/java/org/cytoscape/search/internal/EnhancedSearchPlugin.java
2012-01-11 19:56:45 UTC (rev 27981)
@@ -52,6 +52,9 @@
import org.cytoscape.model.events.RemovedNodesListener;
import org.cytoscape.model.events.RemovedEdgesListener;
import org.cytoscape.model.events.RemovedEdgesEvent;
+import org.cytoscape.model.events.RowSetRecord;
+import java.util.Collection;
+import java.util.Iterator;
public class EnhancedSearchPlugin extends AbstractToolBarComponent
@@ -111,7 +114,17 @@
@Override
public void handleEvent(RowsSetEvent e) {
- this.attributeChanged = true;
+
+ Collection<RowSetRecord> records = e.getPayloadCollection();
+
+ Iterator<RowSetRecord> it= records.iterator();
+ while (it.hasNext()){
+ // Ignore the change of selection attribute
+ if
(!it.next().getColumn().equalsIgnoreCase("selected")){
+ this.attributeChanged = true;
+ break;
+ }
+ }
}
@Override
Modified:
core3/impl/trunk/search-impl/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
===================================================================
---
core3/impl/trunk/search-impl/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
2012-01-11 19:43:13 UTC (rev 27980)
+++
core3/impl/trunk/search-impl/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
2012-01-11 19:56:45 UTC (rev 27981)
@@ -90,13 +90,13 @@
if (status != null &&
status.equalsIgnoreCase(EnhancedSearch.INDEX_SET) &&
!EnhancedSearchPlugin.attributeChanged)
{
idx = enhancedSearch.getNetworkIndex(network);
- EnhancedSearchPlugin.attributeChanged = false;
}
else {
taskMonitor.setStatusMessage("Indexing network");
final EnhancedSearchIndex indexHandler = new
EnhancedSearchIndex(network);
idx = indexHandler.getIndex();
enhancedSearch.setNetworkIndex(network, idx);
+ EnhancedSearchPlugin.attributeChanged = false;
}
if (interrupted)
--
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.
