Attachment 156754 Details for Bug 298946 – patch

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

[patch] patch

disable-pane.patch (text/plain), 4.21 KB, created by Darin Wright

on 2010-01-20 22:19:40 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2010-01-20 22:19:40 EST

Size: 4.21 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.debug.ui
>Index: ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java,v
>retrieving revision 1.2
>diff -u -r1.2 JavaBreakpointConditionEditor.java
>--- ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java	5 Jan 2010 17:13:37 -0000	1.2
>+++ ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java	21 Jan 2010 03:18:58 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009 IBM Corporation and others.
>+ * Copyright (c) 2009, 2010 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
>@@ -166,12 +166,14 @@
> 		fViewer.setInput(document);
> 		String condition = null;
> 		IType type = null;
>-		boolean enabled = false;
>+		boolean controlsEnabled = false;
>+		boolean conditionEnabled = false;
> 		boolean whenTrue = true;
> 		if (breakpoint != null) {
>+			controlsEnabled = true;
> 			if (breakpoint.supportsCondition()) {
> 				condition = breakpoint.getCondition();
>-				enabled = breakpoint.isConditionEnabled();
>+				conditionEnabled = breakpoint.isConditionEnabled();
> 				whenTrue = breakpoint.isConditionSuspendOnTrue();
> 				type = BreakpointUtils.getType(breakpoint);
> 			}
>@@ -217,14 +219,15 @@
>             	setDirty(PROP_CONDITION);
>             }
>         };
>-		fViewer.getDocument().addDocumentListener(fDocumentListener);		
>-		fConditional.setSelection(enabled);
>+		fViewer.getDocument().addDocumentListener(fDocumentListener);
>+		fConditional.setEnabled(controlsEnabled);
>+		fConditional.setSelection(conditionEnabled);
> 		if (whenTrue) {
> 			fSuspendBehavior.select(0);
> 		} else {
> 			fSuspendBehavior.select(1);
> 		}
>-		setEnabled(enabled && breakpoint != null && breakpoint.supportsCondition(), false);
>+		setEnabled(conditionEnabled && breakpoint != null && breakpoint.supportsCondition(), false);
> 		setDirty(false);
> 	}
> 	
>Index: ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java,v
>retrieving revision 1.1
>diff -u -r1.1 StandardJavaBreakpointEditor.java
>--- ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java	21 Dec 2009 19:09:17 -0000	1.1
>+++ ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java	21 Jan 2010 03:18:58 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009 IBM Corporation and others.
>+ * Copyright (c) 2009, 2010 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
>@@ -124,19 +124,23 @@
> 	protected void setBreakpoint(IJavaBreakpoint breakpoint) throws CoreException {
> 		fBreakpoint = breakpoint;
> 		boolean enabled = false;
>+		boolean hasHitCount = false;
> 		String text = ""; //$NON-NLS-1$
> 		boolean suspendThread = true;
> 		if (breakpoint != null) {
>+			enabled = true;
> 			int hitCount = breakpoint.getHitCount();
> 			if (hitCount > 0) {
> 				text = new Integer(hitCount).toString();
>-				enabled = true;
>+				hasHitCount = true;
> 			}
> 			suspendThread= breakpoint.getSuspendPolicy() == IJavaBreakpoint.SUSPEND_THREAD;
> 		}
>-		fHitCountButton.setSelection(enabled);
>-		fHitCountText.setEnabled(enabled);
>+		fHitCountButton.setEnabled(enabled);
>+		fHitCountButton.setSelection(enabled & hasHitCount);
>+		fHitCountText.setEnabled(hasHitCount);
> 		fHitCountText.setText(text);
>+		fSuspendPolicy.setEnabled(enabled);
> 		if(suspendThread) {
> 			fSuspendPolicy.select(0);
> 		} else {

Actions: View | Diff

Attachments on bug 298946: 156754 | 156818