Author: scooter
Date: 2011-10-26 12:39:54 -0700 (Wed, 26 Oct 2011)
New Revision: 27308

Modified:
   
csplugins/trunk/ucsf/scooter/SFLDLoader/src/SFLDLoader/ui/SFLDQueryDialog.java
Log:
Fix bug in selection and handling of empty cells


Modified: 
csplugins/trunk/ucsf/scooter/SFLDLoader/src/SFLDLoader/ui/SFLDQueryDialog.java
===================================================================
--- 
csplugins/trunk/ucsf/scooter/SFLDLoader/src/SFLDLoader/ui/SFLDQueryDialog.java  
    2011-10-26 19:24:11 UTC (rev 27307)
+++ 
csplugins/trunk/ucsf/scooter/SFLDLoader/src/SFLDLoader/ui/SFLDQueryDialog.java  
    2011-10-26 19:39:54 UTC (rev 27308)
@@ -510,7 +510,7 @@
                                        selFamilies = new ArrayList<Family>();
                                        if (selectedRows.length == 1) {
                                                Subgroup sg = 
selSuper.getSubgroup(selectedRows[0]);
-                                               if (selSubgroups.size() > 1 && 
selSubgroups.contains(sg)) {
+                                               if (selSubgroups.size() > 0 && 
selSubgroups.contains(sg)) {
                                                        // Deselect
                                                        selSubgroups.remove(sg);
                                                } else {
@@ -534,7 +534,7 @@
                                        Subgroup selSubgroup = 
selSubgroups.get(0);
                                        if (selectedRows.length == 1) {
                                                Family fam = 
selSubgroup.getFamily(selectedRows[0]);
-                                               if (selFamilies.size() > 1 && 
selFamilies.contains(fam)) {
+                                               if (selFamilies.size() > 0 && 
selFamilies.contains(fam)) {
                                                        // Deselect
                                                        selFamilies.add(fam);
                                                } else {
@@ -585,7 +585,7 @@
                                                                                
     row, col);
                                return cell;
                        }
-                       return null;
+                       return super.getTableCellRendererComponent(table, null, 
false, false, row, col);
                }
        }
 
@@ -617,7 +617,8 @@
                                                                                
     row, col);
                                return cell;
                        }
-                       return null;
+                       return super.getTableCellRendererComponent(table, null, 
false, false, row, col);
+                       // return null;
                }
        }
 
@@ -643,7 +644,7 @@
                                                                                
     row, col);
                                return cell;
                        }
-                       return null;
+                       return super.getTableCellRendererComponent(table, null, 
false, false, row, col);
                }
        }
 }

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