Fix slider deadlock. Fixes #314.

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/control/ControlPanelMediator.java

@@ -792,7 +792,7 @@ private void filterNodesAndEdges(EMViewControlPanel viewPanel, EnrichmentMap map
 			timer.stop();
 		}
 
-		timer.setInitialDelay(250);
+		timer.setInitialDelay(350);
 		timer.start();
 	}
 
@@ -899,7 +899,6 @@ private class FilterActionListener implements ActionListener {
 		private FilterNodesEdgesTask task;
 
 		private boolean cancelled;
-		private Object lock = new Object();
 
 		public FilterActionListener(EMViewControlPanel viewPanel, EnrichmentMap map, CyNetworkView netView) {
 			this.viewPanel = viewPanel;
@@ -934,24 +933,21 @@ public void taskFinished(ObservableTask task) {
 
 				@Override
 				public void allFinished(FinishStatus finishStatus) {
-					synchronized (lock) {
-						task = null;
-						
-						if (!cancelled)
-							netView.updateView();
-					}
+					task = null;
+					if (!cancelled)
+						netView.updateView();
 				}
 			});
 		}
 
 		public void cancel() {
 			cancelled = true;
 
-			synchronized (lock) {
-				if (task != null) {
+			if (task != null) {
+				try {
 					task.cancel();
 					task = null;
-				}
+				} catch(NullPointerException e) {}
 			}
 		}