Attachment 72803 Details for Bug 194543 – Latest patch for 194543.

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

Latest patch for 194543.

194543.txt (text/plain), 7.49 KB, created by Alex Nan

on 2007-06-29 17:59:22 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Nan

Created: 2007-06-29 17:59:22 EDT

Size: 7.49 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.trace.ui
>Index: src/org/eclipse/hyades/trace/ui/internal/util/PerftraceUtil.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/util/PerftraceUtil.java,v
>retrieving revision 1.8
>diff -u -r1.8 PerftraceUtil.java
>--- src/org/eclipse/hyades/trace/ui/internal/util/PerftraceUtil.java	29 Dec 2006 19:16:46 -0000	1.8
>+++ src/org/eclipse/hyades/trace/ui/internal/util/PerftraceUtil.java	29 Jun 2007 21:53:36 -0000
>@@ -1,5 +1,5 @@
> /**********************************************************************
>- * Copyright (c) 2005, 2006 IBM Corporation, Intel Corporation.
>+ * Copyright (c) 2005, 2007 IBM Corporation, Intel Corporation.
>  * 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
>@@ -1332,6 +1332,9 @@
> 
>    public static boolean hasMethodInvocationInfo(final EObject object) {
> 		TRCAgentProxy agentProxy = getAgentProxy(object);
>+		if(agentProxy == null){
>+			return false;
>+		}		
> 		TRCCollectionMode mode = agentProxy.getCollectionMode();
> 
> 		return (mode == TRCCollectionMode.EXECUTION_FULL_LITERAL
>@@ -1344,6 +1347,9 @@
> 
>    public static boolean hasFullMethodInvocationInfo(final EObject object) {
> 	   TRCAgentProxy agentProxy = getAgentProxy(object);
>+	   if(agentProxy == null){
>+		   return false;
>+	   }	   
> 	   TRCCollectionMode mode = agentProxy.getCollectionMode();
> 	   return mode == TRCCollectionMode.EXECUTION_FULL_LITERAL
> 		|| mode == TRCCollectionMode.EXECUTION_NO_INSTANCES_LITERAL
>@@ -1353,6 +1359,9 @@
>    
>    public static boolean hasExecutionInfo(final EObject object) {
> 	   TRCAgentProxy agentProxy = getAgentProxy(object);
>+	   if(agentProxy == null){
>+		   return false;
>+	   }
> 	   TRCCollectionMode mode = agentProxy.getCollectionMode();
> 	   return mode == TRCCollectionMode.EXECUTION_FULL_LITERAL
> 				|| mode == TRCCollectionMode.HEAP_FULL_AND_EXECUTION_STATISTICS_ONLY_LITERAL
>@@ -1365,6 +1374,9 @@
>    
>    public static boolean hasHeapInfo(final EObject object) {
> 	   TRCAgentProxy agentProxy = getAgentProxy(object);
>+	   if(agentProxy == null){
>+		   return false;
>+	   }	   
> 	   TRCCollectionMode mode = agentProxy.getCollectionMode();
> 	   return mode == TRCCollectionMode.HEAP_FULL_LITERAL
> 				|| mode == TRCCollectionMode.HEAP_FULL_AND_EXECUTION_STATISTICS_ONLY_LITERAL
>#P org.eclipse.hyades.trace.views
>Index: src/org/eclipse/hyades/trace/views/adapter/internal/ExecutionStatisticPage2.java
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.hyades.trace.views/src/org/eclipse/hyades/trace/views/adapter/internal/ExecutionStatisticPage2.java,v
>retrieving revision 1.8
>diff -u -r1.8 ExecutionStatisticPage2.java
>--- src/org/eclipse/hyades/trace/views/adapter/internal/ExecutionStatisticPage2.java	30 Apr 2007 23:02:12 -0000	1.8
>+++ src/org/eclipse/hyades/trace/views/adapter/internal/ExecutionStatisticPage2.java	29 Jun 2007 21:53:36 -0000
>@@ -180,14 +180,22 @@
>     }
> 
>     public void dispose() {
>+		super.dispose();
>+		
>+		_mofObject = null;  
>+		
>+		if(fContextMenu != null)
>+		   fContextMenu.dispose();
>+	   
>+		disposed = true;
>+    	
>         if (_items != null) {
>             for (int i = 0; i < _items.length; i++) {
>                 _items[i].dispose();
>             }
>         }
>         _tabFolder.dispose();
>-
>-        _mofObject = null;
>+       
>     }
> 
>     public MultiLevelStatisticView getView() {
>Index: src/org/eclipse/hyades/trace/views/adapter/internal/PatternPage.java
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.hyades.trace.views/src/org/eclipse/hyades/trace/views/adapter/internal/PatternPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 PatternPage.java
>--- src/org/eclipse/hyades/trace/views/adapter/internal/PatternPage.java	16 Sep 2005 22:32:50 -0000	1.3
>+++ src/org/eclipse/hyades/trace/views/adapter/internal/PatternPage.java	29 Jun 2007 21:53:36 -0000
>@@ -1,5 +1,5 @@
> /**********************************************************************
>- * Copyright (c) 2005 IBM Corporation and others.
>+ * Copyright (c) 2005, 2007 IBM Corporation 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
>@@ -140,8 +140,8 @@
> 		}
> 	}
> 
>-	public boolean isEmpty() {
>-		return _view.isEmpty();
>+	public boolean isEmpty() {		
>+		return _view != null ? _view.isEmpty() : true;
> 	}
> 
> 	public Action percentMode() {
>#P org.eclipse.tptp.platform.common.ui.trace
>Index: src/org/eclipse/hyades/trace/ui/internal/util/SaveUtil.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui.trace/src/org/eclipse/hyades/trace/ui/internal/util/SaveUtil.java,v
>retrieving revision 1.2
>diff -u -r1.2 SaveUtil.java
>--- src/org/eclipse/hyades/trace/ui/internal/util/SaveUtil.java	20 Sep 2006 21:21:01 -0000	1.2
>+++ src/org/eclipse/hyades/trace/ui/internal/util/SaveUtil.java	29 Jun 2007 21:53:37 -0000
>@@ -1,5 +1,5 @@
> /**********************************************************************
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2007 IBM Corporation 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
>@@ -117,7 +117,7 @@
> 			}
> 			else if (obj instanceof TRCAgentProxy) {
> 				TRCAgentProxy agent = (TRCAgentProxy)obj;
>-				if (agent.getAgent() != null) {
>+				if (agent.getAgent() != null && agent.getAgent().eResource() != null) {
> 					try {
> 						org.eclipse.hyades.models.hierarchy.util.SaveUtil.saveResource(monitor, agent.getAgent().eResource());
> 					}
>@@ -268,7 +268,7 @@
> 			}
> 			else if (obj instanceof TRCAgentProxy) {
> 				TRCAgentProxy a = (TRCAgentProxy)obj;
>-				if (!a.eIsProxy()) {
>+				if (!a.eIsProxy() && a.getAgent() != null && a.getAgent().eResource() != null) {
> 					if (isReadOnly(a.getAgent().eResource())) {
> 						handleSaveReadOnlyException(a.getName(), a);
> 						return false;
>Index: src/org/eclipse/hyades/trace/ui/TraceViewer.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui.trace/src/org/eclipse/hyades/trace/ui/TraceViewer.java,v
>retrieving revision 1.3
>diff -u -r1.3 TraceViewer.java
>--- src/org/eclipse/hyades/trace/ui/TraceViewer.java	31 May 2007 17:57:12 -0000	1.3
>+++ src/org/eclipse/hyades/trace/ui/TraceViewer.java	29 Jun 2007 21:53:37 -0000
>@@ -414,9 +414,11 @@
> 			if (page instanceof TraceViewerPage) {
> //				INavigator navigator = TPTPUtil.getActiveNavigator();
> //				if (navigator != null && navigator.isLinkingEnabled())
>-					 ((TraceViewerPage) page).refreshPage();
>+				if(!((TraceViewerPage) page).isDisposed()){	 
>+					((TraceViewerPage) page).refreshPage();
>+				}
> 
>-				if (((TraceViewerPage) page).isEmpty()) {
>+				if (((TraceViewerPage) page).isEmpty() || ((TraceViewerPage) page).isDisposed()) {
> 					showPage(defaultPage);
> 				} else {
> 					showPage((TraceViewerPage) page);

Actions: View

Attachments on bug 194543: 72703 | 72741 | 72756 | 72803