Attachment 93094 Details for Bug 166640 – patch for the org.eclipse.tptp.trace.jvmti.client

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

[patch] patch for the org.eclipse.tptp.trace.jvmti.client

166640_2.txt (text/plain), 10.94 KB, created by Igor Alelekov

on 2008-03-21 03:47:49 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Alelekov

Created: 2008-03-21 03:47:49 EDT

Size: 10.94 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.trace.jvmti.client
>Index: src/org/eclipse/tptp/trace/jvmti/internal/client/views/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.tptp.trace.jvmti.client/src/org/eclipse/tptp/trace/jvmti/internal/client/views/messages.properties,v
>retrieving revision 1.16
>diff -u -r1.16 messages.properties
>--- src/org/eclipse/tptp/trace/jvmti/internal/client/views/messages.properties	20 Mar 2008 16:00:36 -0000	1.16
>+++ src/org/eclipse/tptp/trace/jvmti/internal/client/views/messages.properties	21 Mar 2008 07:19:41 -0000
>@@ -126,4 +126,6 @@
> _MONITOR_THREADS_TAB = Threads Statistics
> _MONITOR_CLASSES_TAB = Monitor Classes Statistics
> _MONITOR_BLOCKED_TAB = Blocks Statistics
>-_MONITOR_WAITING_TAB = Waits Statistics
>\ No newline at end of file
>+_MONITOR_WAITING_TAB = Waits Statistics
>+
>+MEM_ALLOCATION_DETAILS_FOR = Allocation details for
>\ No newline at end of file
>Index: src/org/eclipse/tptp/trace/jvmti/internal/client/views/AllocationDetailsView.java
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.tptp.trace.jvmti.client/src/org/eclipse/tptp/trace/jvmti/internal/client/views/AllocationDetailsView.java,v
>retrieving revision 1.7
>diff -u -r1.7 AllocationDetailsView.java
>--- src/org/eclipse/tptp/trace/jvmti/internal/client/views/AllocationDetailsView.java	30 May 2007 15:29:23 -0000	1.7
>+++ src/org/eclipse/tptp/trace/jvmti/internal/client/views/AllocationDetailsView.java	21 Mar 2008 07:19:41 -0000
>@@ -1,5 +1,5 @@
> /*****************************************************************************
>- * Copyright (c) 2007, Intel Corporation.
>+ * Copyright (c) 2008, 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
>@@ -28,6 +28,7 @@
> import org.eclipse.hyades.ui.provisional.context.IContextLabelFormatProvider;
> import org.eclipse.hyades.ui.util.GridUtil;
> import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.graphics.Color;
> import org.eclipse.swt.graphics.Font;
>@@ -39,6 +40,7 @@
> import org.eclipse.tptp.trace.jvmti.internal.client.context.TIContextAttributes;
> import org.eclipse.tptp.trace.jvmti.internal.client.context.TIContextProvider;
> import org.eclipse.tptp.trace.jvmti.internal.client.widgets.Utils;
>+import org.eclipse.ui.forms.IFormColors;
> 
> /**
>  * Allocation Details view provides allocation info for objects
>@@ -77,7 +79,7 @@
> 		return "org.eclipse.hyades.trace.views.statistic.allocdetails04";
> 	}
> 
>-	protected String getViewTypeStr() {
>+	protected String getViewTypeStr() { 
> 		return "viewoption.allocdetails";
> 	}
> 	
>@@ -85,10 +87,10 @@
> 		_label = _toolkit.createLabel(viewContainer, null);
> 		Font font = _label.getFont();
> 		FontData fd = font.getFontData()[0];
>-		font = new Font(null, new FontData(fd.getName(), fd.getHeight() * 3 / 2, fd.getStyle()));
>+		font = new Font(null, new FontData(fd.getName(), fd.getHeight() * 3 / 2, fd.getStyle() | SWT.BOLD));
> 		_label.setFont(font);
> 		_label.setBackground(viewContainer.getBackground());
>-		_label.setForeground(new Color(null, 0, 0, 200));
>+		_label.setForeground(_toolkit.getColors().getColor(IFormColors.TITLE));
> 		_label.setLayoutData(GridUtil.createHorizontalFill());
> 	}
> 
>@@ -287,7 +289,7 @@
> 			_allocAll.clear();
> 			String text = Utils.getPackageClassName(_class);
> 			if (text.length() > 0)
>-				text = "Allocation details for '" + text + "'";
>+				text = UIMessages.MEM_ALLOCATION_DETAILS_FOR + " '" + text + "'";
> 			_label.setText(text);
> 		}
> 		update();
>Index: src/org/eclipse/tptp/trace/jvmti/internal/client/views/BaseMemoryStatisticView.java
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.tptp.trace.jvmti.client/src/org/eclipse/tptp/trace/jvmti/internal/client/views/BaseMemoryStatisticView.java,v
>retrieving revision 1.5
>diff -u -r1.5 BaseMemoryStatisticView.java
>--- src/org/eclipse/tptp/trace/jvmti/internal/client/views/BaseMemoryStatisticView.java	30 May 2007 14:40:07 -0000	1.5
>+++ src/org/eclipse/tptp/trace/jvmti/internal/client/views/BaseMemoryStatisticView.java	21 Mar 2008 07:19:41 -0000
>@@ -1,5 +1,5 @@
> /*****************************************************************************
>- * Copyright (c) 2007, Intel Corporation.
>+ * Copyright (c) 2007, 2008 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
>@@ -26,6 +26,8 @@
> import org.eclipse.hyades.models.trace.impl.TRCPackageImpl;
> import org.eclipse.hyades.models.trace.impl.TRCClassImpl.TRCClassSnapshot;
> import org.eclipse.hyades.models.trace.impl.TRCPackageImpl.TRCPackageSnapshot;
>+import org.eclipse.hyades.trace.ui.FilterTraceViewer;
>+import org.eclipse.hyades.trace.ui.TraceViewer;
> import org.eclipse.hyades.trace.ui.TraceViewerPage;
> import org.eclipse.hyades.trace.ui.internal.util.PerftraceUtil;
> import org.eclipse.hyades.trace.views.adapter.internal.DynamicFilter;
>@@ -33,11 +35,22 @@
> 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.hyades.ui.filters.internal.actions.FiltersEditorAction;
>+import org.eclipse.hyades.ui.filters.internal.util.FilterInformationManager;
>+import org.eclipse.hyades.ui.util.GridUtil;
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.osgi.util.NLS;
>+import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.events.SelectionListener;
>+import org.eclipse.swt.graphics.Font;
>+import org.eclipse.swt.graphics.FontData;
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Label;
>+import org.eclipse.swt.widgets.Link;
>+import org.eclipse.tptp.platform.common.ui.trace.internal.CommonUITraceMessages;
> 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;
>@@ -48,9 +61,9 @@
> import org.eclipse.tptp.trace.jvmti.internal.client.views.columnlabels.TotalInstancesLabelAdapter;
> import org.eclipse.tptp.trace.jvmti.internal.client.views.columnlabels.TotalSizeLabelAdapter;
> import org.eclipse.tptp.trace.jvmti.internal.client.widgets.Utils;
>+import org.eclipse.ui.forms.IFormColors;
> 
> public class BaseMemoryStatisticView extends BaseStatisticView {
>-
> 	static public final int CLASS_MODE = 0; // CM
> 	static public final int PACKAGE_MODE = 1;// PM
> 	// class mode
>@@ -86,6 +99,7 @@
> 	private ColumnLabelAdapter _packageModeCols[] = new ColumnLabelAdapter[PM_COL_NUM];
> 	private ColumnLabelAdapter _classModeCols[] = new ColumnLabelAdapter[CM_COL_NUM];
> 	private Map _ageMap = new Hashtable();
>+	private Link setFilter;
> 
> 	public BaseMemoryStatisticView(Composite parent, TraceViewerPage page) {
> 		super(parent, page);
>@@ -325,12 +339,13 @@
> 
> 	public void update() {
> 		super.update();
>-		if (_page instanceof MemoryAnalysisPage)
>+		if (_page instanceof MemoryAnalysisPage) {
> 			((MemoryAnalysisPage) _page).updateFilterAppliedDescription();
>+	    	setFilter.setText(NLS.bind(CommonUITraceMessages.CHOOSE_FILTER_MSG, getCurrentFilterName()));
>+		}
> 	}
> 
> 	protected void defaultActionForSelection(ISelection selection) {
>-		// none
> 	}
> 
> 	public void widgetDefaultSelected(SelectionEvent event) {
>@@ -343,4 +358,57 @@
> 			return ((MemoryAnalysisPage) _page).getCurrentFilter();
> 		return null;
> 	}
>+	
>+	protected void createLabel(Composite viewContainer) {
>+		Label _label = _toolkit.createLabel(viewContainer, null);
>+		
>+		_label.setBackground(viewContainer.getBackground());
>+    	_label.setForeground(_toolkit.getColors().getColor(IFormColors.TITLE));
>+
>+    	Font font = _label.getFont();
>+    	FontData fd = font.getFontData()[0];
>+    	font = new Font(null, new FontData(fd.getName(), fd.getHeight()*3/2, fd.getStyle() | SWT.BOLD));
>+    	_label.setFont(font);
>+    	
>+		_label.setLayoutData(GridUtil.createHorizontalFill());
>+		
>+		_label.setText(UIMessages.MEM_STATISTICS_TITLE);
>+
>+    	setFilter = new Link(viewContainer, SWT.WRAP | _toolkit.getOrientation());
>+    	setFilter.setBackground(_toolkit.getColors().getBackground());
>+    	setFilter.setForeground(_toolkit.getColors().getColor(IFormColors.TITLE));
>+    	font = setFilter.getFont();
>+    	fd = font.getFontData()[0];
>+    	font = new Font(null, new FontData(fd.getName(), fd.getHeight(), fd.getStyle() | SWT.BOLD));
>+    	setFilter.setFont(font);
>+    	setFilter.addSelectionListener(new SelectionListener() {
>+    		public void widgetDefaultSelected(SelectionEvent e) {}
>+    	
>+    		public void widgetSelected(SelectionEvent e) {
>+    			if (_page != null && _page instanceof MemoryAnalysisPage) {
>+    				TraceViewer viewer = ((MemoryAnalysisPage) _page).getTraceViewer();
>+    				if (viewer != null && viewer instanceof FilterTraceViewer) {
>+    					FilterInformationManager fim = ((FilterTraceViewer) viewer).getFilterInformationManager();
>+        				FiltersEditorAction feAction = new FiltersEditorAction(fim, true);
>+        				feAction.run();
>+    				}
>+    			}
>+    		}
>+    	});
>+    	
>+    	setFilter.setLayoutData(GridUtil.createHorizontalFill());
>+    	setFilter.setText(NLS.bind(CommonUITraceMessages.CHOOSE_FILTER_MSG, getCurrentFilterName()));
>+	}
>+	
>+	public String getCurrentFilterName() {
>+		String filterAppliedName;
>+	
>+		SimpleSearchQuery cf = getCurrentFilter();
>+		if (cf != null)
>+			filterAppliedName = cf.getName();
>+		else
>+			filterAppliedName = CommonUITraceMessages.ST_FLTAPN;
>+		
>+		return filterAppliedName;
>+	}
> }
>Index: src/org/eclipse/tptp/trace/jvmti/internal/client/views/UIMessages.java
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.tptp.trace.jvmti.client/src/org/eclipse/tptp/trace/jvmti/internal/client/views/UIMessages.java,v
>retrieving revision 1.16
>diff -u -r1.16 UIMessages.java
>--- src/org/eclipse/tptp/trace/jvmti/internal/client/views/UIMessages.java	20 Mar 2008 16:00:36 -0000	1.16
>+++ src/org/eclipse/tptp/trace/jvmti/internal/client/views/UIMessages.java	21 Mar 2008 07:19:41 -0000
>@@ -129,6 +129,8 @@
> 	public static String _MONITOR_BLOCKED_TAB;
> 	public static String _MONITOR_WAITING_TAB;	
> 	
>+	public static String MEM_ALLOCATION_DETAILS_FOR;
>+	
> 	private UIMessages() {
> 		// Do not instantiate
> 	}

Actions: View | Diff

Attachments on bug 166640: 54974 | 54975 | 65186 | 65187 | 93091 | 93094