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 196013 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/hyades/trace/views/internal/view/columnlabels/PackageNameColumnLabel.java (-4 / +7 lines)
Lines 1-5 Link Here
1
/**********************************************************************
1
/**********************************************************************
2
 * Copyright (c) 2005 IBM Corporation and others.
2
 * Copyright (c) 2005, 2007 IBM Corporation and others.
3
 * All rights reserved.   This program and the accompanying materials
3
 * All rights reserved.   This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 65-73 Link Here
65
			return (TRCPackage)element;
65
			return (TRCPackage)element;
66
		if (element instanceof TRCClass)
66
		if (element instanceof TRCClass)
67
			return ((TRCClass)element).getPackage();		
67
			return ((TRCClass)element).getPackage();		
68
		if (element instanceof TRCMethod)
68
		if (element instanceof TRCMethod) {
69
			return ((TRCMethod)element).getDefiningClass().getPackage();
69
			if (((TRCMethod) element).getDefiningClass() != null)
70
		
70
				return ((TRCMethod) element).getDefiningClass().getPackage();
71
			else
72
				return null;
73
		}
71
		if (element instanceof TRCObjectReference)
74
		if (element instanceof TRCObjectReference)
72
		{
75
		{
73
			TRCObjectReference ref = (TRCObjectReference)element;
76
			TRCObjectReference ref = (TRCObjectReference)element;
(-)src/org/eclipse/hyades/trace/views/adapter/internal/MethodDetailsTab.java (-18 / +17 lines)
Lines 1-5 Link Here
1
/**********************************************************************
1
/**********************************************************************
2
 * Copyright (c) 2006 Intel Corporation.
2
 * Copyright (c) 2006, 2007 Intel Corporation.
3
 * All rights reserved.   This program and the accompanying materials
3
 * All rights reserved.   This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 158-183 Link Here
158
			else if(selection instanceof TRCMethodInvocation)
158
			else if(selection instanceof TRCMethodInvocation)
159
				method = ((TRCMethodInvocation)selection).getMethod();
159
				method = ((TRCMethodInvocation)selection).getMethod();
160
			
160
			
161
			if(method != null)
161
			if (method != null) {
162
			{
162
				String className = "";
163
				String packName = method.getDefiningClass().getPackage().getName();
163
				String packName = "";
164
				if(packName.length() > 0)
164
				if (method.getDefiningClass() != null) {
165
				{
165
					className = method.getDefiningClass().getName();
166
					methodName.append(": ").append(packName).append(".")
166
					if (method.getDefiningClass().getPackage() != null)
167
				      .append(method.getDefiningClass().getName()).append(".")
167
						packName = method.getDefiningClass().getPackage().getName();
168
				      .append(method.getName()).append(method.getSignature());
169
					
170
				}
168
				}
171
				else
169
				if (packName.length() > 0) {
172
				{
170
					methodName.append(": ").append(packName).append(".")
173
					methodName.append(": ").append(packName)
171
				      	.append(className).append(".")
174
					      .append(method.getDefiningClass().getName()).append(".")
172
				      	.append(method.getName()).append(method.getSignature());
175
					      .append(method.getName()).append(method.getSignature());
173
				} else {
174
					methodName.append(": ")
175
					    .append(className).append(".")
176
				     	.append(method.getName()).append(method.getSignature());
176
				}
177
				}
177
			}
178
			}
178
		}
179
		} else {
179
		else
180
		{
181
			methodName.append(": ").append(TraceUIMessages._171);
180
			methodName.append(": ").append(TraceUIMessages._171);
182
		}
181
		}
183
		
182
		
(-)src/org/eclipse/hyades/trace/views/internal/MultiLevelStatisticView.java (-3 / +5 lines)
Lines 1-5 Link Here
1
/**********************************************************************
1
/**********************************************************************
2
 * Copyright (c) 2005, 2006 IBM Corporation, Intel Corporation.
2
 * Copyright (c) 2005, 2007 IBM Corporation, Intel Corporation.
3
 * All rights reserved.   This program and the accompanying materials
3
 * All rights reserved.   This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 411-417 Link Here
411
			} else if (obj instanceof TRCMethod) {
411
			} else if (obj instanceof TRCMethod) {
412
				meth = (TRCMethod) obj;
412
				meth = (TRCMethod) obj;
413
				cls = meth.getDefiningClass();
413
				cls = meth.getDefiningClass();
414
				pack = cls.getPackage();
414
				if (null != cls)
415
					pack = cls.getPackage();
415
			}
416
			}
416
			else if (obj instanceof TRCObject)
417
			else if (obj instanceof TRCObject)
417
			{
418
			{
Lines 422-428 Link Here
422
			else if(obj instanceof TRCMethodInvocation)
423
			else if(obj instanceof TRCMethodInvocation)
423
			{
424
			{
424
				cls = PerftraceUtil.getClass((TRCMethodInvocation)obj);
425
				cls = PerftraceUtil.getClass((TRCMethodInvocation)obj);
425
				pack = cls.getPackage();
426
				if (null != cls)
427
					pack = cls.getPackage();
426
			}
428
			}
427
			
429
			
428
			searchInLevel(tree,
430
			searchInLevel(tree,

Return to bug 196013