Attachment 106381 Details for Bug 238031 – patch for this bug

[patch] patch for this bug

DebugSettingWarningPatch(v2).txt (text/plain), 12.87 KB, created by Gang(Allen) Ma

on 2008-07-02 22:39:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Gang(Allen) Ma

Created: 2008-07-02 22:39:16 EDT

Size: 12.87 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mtj.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 276)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -34,7 +34,8 @@
>  org.eclipse.ui.forms,
>  org.eclipse.core.expressions,
>  org.eclipse.ui.console,
>- org.eclipse.jface.text
>+ org.eclipse.jface.text,
>+ org.eclipse.jdt.debug
> Eclipse-LazyStart: true
> Bundle-ManifestVersion: 2
> Export-Package: org.eclipse.mtj.ui.devices,
>Index: src/org/eclipse/mtj/ui/MTJUIPluginResources.properties
>===================================================================
>--- src/org/eclipse/mtj/ui/MTJUIPluginResources.properties	(revision 276)
>+++ src/org/eclipse/mtj/ui/MTJUIPluginResources.properties	(working copy)
>@@ -116,6 +116,17 @@
> dialog.newproperty.key=Key:
> dialog.newproperty.value=Value:
> 
>+#
>+# Eclipse debug settings warning
>+#
>+debugWarning.title=Debug Setting Warning
>+debugWarning.toggleMessage=Don't warn me again
>+debugWarning.warningMessage=There are some problems with your Java Debug settings. Do you want to fix it?
>+debugWarning.suspendOnUnCaughtExpWarning=The Suspend execution on uncaught exceptions option must not be checked on java debug preference page.
>+debugWarning.suspendOnCompileErrWarning=The Suspend execution on compilation errors option must not be checked on java debug preference page.
>+debugWarning.reqestTimeoutWarning=The Debugger timeout(ms) must be set equal or greater than {0} on java debug preference page.
>+
>+
> ####################################################################
> #
> #	J2MEProjectPropertiesPage
>Index: src/org/eclipse/mtj/ui/internal/launching/EmulatorLaunchShortcut.java
>===================================================================
>--- src/org/eclipse/mtj/ui/internal/launching/EmulatorLaunchShortcut.java	(revision 276)
>+++ src/org/eclipse/mtj/ui/internal/launching/EmulatorLaunchShortcut.java	(working copy)
>@@ -10,6 +10,8 @@
>  *     Craig Setera (EclipseME) - Initial implementation
>  *     Diego Sandin (Motorola)  - Refactoring package name to follow eclipse
>  *                                standards
>+ *     Gang Ma      (Sybase)	- Add the functionality of warning user if
>+ *     							  the base Eclipse debug settings is not correct
>  */
> package org.eclipse.mtj.ui.internal.launching;
> 
>@@ -24,6 +26,8 @@
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.MultiStatus;
>+import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.SubProgressMonitor;
> import org.eclipse.debug.core.DebugPlugin;
> import org.eclipse.debug.core.ILaunchConfiguration;
>@@ -40,11 +44,16 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jdt.core.JavaModelException;
>+import org.eclipse.jdt.debug.core.JDIDebugModel;
>+import org.eclipse.jdt.debug.ui.JavaDebugUtils;
>+import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
> import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
> import org.eclipse.jdt.ui.JavaElementLabelProvider;
> import org.eclipse.jface.dialogs.ErrorDialog;
>+import org.eclipse.jface.dialogs.IDialogConstants;
> import org.eclipse.jface.dialogs.ProgressMonitorDialog;
> import org.eclipse.jface.operation.IRunnableWithProgress;
>+import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.mtj.core.internal.MTJCorePlugin;
>@@ -50,7 +59,16 @@
> import org.eclipse.mtj.core.internal.MTJCorePlugin;
> import org.eclipse.mtj.core.internal.utils.Utils;
> import org.eclipse.mtj.core.launching.ILaunchConstants;
>+import org.eclipse.mtj.ui.IMTJUIConstants;
>+import org.eclipse.mtj.ui.MTJUIStrings;
> import org.eclipse.mtj.ui.internal.MTJUIPlugin;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.SelectionAdapter;
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.widgets.Button;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
> import org.eclipse.swt.widgets.Shell;
> import org.eclipse.ui.IEditorInput;
> import org.eclipse.ui.IEditorPart;
>@@ -57,6 +75,7 @@
> import org.eclipse.ui.IWorkbenchWindow;
> import org.eclipse.ui.dialogs.ElementListSelectionDialog;
> 
>+
> /**
>  * Emulator launch shortcut implementation.
>  * 
>@@ -393,15 +412,204 @@
>         }
> 
>         if (type != null) {
>-            ILaunchConfiguration config = findLaunchConfiguration(type, mode);
>-            if (config != null) {
>-                try {
>-                    config.launch(mode, null);
>-                } catch (CoreException e) {
>-                    ErrorDialog.openError(getShell(), "Error Launching "
>-                            + config.getName(), e.getMessage(), e.getStatus());
>+			// configure the debugger settings
>+			configDebuggerSetting(mode);
>+			ILaunchConfiguration config = findLaunchConfiguration(type, mode);
>+			if (config != null) {
>+				try {
>+					config.launch(mode, null);
>+				} catch (CoreException e) {
>+					ErrorDialog.openError(getShell(), "Error Launching "
>+							+ config.getName(), e.getMessage(), e.getStatus());
>+				}
>+			}
>+
>+		}
>+    }
>+    
>+    /**
>+     *  The preference key of debug setting warning, 
>+     *  if user select "don't warn me again", the preference will be stored.
>+     */
>+    public static final String PREF_DEBUGSETTING_WARNING = IMTJUIConstants.PLUGIN_ID+".debugSettingWarning";
>+    /**
>+     *  Debugger time out must be set more than 15000 
>+     */
>+    public static final int MIN_DEBUGGERTIMEOUT_SETTING = 15000;
>+    /**
>+     *  Suspend execution on uncaught exception must not be checked 
>+     */
>+    public static final boolean CORRECT_SUSPENDONUNCAUGHTEXP_SETTING = false;
>+    /**
>+     *  Suspend execution on compilation errors must not be checked 
>+     */
>+    public static final boolean CORRECT_SUSPENDONCOMPILEERR_SETTING = false;
>+
>+    /**
>+     * configure the debug setting for user
>+     */
>+    private void configDebuggerSetting(String mode){
>+    	//only need to configure debugger setting while in debug mode
>+    	if(!ILaunchManager.DEBUG_MODE.equalsIgnoreCase(mode))
>+    		return;
>+    	IStatus debugSettingStatus = debugSettingSatisfied();
>+    	//only need to configure debugger setting while the setting is not satisfied
>+    	if(debugSettingStatus.isOK())
>+    		return;
>+    	
>+    	String preferenceKey = PREF_DEBUGSETTING_WARNING;
>+    	String debugWarningDesc = MTJUIPlugin.getDefault().getPreferenceStore().getString(preferenceKey);
>+    	//if the user have ever checked "Don't warn me again",don't warn that
>+    	if (ErrorDialogWithToggle.NO_WARING.equals(debugWarningDesc)){
>+			return;
>+		}
>+    	//show the warning dialog
>+    	Shell shell = getShell();
>+    	ErrorDialogWithToggle dialog = new ErrorDialogWithToggle(shell,
>+				MTJUIStrings.getString("debugWarning.title"), null,
>+				debugSettingStatus, preferenceKey, MTJUIStrings
>+						.getString("debugWarning.toggleMessage"), 
>+						MTJUIPlugin.getDefault().getPreferenceStore());
>+    	dialog.open();
>+    	
>+		boolean answer = (dialog.getReturnCode() == IDialogConstants.YES_ID);
>+		if(answer){
>+			JDIDebugModel.getPreferences().setValue(JDIDebugModel.PREF_REQUEST_TIMEOUT, MIN_DEBUGGERTIMEOUT_SETTING);
>+			JavaDebugUtils.getPreferenceStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, CORRECT_SUSPENDONUNCAUGHTEXP_SETTING);
>+			JavaDebugUtils.getPreferenceStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS, CORRECT_SUSPENDONCOMPILEERR_SETTING);
>+			
>+		}
>+    	
>+    }
>+    
>+    /**
>+     * check if the debug setting is satisfied
>+     * if it is satisfied for debugging return status ok else return status warning.
>+     * @return IStatus
>+     */
>+    private IStatus debugSettingSatisfied(){
>+    	boolean suspendOnUnCaughtExp = JavaDebugUtils.getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS);
>+    	boolean suspendOnCompileErr = JavaDebugUtils.getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS);
>+    	int currReqTimeout = JDIDebugModel.getPreferences().getInt(JDIDebugModel.PREF_REQUEST_TIMEOUT);
>+    	
>+    	if (!suspendOnUnCaughtExp && !suspendOnCompileErr
>+				&& currReqTimeout >= MIN_DEBUGGERTIMEOUT_SETTING) {
>+    		return new Status(IStatus.OK, IMTJUIConstants.PLUGIN_ID, "");
>+    	}else{
>+    		MultiStatus warningStatus = new MultiStatus(IMTJUIConstants.PLUGIN_ID,IStatus.WARNING,MTJUIStrings.getString("debugWarning.warningMessage"),null);
>+    		
>+    		if(suspendOnUnCaughtExp){
>+    			warningStatus.add(new Status(IStatus.WARNING, IMTJUIConstants.PLUGIN_ID, MTJUIStrings.getString("debugWarning.suspendOnUnCaughtExpWarning")));
>+    		}
>+    		if(suspendOnCompileErr){
>+    			warningStatus.add(new Status(IStatus.WARNING, IMTJUIConstants.PLUGIN_ID, MTJUIStrings.getString("debugWarning.suspendOnCompileErrWarning")));
>+        		
>+    		}
>+    		if(currReqTimeout < MIN_DEBUGGERTIMEOUT_SETTING){
>+    			warningStatus.add(new Status(IStatus.WARNING, IMTJUIConstants.PLUGIN_ID, MTJUIStrings.getString("debugWarning.reqestTimeoutWarning",new Integer[]{MIN_DEBUGGERTIMEOUT_SETTING})));
>+        	}
>+    		return warningStatus;
>+    	}
>+	}
>+    /**
>+     * 
>+     * this is a dialog with toggle message, "Yes" "No" and "Details" buttons.
>+     * @author gma
>+     *
>+     */
>+    class ErrorDialogWithToggle extends ErrorDialog {
>+
>+    	public static final String NO_WARING = "neverWaring";
>+    	
>+    	/**
>+         * The selected state of the toggle.
>+         */
>+        private boolean toggleState;
>+    	/**
>+    	 * The preference key which is set by the toggle button.
>+    	 *
>+    	 */
>+    	private String fPreferenceKey= null;
>+    	/**
>+    	 * The message displayed to the user, with the toggle button
>+    	 */
>+    	private String fToggleMessage= null;
>+    	private Button fToggleButton= null;
>+    	/**
>+    	 * The preference store which will be affected by the toggle button
>+    	 */
>+    	IPreferenceStore prefStore= null;
>+
>+    	public ErrorDialogWithToggle(Shell parentShell, String dialogTitle, String message, IStatus status, String preferenceKey, String toggleMessage, IPreferenceStore store) {
>+    		super(parentShell, dialogTitle, message, status, IStatus.WARNING | IStatus.ERROR | IStatus.INFO);
>+    		prefStore= store;
>+    		fPreferenceKey= preferenceKey;
>+    		fToggleMessage= toggleMessage;
>+    	}
>+
>+    	protected Control createDialogArea(Composite parent) {
>+    		Composite dialogComposite= (Composite) super.createDialogArea(parent);
>+    		dialogComposite.setFont(parent.getFont());
>+    		setToggleButton(createCheckButton(dialogComposite, fToggleMessage));
>+    		applyDialogFont(dialogComposite);
>+    		return dialogComposite;
>+    	}
>+    	
>+    	/**
>+    	 * Creates a button with the given label and sets the default 
>+    	 * configuration data.
>+    	 */
>+    	private Button createCheckButton(Composite parent, String label) {
>+    		final Button button= new Button(parent, SWT.CHECK | SWT.LEFT);
>+    		button.setText(label);		
>+
>+    		GridData data = new GridData(SWT.NONE);
>+    		data.horizontalSpan= 2;
>+    		data.horizontalAlignment= GridData.CENTER;
>+    		button.setLayoutData(data);
>+    		button.setFont(parent.getFont());
>+    		button.addSelectionListener(new SelectionAdapter() {
>+
>+                public void widgetSelected(SelectionEvent e) {
>+                    toggleState = button.getSelection();
>+                }
>+            });
>+    		
>+    		return button;
>+    	}
>+
>+    	protected void buttonPressed(int buttonId) {
>+    		
>+            if (buttonId != IDialogConstants.DETAILS_ID) {
>+                if(toggleState && prefStore != null && fPreferenceKey != null){
>+                    prefStore.setValue(fPreferenceKey, NO_WARING);
>                 }
>+                setReturnCode(buttonId);
>+            	close();
>             }
>-        }
>+    		super.buttonPressed(buttonId);
>+    	}
>+    	
>+
>+    	protected Button getToggleButton() {
>+    		return fToggleButton;
>+    	}
>+
>+    	protected void setToggleButton(Button button) {
>+    		fToggleButton = button;
>+    	}
>+    	
>+    	/**
>+    	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
>+    	 */
>+    	protected void createButtonsForButtonBar(Composite parent) {
>+    		createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL,
>+    				true);
>+    		createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL,
>+    				true);
>+    		createDetailsButton(parent);
>+    		
>+    		getButton(IDialogConstants.YES_ID).setFocus();
>+    	}
>     }
> }

Flags:

wds057: iplog+

Actions: View | Diff

Attachments on bug 238031: 106379 | 106381 | 109641