mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-16 05:25:21 +02:00
Code Issues Wiki Activity

Bugzilla 218654. This commit shows some files contain errors. This is because they are being compiled against M4. I will rebuild against M5 shortly. I did a diff of the files and the changes are exactly what I wanted. They will compile against HEAD and M5 when that is resolved.

Browse source
This commit is contained in:
Randy Rohrbach 2008-02-12 20:23:27 +00:00
parent 6321552cfe
commit c7f6460147
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,6 @@ import org.eclipse.dd.dsf.service.IDsfService;
import org.eclipse.dd.dsf.ui.viewmodel.IVMContext; import org.eclipse.dd.dsf.ui.viewmodel.IVMContext;
import org.eclipse.dd.dsf.ui.viewmodel.VMDelta; import org.eclipse.dd.dsf.ui.viewmodel.VMDelta;
import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider; import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;
import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;
import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext; import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;
import org.eclipse.debug.core.model.IExpression; import org.eclipse.debug.core.model.IExpression;
import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.DebugPluginImages;
@ -134,7 +133,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
@Override @Override
protected void updateElementsInSessionThread(final IChildrenUpdate update) { protected void updateElementsInSessionThread(final IChildrenUpdate update) {
getServicesTracker().getService(IRegisters.class).getRegisterGroups( getServicesTracker().getService(IRegisters.class).getRegisterGroups(
new CompositeDMVMContext(update), createCompositeDMVMContext(update),
new DataRequestMonitor<IRegisterGroupDMContext[]>(getSession().getExecutor(), null) { new DataRequestMonitor<IRegisterGroupDMContext[]>(getSession().getExecutor(), null) {
@Override @Override
public void handleCompleted() { public void handleCompleted() {

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

@ -39,7 +39,6 @@ import org.eclipse.dd.dsf.service.IDsfService;
import org.eclipse.dd.dsf.ui.viewmodel.IVMContext; import org.eclipse.dd.dsf.ui.viewmodel.IVMContext;
import org.eclipse.dd.dsf.ui.viewmodel.VMDelta; import org.eclipse.dd.dsf.ui.viewmodel.VMDelta;
import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider; import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;
import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;
import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext; import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;
import org.eclipse.debug.core.model.IExpression; import org.eclipse.debug.core.model.IExpression;
import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.DebugPluginImages;
@ -364,7 +363,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
@Override @Override
protected void updateElementsInSessionThread(final IChildrenUpdate update) { protected void updateElementsInSessionThread(final IChildrenUpdate update) {
getServicesTracker().getService(IRegisters.class).getRegisters( getServicesTracker().getService(IRegisters.class).getRegisters(
new CompositeDMVMContext(update), createCompositeDMVMContext(update),
new DataRequestMonitor<IRegisterDMContext[]>(getSession().getExecutor(), null) { new DataRequestMonitor<IRegisterDMContext[]>(getSession().getExecutor(), null) {
@Override @Override
public void handleCompleted() { public void handleCompleted() {

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

@ -46,7 +46,6 @@ import org.eclipse.dd.dsf.service.IDsfService;
import org.eclipse.dd.dsf.ui.viewmodel.IVMContext; import org.eclipse.dd.dsf.ui.viewmodel.IVMContext;
import org.eclipse.dd.dsf.ui.viewmodel.VMDelta; import org.eclipse.dd.dsf.ui.viewmodel.VMDelta;
import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider; import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMProvider;
import org.eclipse.dd.dsf.ui.viewmodel.dm.CompositeDMVMContext;
import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext; import org.eclipse.dd.dsf.ui.viewmodel.dm.IDMVMContext;
import org.eclipse.debug.core.model.IExpression; import org.eclipse.debug.core.model.IExpression;
import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.DebugUIPlugin;
@ -458,7 +457,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
final IExpressions expressionService = getServicesTracker().getService(IExpressions.class); final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
if (expressionService != null) { if (expressionService != null) {
IExpressionDMContext expressionDMC = expressionService.createExpression( IExpressionDMContext expressionDMC = expressionService.createExpression(
new CompositeDMVMContext(update), createCompositeDMVMContext(update),
update.getExpression().getExpressionText()); update.getExpression().getExpressionText());
VariableExpressionVMC variableVmc = new VariableExpressionVMC(expressionDMC); VariableExpressionVMC variableVmc = new VariableExpressionVMC(expressionDMC);
variableVmc.setExpression(update.getExpression()); variableVmc.setExpression(update.getExpression());

12
plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/dm/AbstractDMVMNode.java
View file

@ -297,6 +297,16 @@ abstract public class AbstractDMVMNode extends AbstractVMNode implements IVMNode
return new DMVMContext(dmc); return new DMVMContext(dmc);
} }
/**
* Creates a default CompositeDMVMContext which represents the selection.
* This can be overridden by view model providers which for their own purposes.
* @param update defines the selection to be updated to
* @return DM Context which represent the current selection
*/
protected IDMContext createCompositeDMVMContext(IViewerUpdate update) {
return new CompositeDMVMContext(update);
}
/** /**
* Searches for a DMC of given type in the tree patch contained in given * Searches for a DMC of given type in the tree patch contained in given
* VMC. Only a DMC in the same session will be returned. * VMC. Only a DMC in the same session will be returned.
@ -305,7 +315,7 @@ abstract public class AbstractDMVMNode extends AbstractVMNode implements IVMNode
* @param dmcType Class object for matching the type. * @param dmcType Class object for matching the type.
* @return DMC, or null if not found. * @return DMC, or null if not found.
*/ */
public <T extends IDMContext> T findDmcInPath(Object inputObject, TreePath path, Class<T> dmcType) { protected <T extends IDMContext> T findDmcInPath(Object inputObject, TreePath path, Class<T> dmcType) {
T retVal = null; T retVal = null;
for (int i = path.getSegmentCount() - 1; i >= 0; i--) { for (int i = path.getSegmentCount() - 1; i >= 0; i--) {
if (path.getSegment(i) instanceof IDMVMContext) { if (path.getSegment(i) instanceof IDMVMContext) {