Attachment #61066 for bug #167995

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

Lines 17-23 Link Here

(-)plugin.properties (-1 / +1 lines)
17		17
18	JVMTI_ANALYSIS_TYPE_DESCRIPTION_EXEC = Execution Time Analysis (Java 5.0 +)	18	JVMTI_ANALYSIS_TYPE_DESCRIPTION_EXEC = Execution Time Analysis (Java 5.0 +)
19	JVMTI_ANALYSIS_TYPE_DESCRIPTION_THRD = Thread Statistics	19	JVMTI_ANALYSIS_TYPE_DESCRIPTION_THRD = Thread Statistics
20	JVMTI_ANALYSIS_TYPE_DESCRIPTION_HEAP = Memory Statistics	20	JVMTI_ANALYSIS_TYPE_DESCRIPTION_HEAP = Memory Analysis
21	JVMTI_ANALYSIS_TYPE_VIEW_FLOW = Execution Flow	21	JVMTI_ANALYSIS_TYPE_VIEW_FLOW = Execution Flow
22	JVMTI_ANALYSIS_TYPE_VIEW_STATISTICS = Execution Statistics	22	JVMTI_ANALYSIS_TYPE_VIEW_STATISTICS = Execution Statistics
23	JVMTI_ANALYSIS_TYPE_VIEW_UML_THREAD = UML2 Thread Interactions	23	JVMTI_ANALYSIS_TYPE_VIEW_UML_THREAD = UML2 Thread Interactions




		</typeDescription>
  <typeDescription
        extension="trace"
        icon="icons/full/obj16/thread.gif"
        name="%JVMTI_ANALYSIS_TYPE_DESCRIPTION_THRD"
        type="org.eclipse.tptp.analysisType.jvmti.thread"/>
  <typeDescription
        extension="trace"
        icon="icons/full/obj16/memleakantype_obj.gif"
        name="%JVMTI_ANALYSIS_TYPE_DESCRIPTION_HEAP"
        type="org.eclipse.tptp.analysisType.jvmti.heap"/>    
	</extension>
	      
	<!-- Contribute a view to the TI analysis types -->

            extension="trace">
	    </analyzerExtension>
       <analyzerExtension
             class="org.eclipse.hyades.trace.views.actions.internal.OpenMemoryStatisticViewAction"
             extension="trace"
             icon="icons/full/obj16/memleakantype_obj.gif"
             id="org.eclipse.tptp.platform.jvmti.client.ClassInteractions"
             name="%JVMTI_ANALYSIS_TYPE_VIEW_HEAP"
             type="org.eclipse.tptp.analysisType.jvmti.heap"/>
       <analyzerExtension
             class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatisticViewAction"
             extension="trace"
             icon="icons/full/obj16/thread.gif"

             type="org.eclipse.tptp.analysisType.jvmti.thread">
       </analyzerExtension>
       <analyzerExtension
             class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenMemoryAnalysisViewAction"
             extension="trace"
             icon="icons/full/obj16/memleakantype_obj.gif"
             id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenMemoryAnalysisViewAction"
             name="%JVMTI_ANALYSIS_TYPE_VIEW_HEAP_ANALYSIS"
             type="org.eclipse.tptp.analysisType.jvmti.heap">
       </analyzerExtension>
	</extension>


            visible="false"
            id="org.eclipse.tptp.trace.jvmti.threadActionSet">
         <action
               label="%JVMTI_ANALYSIS_TYPE_VIEW_THRD"
               icon="icons/full/obj16/thread.gif"
               tooltip="%JVMTI_ANALYSIS_TYPE_TOOLTIP_THRD"
               class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatisticViewAction"
               toolbarPath="trace/group.statistic"
               id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatisticViewAction">
         </action>
         <action
               class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatesViewAction"
               icon="icons/full/cview16/thread_states_view.gif"
               id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatesViewAction"
               label="%JVMTI_ANALYSIS_TYPE_VIEW_THRD_STATES"
               style="push"
               toolbarPath="trace/group.statistic"
               tooltip="%JVMTI_ANALYSIS_TYPE_TOOLTIP_THRD_STATES"/>
         <action
               class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenCallStackViewAction"
               icon="icons/full/cview16/call_stack_view.gif"
               id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenCallStackViewAction"

               toolbarPath="trace/group.statistic"
               tooltip="%JVMTI_ANALYSIS_TYPE_TOOLTIP_HEAP_ANALYSIS">
         </action>
         <action
               class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatesViewAction"
               icon="icons/full/cview16/thread_states_view.gif"
               id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatesViewAction"
               label="%JVMTI_ANALYSIS_TYPE_VIEW_THRD_STATES"
               style="push"
               toolbarPath="trace/group.statistic"
               tooltip="%JVMTI_ANALYSIS_TYPE_TOOLTIP_THRD_STATES"/>
         <action
               label="%JVMTI_ANALYSIS_TYPE_VIEW_THRD"
               icon="icons/full/obj16/thread.gif"
               tooltip="%JVMTI_ANALYSIS_TYPE_TOOLTIP_THRD"
               class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatisticViewAction"
               toolbarPath="trace/group.statistic"
               id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatisticViewAction">
         </action>
      </actionSet>
   </extension>
    <extension




		_method = method;
		_lineNo = lineNo;
	}

	public String getPackageName() {
		String name = null;
		if (_method != null && _method.getDefiningClass() != null
				&& _method.getDefiningClass().getPackage() != null) {
			name = _method.getDefiningClass().getPackage().getName();
		}
		return name;
	}

	public String getClassName() {
		String name = null;
		if (_method != null && _method.getDefiningClass() != null) {
			name = _method.getDefiningClass().getName();
		}
		return name;
	}

	public String getMethodName() {
		String name = null;
		if (_method != null) {
			name = _method.getName();
		}
		return name;
	}

	public void clear() {
		_lineNo = 0;
		_total = 0;
		_sumAges = 0;
		_collected = 0;
		_totalSize = 0;
		_collectedSize = 0;
		_method = null;
	}

	public void sumOf(final AllocationSite a) {
		_total += a._total;
		_sumAges += a._sumAges;
		_collected += a._collected;
		_totalSize += a._totalSize;
		_collectedSize += a._collectedSize;
	}
}




import org.eclipse.hyades.trace.ui.TraceViewer;
import org.eclipse.hyades.trace.ui.TraceViewerPage;
import org.eclipse.hyades.trace.ui.UIPlugin;
import org.eclipse.hyades.trace.ui.internal.util.PerftraceUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;

	static public final int TAB_ALLOC_DETAILS = 1;

	CTabFolder _tabFolder;
	BaseStatisticView _views[];

	public MemoryAnalysisPage(EObject mofObject, TraceViewer viewer) {
		super(mofObject, viewer);
	}

	public void refreshPage() {
		BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
		view.refresh();
		updateButtons();
	}


	public void update(boolean newPage) {
		if (newPage) {
			BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
			view.updateUI(view.getColumnDataList());
			updateButtons();
		}

			}
			public void widgetSelected(SelectionEvent e) {
				updateAllocDetails();
				BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
				view.updateUI(view.getColumnDataList());
				updateButtons();
			}
		});

		_views = new BaseStatisticView[2];
		CTabItem tabItem;

		tabItem = new CTabItem(_tabFolder, SWT.NONE);


	public int getViewTabViewMode() {
		int viewMode = -1;
		BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
		if (view instanceof BaseMemoryStatisticView) {
			BaseMemoryStatisticView view0 = (BaseMemoryStatisticView) view;
			viewMode = view0.getViewMode();

		if (TAB_MEMORY_STATS != tab && TAB_ALLOC_DETAILS != tab)
			return;
		_tabFolder.setSelection(tab);
		BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
		if (view instanceof BaseMemoryStatisticView) {
			BaseMemoryStatisticView view0 = (BaseMemoryStatisticView) view;
			view0.setViewMode(viewMode);

		((MemoryAnalysisViewer) _viewer).updateFilterAppliedDescription();
	}

	public BaseStatisticView getCurrentView() {
		BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
		return view;
	}

	public boolean isShowDelta() {
		BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
		return view.showingDeltaColumns();
	}

	public boolean isShowPercent() {
		BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
		return view.isShowPercent();
	}


	}

	void updateAllocDetails() {
		BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
		if (view instanceof AllocationDetailsView) {
			ITraceSelection model = UIPlugin.getDefault().getSelectionModel(getMOFObject());
			if (model.size() > 0) {

				((AllocationDetailsView) view).showAllocDetails(null);
		}
	}

	public boolean isEmpty() {
		return PerftraceUtil.getTotalSize(getMOFObject()) <= 0;
	}
}




	public static String _Stopped;
	public static String _Unknown;

	// state strings lower case
	public static String _not_started;
	public static String _running;
	public static String _sleeping;

	public static String _THREAD_GROUP_NAME;
	public static String _THREAD_START_TIME;
	public static String _THREAD_STOP_TIME;
	public static String _DURATION;
	public static String _THREAD_STATE;
	public static String _THREAD_RUNNING_TIME;
	public static String _THREAD_SLEEPING_TIME;

	public static String _THREAD_DEADLOCKED_TIME;
	public static String _THREAD_BLOCK_COUNT;
	public static String _THREAD_DEADLOCK_COUNT;
	
	public static String _THREAD_MONITOR;

	// misc
	public static String _Delta;
	public static String _ShowAsPercentage;
	public static String _ShowDeltaColumns;
	public static String _MONITOR_OWNER;
	public static String _TIMEOUT;
	public static String _OBJECT_WAITING_FOR;
	public static String _DURATION;

	private UIMessages() {
		// Do not instantiate




		if (getCurrentPage() instanceof MemoryAnalysisPage)
			page = (MemoryAnalysisPage) getCurrentPage();
		boolean memStatsTab = null != page && page.getViewTab() == MemoryAnalysisPage.TAB_MEMORY_STATS;
		boolean memAllocTab = null != page && page.getViewTab() == MemoryAnalysisPage.TAB_ALLOC_DETAILS;
		boolean classMode = memStatsTab && page.getViewTabViewMode() == BaseMemoryStatisticView.CLASS_MODE;
		boolean packageMode = memStatsTab && page.getViewTabViewMode() == BaseMemoryStatisticView.PACKAGE_MODE;
		boolean isDelta = memStatsTab && page.isShowDelta();
		boolean isPercent = null != page && page.isShowPercent();
		_viewClass.setEnabled(memStatsTab);
		_viewClass.setChecked(classMode);
		_viewPackage.setEnabled(memStatsTab);

		boolean canSrc = null != page && Utils.canOpenSourceOnThisObject(page.getMOFObject());
		_openSource.setEnabled(canSrc);
		_deltaColumns.setEnabled(memStatsTab);
		_percentMode.setEnabled(memAllocTab || memStatsTab);
		_deltaColumns.setChecked(isDelta);
		_percentMode.setChecked(isPercent);
		setFilterActionEnabled(memStatsTab);
	}

	void createActions() {

		manager.add(_percentMode);
		manager.add(_deltaColumns);
	}

	public void setFocus() {
		if (getCurrentPage() != null)
			getCurrentPage().setFocus();
	}
}




import org.eclipse.hyades.trace.views.internal.view.columnlabels.ColumnDisplayInfo;
import org.eclipse.hyades.trace.views.internal.view.columnlabels.ColumnLabelAdapter;
import org.eclipse.hyades.trace.views.util.internal.ColumnData;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.tptp.trace.jvmti.internal.client.context.TIContextAttributes;
import org.eclipse.tptp.trace.jvmti.internal.client.context.TIContextUpdaterHelper;
import org.eclipse.tptp.trace.jvmti.internal.client.views.columnlabels.LiveSizeLabelAdapter;

			_collectedInst = PerftraceUtil.getTotalCollectedInstances(_page.getMOFObject());
			if (_collectedInst < 1)
				_collectedInst = 1;
			//TODO _totalAge = get total age
			if (_totalAge < 1)
				_totalAge = 1;
		}

	}

	public String getColumnText(Object element, int columnIndex) {
		StatisticViewColumnInfo info = StatisticViewColumnInfo.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));
		int pos = info.getColumnData().getInitalPos();
		String label = "placeholder(view)";
		ColumnLabelAdapter columnAdapter = getColumnsLabelProvider(pos);

	}

	public Image getColumnImage(Object element, int columnIndex) {
		StatisticViewColumnInfo info = StatisticViewColumnInfo.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));
		int pos = info.getColumnData().getInitalPos();
		Image image = null;
		ColumnLabelAdapter columnAdapter = getColumnsLabelProvider(pos);


	void updateAgeInfo(Object arr[]) {
		_ageMap.clear();
		_totalAge = 1;
		EList listGC = null;
		for (int i = 0; i < arr.length; i++) {
			if (arr[i] instanceof TRCClass) {
				TRCClass cls = (TRCClass) arr[i];
				if (cls.getTotalInstances() == 0)
					continue;
				AgeInfo ageInfo = new AgeInfo();
				if (listGC == null)
					listGC = cls.getPackage().getProcess().getGcEvents();
				if (null == listGC || listGC.size() == 0)
					return;
				_totalAge = listGC.size();
				EList list = cls.getObjects();
				int len = list.size();
				for (int j = 0; j < len; j++) {

		public int objCount;
	}

	public void update() {
		super.update();
		if (_page instanceof MemoryAnalysisPage)
			((MemoryAnalysisPage) _page).updateFilterAppliedDescription();
	}

	protected void defaultActionForSelection(ISelection selection) {
		// none
	}

	public void widgetDefaultSelected(SelectionEvent event) {
		if (_page instanceof MemoryAnalysisPage)
			((MemoryAnalysisPage)_page).showAllocDetails();
	}

	protected SimpleSearchQuery getCurrentFilter() {
		if (_page instanceof MemoryAnalysisPage)
			return ((MemoryAnalysisPage) _page).getCurrentFilter();
		return null;
	}
}




/*****************************************************************************
 * Copyright (c) 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


import java.util.ArrayList;

import org.eclipse.hyades.trace.internal.ui.PDPluginImages;
import org.eclipse.hyades.trace.ui.IViewSelectionChangedListener;
import org.eclipse.hyades.trace.ui.ProfileEvent;
import org.eclipse.hyades.trace.ui.TraceViewer;
import org.eclipse.hyades.trace.ui.TraceViewerPage;
import org.eclipse.hyades.trace.ui.UIPlugin;
import org.eclipse.hyades.trace.ui.ViewSelectionChangedEvent;
import org.eclipse.hyades.trace.views.actions.internal.OpenSourceAction;
import org.eclipse.hyades.trace.views.adapter.internal.IContextViewer;
import org.eclipse.hyades.trace.views.adapter.internal.TraceConstants;
import org.eclipse.hyades.trace.views.internal.TraceUIPlugin;
import org.eclipse.hyades.trace.views.internal.view.columnlabels.ColumnDisplayInfo;
import org.eclipse.hyades.trace.views.internal.view.columnlabels.ColumnLabelAdapter;
import org.eclipse.hyades.trace.views.internal.view.columnlabels.ColumnLabelComparator;
import org.eclipse.hyades.trace.views.internal.view.columnlabels.ContextUpdaterHelper;
import org.eclipse.hyades.trace.views.util.internal.ColumnData;
import org.eclipse.hyades.ui.util.GridUtil;
import org.eclipse.hyades.ui.util.HyadesFormToolkit;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.ViewForm;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.ControlListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.tptp.trace.jvmti.internal.client.widgets.Utils;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.widgets.ColumnLayout;

/**
 * This class was ported from StatisticView from hyades project for JVMTI trace client.
 * 
 * @see org.eclipse.hyades.trace.views.internal.StatisticView
 * 
 */
public abstract class BaseStatisticView implements IViewSelectionChangedListener, SelectionListener, ControlListener {

	static public String PREFERENCE_KEY_PREFIX = "org.eclipse.tptp.trace.jvmti.internal.client.views.stats.";

	static public String PREFERENCE_KEY_PREFIX = "org.eclipse.tptp.trace.jvmti.internal.client.views.basememstats.";
	static public Object _empty[] = new Object[0];

	protected StructuredViewer _viewer;
	protected Composite _viewContainer;
	protected Composite _filterContainer;
	protected ViewForm _dataPane;
	protected Composite _viewComp;
	protected TraceViewerPage _page;
	protected StatisticSorter _viewerSorter;
	protected ArrayList _currentColumns = null;
	protected Action _updateAction;
	protected Action _showPercent;
	protected Action _deltaColumnsAction;
	protected boolean _newSelection = false;
	protected boolean _isShowPercent = false;
	protected boolean _deltaColumns = false;
	protected boolean _refresh = false;
	protected boolean _firstTime = true;
	protected double _maxTime;
	protected int _totalInst;
	protected int _totalCalls;
	protected int _activeInst;
	protected long _totalSize;
	protected long _activeSize;
	protected int _collectedInst;
	protected HyadesFormToolkit _toolkit;

	protected abstract String getColumnsPreferencesKey();
	protected abstract String getViewTypeStr();
	protected abstract String getDefaultColumnsTemplate();
	protected abstract String getViewTypeStr();
	protected abstract StatisticSorter getViewerSorterInstance();
	protected abstract String getColumnText(Object element, int columnIndex);
	protected abstract Image getColumnImage(Object element, int columnIndex);
	protected abstract Object[] getElements(Object inputElement);
	protected abstract boolean hasChildren(Object element);
	protected abstract Object[] getChildren(Object parentElement);

	public class BaseStatisticContentProvider implements ITreeContentProvider {

		public Object[] getChildren(Object parentElement) {
			return BaseStatisticView.this.getChildren(parentElement);
		}

		public Object getParent(Object element) {
			return null;
		}

		public boolean hasChildren(Object element) {
			return BaseStatisticView.this.hasChildren(element);
		}

		public Object[] getElements(Object inputElement) {
			return BaseStatisticView.this.getElements(inputElement);
		}

		public void dispose() {
		}

		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
		}
	}

	class StatisticTreeViewer extends TreeViewer {

		public StatisticTreeViewer(Tree tree) {
			super(tree);
		}

		public void expandItem(TreeItem item) {
			item.setExpanded(true);
			createChildren(item);
		}

		public ISelection getSelection() {
			ISelection sel = super.getSelection();
			if (sel != null && !sel.isEmpty()) {
			}
			return sel;
		}
	}

	public abstract class StatisticSorter extends ViewerSorter {
		protected TreeColumn _sortColumn;
		protected int _sortSequence = -1;
		protected StatisticViewColumnInfo _info;
		protected int _pos = 0;

		public StatisticSorter() {
			super();
		}

		public void setSortedColumn(TreeColumn newSortColumn) {
			// Get the currently designated sort column and turn remove its sorted indicator
			TreeColumn currentColumn = getCurrentSortColumn(newSortColumn .getParent());
			if (currentColumn != null) {
				if (currentColumn == newSortColumn) {
					_sortSequence = -_sortSequence;
				} else {
					_sortSequence = -1;
				}
			} else {
				_sortSequence = 1;
			}

			setSortedColumn(_sortSequence, newSortColumn);
		}

		public void setSortedColumn(int sortSequence, TreeColumn newSortColumn) {
			_sortSequence = sortSequence;
			_sortColumn = newSortColumn;

			// Get the currently designated sort column and turn remove its sorted indicator
			TreeColumn currentColumn = getCurrentSortColumn(newSortColumn.getParent());
			if (currentColumn != null) {
				String text = currentColumn.getText();
				if (text.startsWith(">") || text.startsWith("<"))
					text = text.substring(1);
				currentColumn.setText(text);
				StatisticViewColumnInfo.getStatisticTableColumnInfo(
						currentColumn).setSortColumn(false);
			}

			// Add the sorted indicator to the newly sorted column
			String text = newSortColumn.getText();
			_info = StatisticViewColumnInfo.getStatisticTableColumnInfo(newSortColumn);
			_pos = _info.getColumnData().getInitalPos();
			newSortColumn.setText(((_sortSequence > 0) ? ">" : "<") + text);
			StatisticViewColumnInfo.getStatisticTableColumnInfo(newSortColumn).setSortColumn(true);
		}

		public int getSortSequence() {
			return _sortSequence;
		}

		public void setSortSequence(int sortSequence) {
			_sortSequence = sortSequence;
		}

		public TreeColumn getCurrentSortColumn(Tree tree) {
			for (int idx = 0; idx < tree.getColumnCount(); idx++) {
				if (StatisticViewColumnInfo.getStatisticTableColumnInfo(
						tree.getColumn(idx)).isSortColumn()) {
					return tree.getColumn(idx);
				}
			}
			return null;
		}

		public TreeColumn resetSortColumn(Tree tree) {
			_sortColumn = getCurrentSortColumn(tree);
			return _sortColumn;
		}
	}

	/** Update action */
	class UpdateAction extends Action {
		public UpdateAction(String name) {
			super(name);
			PlatformUI.getWorkbench().getHelpSystem().setHelp(UpdateAction.this, TraceUIPlugin.getPluginId() + ".uvew0000");
			PDPluginImages.setImageDescriptors(this, PDPluginImages.T_LCL, PDPluginImages.IMG_UPDATEVIEWS);
		}

		public void run() {
			ProfileEvent event = UIPlugin.getDefault().getRefreshViewEvent(_page.getMOFObject());
			UIPlugin.getDefault().notifyProfileEventListener(event);
		}
	}

	/** Show as percent action */
	class ShowPercentAction extends Action {
		public ShowPercentAction(String name) {
			super(name);
			PlatformUI.getWorkbench().getHelpSystem().setHelp(ShowPercentAction.this, TraceUIPlugin.getPluginId() + ".clst0003");
		}

		public void run() {
			handlePercentChanged();
		}
	}

	/** Show delta columns action */
	class DeltaColumnsAction extends Action {
		public DeltaColumnsAction(String name) {
			super(name);
			PlatformUI.getWorkbench().getHelpSystem().setHelp(DeltaColumnsAction.this, TraceUIPlugin.getPluginId() + ".ccol0000");
		}

		public void setChecked(boolean value) {
			super.setChecked(value);
		}

		public void run() {
			handleDeltaChanged();
		}
	}

	protected BaseStatisticView(Composite parent, TraceViewerPage page) {
		this(parent, page, true);
	}

	protected BaseStatisticView(Composite parent, TraceViewerPage page, boolean initializeContent) {
		_page = page;
		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, getContextHelpId());
		if (initializeContent)
			createContent(parent);
	}

	public void createContent(Composite parent) {
		_toolkit = new HyadesFormToolkit(parent.getDisplay());
		_currentColumns = ColumnData.createColumnData(getColumnsPreferencesKey(), getDefaultColumnsTemplate());
		_isShowPercent = Utils.loadIntOption(getPreferenceString(TraceConstants.PERCENTAGE)) == 1;
		_deltaColumns = Utils.loadIntOption(getPreferenceString(TraceConstants.DELTA)) == 1;
		createControl(parent, _currentColumns);
	}

	/*
	 * @see SelectionListener#widgetSelected(SelectionEvent)
	 */
	public void widgetSelected(SelectionEvent arg0) {
		if (arg0.widget instanceof TreeColumn) {
			_viewerSorter.setSortedColumn((TreeColumn) arg0.widget);
			_viewer.setSorter(_viewerSorter);
			_viewer.refresh();
		} else if (arg0.widget instanceof Table || arg0.widget instanceof Tree) {
			updateModelSelection();
		}
		updateButtons();
	}

	public Tree getTree() {
		return (Tree) getTreeViewer().getControl();
	}

	protected TreeViewer getTreeViewer(Tree tree) {
		return new StatisticTreeViewer(tree);
	}

	protected IContentProvider getContentProvider() {
		return new BaseStatisticContentProvider();

		return new StatisticLabelProvider();
	}

	protected void defaultActionForSelection(ISelection selection) {
		OpenSourceAction action = new OpenSourceAction();
		action.selectionChanged(action, selection);
		action.run();
	}

	protected StructuredViewer createTreeViewer(Composite tree) {
		TreeViewer tv = getTreeViewer((Tree) tree);
		tv.addDoubleClickListener(new IDoubleClickListener() {
			public void doubleClick(DoubleClickEvent event) {
				ISelection selection = event.getSelection();
				if (selection != null && !selection.isEmpty()) {
					TreeViewer tv = (TreeViewer) getTreeViewer();
					Object node = ((IStructuredSelection) selection).getFirstElement();
					if (tv.isExpandable(node)) {
						tv.setExpandedState(node, !tv.getExpandedState(node));
					} else {
						defaultActionForSelection(selection);
					}
				}
			}
		});
		return (StructuredViewer) tv;
	}

	protected Composite getViewComponent() {
		return _viewComp;
			_contextInfo.setMOFObject(_page.getMOFObject());
		super.update();
		if (_page instanceof MemoryAnalysisPage)
			((MemoryAnalysisPage) _page).updateFilterAppliedDescription();
	}

	protected TraceViewerPage getTraceViewerPage() {
		return _page;
			_contextInfo.updateStatusContext(language);
	}

	protected ViewForm getDataPane() {
		return _dataPane;
	}

	public void showNewSelection() {
		if (_newSelection) {
			getTree().showSelection();
			_newSelection = false;
		}
	}

	public boolean showingDeltaColumns() {
		return _deltaColumns;
	}

	protected void setNewSelection() {
		_newSelection = true;
	}

	public Action getUpdateAction() {
		if (_updateAction == null) {
			_updateAction = new UpdateAction(UIPlugin.getResourceString("REFRESH_VIEWS"));
		}
		return _updateAction;
	}

	public Action getDeltaColumnsAction() {
		if (_deltaColumnsAction == null) {
			_deltaColumnsAction = new DeltaColumnsAction(UIMessages._ShowDeltaColumns);
		}
		return _deltaColumnsAction;
	}

	public Action getShowPercentAction() {
		if (_showPercent == null) {
			_showPercent = new ShowPercentAction(UIMessages._ShowAsPercentage);
			Object sel = ((IStructuredSelection) selection).getFirstElement();
			notifyViewSelectionChanged(this, sel);
		}
		return _showPercent;
	}

	public boolean isShowPercent() {
		return _isShowPercent;
	}

	public Control getControl() {
		return _viewContainer;
	}

	public ArrayList getColumnDataList() {
		return _currentColumns;
	}

	public StructuredViewer getTreeViewer() {
		return _viewer;
	}

	public StatisticSorter getViewerSorter() {
		return _viewerSorter;
	}

	public void widgetDefaultSelected(SelectionEvent arg0) {
	}

	public void controlMoved(ControlEvent arg0) {
	}

	public void controlResized(ControlEvent arg0) {
		// Get the client area for the shell
		Rectangle dataBounds = getViewComponent().getClientArea();
		getDataPane().setBounds(dataBounds.x, dataBounds.y, dataBounds.width, dataBounds.height);
		// If the table column was resized, update the ColumnData array with the
		// new size and save the new column definitions to the preferences.
		if (arg0.getSource() instanceof TableColumn) {
			ColumnData.setColumns(getColumnDataList(), getColumnsPreferencesKey());
		}
	}

	public void menuAboutToShow(IMenuManager arg0) {
	}

	protected void setRedrawTable(boolean redraw) {
		_viewer.getControl().setRedraw(redraw);
	}

	public void refresh() {
		if (!getTreeViewer().getControl().isDisposed())
			update();
	}

	public void selectionChanged() {
		handleSelectionEvent();
	}

	public void updateUI(ArrayList cols) {
		update();
		updateButtons();
	}

	protected void showPercentUpdate() {
	}

	protected void firstTimeUpdate() {
		_firstTime = false;
		Tree tree = getTree();
		TreeColumn firstColumn = tree.getColumn(0);
		_viewerSorter = getViewerSorterInstance();
		_viewerSorter.setSortedColumn(firstColumn);
		_viewer.setSorter(_viewerSorter);
		redrawTable();
	}

	protected void redrawTable() {
		getTree().setRedraw(false);
		_currentColumns = ColumnData.createColumnData(getColumnsPreferencesKey(), getDefaultColumnsTemplate());
		_currentColumns = TIColumnData.convertColumnData(_currentColumns);

		refresh();
	}

	protected void postUpdateEvents() {
		handleSelectionEvent();
	}

	protected void expandFirstElement() {
	}
		}

	protected String getContext() {
		IContextViewer viewer = getContextViewer();
		return viewer != null ? viewer.getSelectedContext() : null;
	}

	protected boolean contextChanged() {
		IContextViewer viewer = getContextViewer();
		if (viewer != null) {
			if (viewer.contextChanged()) {
				return true;
			} else {
				viewer.setSelectedContext(ContextUpdaterHelper.getCurrentContext(ContextUpdaterHelper.getContexts(_page.getMOFObject()), viewer), false);
				return viewer.contextChanged();
			}
		} else
			return false;
	}

	protected void updateContext() {
		resetColumns(_currentColumns);
		IContextViewer viewer = getContextViewer();
		if (viewer != null)
			viewer.updateContext();
	}

	private IContextViewer getContextViewer() {
		if (_page != null) {
			TraceViewer traceViewer = _page.getTraceViewer();
			if (traceViewer != null && traceViewer instanceof IContextViewer)
				return (IContextViewer) traceViewer;
		}
		return null;
	}

	public void update() {
		if (_firstTime)
			firstTimeUpdate();
		// context changes or context handler selection changes
		if (contextChanged() || _page.getTraceViewer().contextHandlerSelectionChanged()) {
			updateContext();
		}
		IContextViewer viewer = getContextViewer();
		if (viewer != null) {
			viewer.getContextSelectionMenuListener().setMOFObject(_page.getMOFObject());
		}
		// set the input of the viewer
		showPercentUpdate();
		setRedrawTable(false);
		getTreeViewer().setInput(_page.getMOFObject());
		// _viewer.refresh();
		expandFirstElement();
		setRedrawTable(true);
		postUpdateEvents();
	}

	/**
	 * This method is called as a result of changing the selected columns. It
	 * takes the new column definition list and adjusts the columns of the table
	 * to match this list.
	 */
	protected void resetColumns(ArrayList list) {
		String sortedColumnKey = ""; // store sorted column
		boolean isDeltaColumn = false;
		int sortSequence = _viewerSorter.getSortSequence(); // store sorted sequence

		Tree tree = getTree();
		setRedrawTable(false);

		// Dispose all the existing columns
		for (int idx = tree.getColumnCount(); idx > 0; idx--) {
			TreeColumn col = tree.getColumn(tree.getColumnCount() - 1);
			StatisticViewColumnInfo staticTblColInfo = (StatisticViewColumnInfo) (col.getData());
			if (staticTblColInfo.isSortColumn()) {
				sortedColumnKey = staticTblColInfo.getColumnData().key();
				isDeltaColumn = staticTblColInfo.isDeltaColumn();
			}
			col.dispose();
		}

		for (int idx = 0; idx < list.size(); idx++) {
			ColumnData data = (ColumnData) list.get(idx);
			data.setContext(getContext());
			if (data.visible()) {
				new StatisticViewColumnInfo(this, data, _deltaColumns);
			}
		}

		tree = getTree();
		for (int idx = 0; idx < tree.getColumnCount(); idx++) {
			StatisticViewColumnInfo treeColumnInfo = getColumnInfo(tree.getColumn(idx));
			if (treeColumnInfo != null
					&& sortedColumnKey.equals(treeColumnInfo.getColumnData().key())
					&& isDeltaColumn == treeColumnInfo.isDeltaColumn()) {
				treeColumnInfo.setSortColumn(true);
				break;
			}
		}

		if (_viewerSorter.resetSortColumn(getTree()) == null) {
			_viewer.setSorter(null);
		} else {
			_viewerSorter.setSortSequence(sortSequence * -1);
			_viewerSorter.setSortedColumn(_viewerSorter.resetSortColumn(getTree()));
			_viewer.setSorter(_viewerSorter);
		}

		setRedrawTable(true);
	}

	protected Composite createControl(Composite parent, ArrayList cols) {
		GridLayout layout;
		_viewContainer = _toolkit.createComposite(parent, SWT.FLAT);
		layout = new GridLayout();
		layout.numColumns = 1;
		_viewContainer.setLayout(layout);
		_viewContainer.setLayoutData(GridUtil.createFill());
		createLabel(_viewContainer);
		_viewComp = _toolkit.createComposite(_viewContainer, SWT.FLAT);
		layout = new GridLayout();
		layout.numColumns = 1;
		layout.marginWidth = 0;
		layout.marginHeight = 0;
		_viewComp.setLayout(layout);
		_viewComp.setLayoutData(GridUtil.createFill());
		_dataPane = _toolkit.createViewForm(_viewComp);
		Control table = createTableViewer(_dataPane, cols);
		_dataPane.setContent(table);
		_dataPane.setLayoutData(GridUtil.createFill());
		_viewContainer.addControlListener(this);
		return _viewContainer;
	}

	protected void createLabel(Composite viewContainer) {
	}

	protected Tree createTree(Composite parent, int options) {
		Tree tree = _toolkit.createTree(parent, options);
		tree.setLinesVisible(true);
		tree.setHeaderVisible(true);
		ColumnLayout layout = new ColumnLayout();
		layout.maxNumColumns = 100;
		tree.setLayout(layout);
		tree.setLayoutData(new GridData(GridData.FILL_BOTH));
		tree.addSelectionListener(this);
		return tree;
	}

	private Control createTableViewer(Composite parent, ArrayList cols) {
		Tree tree = createTree(parent, SWT.SINGLE | SWT.FULL_SELECTION | SWT.FLAT);
		_viewer = createTreeViewer(tree);
		for (int idx = 0; idx < cols.size(); idx++) {
			ColumnData data = (ColumnData) cols.get(idx);
			data.setContext(getContext());
			if (data.visible()) {
				new StatisticViewColumnInfo(this, data, _deltaColumns);
			}
		}
		_viewer.setContentProvider(getContentProvider());
		_viewer.setLabelProvider(getTableLabelProvider());
		UIPlugin.getDefault().addViewSelectionChangedListener(this);
		return _viewer.getControl();
	}

	public void dispose() {
		UIPlugin.getDefault().removeViewSelectionChangedListener(this);
		_page = null;
	}

	public void handlePercentChanged() {
		_isShowPercent = !_isShowPercent;
		Utils.saveIntOption(getPreferenceString(TraceConstants.PERCENTAGE), (_isShowPercent ? 1 : 0));
		refresh();
		updateButtons();
		}
	}

	public void handleDeltaChanged() {
		_deltaColumns = !_deltaColumns;
		Utils.saveIntOption(getPreferenceString(TraceConstants.DELTA), (_deltaColumns ? 1 : 0));
		resetColumns(_currentColumns);
		refresh();
	}

	protected String getPreferenceString(String str) {
		return getViewTypeStr() + "." + str;
	}

	public void updateModelSelection() {
		ISelection selection = getTreeViewer().getSelection();
		if (selection != null && !selection.isEmpty()) {
			Object sel = ((IStructuredSelection) selection).getFirstElement();
			notifyViewSelectionChanged(this, sel);
		}
	}

	public void notifyViewSelectionChanged(Object source, Object selection) {
		UIPlugin.getDefault().getSelectionModel(_page.getMOFObject()).add(selection);
		ViewSelectionChangedEvent event = UIPlugin.getDefault().getViewSelectionChangedEvent();
		event.setSource(source);
		UIPlugin.getDefault().notifyViewSelectionChangedListener(event);
	}

	public HyadesFormToolkit getToolkit() {
		return _toolkit;
	}

	protected StatisticViewColumnInfo getColumnInfo(TreeColumn treeColumn) {
		if (treeColumn.getData() != null && treeColumn.getData() instanceof StatisticViewColumnInfo)
			return (StatisticViewColumnInfo) treeColumn.getData();
		return null;
	}

	protected int compareElements(Object obj1, Object obj2, ColumnLabelAdapter col, boolean isDeltaColumn) {
		ColumnDisplayInfo info = getColumnDisplayInfo(col, isDeltaColumn);
		return ColumnLabelComparator.compare(obj1, obj2, col, info);
	}

	protected String getElementColumnText(Object obj, ColumnLabelAdapter col, boolean isDeltaColumn) {
		ColumnDisplayInfo info = getColumnDisplayInfo(col, isDeltaColumn);
		return col.getDisplayString(obj, info);
	}

	protected Image getElementColumnImage(Object obj, ColumnLabelAdapter col, boolean isDeltaColumn) {
		ColumnDisplayInfo info = getColumnDisplayInfo(col, isDeltaColumn);
		return col.getDisplayImage(obj, info);
	}

	protected ColumnDisplayInfo getColumnDisplayInfo(ColumnLabelAdapter col, boolean isDeltaColumn) {
		return col.getColumnDisplayInfo();
	}

	protected String getContextHelpId() {
		return null;
	}

	protected void updateButtons() {
		if (_page instanceof MemoryAnalysisPage) {
			((MemoryAnalysisPage)_page).updateButtons();
		}
	}

	protected void handleSelectionEvent() {
		/*ITraceSelection model = UIPlugin.getDefault().getSelectionModel(_page.getMOFObject());
		if (model.size() > 0) {
			Object sel = model.getFirstElement();
			if (sel != null) {
				//select(sel);
				//if (sel instanceof EObject)
				//	updateStatusContext(ContextManager.getContextLanguage(ContextUpdaterHelper.getContext((EObject)sel)));
			}
		}*/
	}

	public void handleViewSelectionChangedEvent(ViewSelectionChangedEvent event) {
		Object source = event.getSource();
		if (source != this) {
			handleSelectionEvent();
		} else {
			/*ITraceSelection model = UIPlugin.getDefault().getSelectionModel(_page.getMOFObject());
			if (model.size() > 0) {
				//Object sel = model.getFirstElement();
				//if (sel != null && sel instanceof EObject)
				//	updateStatusContext(ContextManager.getContextLanguage(ContextUpdaterHelper.getContext((EObject)sel)));
			}*/
			updateButtons();
		}
	}
}

Lines 69-74 Link Here

(-)src/org/eclipse/tptp/trace/jvmti/internal/client/views/messages.properties (+4 lines)
69	_THREAD_BLOCK_COUNT = Block Count	69	_THREAD_BLOCK_COUNT = Block Count
70	_THREAD_DEADLOCK_COUNT = Deadlock Count	70	_THREAD_DEADLOCK_COUNT = Deadlock Count
71		71
		72	#misc
		73	_Delta = Delta
		74	_ShowAsPercentage = Show as Percentage
		75	_ShowDeltaColumns = Show Delta Columns
72	_THREAD_MONITOR = Monitor	76	_THREAD_MONITOR = Monitor
73	_MONITOR_OWNER = Monitor Owner	77	_MONITOR_OWNER = Monitor Owner
74	_TIMEOUT = Timeout	78	_TIMEOUT = Timeout





package org.eclipse.tptp.trace.jvmti.internal.client.views;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;


import org.eclipse.hyades.models.trace.TRCFullTraceObject;
import org.eclipse.hyades.models.trace.TRCMethod;
import org.eclipse.hyades.models.trace.TRCObjectAllocationAnnotation;
import org.eclipse.hyades.models.trace.TRCPackage;
import org.eclipse.hyades.trace.ui.TraceViewerPage;
import org.eclipse.hyades.trace.ui.internal.util.TString;
import org.eclipse.hyades.trace.views.util.internal.ColumnData;
import org.eclipse.hyades.trace.views.util.internal.StatisticTableColumnInfo;
import org.eclipse.hyades.ui.provisional.context.IContextLabelFormatProvider;
import org.eclipse.hyades.ui.util.GridUtil;
import org.eclipse.jface.viewers.Viewer;

	private TRCClass _class;
	private int _nextIndex;
	private Label _label;
	AllocationSite _allocAll = new AllocationSite();
	static final Object _emptyArr[] = new Object[0];

	protected AllocationDetailsView(Composite parent, TraceViewerPage page) {

		return "viewoption.allocdetails";
	}
	
	protected void createLabel(Composite viewContainer) {
		_label = _toolkit.createLabel(viewContainer, null);
		_label = _toolkit.createLabel(comp, null);
		Font font = _label.getFont();
		FontData fd = font.getFontData()[0];
		font = new Font(null, new FontData(fd.getName(), fd.getHeight() * 3 / 2, fd.getStyle()));
		_label.setFont(font);
		_label.setBackground(viewContainer.getBackground());
		_label.setForeground(new Color(null, 0, 0, 200));
		_label.setLayoutData(GridUtil.createHorizontalFill());
		return comp;
	}

	protected String getDefaultColumnsTemplate() {

			;
	}

	String formatPercent(int val, int max) {
		String s = max > 0 && max >= val ?
			TString.formatAsPercentage((double)val / (double)max) : "";
		return s;
	}

	public String getColumnText(Object element, int columnIndex) {
		StatisticViewColumnInfo info = StatisticViewColumnInfo
				.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));
		int pos = info.getColumnData().getInitalPos();
		String label = "";
		if (!(element instanceof AllocationSite))
			return label;
		boolean noperc = !isShowPercent();
		AllocationSite allocSite = (AllocationSite) element;
		switch (pos) {
		case AD_COL_METHOD_NAME:
			label = allocSite.getMethodName();
				label = allocSite._method.getName();
			break;
		case AD_COL_CLASS_NAME:
			label = allocSite.getClassName();
					allocSite._method.getDefiningClass() != null)
				label = allocSite._method.getDefiningClass().getName();
			break;
		case AD_COL_PACKAGE_NAME:
			label = allocSite.getPackageName();
					allocSite._method.getDefiningClass() != null &&
					allocSite._method.getDefiningClass().getPackage() != null)
				label = allocSite._method.getDefiningClass().getPackage().getName();
			break;
		case AD_COL_LINE_NO:
			label = String.valueOf(allocSite._lineNo);
			break;
		case AD_COL_TOTAL_INST:
			if (noperc)
				label = String.valueOf(allocSite._total);
			else
				label = formatPercent(allocSite._total, _allocAll._total);
			break;
		case AD_COL_TOTAL_SIZE:
			if (noperc)
				label = String.valueOf(allocSite._totalSize);
			else
				label = formatPercent(allocSite._totalSize, _allocAll._totalSize);
			break;
		case AD_COL_LIVE_INST:
			if (noperc)
				label = String.valueOf(allocSite._total - allocSite._collected);
			else
				label = formatPercent(allocSite._total - allocSite._collected,
						_allocAll._total - _allocAll._collected);
			break;
		case AD_COL_LIVE_SIZE:
			if (noperc)
				label = String.valueOf(allocSite._totalSize - allocSite._collectedSize);
			else
				label = formatPercent(allocSite._totalSize - allocSite._collectedSize,
						_allocAll._totalSize - _allocAll._collectedSize);
			break;
		case AD_COL_AVG_AGE:
			if (noperc) {
				double age = 0;
				if (allocSite._total > 0) {
					age = (double) allocSite._sumAges / allocSite._total;
					label = String.valueOf(age);
				}
				IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.CALL_SITE_AVG_AGE);
				label = formatter.getDisplayStringFromElement(new Double(age), null, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);
			} else {
				label = formatPercent(allocSite._sumAges, _allocAll._sumAges);
			}
			IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.CALL_SITE_AVG_AGE);
			label = formatter.getDisplayStringFromElement(new Double(age), null, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);
			break;
		}
		if (null == label)
			label = "";
		return label;
	}

	public Image getColumnImage(Object element, int columnIndex) {
		StatisticViewColumnInfo info = StatisticViewColumnInfo.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));
		int pos = info.getColumnData().getInitalPos();
		Image image = null;
		if (!(element instanceof AllocationSite))
			return image;
		AllocationSite allocSite = (AllocationSite) element;
		String name = null;
		switch (pos) {
		case AD_COL_METHOD_NAME:
			name = allocSite.getMethodName();
			if (name != null) {
				IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.METHOD_NAME);
				image = formatter.getDisplayImageByElement(name, null, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);
			}
			break;
		case AD_COL_CLASS_NAME:
			name = allocSite.getClassName();
			if (name != null) {
				TRCClass cls = allocSite._method.getDefiningClass();
				IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.CLASS_NAME);
				image = formatter.getDisplayImageByElement(name, null, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);
			}
			break;
		case AD_COL_PACKAGE_NAME:
			name = allocSite.getPackageName();
			if (name != null) {
					allocSite._method.getDefiningClass().getPackage() != null) {
				TRCPackage pkg = allocSite._method.getDefiningClass().getPackage();
				IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.PACKAGE_NAME);
				image = formatter.getDisplayImageByElement(name, null, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);
			}
			break;
		}

		AllocationSite a1 = (AllocationSite) e1;
		AllocationSite a2 = (AllocationSite) e2;
		switch (pos) {
		case AD_COL_METHOD_NAME:
			ret = Utils.compare(a1._method != null ? a1._method.getName() : null
					, a2._method != null ? a2._method.getName() : null);
			break;
		case AD_COL_CLASS_NAME:
			ret = Utils.compare(a1._method != null &&
					a1._method.getDefiningClass() != null ?
							a1._method.getDefiningClass().getName() : null
					, a2._method != null &&
					a2._method.getDefiningClass() != null ?
							a2._method.getDefiningClass().getName() : null);
			break;
		case AD_COL_PACKAGE_NAME:
			if (0 == ret) {
				ret = Utils.compare(a1.getPackageName(), a2.getPackageName());
			}
			//break;
		case AD_COL_CLASS_NAME:
			if (0 == ret) {
				ret = Utils.compare(a1.getClassName(), a2.getClassName());
			}
			//break;
		case AD_COL_METHOD_NAME:
			if (0 == ret) {
				ret = Utils.compare(a1.getMethodName(), a2.getMethodName());
			}
			//break;
		case AD_COL_LINE_NO:
			if (0 == ret) {
				ret = a1._lineNo - a2._lineNo;
			}
			break;
		case AD_COL_TOTAL_INST:
			ret = a1._total - a2._total;

			ret = (a1._totalSize - a1._collectedSize) - (a2._totalSize - a2._collectedSize);
			break;
		case AD_COL_AVG_AGE:
			ret = a1._sumAges - a2._sumAges;
			double age2 = a2._total > 0 ? a2._sumAges / a2._total : 0;
			ret = Utils.compare(age1, age2);
			break;
		}
		return ret;

			_class = (TRCClass) obj;
			_nextIndex = 0;
			_allocSites.clear();
			_allocAll.clear();
			String text = Utils.getPackageClassName(_class);
			if (text.length() > 0)
				text = "Allocation details for '" + text + "'";
			_label.setText(text);
			//_label.getParent().layout();
		}
		refresh();
	}

	void updateData() {
		_nextIndex = 0;
		_allocSites.clear();
		_allocAll.clear();
		if (null == _class)
			return;
		TRCObjectAllocationAnnotation aa = Utils.getAllocationAnnotation(_class);

			int j = i + i + 1;
			if (j < objectsLen && objects.get(j) instanceof TRCFullTraceObject) {
				TRCFullTraceObject trObj = (TRCFullTraceObject) objects.get(j);
				int objSize = trObj.getSize();
				if (trObj.getCollectTime() > 0) {
					allocSite._collected++;
					allocSite._collectedSize += objSize;
					_allocAll._collected++;
					_allocAll._collectedSize += objSize;
				}
				allocSite._totalSize += trObj.getSize();
				int age = Utils.getObjAge(trObj, listGC);
				allocSite._totalSize += objSize;
				allocSite._sumAges += age;
				allocSite._total++;
				_allocAll._totalSize += objSize;
				_allocAll._sumAges += age;
				_allocAll._total++;
			}
		}
		_nextIndex = lineNoLen;

Lines 514-519 Link Here

(-)src/org/eclipse/tptp/trace/jvmti/internal/client/widgets/Utils.java (+5 lines)
514	return val;	514	return val;
515	}	515	}
516		516
		517	static public int loadIntOption(String opt) {
		518	int val = TraceUIPlugin.getDefault().getPreferenceStore().getInt(opt);
		519	return val;
		520	}
		521
517	static public void saveIntOption(String opt, int val) {	522	static public void saveIntOption(String opt, int val) {
518	TraceUIPlugin.getDefault().getPreferenceStore().setValue(opt, val);	523	TraceUIPlugin.getDefault().getPreferenceStore().setValue(opt, val);
519	}	524	}




/**********************************************************************
 * Copyright (c) 2005 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
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: StatisticTableColumnInfo.java,v 1.4 2005/08/10 02:37:48 popescu Exp $
 * 
 * Contributors: 
 * IBM - Initial API and implementation
 **********************************************************************/
package org.eclipse.tptp.trace.jvmti.internal.client.views;

import org.eclipse.hyades.trace.views.util.internal.ColumnData;
import org.eclipse.swt.*;
import org.eclipse.swt.widgets.*;

/**
 * This class was ported from hyades project for JVMTI trace client.
 */
public class StatisticViewColumnInfo {

	private boolean _isSortColumn = false;
	private boolean _isDeltaColumn = false;
	private ColumnData _columnData;

	public ColumnData getColumnData() {
		return _columnData;
	}

	public boolean isSortColumn() {
		return _isSortColumn;
	}

	public boolean isDeltaColumn() {
		return _isDeltaColumn;
	}

	public void setSortColumn(boolean flag) {
		_isSortColumn = flag;
	}

	public void setDeltaColumn(boolean flag) {
		_isDeltaColumn = flag;
	}

	static public StatisticViewColumnInfo getStatisticTableColumnInfo(TreeColumn col) {
		if (col.getData() != null && col.getData() instanceof StatisticViewColumnInfo) {
			return (StatisticViewColumnInfo) (col.getData());
		} else {
			return null;
		}
	}

	private StatisticViewColumnInfo(BaseStatisticView statisticView, ColumnData data) {
		TreeColumn treeColumn = new TreeColumn(statisticView.getTree(), SWT.NULL | SWT.NO_BACKGROUND | data.getAlignment());
		treeColumn.setData(this);
		initializeTreeColumn(statisticView, treeColumn, data, true);
	}

	public StatisticViewColumnInfo(BaseStatisticView statisticView, ColumnData data, boolean deltaColumnsEnabled) {
		TreeColumn treeColumn = new TreeColumn(statisticView.getTree(), SWT.NULL | SWT.NO_BACKGROUND | data.getAlignment());
		treeColumn.setData(this);
		initializeTreeColumn(statisticView, treeColumn, data, false);
		if (deltaColumnsEnabled && data.supportsDelta()) {
			new StatisticViewColumnInfo(statisticView, data);
		}
	}

	private void initializeTreeColumn(BaseStatisticView statisticView, TreeColumn treeColumn, ColumnData data, boolean isDeltaColumn) {
		_columnData = data;
		_isDeltaColumn = isDeltaColumn;
		treeColumn.setResizable(data.isResizable());
		if (isDeltaColumn) {
			treeColumn.setText(UIMessages._Delta + ":" + data.name());
		} else {
			treeColumn.setText(data.name());
		}
		treeColumn.setWidth(data.width());
		treeColumn.addSelectionListener(statisticView);
		treeColumn.addControlListener(statisticView);
	}
}

Return to bug 167995

Lines 20-26 Link Here

(-)src/org/eclipse/tptp/trace/jvmti/internal/client/views/MemoryAnalysisPage.java (-13 / +17 lines)
20	import org.eclipse.hyades.trace.ui.TraceViewer;	20	import org.eclipse.hyades.trace.ui.TraceViewer;
21	import org.eclipse.hyades.trace.ui.TraceViewerPage;	21	import org.eclipse.hyades.trace.ui.TraceViewerPage;
22	import org.eclipse.hyades.trace.ui.UIPlugin;	22	import org.eclipse.hyades.trace.ui.UIPlugin;
23	import org.eclipse.hyades.trace.views.internal.StatisticView;	23	import org.eclipse.hyades.trace.ui.internal.util.PerftraceUtil;
24	import org.eclipse.swt.SWT;	24	import org.eclipse.swt.SWT;
25	import org.eclipse.swt.custom.CTabFolder;	25	import org.eclipse.swt.custom.CTabFolder;
26	import org.eclipse.swt.custom.CTabItem;	26	import org.eclipse.swt.custom.CTabItem;
Lines 36-49 Link Here
36	static public final int TAB_ALLOC_DETAILS = 1;	36	static public final int TAB_ALLOC_DETAILS = 1;
37		37
38	CTabFolder _tabFolder;	38	CTabFolder _tabFolder;
39	StatisticView _views[];	39	BaseStatisticView _views[];
40		40
41	public MemoryAnalysisPage(EObject mofObject, TraceViewer viewer) {	41	public MemoryAnalysisPage(EObject mofObject, TraceViewer viewer) {
42	super(mofObject, viewer);	42	super(mofObject, viewer);
43	}	43	}
44		44
45	public void refreshPage() {	45	public void refreshPage() {
46	StatisticView view = _views[_tabFolder.getSelectionIndex()];	46	BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
47	view.refresh();	47	view.refresh();
48	updateButtons();	48	updateButtons();
49	}	49	}
Lines 53-59 Link Here
53		53
54	public void update(boolean newPage) {	54	public void update(boolean newPage) {
55	if (newPage) {	55	if (newPage) {
56	StatisticView view = _views[_tabFolder.getSelectionIndex()];	56	BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
57	view.updateUI(view.getColumnDataList());	57	view.updateUI(view.getColumnDataList());
58	updateButtons();	58	updateButtons();
59	}	59	}
Lines 74-86 Link Here
74	}	74	}
75	public void widgetSelected(SelectionEvent e) {	75	public void widgetSelected(SelectionEvent e) {
76	updateAllocDetails();	76	updateAllocDetails();
77	StatisticView view = _views[_tabFolder.getSelectionIndex()];	77	BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
78	view.updateUI(view.getColumnDataList());	78	view.updateUI(view.getColumnDataList());
79	updateButtons();	79	updateButtons();
80	}	80	}
81	});	81	});
82		82
83	_views = new StatisticView[2];	83	_views = new BaseStatisticView[2];
84	CTabItem tabItem;	84	CTabItem tabItem;
85		85
86	tabItem = new CTabItem(_tabFolder, SWT.NONE);	86	tabItem = new CTabItem(_tabFolder, SWT.NONE);
Lines 117-123 Link Here
117		117
118	public int getViewTabViewMode() {	118	public int getViewTabViewMode() {
119	int viewMode = -1;	119	int viewMode = -1;
120	StatisticView view = _views[_tabFolder.getSelectionIndex()];	120	BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
121	if (view instanceof BaseMemoryStatisticView) {	121	if (view instanceof BaseMemoryStatisticView) {
122	BaseMemoryStatisticView view0 = (BaseMemoryStatisticView) view;	122	BaseMemoryStatisticView view0 = (BaseMemoryStatisticView) view;
123	viewMode = view0.getViewMode();	123	viewMode = view0.getViewMode();
Lines 129-135 Link Here
129	if (TAB_MEMORY_STATS != tab && TAB_ALLOC_DETAILS != tab)	129	if (TAB_MEMORY_STATS != tab && TAB_ALLOC_DETAILS != tab)
130	return;	130	return;
131	_tabFolder.setSelection(tab);	131	_tabFolder.setSelection(tab);
132	StatisticView view = _views[_tabFolder.getSelectionIndex()];	132	BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
133	if (view instanceof BaseMemoryStatisticView) {	133	if (view instanceof BaseMemoryStatisticView) {
134	BaseMemoryStatisticView view0 = (BaseMemoryStatisticView) view;	134	BaseMemoryStatisticView view0 = (BaseMemoryStatisticView) view;
135	view0.setViewMode(viewMode);	135	view0.setViewMode(viewMode);
Lines 147-164 Link Here
147	((MemoryAnalysisViewer) _viewer).updateFilterAppliedDescription();	147	((MemoryAnalysisViewer) _viewer).updateFilterAppliedDescription();
148	}	148	}
149		149
150	public StatisticView getCurrentView() {	150	public BaseStatisticView getCurrentView() {
151	StatisticView view = _views[_tabFolder.getSelectionIndex()];	151	BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
152	return view;	152	return view;
153	}	153	}
154		154
155	public boolean isShowDelta() {	155	public boolean isShowDelta() {
156	StatisticView view = _views[_tabFolder.getSelectionIndex()];	156	BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
157	return view.showingDeltaColumns();	157	return view.showingDeltaColumns();
158	}	158	}
159		159
160	public boolean isShowPercent() {	160	public boolean isShowPercent() {
161	StatisticView view = _views[_tabFolder.getSelectionIndex()];	161	BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
162	return view.isShowPercent();	162	return view.isShowPercent();
163	}	163	}
164		164
Lines 168-174 Link Here
168	}	168	}
169		169
170	void updateAllocDetails() {	170	void updateAllocDetails() {
171	StatisticView view = _views[_tabFolder.getSelectionIndex()];	171	BaseStatisticView view = _views[_tabFolder.getSelectionIndex()];
172	if (view instanceof AllocationDetailsView) {	172	if (view instanceof AllocationDetailsView) {
173	ITraceSelection model = UIPlugin.getDefault().getSelectionModel(getMOFObject());	173	ITraceSelection model = UIPlugin.getDefault().getSelectionModel(getMOFObject());
174	if (model.size() > 0) {	174	if (model.size() > 0) {
Lines 178-181 Link Here
178	((AllocationDetailsView) view).showAllocDetails(null);	178	((AllocationDetailsView) view).showAllocDetails(null);
179	}	179	}
180	}	180	}
		181
		182	public boolean isEmpty() {
		183	return PerftraceUtil.getTotalSize(getMOFObject()) <= 0;
		184	}
181	}	185	}

Lines 127-136 Link Here

(-)src/org/eclipse/tptp/trace/jvmti/internal/client/views/MemoryAnalysisViewer.java (-2 / +9 lines)
127	if (getCurrentPage() instanceof MemoryAnalysisPage)	127	if (getCurrentPage() instanceof MemoryAnalysisPage)
128	page = (MemoryAnalysisPage) getCurrentPage();	128	page = (MemoryAnalysisPage) getCurrentPage();
129	boolean memStatsTab = null != page && page.getViewTab() == MemoryAnalysisPage.TAB_MEMORY_STATS;	129	boolean memStatsTab = null != page && page.getViewTab() == MemoryAnalysisPage.TAB_MEMORY_STATS;
		130	boolean memAllocTab = null != page && page.getViewTab() == MemoryAnalysisPage.TAB_ALLOC_DETAILS;
130	boolean classMode = memStatsTab && page.getViewTabViewMode() == BaseMemoryStatisticView.CLASS_MODE;	131	boolean classMode = memStatsTab && page.getViewTabViewMode() == BaseMemoryStatisticView.CLASS_MODE;
131	boolean packageMode = memStatsTab && page.getViewTabViewMode() == BaseMemoryStatisticView.PACKAGE_MODE;	132	boolean packageMode = memStatsTab && page.getViewTabViewMode() == BaseMemoryStatisticView.PACKAGE_MODE;
132	boolean isDelta = memStatsTab && page.isShowDelta();	133	boolean isDelta = memStatsTab && page.isShowDelta();
133	boolean isPercent = memStatsTab && page.isShowPercent();	134	boolean isPercent = null != page && page.isShowPercent();
134	_viewClass.setEnabled(memStatsTab);	135	_viewClass.setEnabled(memStatsTab);
135	_viewClass.setChecked(classMode);	136	_viewClass.setChecked(classMode);
136	_viewPackage.setEnabled(memStatsTab);	137	_viewPackage.setEnabled(memStatsTab);
Lines 138-146 Link Here
138	boolean canSrc = null != page && Utils.canOpenSourceOnThisObject(page.getMOFObject());	139	boolean canSrc = null != page && Utils.canOpenSourceOnThisObject(page.getMOFObject());
139	_openSource.setEnabled(canSrc);	140	_openSource.setEnabled(canSrc);
140	_deltaColumns.setEnabled(memStatsTab);	141	_deltaColumns.setEnabled(memStatsTab);
141	_percentMode.setEnabled(memStatsTab);	142	_percentMode.setEnabled(memAllocTab \|\| memStatsTab);
142	_deltaColumns.setChecked(isDelta);	143	_deltaColumns.setChecked(isDelta);
143	_percentMode.setChecked(isPercent);	144	_percentMode.setChecked(isPercent);
		145	setFilterActionEnabled(memStatsTab);
144	}	146	}
145		147
146	void createActions() {	148	void createActions() {
Lines 216-219 Link Here
216	manager.add(_percentMode);	218	manager.add(_percentMode);
217	manager.add(_deltaColumns);	219	manager.add(_deltaColumns);
218	}	220	}
		221
		222	public void setFocus() {
		223	if (getCurrentPage() != null)
		224	getCurrentPage().setFocus();
		225	}
219	}	226	}

Lines 33-46 Link Here

(-)src/org/eclipse/tptp/trace/jvmti/internal/client/views/BaseMemoryStatisticView.java (-11 / +24 lines)
33	import org.eclipse.hyades.trace.views.internal.view.columnlabels.ColumnDisplayInfo;	33	import org.eclipse.hyades.trace.views.internal.view.columnlabels.ColumnDisplayInfo;
34	import org.eclipse.hyades.trace.views.internal.view.columnlabels.ColumnLabelAdapter;	34	import org.eclipse.hyades.trace.views.internal.view.columnlabels.ColumnLabelAdapter;
35	import org.eclipse.hyades.trace.views.util.internal.ColumnData;	35	import org.eclipse.hyades.trace.views.util.internal.ColumnData;
36	import org.eclipse.hyades.trace.views.util.internal.StatisticTableColumnInfo;	36	import org.eclipse.jface.viewers.ISelection;
37	import org.eclipse.jface.viewers.StructuredViewer;
38	import org.eclipse.jface.viewers.TreeViewer;
39	import org.eclipse.jface.viewers.Viewer;	37	import org.eclipse.jface.viewers.Viewer;
40	import org.eclipse.swt.events.SelectionEvent;	38	import org.eclipse.swt.events.SelectionEvent;
41	import org.eclipse.swt.graphics.Image;	39	import org.eclipse.swt.graphics.Image;
42	import org.eclipse.swt.widgets.Composite;	40	import org.eclipse.swt.widgets.Composite;
43	import org.eclipse.swt.widgets.Tree;
44	import org.eclipse.tptp.trace.jvmti.internal.client.context.TIContextAttributes;	41	import org.eclipse.tptp.trace.jvmti.internal.client.context.TIContextAttributes;
45	import org.eclipse.tptp.trace.jvmti.internal.client.context.TIContextUpdaterHelper;	42	import org.eclipse.tptp.trace.jvmti.internal.client.context.TIContextUpdaterHelper;
46	import org.eclipse.tptp.trace.jvmti.internal.client.views.columnlabels.LiveSizeLabelAdapter;	43	import org.eclipse.tptp.trace.jvmti.internal.client.views.columnlabels.LiveSizeLabelAdapter;
Lines 177-183 Link Here
177	_collectedInst = PerftraceUtil.getTotalCollectedInstances(_page.getMOFObject());	174	_collectedInst = PerftraceUtil.getTotalCollectedInstances(_page.getMOFObject());
178	if (_collectedInst < 1)	175	if (_collectedInst < 1)
179	_collectedInst = 1;	176	_collectedInst = 1;
180	//TODO _totalAge = get total age
181	if (_totalAge < 1)	177	if (_totalAge < 1)
182	_totalAge = 1;	178	_totalAge = 1;
183	}	179	}
Lines 202-208 Link Here
202	}	198	}
203		199
204	public String getColumnText(Object element, int columnIndex) {	200	public String getColumnText(Object element, int columnIndex) {
205	StatisticTableColumnInfo info = StatisticTableColumnInfo.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));	201	StatisticViewColumnInfo info = StatisticViewColumnInfo.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));
206	int pos = info.getColumnData().getInitalPos();	202	int pos = info.getColumnData().getInitalPos();
207	String label = "placeholder(view)";	203	String label = "placeholder(view)";
208	ColumnLabelAdapter columnAdapter = getColumnsLabelProvider(pos);	204	ColumnLabelAdapter columnAdapter = getColumnsLabelProvider(pos);
Lines 212-218 Link Here
212	}	208	}
213		209
214	public Image getColumnImage(Object element, int columnIndex) {	210	public Image getColumnImage(Object element, int columnIndex) {
215	StatisticTableColumnInfo info = StatisticTableColumnInfo.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));	211	StatisticViewColumnInfo info = StatisticViewColumnInfo.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));
216	int pos = info.getColumnData().getInitalPos();	212	int pos = info.getColumnData().getInitalPos();
217	Image image = null;	213	Image image = null;
218	ColumnLabelAdapter columnAdapter = getColumnsLabelProvider(pos);	214	ColumnLabelAdapter columnAdapter = getColumnsLabelProvider(pos);
Lines 293-305 Link Here
293		289
294	void updateAgeInfo(Object arr[]) {	290	void updateAgeInfo(Object arr[]) {
295	_ageMap.clear();	291	_ageMap.clear();
		292	_totalAge = 1;
		293	EList listGC = null;
296	for (int i = 0; i < arr.length; i++) {	294	for (int i = 0; i < arr.length; i++) {
297	if (arr[i] instanceof TRCClass) {	295	if (arr[i] instanceof TRCClass) {
298	TRCClass cls = (TRCClass) arr[i];	296	TRCClass cls = (TRCClass) arr[i];
		297	if (cls.getTotalInstances() == 0)
		298	continue;
299	AgeInfo ageInfo = new AgeInfo();	299	AgeInfo ageInfo = new AgeInfo();
300	EList listGC = cls.getPackage().getProcess().getGcEvents();	300	if (listGC == null)
		301	listGC = cls.getPackage().getProcess().getGcEvents();
301	if (null == listGC \|\| listGC.size() == 0)	302	if (null == listGC \|\| listGC.size() == 0)
302	return;	303	return;
		304	_totalAge = listGC.size();
303	EList list = cls.getObjects();	305	EList list = cls.getObjects();
304	int len = list.size();	306	int len = list.size();
305	for (int j = 0; j < len; j++) {	307	for (int j = 0; j < len; j++) {
Lines 320-332 Link Here
320	public int objCount;	322	public int objCount;
321	}	323	}
322		324
323	protected StructuredViewer createTreeViewer(Composite tree) {	325	public void update() {
324	TreeViewer tv = getTreeViewer((Tree) tree);	326	super.update();
325	return tv;	327	if (_page instanceof MemoryAnalysisPage)
		328	((MemoryAnalysisPage) _page).updateFilterAppliedDescription();
		329	}
		330
		331	protected void defaultActionForSelection(ISelection selection) {
		332	// none
326	}	333	}
327		334
328	public void widgetDefaultSelected(SelectionEvent event) {	335	public void widgetDefaultSelected(SelectionEvent event) {
329	if (_page instanceof MemoryAnalysisPage)	336	if (_page instanceof MemoryAnalysisPage)
330	((MemoryAnalysisPage)_page).showAllocDetails();	337	((MemoryAnalysisPage)_page).showAllocDetails();
331	}	338	}
		339
		340	protected SimpleSearchQuery getCurrentFilter() {
		341	if (_page instanceof MemoryAnalysisPage)
		342	return ((MemoryAnalysisPage) _page).getCurrentFilter();
		343	return null;
		344	}
332	}	345	}

Lines 12-25 Link Here

(-)plugin.xml (-33 / +27 lines)
12	</typeDescription>	12	</typeDescription>
13	<typeDescription	13	<typeDescription
14	extension="trace"	14	extension="trace"
15	icon="icons/full/obj16/exectimeantype_obj.gif"	15	icon="icons/full/obj16/thread.gif"
16	name="%JVMTI_ANALYSIS_TYPE_DESCRIPTION_HEAP"	16	name="%JVMTI_ANALYSIS_TYPE_DESCRIPTION_THRD"
17	type="org.eclipse.tptp.analysisType.jvmti.heap"/>	17	type="org.eclipse.tptp.analysisType.jvmti.thread"/>
18	<typeDescription	18	<typeDescription
19	extension="trace"	19	extension="trace"
20	icon="icons/full/obj16/exectimeantype_obj.gif"	20	icon="icons/full/obj16/memleakantype_obj.gif"
21	name="%JVMTI_ANALYSIS_TYPE_DESCRIPTION_THRD"	21	name="%JVMTI_ANALYSIS_TYPE_DESCRIPTION_HEAP"
22	type="org.eclipse.tptp.analysisType.jvmti.thread"/>	22	type="org.eclipse.tptp.analysisType.jvmti.heap"/>
23	</extension>	23	</extension>
24		24
25	<!-- Contribute a view to the TI analysis types -->	25	<!-- Contribute a view to the TI analysis types -->
Lines 77-89 Link Here
77	extension="trace">	77	extension="trace">
78	</analyzerExtension>	78	</analyzerExtension>
79	<analyzerExtension	79	<analyzerExtension
80	class="org.eclipse.hyades.trace.views.actions.internal.OpenMemoryStatisticViewAction"
81	extension="trace"
82	icon="icons/full/obj16/memleakantype_obj.gif"
83	id="org.eclipse.tptp.platform.jvmti.client.ClassInteractions"
84	name="%JVMTI_ANALYSIS_TYPE_VIEW_HEAP"
85	type="org.eclipse.tptp.analysisType.jvmti.heap"/>
86	<analyzerExtension
87	class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatisticViewAction"	80	class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatisticViewAction"
88	extension="trace"	81	extension="trace"
89	icon="icons/full/obj16/thread.gif"	82	icon="icons/full/obj16/thread.gif"
Lines 99-109 Link Here
99	type="org.eclipse.tptp.analysisType.jvmti.thread">	92	type="org.eclipse.tptp.analysisType.jvmti.thread">
100	</analyzerExtension>	93	</analyzerExtension>
101	<analyzerExtension	94	<analyzerExtension
102	class="org.eclipse.tptp.trace.jvmti.internal.client.views.MemoryAnalysisViewer"	95	class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenMemoryAnalysisViewAction"
103	extension="org.eclipse.tptp.trace.jvmti.client.analyzerExtension2"	96	extension="trace"
104	icon="icons/full/obj16/memleakantype_obj.gif"	97	icon="icons/full/obj16/memleakantype_obj.gif"
105	id="org.eclipse.tptp.trace.jvmti.internal.client.views.MemoryAnalysisViewer"	98	id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenMemoryAnalysisViewAction"
106	name="%JVMTI_ANALYSIS_TYPE_VIEW_HEAP_ANALYSIS">	99	name="%JVMTI_ANALYSIS_TYPE_VIEW_HEAP_ANALYSIS"
		100	type="org.eclipse.tptp.analysisType.jvmti.heap">
107	</analyzerExtension>	101	</analyzerExtension>
108	</extension>	102	</extension>
109		103
Lines 176-197 Link Here
176	visible="false"	170	visible="false"
177	id="org.eclipse.tptp.trace.jvmti.threadActionSet">	171	id="org.eclipse.tptp.trace.jvmti.threadActionSet">
178	<action	172	<action
179	label="%JVMTI_ANALYSIS_TYPE_VIEW_THRD"
180	icon="icons/full/obj16/thread.gif"
181	tooltip="%JVMTI_ANALYSIS_TYPE_TOOLTIP_THRD"
182	class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatisticViewAction"
183	toolbarPath="trace/group.statistic"
184	id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatisticViewAction">
185	</action>
186	<action
187	class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatesViewAction"
188	icon="icons/full/cview16/thread_states_view.gif"
189	id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatesViewAction"
190	label="%JVMTI_ANALYSIS_TYPE_VIEW_THRD_STATES"
191	style="push"
192	toolbarPath="trace/group.statistic"
193	tooltip="%JVMTI_ANALYSIS_TYPE_TOOLTIP_THRD_STATES"/>
194	<action
195	class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenCallStackViewAction"	173	class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenCallStackViewAction"
196	icon="icons/full/cview16/call_stack_view.gif"	174	icon="icons/full/cview16/call_stack_view.gif"
197	id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenCallStackViewAction"	175	id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenCallStackViewAction"
Lines 209-214 Link Here
209	toolbarPath="trace/group.statistic"	187	toolbarPath="trace/group.statistic"
210	tooltip="%JVMTI_ANALYSIS_TYPE_TOOLTIP_HEAP_ANALYSIS">	188	tooltip="%JVMTI_ANALYSIS_TYPE_TOOLTIP_HEAP_ANALYSIS">
211	</action>	189	</action>
		190	<action
		191	class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatesViewAction"
		192	icon="icons/full/cview16/thread_states_view.gif"
		193	id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatesViewAction"
		194	label="%JVMTI_ANALYSIS_TYPE_VIEW_THRD_STATES"
		195	style="push"
		196	toolbarPath="trace/group.statistic"
		197	tooltip="%JVMTI_ANALYSIS_TYPE_TOOLTIP_THRD_STATES"/>
		198	<action
		199	label="%JVMTI_ANALYSIS_TYPE_VIEW_THRD"
		200	icon="icons/full/obj16/thread.gif"
		201	tooltip="%JVMTI_ANALYSIS_TYPE_TOOLTIP_THRD"
		202	class="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatisticViewAction"
		203	toolbarPath="trace/group.statistic"
		204	id="org.eclipse.tptp.trace.jvmti.internal.client.views.OpenThreadStatisticViewAction">
		205	</action>
212	</actionSet>	206	</actionSet>
213	</extension>	207	</extension>
214	<extension	208	<extension

Lines 33-36 Link Here

(-)src/org/eclipse/tptp/trace/jvmti/internal/client/AllocationSite.java (+43 lines)
33	_method = method;	33	_method = method;
34	_lineNo = lineNo;	34	_lineNo = lineNo;
35	}	35	}
		36
		37	public String getPackageName() {
		38	String name = null;
		39	if (_method != null && _method.getDefiningClass() != null
		40	&& _method.getDefiningClass().getPackage() != null) {
		41	name = _method.getDefiningClass().getPackage().getName();
		42	}
		43	return name;
		44	}
		45
		46	public String getClassName() {
		47	String name = null;
		48	if (_method != null && _method.getDefiningClass() != null) {
		49	name = _method.getDefiningClass().getName();
		50	}
		51	return name;
		52	}
		53
		54	public String getMethodName() {
		55	String name = null;
		56	if (_method != null) {
		57	name = _method.getName();
		58	}
		59	return name;
		60	}
		61
		62	public void clear() {
		63	_lineNo = 0;
		64	_total = 0;
		65	_sumAges = 0;
		66	_collected = 0;
		67	_totalSize = 0;
		68	_collectedSize = 0;
		69	_method = null;
		70	}
		71
		72	public void sumOf(final AllocationSite a) {
		73	_total += a._total;
		74	_sumAges += a._sumAges;
		75	_collected += a._collected;
		76	_totalSize += a._totalSize;
		77	_collectedSize += a._collectedSize;
		78	}
36	}	79	}

Lines 36-41 Link Here

(-)src/org/eclipse/tptp/trace/jvmti/internal/client/views/UIMessages.java (-2 / +7 lines)
36	public static String _Stopped;	36	public static String _Stopped;
37	public static String _Unknown;	37	public static String _Unknown;
38		38
		39	// state strings lower case
39	public static String _not_started;	40	public static String _not_started;
40	public static String _running;	41	public static String _running;
41	public static String _sleeping;	42	public static String _sleeping;
Lines 65-71 Link Here
65	public static String _THREAD_GROUP_NAME;	66	public static String _THREAD_GROUP_NAME;
66	public static String _THREAD_START_TIME;	67	public static String _THREAD_START_TIME;
67	public static String _THREAD_STOP_TIME;	68	public static String _THREAD_STOP_TIME;
68	public static String _DURATION;
69	public static String _THREAD_STATE;	69	public static String _THREAD_STATE;
70	public static String _THREAD_RUNNING_TIME;	70	public static String _THREAD_RUNNING_TIME;
71	public static String _THREAD_SLEEPING_TIME;	71	public static String _THREAD_SLEEPING_TIME;
Lines 74-84 Link Here
74	public static String _THREAD_DEADLOCKED_TIME;	74	public static String _THREAD_DEADLOCKED_TIME;
75	public static String _THREAD_BLOCK_COUNT;	75	public static String _THREAD_BLOCK_COUNT;
76	public static String _THREAD_DEADLOCK_COUNT;	76	public static String _THREAD_DEADLOCK_COUNT;
77
78	public static String _THREAD_MONITOR;	77	public static String _THREAD_MONITOR;
		78
		79	// misc
		80	public static String _Delta;
		81	public static String _ShowAsPercentage;
		82	public static String _ShowDeltaColumns;
79	public static String _MONITOR_OWNER;	83	public static String _MONITOR_OWNER;
80	public static String _TIMEOUT;	84	public static String _TIMEOUT;
81	public static String _OBJECT_WAITING_FOR;	85	public static String _OBJECT_WAITING_FOR;
		86	public static String _DURATION;
82		87
83	private UIMessages() {	88	private UIMessages() {
84	// Do not instantiate	89	// Do not instantiate

Lines 14-20 Link Here

(-)src/org/eclipse/tptp/trace/jvmti/internal/client/views/AllocationDetailsView.java (-69 / +88 lines)
14		14
15	package org.eclipse.tptp.trace.jvmti.internal.client.views;	15	package org.eclipse.tptp.trace.jvmti.internal.client.views;
16		16
17	import java.util.ArrayList;
18	import java.util.HashMap;	17	import java.util.HashMap;
19	import java.util.Map;	18	import java.util.Map;
20		19
Lines 23-32 Link Here
23	import org.eclipse.hyades.models.trace.TRCFullTraceObject;	22	import org.eclipse.hyades.models.trace.TRCFullTraceObject;
24	import org.eclipse.hyades.models.trace.TRCMethod;	23	import org.eclipse.hyades.models.trace.TRCMethod;
25	import org.eclipse.hyades.models.trace.TRCObjectAllocationAnnotation;	24	import org.eclipse.hyades.models.trace.TRCObjectAllocationAnnotation;
26	import org.eclipse.hyades.models.trace.TRCPackage;
27	import org.eclipse.hyades.trace.ui.TraceViewerPage;	25	import org.eclipse.hyades.trace.ui.TraceViewerPage;
		26	import org.eclipse.hyades.trace.ui.internal.util.TString;
28	import org.eclipse.hyades.trace.views.util.internal.ColumnData;	27	import org.eclipse.hyades.trace.views.util.internal.ColumnData;
29	import org.eclipse.hyades.trace.views.util.internal.StatisticTableColumnInfo;
30	import org.eclipse.hyades.ui.provisional.context.IContextLabelFormatProvider;	28	import org.eclipse.hyades.ui.provisional.context.IContextLabelFormatProvider;
31	import org.eclipse.hyades.ui.util.GridUtil;	29	import org.eclipse.hyades.ui.util.GridUtil;
32	import org.eclipse.jface.viewers.Viewer;	30	import org.eclipse.jface.viewers.Viewer;
Lines 58-63 Link Here
58	private TRCClass _class;	56	private TRCClass _class;
59	private int _nextIndex;	57	private int _nextIndex;
60	private Label _label;	58	private Label _label;
		59	AllocationSite _allocAll = new AllocationSite();
61	static final Object _emptyArr[] = new Object[0];	60	static final Object _emptyArr[] = new Object[0];
62		61
63	protected AllocationDetailsView(Composite parent, TraceViewerPage page) {	62	protected AllocationDetailsView(Composite parent, TraceViewerPage page) {
Lines 72-88 Link Here
72	return "viewoption.allocdetails";	71	return "viewoption.allocdetails";
73	}	72	}
74		73
75	protected Composite createControl(Composite parent, ArrayList cols) {	74	protected void createLabel(Composite viewContainer) {
76	Composite comp = super.createControl(parent, cols);	75	_label = _toolkit.createLabel(viewContainer, null);
77	_label = _toolkit.createLabel(comp, null);
78	Font font = _label.getFont();	76	Font font = _label.getFont();
79	FontData fd = font.getFontData()[0];	77	FontData fd = font.getFontData()[0];
80	font = new Font(null, new FontData(fd.getName(), fd.getHeight() * 3 / 2, fd.getStyle()));	78	font = new Font(null, new FontData(fd.getName(), fd.getHeight() * 3 / 2, fd.getStyle()));
81	_label.setFont(font);	79	_label.setFont(font);
82	_label.setBackground(comp.getBackground());	80	_label.setBackground(viewContainer.getBackground());
83	_label.setForeground(new Color(null, 0, 0, 200));	81	_label.setForeground(new Color(null, 0, 0, 200));
84	_label.setLayoutData(GridUtil.createHorizontalFill());	82	_label.setLayoutData(GridUtil.createHorizontalFill());
85	return comp;
86	}	83	}
87		84
88	protected String getDefaultColumnsTemplate() {	85	protected String getDefaultColumnsTemplate() {
Lines 100-186 Link Here
100	;	97	;
101	}	98	}
102		99
		100	String formatPercent(int val, int max) {
		101	String s = max > 0 && max >= val ?
		102	TString.formatAsPercentage((double)val / (double)max) : "";
		103	return s;
		104	}
		105
103	public String getColumnText(Object element, int columnIndex) {	106	public String getColumnText(Object element, int columnIndex) {
104	StatisticTableColumnInfo info = StatisticTableColumnInfo	107	StatisticViewColumnInfo info = StatisticViewColumnInfo
105	.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));	108	.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));
106	int pos = info.getColumnData().getInitalPos();	109	int pos = info.getColumnData().getInitalPos();
107	String label = "";	110	String label = "";
108	if (!(element instanceof AllocationSite))	111	if (!(element instanceof AllocationSite))
109	return label;	112	return label;
		113	boolean noperc = !isShowPercent();
110	AllocationSite allocSite = (AllocationSite) element;	114	AllocationSite allocSite = (AllocationSite) element;
111	switch (pos) {	115	switch (pos) {
112	case AD_COL_METHOD_NAME:	116	case AD_COL_METHOD_NAME:
113	if (allocSite._method != null)	117	label = allocSite.getMethodName();
114	label = allocSite._method.getName();
115	break;	118	break;
116	case AD_COL_CLASS_NAME:	119	case AD_COL_CLASS_NAME:
117	if (allocSite._method != null &&	120	label = allocSite.getClassName();
118	allocSite._method.getDefiningClass() != null)
119	label = allocSite._method.getDefiningClass().getName();
120	break;	121	break;
121	case AD_COL_PACKAGE_NAME:	122	case AD_COL_PACKAGE_NAME:
122	if (allocSite._method != null &&	123	label = allocSite.getPackageName();
123	allocSite._method.getDefiningClass() != null &&
124	allocSite._method.getDefiningClass().getPackage() != null)
125	label = allocSite._method.getDefiningClass().getPackage().getName();
126	break;	124	break;
127	case AD_COL_LINE_NO:	125	case AD_COL_LINE_NO:
128	label = "" + allocSite._lineNo;	126	label = String.valueOf(allocSite._lineNo);
129	break;	127	break;
130	case AD_COL_TOTAL_INST:	128	case AD_COL_TOTAL_INST:
131	label = "" + allocSite._total;	129	if (noperc)
		130	label = String.valueOf(allocSite._total);
		131	else
		132	label = formatPercent(allocSite._total, _allocAll._total);
132	break;	133	break;
133	case AD_COL_TOTAL_SIZE:	134	case AD_COL_TOTAL_SIZE:
134	label = "" + allocSite._totalSize;	135	if (noperc)
		136	label = String.valueOf(allocSite._totalSize);
		137	else
		138	label = formatPercent(allocSite._totalSize, _allocAll._totalSize);
135	break;	139	break;
136	case AD_COL_LIVE_INST:	140	case AD_COL_LIVE_INST:
137	label = "" + (allocSite._total - allocSite._collected);	141	if (noperc)
		142	label = String.valueOf(allocSite._total - allocSite._collected);
		143	else
		144	label = formatPercent(allocSite._total - allocSite._collected,
		145	_allocAll._total - _allocAll._collected);
138	break;	146	break;
139	case AD_COL_LIVE_SIZE:	147	case AD_COL_LIVE_SIZE:
140	label = "" + (allocSite._totalSize - allocSite._collectedSize);	148	if (noperc)
		149	label = String.valueOf(allocSite._totalSize - allocSite._collectedSize);
		150	else
		151	label = formatPercent(allocSite._totalSize - allocSite._collectedSize,
		152	_allocAll._totalSize - _allocAll._collectedSize);
141	break;	153	break;
142	case AD_COL_AVG_AGE:	154	case AD_COL_AVG_AGE:
143	double age = 0;	155	if (noperc) {
144	if (allocSite._total > 0) {	156	double age = 0;
145	age = (double) allocSite._sumAges / allocSite._total;	157	if (allocSite._total > 0) {
146	label = "" + age;	158	age = (double) allocSite._sumAges / allocSite._total;
		159	label = String.valueOf(age);
		160	}
		161	IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.CALL_SITE_AVG_AGE);
		162	label = formatter.getDisplayStringFromElement(new Double(age), null, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);
		163	} else {
		164	label = formatPercent(allocSite._sumAges, _allocAll._sumAges);
147	}	165	}
148	IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.CALL_SITE_AVG_AGE);
149	label = formatter.getDisplayStringFromElement(new Double(age), null, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);
150	break;	166	break;
151	}	167	}
		168	if (null == label)
		169	label = "";
152	return label;	170	return label;
153	}	171	}
154		172
155	public Image getColumnImage(Object element, int columnIndex) {	173	public Image getColumnImage(Object element, int columnIndex) {
156	StatisticTableColumnInfo info = StatisticTableColumnInfo.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));	174	StatisticViewColumnInfo info = StatisticViewColumnInfo.getStatisticTableColumnInfo(getTree().getColumn(columnIndex));
157	int pos = info.getColumnData().getInitalPos();	175	int pos = info.getColumnData().getInitalPos();
158	Image image = null;	176	Image image = null;
159	if (!(element instanceof AllocationSite))	177	if (!(element instanceof AllocationSite))
160	return image;	178	return image;
161	AllocationSite allocSite = (AllocationSite) element;	179	AllocationSite allocSite = (AllocationSite) element;
		180	String name = null;
162	switch (pos) {	181	switch (pos) {
163	case AD_COL_METHOD_NAME:	182	case AD_COL_METHOD_NAME:
164	if (allocSite._method != null) {	183	name = allocSite.getMethodName();
		184	if (name != null) {
165	IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.METHOD_NAME);	185	IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.METHOD_NAME);
166	image = formatter.getDisplayImageByElement(allocSite._method.getName(), allocSite._method, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);	186	image = formatter.getDisplayImageByElement(name, null, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);
167	}	187	}
168	break;	188	break;
169	case AD_COL_CLASS_NAME:	189	case AD_COL_CLASS_NAME:
170	if (allocSite._method != null &&	190	name = allocSite.getClassName();
171	allocSite._method.getDefiningClass() != null) {	191	if (name != null) {
172	TRCClass cls = allocSite._method.getDefiningClass();
173	IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.CLASS_NAME);	192	IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.CLASS_NAME);
174	image = formatter.getDisplayImageByElement(cls.getName(), cls, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);	193	image = formatter.getDisplayImageByElement(name, null, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);
175	}	194	}
176	break;	195	break;
177	case AD_COL_PACKAGE_NAME:	196	case AD_COL_PACKAGE_NAME:
178	if (allocSite._method != null &&	197	name = allocSite.getPackageName();
179	allocSite._method.getDefiningClass() != null &&	198	if (name != null) {
180	allocSite._method.getDefiningClass().getPackage() != null) {
181	TRCPackage pkg = allocSite._method.getDefiningClass().getPackage();
182	IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.PACKAGE_NAME);	199	IContextLabelFormatProvider formatter = TIContextProvider.instance().getContextLabelFormatProvider(TIContextAttributes.PACKAGE_NAME);
183	image = formatter.getDisplayImageByElement(pkg.getName(), pkg, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);	200	image = formatter.getDisplayImageByElement(name, null, IContextLabelFormatProvider.MODE_COLUMN_CONTENT);
184	}	201	}
185	break;	202	break;
186	}	203	}
Lines 194-223 Link Here
194	AllocationSite a1 = (AllocationSite) e1;	211	AllocationSite a1 = (AllocationSite) e1;
195	AllocationSite a2 = (AllocationSite) e2;	212	AllocationSite a2 = (AllocationSite) e2;
196	switch (pos) {	213	switch (pos) {
197	case AD_COL_METHOD_NAME:
198	ret = Utils.compare(a1._method != null ? a1._method.getName() : null
199	, a2._method != null ? a2._method.getName() : null);
200	break;
201	case AD_COL_CLASS_NAME:
202	ret = Utils.compare(a1._method != null &&
203	a1._method.getDefiningClass() != null ?
204	a1._method.getDefiningClass().getName() : null
205	, a2._method != null &&
206	a2._method.getDefiningClass() != null ?
207	a2._method.getDefiningClass().getName() : null);
208	break;
209	case AD_COL_PACKAGE_NAME:	214	case AD_COL_PACKAGE_NAME:
210	ret = Utils.compare(a1._method != null &&	215	if (0 == ret) {
211	a1._method.getDefiningClass() != null &&	216	ret = Utils.compare(a1.getPackageName(), a2.getPackageName());
212	a1._method.getDefiningClass().getPackage() != null ?	217	}
213	a1._method.getDefiningClass().getPackage().getName() : null	218	//break;
214	, a2._method != null &&	219	case AD_COL_CLASS_NAME:
215	a2._method.getDefiningClass() != null &&	220	if (0 == ret) {
216	a2._method.getDefiningClass().getPackage() != null ?	221	ret = Utils.compare(a1.getClassName(), a2.getClassName());
217	a2._method.getDefiningClass().getPackage().getName() : null);	222	}
218	break;	223	//break;
		224	case AD_COL_METHOD_NAME:
		225	if (0 == ret) {
		226	ret = Utils.compare(a1.getMethodName(), a2.getMethodName());
		227	}
		228	//break;
219	case AD_COL_LINE_NO:	229	case AD_COL_LINE_NO:
220	ret = a1._lineNo - a2._lineNo;	230	if (0 == ret) {
		231	ret = a1._lineNo - a2._lineNo;
		232	}
221	break;	233	break;
222	case AD_COL_TOTAL_INST:	234	case AD_COL_TOTAL_INST:
223	ret = a1._total - a2._total;	235	ret = a1._total - a2._total;
Lines 232-240 Link Here
232	ret = (a1._totalSize - a1._collectedSize) - (a2._totalSize - a2._collectedSize);	244	ret = (a1._totalSize - a1._collectedSize) - (a2._totalSize - a2._collectedSize);
233	break;	245	break;
234	case AD_COL_AVG_AGE:	246	case AD_COL_AVG_AGE:
235	double age1 = a1._total > 0 ? a1._sumAges / a1._total : 0;	247	ret = a1._sumAges - a2._sumAges;
236	double age2 = a2._total > 0 ? a2._sumAges / a2._total : 0;
237	ret = Utils.compare(age1, age2);
238	break;	248	break;
239	}	249	}
240	return ret;	250	return ret;
Lines 266-281 Link Here
266	_class = (TRCClass) obj;	276	_class = (TRCClass) obj;
267	_nextIndex = 0;	277	_nextIndex = 0;
268	_allocSites.clear();	278	_allocSites.clear();
		279	_allocAll.clear();
269	String text = Utils.getPackageClassName(_class);	280	String text = Utils.getPackageClassName(_class);
270	if (text.length() > 0)	281	if (text.length() > 0)
271	text = "Allocation details for '" + text + "'";	282	text = "Allocation details for '" + text + "'";
272	_label.setText(text);	283	_label.setText(text);
273	//_label.getParent().layout();
274	}	284	}
275	refresh();	285	refresh();
276	}	286	}
277		287
278	void updateData() {	288	void updateData() {
		289	_nextIndex = 0;
		290	_allocSites.clear();
		291	_allocAll.clear();
279	if (null == _class)	292	if (null == _class)
280	return;	293	return;
281	TRCObjectAllocationAnnotation aa = Utils.getAllocationAnnotation(_class);	294	TRCObjectAllocationAnnotation aa = Utils.getAllocationAnnotation(_class);
Lines 309-322 Link Here
309	int j = i + i + 1;	322	int j = i + i + 1;
310	if (j < objectsLen && objects.get(j) instanceof TRCFullTraceObject) {	323	if (j < objectsLen && objects.get(j) instanceof TRCFullTraceObject) {
311	TRCFullTraceObject trObj = (TRCFullTraceObject) objects.get(j);	324	TRCFullTraceObject trObj = (TRCFullTraceObject) objects.get(j);
		325	int objSize = trObj.getSize();
312	if (trObj.getCollectTime() > 0) {	326	if (trObj.getCollectTime() > 0) {
313	allocSite._collected++;	327	allocSite._collected++;
314	allocSite._collectedSize += trObj.getSize();	328	allocSite._collectedSize += objSize;
		329	_allocAll._collected++;
		330	_allocAll._collectedSize += objSize;
315	}	331	}
316	allocSite._totalSize += trObj.getSize();
317	int age = Utils.getObjAge(trObj, listGC);	332	int age = Utils.getObjAge(trObj, listGC);
		333	allocSite._totalSize += objSize;
318	allocSite._sumAges += age;	334	allocSite._sumAges += age;
319	allocSite._total++;	335	allocSite._total++;
		336	_allocAll._totalSize += objSize;
		337	_allocAll._sumAges += age;
		338	_allocAll._total++;
320	}	339	}
321	}	340	}
322	_nextIndex = lineNoLen;	341	_nextIndex = lineNoLen;

Added Link Here

(-)src/org/eclipse/tptp/trace/jvmti/internal/client/views/StatisticViewColumnInfo.java (+83 lines)
1	/**********************************************************************
2	* Copyright (c) 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: StatisticTableColumnInfo.java,v 1.4 2005/08/10 02:37:48 popescu Exp $
8	*
9	* Contributors:
10	* IBM - Initial API and implementation
11	**********************************************************************/
12	package org.eclipse.tptp.trace.jvmti.internal.client.views;
13
14	import org.eclipse.hyades.trace.views.util.internal.ColumnData;
15	import org.eclipse.swt.*;
16	import org.eclipse.swt.widgets.*;
17
18	/**
19	* This class was ported from hyades project for JVMTI trace client.
20	*/
21	public class StatisticViewColumnInfo {
22
23	private boolean _isSortColumn = false;
24	private boolean _isDeltaColumn = false;
25	private ColumnData _columnData;
26
27	public ColumnData getColumnData() {
28	return _columnData;
29	}
30
31	public boolean isSortColumn() {
32	return _isSortColumn;
33	}
34
35	public boolean isDeltaColumn() {
36	return _isDeltaColumn;
37	}
38
39	public void setSortColumn(boolean flag) {
40	_isSortColumn = flag;
41	}
42
43	public void setDeltaColumn(boolean flag) {
44	_isDeltaColumn = flag;
45	}
46
47	static public StatisticViewColumnInfo getStatisticTableColumnInfo(TreeColumn col) {
48	if (col.getData() != null && col.getData() instanceof StatisticViewColumnInfo) {
49	return (StatisticViewColumnInfo) (col.getData());
50	} else {
51	return null;
52	}
53	}
54
55	private StatisticViewColumnInfo(BaseStatisticView statisticView, ColumnData data) {
56	TreeColumn treeColumn = new TreeColumn(statisticView.getTree(), SWT.NULL \| SWT.NO_BACKGROUND \| data.getAlignment());
57	treeColumn.setData(this);
58	initializeTreeColumn(statisticView, treeColumn, data, true);
59	}
60
61	public StatisticViewColumnInfo(BaseStatisticView statisticView, ColumnData data, boolean deltaColumnsEnabled) {
62	TreeColumn treeColumn = new TreeColumn(statisticView.getTree(), SWT.NULL \| SWT.NO_BACKGROUND \| data.getAlignment());
63	treeColumn.setData(this);
64	initializeTreeColumn(statisticView, treeColumn, data, false);
65	if (deltaColumnsEnabled && data.supportsDelta()) {
66	new StatisticViewColumnInfo(statisticView, data);
67	}
68	}
69
70	private void initializeTreeColumn(BaseStatisticView statisticView, TreeColumn treeColumn, ColumnData data, boolean isDeltaColumn) {
71	_columnData = data;
72	_isDeltaColumn = isDeltaColumn;
73	treeColumn.setResizable(data.isResizable());
74	if (isDeltaColumn) {
75	treeColumn.setText(UIMessages._Delta + ":" + data.name());
76	} else {
77	treeColumn.setText(data.name());
78	}
79	treeColumn.setWidth(data.width());
80	treeColumn.addSelectionListener(statisticView);
81	treeColumn.addControlListener(statisticView);
82	}
83	}