Attachment #73648 for bug #196013

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




		//Summary element
		TreeItem[] items = tree.getItems();
		if (items.length != 0) // if we have data
		{
			//((MultiLevelStatisticTreeViewer) getTableViewer()).expandItem(items[0]);

			if (obj instanceof TRCPackage)

			} else if (obj instanceof TRCMethod) {
				meth = (TRCMethod) obj;
				cls = meth.getDefiningClass();
				if (null != cls)
					pack = cls.getPackage();
			}
			else if (obj instanceof TRCObject)
			{

			else if(obj instanceof TRCMethodInvocation)
			{
				cls = PerftraceUtil.getClass((TRCMethodInvocation)obj);
				if (null != cls)
					pack = cls.getPackage();
			}
			
			searchInLevel(tree,




		
	}
	
	protected TRCPackage getTRCPackage(Object element, ColumnDisplayInfo info) {
	{
		if (element instanceof TRCPackage)
			return (TRCPackage) element;
		if (element instanceof TRCClass)
			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();
			  object = ref.getOwner();
			else
				object = ref.getTarget();

			return PerftraceUtil.getClass(object).getPackage();
		}
		if (element instanceof TRCObject)
			return PerftraceUtil.getClass((TRCObject) element).getPackage();
		if (element instanceof Coverage)
			return getTRCPackage(((Coverage) element).getTraceObj(), info);
		return null;
		return null;		
	}
	
	public Image getDisplayImage(Object element, ColumnDisplayInfo info) {




			else if(selection instanceof TRCMethodInvocation)
				method = ((TRCMethodInvocation)selection).getMethod();
			
			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();
				      .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);
		}
		

Return to bug 196013

Lines 400-406 Link Here

(-)src/org/eclipse/hyades/trace/views/internal/MultiLevelStatisticView.java (-3 / +5 lines)
400	//Summary element	400	//Summary element
401	TreeItem[] items = tree.getItems();	401	TreeItem[] items = tree.getItems();
402	if (items.length != 0) // if we have data	402	if (items.length != 0) // if we have data
403	{	403	{
404	//((MultiLevelStatisticTreeViewer) getTableViewer()).expandItem(items[0]);	404	//((MultiLevelStatisticTreeViewer) getTableViewer()).expandItem(items[0]);
405		405
406	if (obj instanceof TRCPackage)	406	if (obj instanceof TRCPackage)
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,

Lines 59-91 Link Here

(-)src/org/eclipse/hyades/trace/views/internal/view/columnlabels/PackageNameColumnLabel.java (-19 / +18 lines)
59		59
60	}	60	}
61		61
62	protected TRCPackage getTRCPackage(Object element, ColumnDisplayInfo info)	62	protected TRCPackage getTRCPackage(Object element, ColumnDisplayInfo info) {
63	{
64	if (element instanceof TRCPackage)	63	if (element instanceof TRCPackage)
65	return (TRCPackage)element;	64	return (TRCPackage) element;
66	if (element instanceof TRCClass)	65	if (element instanceof TRCClass)
67	return ((TRCClass)element).getPackage();	66	return ((TRCClass) element).getPackage();
68	if (element instanceof TRCMethod)	67	if (element instanceof TRCMethod) {
69	return ((TRCMethod)element).getDefiningClass().getPackage();	68	if (((TRCMethod) element).getDefiningClass() != null)
70		69	return ((TRCMethod) element).getDefiningClass().getPackage();
71	if (element instanceof TRCObjectReference)	70	else
72	{	71	return null;
73	TRCObjectReference ref = (TRCObjectReference)element;	72	}
		73	if (element instanceof TRCObjectReference) {
		74	TRCObjectReference ref = (TRCObjectReference) element;
74	TRCObject object = null;	75	TRCObject object = null;
75		76	if (info.showReferTo)
76	if(info.showReferTo)	77	object = ref.getOwner();
77	object = ref.getOwner();
78	else	78	else
79	object = ref.getTarget();	79	object = ref.getTarget();
80		80
81	return PerftraceUtil.getClass(object).getPackage();	81	return PerftraceUtil.getClass(object).getPackage();
82	}	82	}
83	if (element instanceof TRCObject)	83	if (element instanceof TRCObject)
84	return PerftraceUtil.getClass((TRCObject)element).getPackage();	84	return PerftraceUtil.getClass((TRCObject) element).getPackage();
85	if (element instanceof Coverage)	85	if (element instanceof Coverage)
86	return getTRCPackage(((Coverage)element).getTraceObj(), info);	86	return getTRCPackage(((Coverage) element).getTraceObj(), info);
87		87	return null;
88	return null;
89	}	88	}
90		89
91	public Image getDisplayImage(Object element, ColumnDisplayInfo info) {	90	public Image getDisplayImage(Object element, ColumnDisplayInfo info) {

Lines 158-183 Link Here

(-)src/org/eclipse/hyades/trace/views/adapter/internal/MethodDetailsTab.java (-17 / +16 lines)
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