Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 166543
Collapse All | Expand All

(-)src/org/eclipse/tptp/monitoring/logui/internal/wizards/ImportLogWizard.java (+13 lines)
Lines 818-823 Link Here
818
				}
818
				}
819
819
820
				if (bAppend) {
820
				if (bAppend) {
821
				    removeInternalCorrelations(foundAgent,CommonUIConstants.LOG_NAVIGATOR_ID);
821
					return foundAgent.getAgent();
822
					return foundAgent.getAgent();
822
				} else {
823
				} else {
823
					if(foundAgent.getAgent().eResource()!=null){
824
					if(foundAgent.getAgent().eResource()!=null){
Lines 2375-2380 Link Here
2375
		DeleteUtil.setDeleteInProgress(true);
2376
		DeleteUtil.setDeleteInProgress(true);
2376
		DeleteUtil.deleteResource(res, true, true, navigatorID);
2377
		DeleteUtil.deleteResource(res, true, true, navigatorID);
2377
		
2378
		
2379
		removeInternalCorrelations(agentProxy,navigatorID);
2380
		
2378
		TraceModelFactoryWrapper.instance().deleteAgent(agentProxy);
2381
		TraceModelFactoryWrapper.instance().deleteAgent(agentProxy);
2379
		DeleteUtil.setDeleteInProgress(false);
2382
		DeleteUtil.setDeleteInProgress(false);
2380
		
2383
		
Lines 2384-2389 Link Here
2384
		TraceUIManager.getTraceUIManager().notifyProfileEventListener(event);
2387
		TraceUIManager.getTraceUIManager().notifyProfileEventListener(event);
2385
2388
2386
	}
2389
	}
2390
	
2391
	public void removeInternalCorrelations(TRCAgentProxy agentProxy, String navigatorID)
2392
	{
2393
	    List corrs = agentProxy.getInternalCorrelations();
2394
        for(int i=0;i<corrs.size();i++)
2395
        {
2396
            CorrelationContainerProxy corrProxy = (CorrelationContainerProxy)corrs.get(i);
2397
            DeleteUtil.deleteCorrelationContainer(corrProxy, true, true, true, navigatorID);
2398
        }
2399
	}
2387
2400
2388
	public IImportLogWizard getDelegator() {
2401
	public IImportLogWizard getDelegator() {
2389
		return delegate;
2402
		return delegate;

Return to bug 166543