Attachment 159725 Details for Bug 248606 – Modifications resulting from Marc's review

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

[patch] Modifications resulting from Marc's review

patch_248606_3 (text/plain), 5.61 KB, created by John Cortell

on 2010-02-21 18:51:16 EST

(hide)

Description:

Filename:

MIME Type:

Creator: John Cortell

Created: 2010-02-21 18:51:16 EST

Size: 5.61 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.debug.core
>Index: src/org/eclipse/cdt/debug/internal/core/CRequest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRequest.java,v
>retrieving revision 1.1
>diff -u -r1.1 CRequest.java
>--- src/org/eclipse/cdt/debug/internal/core/CRequest.java	19 Feb 2010 23:47:02 -0000	1.1
>+++ src/org/eclipse/cdt/debug/internal/core/CRequest.java	21 Feb 2010 23:48:21 -0000
>@@ -1,3 +1,14 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 Wind River Systems, Inc. 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:
>+ *     Anton Leherbauer (Wind River Systems) - initial API and implementation
>+ *     Freescale Semiconductor - refactoring
>+ *******************************************************************************/
> package org.eclipse.cdt.debug.internal.core;
> 
> import org.eclipse.core.runtime.IStatus;
>Index: src/org/eclipse/cdt/debug/internal/core/ICWatchpointTarget.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/ICWatchpointTarget.java,v
>retrieving revision 1.1
>diff -u -r1.1 ICWatchpointTarget.java
>--- src/org/eclipse/cdt/debug/internal/core/ICWatchpointTarget.java	19 Feb 2010 23:47:02 -0000	1.1
>+++ src/org/eclipse/cdt/debug/internal/core/ICWatchpointTarget.java	21 Feb 2010 23:48:21 -0000
>@@ -25,7 +25,7 @@
> 
> 	/** IRequest object used in the asynchronous method {@link ICWatchpointTarget#getSize()} */
> 	interface GetSizeRequest extends IRequest {
>-		int getSize();
>+		int getSize(); // returns -1 if size not available
> 		void setSize(int size);
> 	};
> 	
>#P org.eclipse.cdt.debug.ui
>Index: src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java,v
>retrieving revision 1.4
>diff -u -r1.4 AddWatchpointOnVariableActionDelegate.java
>--- src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java	19 Feb 2010 23:47:04 -0000	1.4
>+++ src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java	21 Feb 2010 23:48:22 -0000
>@@ -53,7 +53,7 @@
> 	}
> 
> 	private static class GetSizeRequest extends CRequest implements ICWatchpointTarget.GetSizeRequest {
>-		int fSize;
>+		int fSize = -1;
> 		public int getSize() {
> 			return fSize;
> 		}
>@@ -122,6 +122,7 @@
> 	 *      org.eclipse.jface.viewers.ISelection)
> 	 */
> 	public void selectionChanged(final IAction action, ISelection selection) {
>+		fVar = null;
> 		if (selection == null || selection.isEmpty()) {
> 			action.setEnabled(false);
> 			return;
>#P org.eclipse.cdt.dsf.gdb.ui
>Index: src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.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/GdbVariableVMNode.java,v
>retrieving revision 1.1
>diff -u -r1.1 GdbVariableVMNode.java
>--- src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java	19 Feb 2010 23:47:01 -0000	1.1
>+++ src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java	21 Feb 2010 23:48:23 -0000
>@@ -66,19 +66,23 @@
> 	                    if (expressionService != null) {
> 	                    	final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<IExpressionDMAddress>(getSession().getExecutor(), null) {
>                                 @Override
>-								public void handleSuccess() {
>-                                    request.setSize(getData().getSize());
>+								public void handleCompleted() {
>+                                	if (isSuccess()) {
>+                                		request.setSize(getData().getSize());
>+                                	}
>                                     request.done();
>                                 }
> 	                    	};
> 	                    	
> 	                        expressionService.getExpressionAddressData(exprDmc, drm);
> 	                    }
>+	        			else {
>+	        				request.done();
>+	        			}
> 	                }
> 	            });
> 			}
> 			else {
>-				request.setSize(-1);
> 				request.done();
> 			}
> 		}
>@@ -104,24 +108,22 @@
> 	                                	assert getData().getSize() > 0;
> 	                                    request.setCanCreate(true);
>                                 	}
>-                                	else {
>-                                		request.setCanCreate(false);
>-                                	}
> 	                                request.done();
>                                 }
> 	                    	};
> 	                    	
> 	                        expressionService.getExpressionAddressData(exprDmc, drm);
> 	                    }
>+	        			else {
>+	        				request.done();
>+	        			}
> 	                }
> 	            });
> 			}
> 			else {
>-				request.setCanCreate(false);
> 				request.done();
> 			}
> 		}
>-		
> 	};
> 	
> 	/**

Actions: View | Diff

Attachments on bug 248606: 159245 | 159459 | 159500 | 159725 | 159821