From 87128db4da4505f10dcbd9af0e86b2b190f8c2c1 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Mon, 28 Jul 2003 17:25:01 +0000 Subject: [PATCH] Cleanup. Removed the 'reset' and 'getQualifiedName' methods from the 'ICVaraible' interface. --- debug/org.eclipse.cdt.debug.core/ChangeLog | 5 +++++ .../cdt/debug/core/model/ICVariable.java | 4 ---- .../debug/internal/core/model/CVariable.java | 17 +++++++++-------- debug/org.eclipse.cdt.debug.ui/ChangeLog | 4 ++++ .../actions/VariableFormatActionDelegate.java | 1 - 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index f534cdb30c7..7318f8a1513 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,8 @@ +2003-07-28 Mikhail Khodjaiants + Cleanup. Removed the 'reset' and 'getQualifiedName' methods from the 'ICVaraible' interface. + * ICVariable.java + * CVariable.java + 2003-07-24 Mikhail Khodjaiants Fix for PR 40696. If the project contains the reference to a project that is deleted from the workspace the source locator tries to get the location of deleted project. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICVariable.java index d8fbcc7986b..5646460d3b6 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICVariable.java @@ -20,16 +20,12 @@ public interface ICVariable extends IVariable void setFormat( int format ) throws DebugException; - void reset() throws DebugException; - ICType getType() throws DebugException; boolean isEditable(); boolean hasChildren(); - String getQualifiedName() throws DebugException; - boolean isEnabled(); void setEnabled( boolean enabled ) throws DebugException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java index e7735a3e047..e244002e77a 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java @@ -151,6 +151,7 @@ public abstract class CVariable extends CDebugElement return fException; } } + class InternalVariable { private ICDIVariableObject fCDIVariableObject; @@ -632,14 +633,17 @@ public abstract class CVariable extends CDebugElement * @see org.eclipse.cdt.debug.core.model.ICVariable#setFormat(int) */ public void setFormat( int format ) throws DebugException + { + doSetFormat( format ); + reset(); + } + + protected void doSetFormat( int format ) { fFormat = format; } - /** - * @see org.eclipse.cdt.debug.core.model.ICVariable#reset() - */ - public void reset() throws DebugException + protected void reset() throws DebugException { ((CValue)getValue()).reset(); fireChangeEvent( DebugEvent.STATE ); @@ -824,10 +828,7 @@ public abstract class CVariable extends CDebugElement return result; } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.core.model.ICVariable#getQualifiedName() - */ - public String getQualifiedName() throws DebugException + protected String getQualifiedName() throws DebugException { if ( fQualifiedName == null ) { diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 36aaff6490f..1d1937d0a8b 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,7 @@ +2003-07-28 Mikhail Khodjaiants + Cleanup. Removed the 'reset' method from the 'ICVaraible' interface. + * VariableFormatActionDelegate.java + 2003-07-24 Mikhail Khodjaiants New icon for closed projects. * icons/full/obj16/cproject_obj.gif: new diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java index 32888853c60..2f0372e391d 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/VariableFormatActionDelegate.java @@ -128,6 +128,5 @@ public class VariableFormatActionDelegate implements IObjectActionDelegate protected void doAction( ICVariable var ) throws DebugException { var.setFormat( fFormat ); - var.reset(); } }