Bug [381103] Context tree collapsed and no context selected.

1 files changed, 12 insertions, 0 deletions

diff --git a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/TCFThreadFilterEditor.java b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/TCFThreadFilterEditor.java
index 2a280ee..1909a34 100644
--- a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/TCFThreadFilterEditor.java
+++ b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/TCFThreadFilterEditor.java
@@ -211,6 +211,17 @@ public class TCFThreadFilterEditor {
                             break;
                         }
                     }
+                    // Some queries eliminate parent elements for grandchild matches.
+                    if (filteredList.size() == 0) {
+                        for (Object check_obj : resultArray) {
+                            if ( check_obj instanceof Context && ((Context)obj).fIsContainer) {
+                                Object[] childArray = getChildren(check_obj);
+                                if (childArray != null) {
+                                    filteredList.addAll(Arrays.asList(childArray));
+                                }
+                            }
+                        }
+                    }
                 }
             }
             if (filterExpr != null && filterExpr.length() != 0) {
@@ -457,6 +468,7 @@ public class TCFThreadFilterEditor {
                 scopeExprCombo.getParent().layout();
                 if (fThreadViewer != null) {
                     fThreadViewer.refresh();
+                    setInitialCheckedState();
                 }
             }
         }