Author: kono
Date: 2012-03-02 12:15:53 -0800 (Fri, 02 Mar 2012)
New Revision: 28416
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/quickfind/util/QuickFindImpl.java
Log:
refs #717
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/quickfind/util/QuickFindImpl.java
===================================================================
---
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/quickfind/util/QuickFindImpl.java
2012-03-02 20:09:26 UTC (rev 28415)
+++
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/quickfind/util/QuickFindImpl.java
2012-03-02 20:15:53 UTC (rev 28416)
@@ -30,9 +30,10 @@
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.cytoscape.filter.internal.widgets.autocomplete.index.GenericIndex;
import org.cytoscape.filter.internal.widgets.autocomplete.index.Hit;
@@ -54,19 +55,25 @@
* @author Ethan Cerami.
*/
public class QuickFindImpl implements QuickFind {
- private ArrayList listenerList = new ArrayList();
- private Map<CyNetwork, GenericIndex> networkMap = new
ConcurrentHashMap<CyNetwork, GenericIndex>();
+
+ private final List<QuickFindListener> listenerList;
+ private final Map<CyNetwork, GenericIndex> networkMap;
+
private int maxProgress;
private int currentProgress;
private static final boolean OUTPUT_PERFORMANCE_STATS = false;
+ public QuickFindImpl() {
+ this.listenerList = new ArrayList<QuickFindListener>();
+ this.networkMap = new HashMap<CyNetwork, GenericIndex>();
+ }
+
+
/**
- * DOCUMENT ME!
- *
- * @param network DOCUMENT ME!
- * @param taskMonitor DOCUMENT ME!
+ * {@inheritDoc}
*/
+ @Override
public synchronized void addNetwork(CyNetwork network, TaskMonitor
taskMonitor) {
// check args - short circuit if necessary
if (network.getNodeCount() == 0)
@@ -148,7 +155,7 @@
return true;
}
-
+ @Override
public synchronized void removeNetwork(CyNetwork network) {
networkMap.remove(networkMap);
@@ -160,7 +167,7 @@
}
@Override
- public GenericIndex getIndex(final CyNetwork network) {
+ public synchronized GenericIndex getIndex(final CyNetwork network) {
return networkMap.get(network);
}
@@ -172,6 +179,7 @@
CyTable table;
if (indexType == QuickFind.INDEX_NODES) {
CyNode node = null;
+ //
if (!(cyNetwork.getNodeList() == null ||
cyNetwork.getNodeList().size() == 0)){
node =
cyNetwork.getNodeList().iterator().next();
}
--
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.
