Author: ruschein
Date: 2011-08-31 16:31:22 -0700 (Wed, 31 Aug 2011)
New Revision: 26676

Modified:
   
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
Log:
Fixed a null-pointer exception.

Modified: 
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
===================================================================
--- 
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
  2011-08-31 23:22:08 UTC (rev 26675)
+++ 
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
  2011-08-31 23:31:22 UTC (rev 26676)
@@ -920,10 +920,11 @@
                        JButton _btn = (JButton) _actionObject;
 
                        if (_btn == btnApplyFilter) {
-                               //System.out.println("\nApplyButton is 
clicked!");
-                               //System.out.println("\tThe Filter to apply is 
\n" + cmbSelectFilter.getSelectedItem().toString()+"\n");
                                CompositeFilter theFilterToApply = 
(CompositeFilter) cmbSelectFilter.getSelectedItem();
-                               
theFilterToApply.setNetwork(applicationManager.getCurrentNetwork());
+                               final CyNetwork currentNetwork = 
applicationManager.getCurrentNetwork();
+                               if (currentNetwork == null)
+                                       return;
+                               theFilterToApply.setNetwork(currentNetwork);
                                FilterUtil.doSelection(theFilterToApply, 
applicationManager);
                        }
                        if (_btn == btnAddFilterWidget) {

-- 
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.

Reply via email to