From 85cad372b091aecc3d3936df5ea0a8da84e392ff Mon Sep 17 00:00:00 2001 From: Pablo Torregrosa Paez Date: Wed, 15 Jul 2015 16:19:34 +0200 Subject: Target Explorer: Fix empty Properties view in System Monitor. Change-Id: I6374a3aed791ef7c741f660706f7a1f4a03567d4 Signed-off-by: Pablo Torregrosa Paez --- .../te/tcf/processes/ui/editor/ProcessMonitorEventListener.java | 8 +++++++- .../eclipse/tcf/te/ui/views/handler/ShowInPropertiesHandler.java | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'target_explorer') diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEventListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEventListener.java index 0aee63f0a..7f6441f43 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEventListener.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/editor/ProcessMonitorEventListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2014 Wind River Systems, Inc. and others. All rights reserved. + * Copyright (c) 2014, 2015 Wind River Systems, Inc. and others. All rights reserved. * This program and the accompanying materials are made available under the terms * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -29,6 +29,7 @@ import org.eclipse.tcf.te.tcf.processes.core.model.interfaces.runtime.IRuntimeMo import org.eclipse.tcf.te.ui.events.AbstractEventListener; import org.eclipse.tcf.te.ui.swt.DisplayUtil; import org.eclipse.tcf.te.ui.trees.TreeControl; +import org.eclipse.ui.views.properties.PropertySheet; /** * Process monitor page event listener implementation. @@ -114,6 +115,11 @@ public class ProcessMonitorEventListener extends AbstractEventListener { } } } + + // PropertySheet reloaded + else if (source instanceof PropertySheet) { + treeControl.getParentPart().setFocus(); + } } } } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ShowInPropertiesHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ShowInPropertiesHandler.java index 777f20ec3..b9f912252 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ShowInPropertiesHandler.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/ShowInPropertiesHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved. + * Copyright (c) 2012, 2015 Wind River Systems, Inc. and others. All rights reserved. * This program and the accompanying materials are made available under the terms * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -14,6 +14,9 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.SafeRunner; import org.eclipse.jface.util.SafeRunnable; +import org.eclipse.tcf.te.runtime.events.ChangeEvent; +import org.eclipse.tcf.te.runtime.events.EventManager; +import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.handlers.HandlerUtil; @@ -41,7 +44,8 @@ public class ShowInPropertiesHandler extends AbstractHandler { } @Override public void run() throws Exception { - activePage.showView(PROP_VIEW_ID); + IViewPart view = activePage.showView(PROP_VIEW_ID); + EventManager.getInstance().fireEvent(new ChangeEvent(view, "PropertySheetLoad", null, null)); }}); return null; } -- cgit v1.2.3