mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-04 14:55:41 +02:00
fix for Bug 160763 - properties updated after deferred query
This commit is contained in:
parent
33267de4c3
commit
75935aab7e
2 changed files with 36 additions and 4 deletions
|
@ -3460,6 +3460,8 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
|
||||||
*/
|
*/
|
||||||
protected void findAndUpdateFilterParent(ISystemResourceChangeEvent event, int type) {
|
protected void findAndUpdateFilterParent(ISystemResourceChangeEvent event, int type) {
|
||||||
ISubSystem ss = (ISubSystem) event.getGrandParent();
|
ISubSystem ss = (ISubSystem) event.getGrandParent();
|
||||||
|
|
||||||
|
|
||||||
boolean add = false, move = false, delete = false;
|
boolean add = false, move = false, delete = false;
|
||||||
boolean afilterstring = false;
|
boolean afilterstring = false;
|
||||||
//if (debug)
|
//if (debug)
|
||||||
|
@ -5020,16 +5022,30 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
|
||||||
Vector matches = new Vector();
|
Vector matches = new Vector();
|
||||||
matches = findAllRemoteItemReferences(parentElementOrTreePath, parentElementOrTreePath, matches);
|
matches = findAllRemoteItemReferences(parentElementOrTreePath, parentElementOrTreePath, matches);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//Widget[] widgets = internalFindItems(parentElementOrTreePath);
|
//Widget[] widgets = internalFindItems(parentElementOrTreePath);
|
||||||
// If parent hasn't been realized yet, just ignore the add.
|
// If parent hasn't been realized yet, just ignore the add.
|
||||||
if (matches.size() == 0) {
|
if (matches.size() == 0) {
|
||||||
super.add(parentElementOrTreePath, childElements);
|
super.add(parentElementOrTreePath, childElements);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
for (int i = 0; i < matches.size(); i++) {
|
for (int i = 0; i < matches.size(); i++) {
|
||||||
Widget match = (Widget) matches.get(i);
|
Widget match = (Widget) matches.get(i);
|
||||||
internalAdd(match, parentElementOrTreePath, childElements);
|
internalAdd(match, parentElementOrTreePath, childElements);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TreeItem item = getFirstSelectedTreeItem();
|
||||||
|
if (item != null)
|
||||||
|
{
|
||||||
|
if (item.getData() == parentElementOrTreePath)
|
||||||
|
{
|
||||||
|
updatePropertySheet();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -3460,6 +3460,8 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
|
||||||
*/
|
*/
|
||||||
protected void findAndUpdateFilterParent(ISystemResourceChangeEvent event, int type) {
|
protected void findAndUpdateFilterParent(ISystemResourceChangeEvent event, int type) {
|
||||||
ISubSystem ss = (ISubSystem) event.getGrandParent();
|
ISubSystem ss = (ISubSystem) event.getGrandParent();
|
||||||
|
|
||||||
|
|
||||||
boolean add = false, move = false, delete = false;
|
boolean add = false, move = false, delete = false;
|
||||||
boolean afilterstring = false;
|
boolean afilterstring = false;
|
||||||
//if (debug)
|
//if (debug)
|
||||||
|
@ -5020,16 +5022,30 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
|
||||||
Vector matches = new Vector();
|
Vector matches = new Vector();
|
||||||
matches = findAllRemoteItemReferences(parentElementOrTreePath, parentElementOrTreePath, matches);
|
matches = findAllRemoteItemReferences(parentElementOrTreePath, parentElementOrTreePath, matches);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//Widget[] widgets = internalFindItems(parentElementOrTreePath);
|
//Widget[] widgets = internalFindItems(parentElementOrTreePath);
|
||||||
// If parent hasn't been realized yet, just ignore the add.
|
// If parent hasn't been realized yet, just ignore the add.
|
||||||
if (matches.size() == 0) {
|
if (matches.size() == 0) {
|
||||||
super.add(parentElementOrTreePath, childElements);
|
super.add(parentElementOrTreePath, childElements);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
for (int i = 0; i < matches.size(); i++) {
|
for (int i = 0; i < matches.size(); i++) {
|
||||||
Widget match = (Widget) matches.get(i);
|
Widget match = (Widget) matches.get(i);
|
||||||
internalAdd(match, parentElementOrTreePath, childElements);
|
internalAdd(match, parentElementOrTreePath, childElements);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TreeItem item = getFirstSelectedTreeItem();
|
||||||
|
if (item != null)
|
||||||
|
{
|
||||||
|
if (item.getData() == parentElementOrTreePath)
|
||||||
|
{
|
||||||
|
updatePropertySheet();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Add table
Reference in a new issue