Attachment 159709 Details for Bug 255026 – Use inspector hover in DSF-GDB

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

[patch] Use inspector hover in DSF-GDB

zpatch1.txt (text/plain), 13.71 KB, created by Marc Khouzam

on 2010-02-21 10:33:05 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2010-02-21 10:33:05 EST

Size: 13.71 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/gdb/IGdbDebugPreferenceConstants.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/IGdbDebugPreferenceConstants.java,v
>retrieving revision 1.1
>diff -u -r1.1 IGdbDebugPreferenceConstants.java
>--- src/org/eclipse/cdt/dsf/gdb/IGdbDebugPreferenceConstants.java	5 Jun 2009 02:30:06 -0000	1.1
>+++ src/org/eclipse/cdt/dsf/gdb/IGdbDebugPreferenceConstants.java	21 Feb 2010 15:25:04 -0000
>@@ -1,40 +1,46 @@
>-/*******************************************************************************
>- * Copyright (c) 2009 Ericsson 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
>- * 
>- * Contributors:
>- *     Ericsson - initial implementation
>- *******************************************************************************/
>-package org.eclipse.cdt.dsf.gdb;
>-
>-import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
>-
>-
>-
>-/**
>- * @noimplement This interface is not intended to be implemented by clients.
>- * @since 2.0
>- */
>-public interface IGdbDebugPreferenceConstants {
>-	
>-	/**
>-	 * Boolean preference whether to enable GDB traces. Default is <code>true</code>. 
>-	 */
>-	public static final String PREF_TRACES_ENABLE = "tracesEnable"; //$NON-NLS-1$
>-
>-	/**
>-	 * Boolean preference whether to automatically terminate GDB when the inferior exists. Default is <code>true</code>. 
>-	 */
>-	public static final String PREF_AUTO_TERMINATE_GDB = "autoTerminateGdb"; //$NON-NLS-1$
>-	
>-    /**
>-     * Help prefixes.
>-     */
>-    public static final String PREFIX = GdbPlugin.PLUGIN_ID + "."; //$NON-NLS-1$
>-    
>-    public static final String PREFERENCE_PAGE= PREFIX + "preference_page_context"; //$NON-NLS-1$
>-}
>-
>+/*******************************************************************************
>+ * Copyright (c) 2009 Ericsson 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
>+ * 
>+ * Contributors:
>+ *     Ericsson - initial implementation
>+ *******************************************************************************/
>+package org.eclipse.cdt.dsf.gdb;
>+
>+import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
>+
>+
>+
>+/**
>+ * @noimplement This interface is not intended to be implemented by clients.
>+ * @since 2.0
>+ */
>+public interface IGdbDebugPreferenceConstants {
>+	
>+	/**
>+	 * Boolean preference whether to enable GDB traces. Default is <code>true</code>. 
>+	 */
>+	public static final String PREF_TRACES_ENABLE = "tracesEnable"; //$NON-NLS-1$
>+
>+	/**
>+	 * Boolean preference whether to automatically terminate GDB when the inferior exists. Default is <code>true</code>. 
>+	 */
>+	public static final String PREF_AUTO_TERMINATE_GDB = "autoTerminateGdb"; //$NON-NLS-1$
>+
>+	/**
>+	 * Boolean preference whether to use the advanced Inspect debug text hover. Default is <code>true</code>. 
>+	 * @since 3.0
>+	 */
>+	public static final String PREF_USE_INSPECTOR_HOVER = "useInspectorHover"; //$NON-NLS-1$
>+
>+    /**
>+     * Help prefixes.
>+     */
>+    public static final String PREFIX = GdbPlugin.PLUGIN_ID + "."; //$NON-NLS-1$
>+    
>+    public static final String PREFERENCE_PAGE= PREFIX + "preference_page_context"; //$NON-NLS-1$
>+}
>+
>#P org.eclipse.cdt.dsf.gdb.ui
>Index: src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java,v
>retrieving revision 1.9
>diff -u -r1.9 GdbAdapterFactory.java
>--- src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java	12 Feb 2010 00:57:47 -0000	1.9
>+++ src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java	21 Feb 2010 15:25:05 -0000
>@@ -72,6 +72,7 @@
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicyFactory;
>+import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider;
> import org.eclipse.debug.ui.contexts.ISuspendTrigger;
> import org.eclipse.debug.ui.sourcelookup.ISourceDisplay;
> 
>@@ -123,7 +124,8 @@
>             session.registerModelAdapter(SteppingController.class, fSteppingController);
> 
>             fViewModelAdapter = new GdbViewModelAdapter(session, fSteppingController);
>-
>+            session.registerModelAdapter(IViewerInputProvider.class, fViewModelAdapter);
>+            
>             if (launch.getSourceLocator() instanceof ISourceLookupDirector) {
>                 fSourceDisplayAdapter = new DsfSourceDisplayAdapter(session, (ISourceLookupDirector)launch.getSourceLocator(), fSteppingController);
>             } else {
>Index: src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbDebugTextHover.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbDebugTextHover.java,v
>retrieving revision 1.2
>diff -u -r1.2 GdbDebugTextHover.java
>--- src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbDebugTextHover.java	14 Feb 2010 01:21:42 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbDebugTextHover.java	21 Feb 2010 15:25:05 -0000
>@@ -12,8 +12,10 @@
> package org.eclipse.cdt.dsf.gdb.internal.ui;
> 
> import org.eclipse.cdt.dsf.debug.ui.AbstractDsfDebugTextHover;
>+import org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants;
> import org.eclipse.cdt.dsf.gdb.launching.GdbLaunchDelegate;
> import org.eclipse.cdt.dsf.mi.service.MIExpressions;
>+import org.eclipse.core.runtime.Platform;
> 
> /**
>  * Debug editor text hover for GDB.
>@@ -31,4 +33,14 @@
> 	protected String getHoverFormat() {
>     	return  MIExpressions.DETAILS_FORMAT;
>     }
>+
>+    @Override
>+    protected boolean useExpressionExplorer() {
>+    	if (Platform.getPreferencesService().getBoolean("org.eclipse.cdt.dsf.gdb.ui",  //$NON-NLS-1$
>+				IGdbDebugPreferenceConstants.PREF_USE_INSPECTOR_HOVER,
>+				true, null)) {
>+    		return true;
>+    	}
>+    	return false;
>+    }
> }
>Index: src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java,v
>retrieving revision 1.2
>diff -u -r1.2 GdbDebugPreferencePage.java
>--- src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java	5 Jun 2009 02:30:07 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java	21 Feb 2010 15:25:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009 Ericsson and others.
>+ * Copyright (c) 2009, 2010 Ericsson 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
>@@ -84,6 +84,22 @@
> 		// need to set layout again
> 		group.setLayout(groupLayout);
> 
>+		group= new Group(parent, SWT.NONE);
>+		group.setText(MessagesForPreferences.GdbDebugPreferencePage_hover_label);
>+		groupLayout= new GridLayout(3, false);
>+		group.setLayout(groupLayout);
>+		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>+
>+		boolField= new BooleanFieldEditor(
>+				IGdbDebugPreferenceConstants.PREF_USE_INSPECTOR_HOVER,
>+				MessagesForPreferences.GdbDebugPreferencePage_useInspectorHover_label,
>+				group);
>+
>+		boolField.fillIntoGrid(group, 3);
>+		addField(boolField);
>+		// need to set layout again
>+		group.setLayout(groupLayout);
>+
> 	}
> 
> 	@Override
>Index: src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbPreferenceInitializer.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbPreferenceInitializer.java,v
>retrieving revision 1.2
>diff -u -r1.2 GdbPreferenceInitializer.java
>--- src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbPreferenceInitializer.java	5 Jun 2009 02:30:07 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbPreferenceInitializer.java	21 Feb 2010 15:25:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009 Ericsson and others.
>+ * Copyright (c) 2009, 2010 Ericsson 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
>@@ -24,5 +24,6 @@
> 		IPreferenceStore store = GdbUIPlugin.getDefault().getPreferenceStore();
> 		store.setDefault(IGdbDebugPreferenceConstants.PREF_TRACES_ENABLE, true);
> 		store.setDefault(IGdbDebugPreferenceConstants.PREF_AUTO_TERMINATE_GDB, true);
>+		store.setDefault(IGdbDebugPreferenceConstants.PREF_USE_INSPECTOR_HOVER, true);
> 	}
> }
>Index: src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java,v
>retrieving revision 1.2
>diff -u -r1.2 MessagesForPreferences.java
>--- src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java	5 Jun 2009 02:30:07 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java	21 Feb 2010 15:25:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009 Ericsson and others.
>+ * Copyright (c) 2009, 2010 Ericsson 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
>@@ -23,6 +23,8 @@
> 	public static String GdbDebugPreferencePage_enableTraces_label;
> 	public static String GdbDebugPreferencePage_termination_label;
> 	public static String GdbDebugPreferencePage_autoTerminateGdb_label;
>+	public static String GdbDebugPreferencePage_hover_label;
>+	public static String GdbDebugPreferencePage_useInspectorHover_label;
> 
> 	static {
> 		// initialize resource bundle
>Index: src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/messages.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/messages.properties,v
>retrieving revision 1.2
>diff -u -r1.2 messages.properties
>--- src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/messages.properties	5 Jun 2009 02:30:07 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/messages.properties	21 Feb 2010 15:25:05 -0000
>@@ -16,3 +16,6 @@
> 
> GdbDebugPreferencePage_termination_label=Termination
> GdbDebugPreferencePage_autoTerminateGdb_label=Terminate GDB when last process exits
>+
>+GdbDebugPreferencePage_hover_label=Debug Text Hover
>+GdbDebugPreferencePage_useInspectorHover_label=Use Debug Inspector Hover
>Index: src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbViewModelAdapter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbViewModelAdapter.java,v
>retrieving revision 1.4
>diff -u -r1.4 GdbViewModelAdapter.java
>--- src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbViewModelAdapter.java	19 Feb 2010 23:47:01 -0000	1.4
>+++ src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbViewModelAdapter.java	21 Feb 2010 15:25:05 -0000
>@@ -11,8 +11,10 @@
> package org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel;
> 
> import org.eclipse.cdt.dsf.concurrent.ThreadSafe;
>+import org.eclipse.cdt.dsf.debug.ui.IDsfDebugUIConstants;
> import org.eclipse.cdt.dsf.debug.ui.viewmodel.AbstractDebugVMAdapter;
> import org.eclipse.cdt.dsf.debug.ui.viewmodel.SteppingController;
>+import org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.ExpressionVMProvider;
> import org.eclipse.cdt.dsf.debug.ui.viewmodel.modules.ModulesVMProvider;
> import org.eclipse.cdt.dsf.debug.ui.viewmodel.register.RegisterVMProvider;
> import org.eclipse.cdt.dsf.gdb.internal.ui.viewmodel.breakpoints.GdbBreakpointVMProvider;
>@@ -50,6 +52,8 @@
>             return new RegisterVMProvider(this, context, getSession());
>         } else if (IDebugUIConstants.ID_EXPRESSION_VIEW.equals(context.getId()) ) {
>             return new GdbExpressionVMProvider(this, context, getSession());
>+        } else if (IDsfDebugUIConstants.ID_EXPRESSION_HOVER.equals(context.getId()) ) {
>+            return new ExpressionVMProvider(this, context, getSession());
>         } else if (IDebugUIConstants.ID_MODULE_VIEW.equals(context.getId()) ) {
>             return new ModulesVMProvider(this, context, getSession());
>         } else if (IDebugUIConstants.ID_BREAKPOINT_VIEW.equals(context.getId()) ) {

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 255026: 151809 | 154482 | 159709