mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

More work on bugzilla 202852

Browse source
This commit is contained in:
Randy Rohrbach 2008-05-13 16:09:37 +00:00
parent 9400014991
commit 3052dbcd3c
5 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterBitFieldVMNode.java
View file

@ -805,13 +805,15 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
* (non-Javadoc) * (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[]) * @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) { public void compareElements(IElementCompareRequest[] requests) {
for ( final IElementCompareRequest request : requests ) { for ( final IElementCompareRequest request : requests ) {
Object element = request.getElement(); Object element = request.getElement();
final IMemento memento = request.getMemento(); 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 (mementoName != null) {
if (element instanceof IDMVMContext) { if (element instanceof IDMVMContext) {
@ -831,8 +833,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
if ( getStatus().isOK() ) { if ( getStatus().isOK() ) {
String bitFieldName = "BitField." + getData().getName() + "." + bitFieldDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ request.setEqual( mementoName.equals( "BitField." + getData().getName() ) ); //$NON-NLS-1$
request.setEqual( bitFieldName.equals( mementoName ) );
} }
request.done(); request.done();
} }
@ -892,8 +893,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
if ( getStatus().isOK() ) { if ( getStatus().isOK() ) {
String bitFieldName = "BitField." + getData().getName() + "." + bitFieldDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ memento.putString(MEMENTO_NAME, "BitField." + getData().getName()); //$NON-NLS-1$
memento.putString("BITFIELD_MEMENTO_NAME", bitFieldName); //$NON-NLS-1$
} }
request.done(); request.done();
} }

10
plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterGroupVMNode.java
View file

@ -468,13 +468,15 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
* (non-Javadoc) * (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[]) * @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) { public void compareElements(IElementCompareRequest[] requests) {
for ( final IElementCompareRequest request : requests ) { for ( final IElementCompareRequest request : requests ) {
Object element = request.getElement(); Object element = request.getElement();
final IMemento memento = request.getMemento(); 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 (mementoName != null) {
if (element instanceof IDMVMContext) { if (element instanceof IDMVMContext) {
@ -494,8 +496,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
if ( getStatus().isOK() ) { if ( getStatus().isOK() ) {
String grpName = "Group." + getData().getName() + "." + regDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ request.setEqual( mementoName.equals( "Group." + getData().getName()) ); //$NON-NLS-1$
request.setEqual( grpName.equals( mementoName ) );
} }
request.done(); request.done();
} }
@ -556,8 +557,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
if ( getStatus().isOK() ) { if ( getStatus().isOK() ) {
String grpName = "Group." + getData().getName() + "." + regDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ memento.putString(MEMENTO_NAME, "Group." + getData().getName()); //$NON-NLS-1$
memento.putString("GROUP_MEMENTO_NAME", grpName); //$NON-NLS-1$
} }
request.done(); request.done();
} }

10
plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterVMNode.java
View file

@ -749,13 +749,15 @@ public class RegisterVMNode extends AbstractExpressionVMNode
* (non-Javadoc) * (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[]) * @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) { public void compareElements(IElementCompareRequest[] requests) {
for ( final IElementCompareRequest request : requests ) { for ( final IElementCompareRequest request : requests ) {
Object element = request.getElement(); Object element = request.getElement();
final IMemento memento = request.getMemento(); 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 (mementoName != null) {
if (element instanceof IDMVMContext) { if (element instanceof IDMVMContext) {
@ -775,8 +777,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
if ( getStatus().isOK() ) { if ( getStatus().isOK() ) {
String regName = "Register." + getData().getName() + "." + regDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ request.setEqual( mementoName.equals( "Register." + getData().getName() ) ); //$NON-NLS-1$
request.setEqual( regName.equals( mementoName ) );
} }
request.done(); request.done();
} }
@ -836,8 +837,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
if ( getStatus().isOK() ) { if ( getStatus().isOK() ) {
String regName = "Register." + getData().getName() + "." + regDmc.getSessionId(); //$NON-NLS-1$ //$NON-NLS-2$ memento.putString(MEMENTO_NAME, "Register." + getData().getName()); //$NON-NLS-1$
memento.putString("REGISTER_MEMENTO_NAME", regName);
} }
request.done(); request.done();
} }

8
plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java
View file

@ -722,16 +722,18 @@ public class VariableVMNode extends AbstractExpressionVMNode
*/ */
private String produceExpressionElementName( String viewName , IExpressionDMContext expression ) { 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) { public void compareElements(IElementCompareRequest[] requests) {
for ( IElementCompareRequest request : requests ) { for ( IElementCompareRequest request : requests ) {
Object element = request.getElement(); Object element = request.getElement();
IMemento memento = request.getMemento(); 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 (mementoName != null) {
if (element instanceof IDMVMContext) { if (element instanceof IDMVMContext) {
@ -767,7 +769,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
if ( dmc instanceof IExpressionDMContext) { if ( dmc instanceof IExpressionDMContext) {
String elementName = produceExpressionElementName( request.getPresentationContext().getId(), (IExpressionDMContext) dmc ); String elementName = produceExpressionElementName( request.getPresentationContext().getId(), (IExpressionDMContext) dmc );
memento.putString("VARIABLE_MEMENTO_NAME", elementName); //$NON-NLS-1$ memento.putString(MEMENTO_NAME, elementName);
} }
} }
request.done(); request.done();

9
plugins/org.eclipse.dd.examples.pda.ui/src/org/eclipse/dd/examples/pda/ui/viewmodel/launch/PDAProgramVMNode.java
View file

@ -297,18 +297,19 @@ public class PDAProgramVMNode extends AbstractDMVMNode
* (non-Javadoc) * (non-Javadoc)
* @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[]) * @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 ) { 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) { public void compareElements(IElementCompareRequest[] requests) {
for ( IElementCompareRequest request : requests ) { for ( IElementCompareRequest request : requests ) {
Object element = request.getElement(); Object element = request.getElement();
IMemento memento = request.getMemento(); IMemento memento = request.getMemento();
String mementoName = memento.getString("PDAPROGRAM_MEMENTO_NAME"); //$NON-NLS-1$ String mementoName = memento.getString(MEMENTO_NAME);
if (mementoName != null) { if (mementoName != null) {
if (element instanceof IDMVMContext) { if (element instanceof IDMVMContext) {
@ -344,7 +345,7 @@ public class PDAProgramVMNode extends AbstractDMVMNode
if ( dmc instanceof PDAProgramDMContext) { if ( dmc instanceof PDAProgramDMContext) {
String elementName = produceProgramElementName( request.getPresentationContext().getId(), (PDAProgramDMContext) dmc ); String elementName = produceProgramElementName( request.getPresentationContext().getId(), (PDAProgramDMContext) dmc );
memento.putString("PDAPROGRAM_MEMENTO_NAME", elementName); //$NON-NLS-1$ memento.putString(MEMENTO_NAME, elementName);
} }
} }
request.done(); request.done();