Target Explorer: introduce ISelectionService for default context support

2 files changed, 12 insertions, 3 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java
index 30256a7ee..f308c722c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java
@@ -24,6 +24,7 @@ import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerUtil;
 import org.eclipse.tcf.te.runtime.utils.StatusHelper;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
 import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelRefreshService;
+import org.eclipse.tcf.te.tcf.locator.interfaces.services.ISelectionService;
 import org.eclipse.tcf.te.tcf.ui.help.IContextHelpIds;
 import org.eclipse.tcf.te.tcf.ui.nls.Messages;
 import org.eclipse.tcf.te.tcf.ui.sections.SimulatorTypeSelectionSection;
@@ -52,10 +53,13 @@ public abstract class AbstractConfigurationEditorPage extends AbstractCustomForm
 			return;
 		}
 		super.setInput(input);
-		final IPeerModel peerModel = (IPeerModel)input.getAdapter(IPeerModel.class);
-		if (peerModel != null) {
+		if (getEditorInputNode() instanceof IPeerModel) {
 			// save history to reopen the editor on eclipse startup
-			HistoryManager.getInstance().add(getHistoryId(), peerModel.getPeerId());
+			HistoryManager.getInstance().add(getHistoryId(), ((IPeerModel)getEditorInputNode()).getPeerId());
+			ISelectionService selService = ServiceManager.getInstance().getService(ISelectionService.class);
+			if (selService != null) {
+				selService.setDefaultSelection((IPeerModel)getEditorInputNode());
+			}
 		}
 	}
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/OverviewEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/OverviewEditorPage.java
index 1fbd2ee62..1cc1aaf7c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/OverviewEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/OverviewEditorPage.java
@@ -27,6 +27,7 @@ import org.eclipse.tcf.te.runtime.utils.StatusHelper;
 import org.eclipse.tcf.te.tcf.core.interfaces.IPeerType;
 import org.eclipse.tcf.te.tcf.locator.ScannerRunnable;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
+import org.eclipse.tcf.te.tcf.locator.interfaces.services.ISelectionService;
 import org.eclipse.tcf.te.tcf.ui.activator.UIPlugin;
 import org.eclipse.tcf.te.tcf.ui.editor.sections.AttributesSection;
 import org.eclipse.tcf.te.tcf.ui.editor.sections.GeneralInformationSection;
@@ -180,6 +181,10 @@ public class OverviewEditorPage extends AbstractCustomFormToolkitEditorPage {
 		if (getEditorInputNode() instanceof IPeerModel) {
 			// save history to reopen the editor on eclipse startup
 			HistoryManager.getInstance().add(IPeerType.TYPE_GENERIC, ((IPeerModel)getEditorInputNode()).getPeerId());
+			ISelectionService selService = ServiceManager.getInstance().getService(ISelectionService.class);
+			if (selService != null) {
+				selService.setDefaultSelection((IPeerModel)getEditorInputNode());
+			}
 			// Invoke the scanner runnable
 			ScannerRunnable runnable = new ScannerRunnable(null, ((IPeerModel)getEditorInputNode()));
 			Protocol.invokeLater(runnable);