From 02d1f6533a2672c9239141b0b6e40c8e7b624f34 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Fri, 24 Apr 2009 19:44:28 +0000 Subject: [PATCH] [218847] Add SELECT to startup events. Also, handle ModelProxyInstalledEvent the same way as DataModelInitializedEvent, in order to get an initial selection when the debug view is opened. --- .../debug/ui/viewmodel/launch/LaunchRootVMNode.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchRootVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchRootVMNode.java index f8e1cab5ff8..aaa77f2f50e 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchRootVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/LaunchRootVMNode.java @@ -19,6 +19,7 @@ import org.eclipse.cdt.dsf.datamodel.DataModelInitializedEvent; import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin; import org.eclipse.cdt.dsf.ui.viewmodel.AbstractVMProvider; import org.eclipse.cdt.dsf.ui.viewmodel.IRootVMNode; +import org.eclipse.cdt.dsf.ui.viewmodel.ModelProxyInstalledEvent; import org.eclipse.cdt.dsf.ui.viewmodel.RootVMNode; import org.eclipse.cdt.dsf.ui.viewmodel.VMDelta; import org.eclipse.core.runtime.IStatus; @@ -74,7 +75,7 @@ public class LaunchRootVMNode extends RootVMNode { return false; } - } else if (e instanceof DataModelInitializedEvent) { + } else if (e instanceof ModelProxyInstalledEvent || e instanceof DataModelInitializedEvent) { return true; } @@ -89,8 +90,8 @@ public class LaunchRootVMNode extends RootVMNode if (le.fType == LaunchesEvent.Type.CHANGED || le.fType == LaunchesEvent.Type.TERMINATED) { flags = IModelDelta.STATE | IModelDelta.CONTENT; } - } else if (e instanceof DataModelInitializedEvent) { - flags = IModelDelta.EXPAND; + } else if (e instanceof ModelProxyInstalledEvent || e instanceof DataModelInitializedEvent) { + flags = IModelDelta.EXPAND | IModelDelta.SELECT; } return flags; @@ -127,8 +128,8 @@ public class LaunchRootVMNode extends RootVMNode } } } - } else if (event instanceof DataModelInitializedEvent) { - rootDelta.setFlags(rootDelta.getFlags() | IModelDelta.EXPAND); + } else if (event instanceof ModelProxyInstalledEvent || event instanceof DataModelInitializedEvent) { + rootDelta.setFlags(rootDelta.getFlags() | IModelDelta.EXPAND | IModelDelta.SELECT); } rm.setData(rootDelta); rm.done();