From 3052dbcd3c825dc0e6e8ad8f617a26647b32aa17 Mon Sep 17 00:00:00 2001 From: Randy Rohrbach Date: Tue, 13 May 2008 16:09:37 +0000 Subject: [PATCH] More work on bugzilla 202852 --- .../ui/viewmodel/register/RegisterBitFieldVMNode.java | 10 +++++----- .../ui/viewmodel/register/RegisterGroupVMNode.java | 10 +++++----- .../ui/viewmodel/register/RegisterVMNode.java | 10 +++++----- .../ui/viewmodel/variable/VariableVMNode.java | 8 +++++--- .../pda/ui/viewmodel/launch/PDAProgramVMNode.java | 9 +++++---- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterBitFieldVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterBitFieldVMNode.java index fbde122c836..9ac5c7de15e 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterBitFieldVMNode.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterBitFieldVMNode.java @@ -805,13 +805,15 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode * (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[]) */ + private final String MEMENTO_NAME = "BITFIELD_MEMENTO_NAME"; //$NON-NLS-1$ + public void compareElements(IElementCompareRequest[] requests) { for ( final IElementCompareRequest request : requests ) { Object element = request.getElement(); final IMemento memento = request.getMemento(); - final String mementoName = memento.getString("BITFIELD_MEMENTO_NAME"); //$NON-NLS-1$ + final String mementoName = memento.getString(MEMENTO_NAME); if (mementoName != null) { if (element instanceof IDMVMContext) { @@ -831,8 +833,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode @Override protected void handleCompleted() { if ( getStatus().isOK() ) { - String bitFieldName = "BitField." + getData().getName() + "." + bitFieldDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ - request.setEqual( bitFieldName.equals( mementoName ) ); + request.setEqual( mementoName.equals( "BitField." + getData().getName() ) ); //$NON-NLS-1$ } request.done(); } @@ -892,8 +893,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode @Override protected void handleCompleted() { if ( getStatus().isOK() ) { - String bitFieldName = "BitField." + getData().getName() + "." + bitFieldDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ - memento.putString("BITFIELD_MEMENTO_NAME", bitFieldName); //$NON-NLS-1$ + memento.putString(MEMENTO_NAME, "BitField." + getData().getName()); //$NON-NLS-1$ } request.done(); } diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterGroupVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterGroupVMNode.java index c994261b297..4205c5d5145 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterGroupVMNode.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterGroupVMNode.java @@ -468,13 +468,15 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode * (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[]) */ + private final String MEMENTO_NAME = "GROUP_MEMENTO_NAME"; //$NON-NLS-1$ + public void compareElements(IElementCompareRequest[] requests) { for ( final IElementCompareRequest request : requests ) { Object element = request.getElement(); final IMemento memento = request.getMemento(); - final String mementoName = memento.getString("GROUP_MEMENTO_NAME"); //$NON-NLS-1$ + final String mementoName = memento.getString(MEMENTO_NAME); if (mementoName != null) { if (element instanceof IDMVMContext) { @@ -494,8 +496,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode @Override protected void handleCompleted() { if ( getStatus().isOK() ) { - String grpName = "Group." + getData().getName() + "." + regDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ - request.setEqual( grpName.equals( mementoName ) ); + request.setEqual( mementoName.equals( "Group." + getData().getName()) ); //$NON-NLS-1$ } request.done(); } @@ -556,8 +557,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode @Override protected void handleCompleted() { if ( getStatus().isOK() ) { - String grpName = "Group." + getData().getName() + "." + regDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ - memento.putString("GROUP_MEMENTO_NAME", grpName); //$NON-NLS-1$ + memento.putString(MEMENTO_NAME, "Group." + getData().getName()); //$NON-NLS-1$ } request.done(); } diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterVMNode.java index 9102c94da9d..2a37f802def 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterVMNode.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterVMNode.java @@ -749,13 +749,15 @@ public class RegisterVMNode extends AbstractExpressionVMNode * (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[]) */ + private final String MEMENTO_NAME = "REGISTER_MEMENTO_NAME"; //$NON-NLS-1$ + public void compareElements(IElementCompareRequest[] requests) { for ( final IElementCompareRequest request : requests ) { Object element = request.getElement(); final IMemento memento = request.getMemento(); - final String mementoName = memento.getString("REGISTER_MEMENTO_NAME"); //$NON-NLS-1$ + final String mementoName = memento.getString(MEMENTO_NAME); if (mementoName != null) { if (element instanceof IDMVMContext) { @@ -775,8 +777,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode @Override protected void handleCompleted() { if ( getStatus().isOK() ) { - String regName = "Register." + getData().getName() + "." + regDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ - request.setEqual( regName.equals( mementoName ) ); + request.setEqual( mementoName.equals( "Register." + getData().getName() ) ); //$NON-NLS-1$ } request.done(); } @@ -836,8 +837,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode @Override protected void handleCompleted() { if ( getStatus().isOK() ) { - String regName = "Register." + getData().getName() + "." + regDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ - memento.putString("REGISTER_MEMENTO_NAME", regName); + memento.putString(MEMENTO_NAME, "Register." + getData().getName()); //$NON-NLS-1$ } request.done(); } diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java index d0c5fd49734..4c816e63da2 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java @@ -722,16 +722,18 @@ public class VariableVMNode extends AbstractExpressionVMNode */ private String produceExpressionElementName( String viewName , IExpressionDMContext expression ) { - return "variable." + expression.getExpression() + "." + expression.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ + return "Variable." + expression.getExpression(); //$NON-NLS-1$ } + private final String MEMENTO_NAME = "VARIABLE_MEMENTO_NAME"; //$NON-NLS-1$ + public void compareElements(IElementCompareRequest[] requests) { for ( IElementCompareRequest request : requests ) { Object element = request.getElement(); IMemento memento = request.getMemento(); - String mementoName = memento.getString("VARIABLE_MEMENTO_NAME"); //$NON-NLS-1$ + String mementoName = memento.getString(MEMENTO_NAME); //$NON-NLS-1$ if (mementoName != null) { if (element instanceof IDMVMContext) { @@ -767,7 +769,7 @@ public class VariableVMNode extends AbstractExpressionVMNode if ( dmc instanceof IExpressionDMContext) { String elementName = produceExpressionElementName( request.getPresentationContext().getId(), (IExpressionDMContext) dmc ); - memento.putString("VARIABLE_MEMENTO_NAME", elementName); //$NON-NLS-1$ + memento.putString(MEMENTO_NAME, elementName); } } request.done(); diff --git a/plugins/org.eclipse.dd.examples.pda.ui/src/org/eclipse/dd/examples/pda/ui/viewmodel/launch/PDAProgramVMNode.java b/plugins/org.eclipse.dd.examples.pda.ui/src/org/eclipse/dd/examples/pda/ui/viewmodel/launch/PDAProgramVMNode.java index f5c0fbad520..a9faa8adeb4 100644 --- a/plugins/org.eclipse.dd.examples.pda.ui/src/org/eclipse/dd/examples/pda/ui/viewmodel/launch/PDAProgramVMNode.java +++ b/plugins/org.eclipse.dd.examples.pda.ui/src/org/eclipse/dd/examples/pda/ui/viewmodel/launch/PDAProgramVMNode.java @@ -297,18 +297,19 @@ public class PDAProgramVMNode extends AbstractDMVMNode * (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[]) */ - private String produceProgramElementName( String viewName , PDAProgramDMContext execCtx ) { - return "PDA." + execCtx.getProgram() + "." + execCtx.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ + return "PDA." + execCtx.getProgram(); //$NON-NLS-1$ } + private final String MEMENTO_NAME = "PDAPROGRAM_MEMENTO_NAME"; //$NON-NLS-1$ + public void compareElements(IElementCompareRequest[] requests) { for ( IElementCompareRequest request : requests ) { Object element = request.getElement(); IMemento memento = request.getMemento(); - String mementoName = memento.getString("PDAPROGRAM_MEMENTO_NAME"); //$NON-NLS-1$ + String mementoName = memento.getString(MEMENTO_NAME); if (mementoName != null) { if (element instanceof IDMVMContext) { @@ -344,7 +345,7 @@ public class PDAProgramVMNode extends AbstractDMVMNode if ( dmc instanceof PDAProgramDMContext) { String elementName = produceProgramElementName( request.getPresentationContext().getId(), (PDAProgramDMContext) dmc ); - memento.putString("PDAPROGRAM_MEMENTO_NAME", elementName); //$NON-NLS-1$ + memento.putString(MEMENTO_NAME, elementName); } } request.done();