Attachment 165910 Details for Bug 310171 – Proposed fix for this bug.

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

[patch] Proposed fix for this bug.

bug_310171.patch (text/plain), 3.02 KB, created by Norman Yee

on 2010-04-23 09:31:51 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Norman Yee

Created: 2010-04-23 09:31:51 EDT

Size: 3.02 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.ui
>Index: src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java,v
>retrieving revision 1.7
>diff -u -r1.7 DisassemblyBackendDsf.java
>--- src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java	15 Apr 2010 13:54:06 -0000	1.7
>+++ src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java	23 Apr 2010 13:22:48 -0000
>@@ -469,50 +469,29 @@
> 					} else {
> 						final IStatus status= getStatus();
> 						if (status != null && !status.isOK()) {
>-							if( file != null )	{
>-								fCallback.asyncExec(new Runnable() {
>-									public void run() {
>-										fCallback.retrieveDisassembly(startAddress, finalEndAddress, linesHint, true, true);
>-									}});
>-							}
>-							else {
>-								fCallback.asyncExec(new Runnable() {
>-									public void run() {
>-										fCallback.doScrollLocked(new Runnable() {
>-											public void run() {
>-												fCallback.insertError(startAddress, status.getMessage());
>-											}
>-										});
>-									}});
>-							}
>+							fCallback.asyncExec(new Runnable() {
>+								public void run() {
>+									fCallback.doScrollLocked(new Runnable() {
>+										public void run() {
>+											fCallback.insertError(startAddress, status.getMessage());
>+										}
>+									});
>+								}});
> 						}
> 						fCallback.setUpdatePending(false);
> 					}
> 				}
> 			};
>-			if (file != null) {
>-				executor.execute(new Runnable() {
>-					public void run() {
>-						final IDisassembly disassembly= fServicesTracker.getService(IDisassembly.class);
>-						if (disassembly == null) {
>-							disassemblyRequest.cancel();
>-							disassemblyRequest.done();
>-							return;
>-						}
>-						disassembly.getMixedInstructions(context, file, lineNumber, lines*2, disassemblyRequest);
>-					}});
>-			} else {
>-				executor.execute(new Runnable() {
>-					public void run() {
>-						final IDisassembly disassembly= fServicesTracker.getService(IDisassembly.class);
>-						if (disassembly == null) {
>-							disassemblyRequest.cancel();
>-							disassemblyRequest.done();
>-							return;
>-						}
>-						disassembly.getMixedInstructions(context, startAddress, finalEndAddress, disassemblyRequest);
>-					}});
>-			}
>+			executor.execute(new Runnable() {
>+				public void run() {
>+					final IDisassembly disassembly= fServicesTracker.getService(IDisassembly.class);
>+					if (disassembly == null) {
>+						disassemblyRequest.cancel();
>+						disassemblyRequest.done();
>+						return;
>+					}
>+					disassembly.getMixedInstructions(context, startAddress, finalEndAddress, disassemblyRequest);
>+				}});
> 		} else {
> 			final DataRequestMonitor<IInstruction[]> disassemblyRequest= new DataRequestMonitor<IInstruction[]>(executor, null) {
> 				@Override

Flags:

aleherb+eclipse: iplog-

Actions: View | Diff

Attachments on bug 310171: 165910 | 166299