Attachment 100084 Details for Bug 166543 – Updated patch

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

Updated patch

Bug166543_updated.txt (text/plain), 2.70 KB, created by Alex Nan

on 2008-05-13 19:20:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Nan

Created: 2008-05-13 19:20:39 EDT

Size: 2.70 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.common.ui.trace
>Index: src/org/eclipse/hyades/trace/ui/internal/util/DeleteUtil.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui.trace/src/org/eclipse/hyades/trace/ui/internal/util/DeleteUtil.java,v
>retrieving revision 1.8
>diff -u -r1.8 DeleteUtil.java
>--- src/org/eclipse/hyades/trace/ui/internal/util/DeleteUtil.java	16 Apr 2008 15:57:32 -0000	1.8
>+++ src/org/eclipse/hyades/trace/ui/internal/util/DeleteUtil.java	13 May 2008 23:17:10 -0000
>@@ -518,7 +518,10 @@
> 				deleteResource(res, true, saveRequired, navigatorID);
> 
> 			}
>-			((IHyadesExtendedResource) correlationContainer.eResource()).delete();
>+			IHyadesExtendedResource corrRes = (IHyadesExtendedResource)correlationContainer.eResource();
>+			if(corrRes != null){
>+				corrRes.delete();
>+			}
> 			correlationContainer.setCorrelationContainerProxy(null);
> 		}
> 
>#P org.eclipse.tptp.monitoring.logui
>Index: src/org/eclipse/tptp/monitoring/logui/internal/wizards/ImportLogWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.monitoring.logui/src/org/eclipse/tptp/monitoring/logui/internal/wizards/ImportLogWizard.java,v
>retrieving revision 1.118
>diff -u -r1.118 ImportLogWizard.java
>--- src/org/eclipse/tptp/monitoring/logui/internal/wizards/ImportLogWizard.java	10 Apr 2008 00:18:29 -0000	1.118
>+++ src/org/eclipse/tptp/monitoring/logui/internal/wizards/ImportLogWizard.java	13 May 2008 23:17:10 -0000
>@@ -818,6 +818,7 @@
> 				}
> 
> 				if (bAppend) {
>+				    removeInternalCorrelations(foundAgent,CommonUIConstants.LOG_NAVIGATOR_ID);
> 					return foundAgent.getAgent();
> 				} else {
> 					if(foundAgent.getAgent().eResource()!=null){
>@@ -2375,6 +2376,8 @@
> 		DeleteUtil.setDeleteInProgress(true);
> 		DeleteUtil.deleteResource(res, true, true, navigatorID);
> 		
>+		removeInternalCorrelations(agentProxy,navigatorID);
>+		
> 		TraceModelFactoryWrapper.instance().deleteAgent(agentProxy);
> 		DeleteUtil.setDeleteInProgress(false);
> 		
>@@ -2384,6 +2387,16 @@
> 		TraceUIManager.getTraceUIManager().notifyProfileEventListener(event);
> 
> 	}
>+	
>+	public void removeInternalCorrelations(TRCAgentProxy agentProxy, String navigatorID)
>+	{
>+	    List corrs = agentProxy.getInternalCorrelations();
>+        for(int i=0;i<corrs.size();i++)
>+        {
>+            CorrelationContainerProxy corrProxy = (CorrelationContainerProxy)corrs.get(i);
>+            DeleteUtil.deleteCorrelationContainer(corrProxy, true, true, true, navigatorID);
>+        }
>+	}
> 
> 	public IImportLogWizard getDelegator() {
> 		return delegate;

Actions: View

Attachments on bug 166543: 54921 | 99819 | 100084