Attachment 73648 Details for Bug 196013 – Proposed fix2

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

[patch] Proposed fix2

bug196013_NPE_fix2.patch.txt (text/plain), 5.76 KB, created by Ruslan Scherbakov

on 2007-07-12 06:46:51 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ruslan Scherbakov

Created: 2007-07-12 06:46:51 EDT

Size: 5.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.trace.views
>Index: src/org/eclipse/hyades/trace/views/internal/MultiLevelStatisticView.java
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.hyades.trace.views/src/org/eclipse/hyades/trace/views/internal/MultiLevelStatisticView.java,v
>retrieving revision 1.11
>diff -u -r1.11 MultiLevelStatisticView.java
>--- src/org/eclipse/hyades/trace/views/internal/MultiLevelStatisticView.java	21 Sep 2006 19:19:29 -0000	1.11
>+++ src/org/eclipse/hyades/trace/views/internal/MultiLevelStatisticView.java	12 Jul 2007 10:40:22 -0000
>@@ -400,7 +400,7 @@
> 		//Summary element
> 		TreeItem[] items = tree.getItems();
> 		if (items.length != 0) // if we have data
>-			{
>+		{
> 			//((MultiLevelStatisticTreeViewer) getTableViewer()).expandItem(items[0]);
> 
> 			if (obj instanceof TRCPackage)
>@@ -411,7 +411,8 @@
> 			} else if (obj instanceof TRCMethod) {
> 				meth = (TRCMethod) obj;
> 				cls = meth.getDefiningClass();
>-				pack = cls.getPackage();
>+				if (null != cls)
>+					pack = cls.getPackage();
> 			}
> 			else if (obj instanceof TRCObject)
> 			{
>@@ -422,7 +423,8 @@
> 			else if(obj instanceof TRCMethodInvocation)
> 			{
> 				cls = PerftraceUtil.getClass((TRCMethodInvocation)obj);
>-				pack = cls.getPackage();
>+				if (null != cls)
>+					pack = cls.getPackage();
> 			}
> 			
> 			searchInLevel(tree,
>Index: src/org/eclipse/hyades/trace/views/internal/view/columnlabels/PackageNameColumnLabel.java
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.hyades.trace.views/src/org/eclipse/hyades/trace/views/internal/view/columnlabels/PackageNameColumnLabel.java,v
>retrieving revision 1.10
>diff -u -r1.10 PackageNameColumnLabel.java
>--- src/org/eclipse/hyades/trace/views/internal/view/columnlabels/PackageNameColumnLabel.java	27 Oct 2005 18:34:02 -0000	1.10
>+++ src/org/eclipse/hyades/trace/views/internal/view/columnlabels/PackageNameColumnLabel.java	12 Jul 2007 10:40:22 -0000
>@@ -59,33 +59,32 @@
> 		
> 	}
> 	
>-	protected TRCPackage getTRCPackage(Object element, ColumnDisplayInfo info)
>-	{
>+	protected TRCPackage getTRCPackage(Object element, ColumnDisplayInfo info) {
> 		if (element instanceof TRCPackage)
>-			return (TRCPackage)element;
>+			return (TRCPackage) element;
> 		if (element instanceof TRCClass)
>-			return ((TRCClass)element).getPackage();		
>-		if (element instanceof TRCMethod)
>-			return ((TRCMethod)element).getDefiningClass().getPackage();
>-		
>-		if (element instanceof TRCObjectReference)
>-		{
>-			TRCObjectReference ref = (TRCObjectReference)element;
>+			return ((TRCClass) element).getPackage();
>+		if (element instanceof TRCMethod) {
>+			if (((TRCMethod) element).getDefiningClass() != null)
>+				return ((TRCMethod) element).getDefiningClass().getPackage();
>+			else
>+				return null;
>+		}
>+		if (element instanceof TRCObjectReference) {
>+			TRCObjectReference ref = (TRCObjectReference) element;
> 			TRCObject object = null;
>-			
>-			if(info.showReferTo)
>-			  object = ref.getOwner();
>+			if (info.showReferTo)
>+				object = ref.getOwner();
> 			else
>-			  object = ref.getTarget();  
>-			
>+				object = ref.getTarget();
>+
> 			return PerftraceUtil.getClass(object).getPackage();
> 		}
> 		if (element instanceof TRCObject)
>-			return PerftraceUtil.getClass((TRCObject)element).getPackage();
>+			return PerftraceUtil.getClass((TRCObject) element).getPackage();
> 		if (element instanceof Coverage)
>-			return getTRCPackage(((Coverage)element).getTraceObj(), info);
>-		
>-		return null;		
>+			return getTRCPackage(((Coverage) element).getTraceObj(), info);
>+		return null;
> 	}
> 	
> 	public Image getDisplayImage(Object element, ColumnDisplayInfo info) {
>Index: src/org/eclipse/hyades/trace/views/adapter/internal/MethodDetailsTab.java
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.hyades.trace.views/src/org/eclipse/hyades/trace/views/adapter/internal/MethodDetailsTab.java,v
>retrieving revision 1.5
>diff -u -r1.5 MethodDetailsTab.java
>--- src/org/eclipse/hyades/trace/views/adapter/internal/MethodDetailsTab.java	1 Nov 2006 18:13:30 -0000	1.5
>+++ src/org/eclipse/hyades/trace/views/adapter/internal/MethodDetailsTab.java	12 Jul 2007 10:40:22 -0000
>@@ -158,26 +158,25 @@
> 			else if(selection instanceof TRCMethodInvocation)
> 				method = ((TRCMethodInvocation)selection).getMethod();
> 			
>-			if(method != null)
>-			{
>-				String packName = method.getDefiningClass().getPackage().getName();
>-				if(packName.length() > 0)
>-				{
>-					methodName.append(": ").append(packName).append(".")
>-				      .append(method.getDefiningClass().getName()).append(".")
>-				      .append(method.getName()).append(method.getSignature());
>-					
>+			if (method != null) {
>+				String className = "";
>+				String packName = "";
>+				if (method.getDefiningClass() != null) {
>+					className = method.getDefiningClass().getName();
>+					if (method.getDefiningClass().getPackage() != null)
>+						packName = method.getDefiningClass().getPackage().getName();
> 				}
>-				else
>-				{
>-					methodName.append(": ").append(packName)
>-					      .append(method.getDefiningClass().getName()).append(".")
>-					      .append(method.getName()).append(method.getSignature());
>+				if (packName.length() > 0) {
>+					methodName.append(": ").append(packName).append(".")
>+				      	.append(className).append(".")
>+				      	.append(method.getName()).append(method.getSignature());
>+				} else {
>+					methodName.append(": ")
>+					    .append(className).append(".")
>+				     	.append(method.getName()).append(method.getSignature());
> 				}
> 			}
>-		}
>-		else
>-		{
>+		} else {
> 			methodName.append(": ").append(TraceUIMessages._171);
> 		}
>

Actions: View | Diff

Attachments on bug 196013: 73514 | 73558 | 73559 | 73574 | 73648 | 73705