Attachment 92775 Details for Bug 199588 – Patch file

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch file

tptp_patch_bugzilla199588_20080318.txt (text/plain), 3.30 KB, created by Yasuhisa Gotoh

on 2008-03-18 04:01:09 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhisa Gotoh

Created: 2008-03-18 04:01:09 EDT

Size: 3.30 KB

patch

obsolete

>Index: src/org/eclipse/hyades/sd/logc/internal/actions/OpenTimeBaseUML2SDViewAction.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.log.views/src/org/eclipse/hyades/sd/logc/internal/actions/OpenTimeBaseUML2SDViewAction.java,v
>retrieving revision 1.18
>diff -u -r1.18 OpenTimeBaseUML2SDViewAction.java
>--- src/org/eclipse/hyades/sd/logc/internal/actions/OpenTimeBaseUML2SDViewAction.java	31 Jan 2008 03:26:49 -0000	1.18
>+++ src/org/eclipse/hyades/sd/logc/internal/actions/OpenTimeBaseUML2SDViewAction.java	18 Mar 2008 07:43:33 -0000
>@@ -23,16 +23,20 @@
> import org.eclipse.hyades.sd.logc.SDLogcConstants;
> import org.eclipse.hyades.sd.logc.internal.loader.LogInteractions;
> import org.eclipse.hyades.trace.ui.HyadesUtil;
>+import org.eclipse.hyades.ui.internal.navigator.INavigator;
> import org.eclipse.hyades.uml2sd.ui.load.LoadersManager;
> import org.eclipse.hyades.uml2sd.ui.view.SDView;
> import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.dialogs.ErrorDialog;
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.jface.viewers.StructuredSelection;
> import org.eclipse.tptp.platform.common.ui.trace.internal.TraceUIManager;
> import org.eclipse.tptp.platform.log.views.internal.LogViewsMessages;
> import org.eclipse.tptp.platform.log.views.internal.LogViewsPlugin;
>+import org.eclipse.tptp.platform.log.views.internal.navigator.LogNavigator;
> import org.eclipse.tptp.platform.log.views.provisional.util.ILogViewsUtils;
>+import org.eclipse.tptp.symptom.eventwrappers.CBECommonBaseEventWeakRef;
> import org.eclipse.ui.IObjectActionDelegate;
> import org.eclipse.ui.IWorkbenchPage;
> import org.eclipse.ui.IWorkbenchPart;
>@@ -63,11 +67,22 @@
> 			LogInteractions loader = (LogInteractions)LoadersManager.getLoadersManager().getCurrentLoader(SDLogcConstants.LogInteractionsViewID);
> 			loader.generateLogInteractions(sel,CorrelationHelper.getInstance().getCorrelationByName(getcorrName()));
> 			ILogViewsUtils.INSTANCE.getLogUtil().selectInLogNavigator(loader.getCorrelationContainerProxy());
>+			// Bug 199588
>+			// The above selectInLogNavigator() method does not work intentionally due to asyncExec() operation inside it
>+			// so that we need to explicitly select the newly created CorrelationContainerProxy object here.
>+			INavigator curNavigator = HyadesUtil.getActiveNavigator();
>+			if (curNavigator instanceof LogNavigator) {
>+				((LogNavigator) curNavigator).selectReveal(new StructuredSelection(loader.getCorrelationContainerProxy()));
>+			}
> 	
> 			TraceUIManager.getTraceUIManager().getSelectionModel(loader.getCorrelationContainerProxy()).add(cbeEvent);
> 			ILogViewsUtils.INSTANCE.getLogUtil().notifyViewSelectionChanged(loader, loader.getInput() instanceof EObject ? (EObject)loader.getInput() : HyadesUtil.getMofObject(),cbeEvent);
> 			CBECommonBaseEvent selection = (CBECommonBaseEvent)TraceUIManager.getTraceUIManager().getSelectionModel(loader.getCorrelationContainerProxy()).getFirstElement();
> 			if(sel!=null){
>+				// Bug 199588
>+				if (selection instanceof CBECommonBaseEventWeakRef) {
>+					selection = ((CBECommonBaseEventWeakRef) selection).getDelegate();
>+				}
> 					loader.setSelection(selection);
> 			}
> 			p.stopAndPrintStatus();

Actions: View | Diff

Attachments on bug 199588: 92775