Attachment 72756 Details for Bug 194543 – patch

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

[patch] patch

194543.1_patch.txt (text/plain), 4.34 KB, created by Eugene Chan

on 2007-06-29 01:27:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eugene Chan

Created: 2007-06-29 01:27:56 EDT

Size: 4.34 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/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 05:25:09 -0000
>@@ -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;
>#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 05:25:09 -0000
>@@ -180,6 +180,15 @@
>     }
> 
>     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();
>#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 05:25:12 -0000
>@@ -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

Actions: View | Diff

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