diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java index f6477628a11..c802e295dce 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java @@ -23,7 +23,6 @@ import org.eclipse.cdt.dsf.datamodel.IDMEvent; import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin; import org.eclipse.cdt.dsf.service.DsfServicesTracker; import org.eclipse.cdt.dsf.service.DsfSession; -import org.eclipse.cdt.dsf.service.IDsfService; import org.eclipse.cdt.dsf.ui.viewmodel.AbstractVMContext; import org.eclipse.cdt.dsf.ui.viewmodel.AbstractVMNode; import org.eclipse.cdt.dsf.ui.viewmodel.IVMContext; @@ -178,73 +177,6 @@ abstract public class AbstractDMVMNode extends AbstractVMNode implements IVMNode return true; } - /** - * Convenience method that checks whether the given dmc context is null. If it is null, an - * appropriate error message is set in the update. - * @param dmc Data Model Context (DMC) to check. - * @param update Update to handle in case the DMC is null. - * @return true if the DMC is NOT null, indicating that it's OK to proceed. - * - * This method has been deprecated. Users should simply perform this functionality in-line - * - * Example : - * - * IExampleDmc dmc = final TimerDMContext dmc = findDmcInPath(...) - * if ( dmc == null ) { - * handleFailedUpdate(update); - * // - * // Perform whatever cleanup or completion is needed because of a lack of - * // a valid data model context. - * // - * ........ - * return; - * } - */ - - @Deprecated - protected boolean checkDmc(IDMContext dmc, IViewerUpdate update) { - if (dmc == null) { - update.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.INVALID_STATE, - "No valid context found.", null)); //$NON-NLS-1$ - handleFailedUpdate(update); - return false; - } - return true; - } - - /** - * A convenience method that checks whether a given service exists. If the service does not - * exist, the update is filled in with the appropriate error message. - * @param serviceClass Service class to find. - * @param filter Service filter to use in addition to the service class name. - * @param update Update object to fill in. - * @return true if service IS found, indicating that it's OK to proceed. - * - * This method has been deprecated. Users should simply perform this functionality in-line - * - * Example : - * - * IExampleService service = getServicesTracker().getService(IExampleService.class,null); - * if ( service == null ) { - * handleFailedUpdate(update); - * // - * // Perform whatever cleanup or completion is needed because of a lack of the service. - * // - * ........ - * return; - * } - */ - @Deprecated - protected boolean checkService(Class serviceClass, String filter, IViewerUpdate update) { - if (getServicesTracker().getService(serviceClass, filter) == null) { - update.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.INVALID_STATE, - "Service " + serviceClass.getName() + " not available.", null)); //$NON-NLS-1$ //$NON-NLS-2$ - handleFailedUpdate(update); - return false; - } - return true; - } - public void update(final IHasChildrenUpdate[] updates) { try { getSession().getExecutor().execute(new DsfRunnable() { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMProvider.java index 606ef55da32..c39b5ea7abc 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMProvider.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMProvider.java @@ -11,8 +11,6 @@ package org.eclipse.cdt.dsf.ui.viewmodel.datamodel; import org.eclipse.cdt.dsf.concurrent.ConfinedToDsfExecutor; -import org.eclipse.cdt.dsf.datamodel.IDMEvent; -import org.eclipse.cdt.dsf.service.DsfServiceEventHandler; import org.eclipse.cdt.dsf.service.DsfSession; import org.eclipse.cdt.dsf.ui.viewmodel.AbstractVMAdapter; import org.eclipse.cdt.dsf.ui.viewmodel.IVMNode; @@ -56,13 +54,4 @@ abstract public class AbstractDMVMProvider extends AbstractCachingVMProvider } public DsfSession getSession() { return fSession; } - - /** - * @deprecated Kept for API compatibility reasons. - * Events are now received and dispatched by the VM adapter. - */ - @Deprecated - @DsfServiceEventHandler - public void eventDispatched(final IDMEvent event) { - } } diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java index 94a8a83957f..99eb178d709 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java @@ -57,17 +57,6 @@ abstract public class Query extends DsfRunnable /** The synchronization object for this query */ private final Sync fSync = new Sync(); - /** - * The Query constructor no longer requires an executor to be specified. - * This executor was used to contruct the DataRequestMonitor argument to the - * {@link #execute(DataRequestMonitor)} method. But a simplification in the - * RequestMonitor object, made this unnecessary. - * @param executor - */ - @Deprecated - public Query(DsfExecutor executor) { - } - /** * The no-argument constructor */ diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java index 6e9692145ff..9bb94a1b24e 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java @@ -240,6 +240,9 @@ abstract public class Sequence extends DsfRunnable implements Future { /** * Constructor that initialized the steps and the result callback. + *

Note: This constructor should not be used because it creates a + * potential ambiguity when one of the two monitors is canceled.

+ * * @param executor The DSF executor which will be used to invoke all * steps. * @param pm Progress monitor for monitoring this sequence. This @@ -253,12 +256,8 @@ abstract public class Sequence extends DsfRunnable implements Future { * @param Result that will be submitted to executor when sequence is * finished. Can be null if calling from non-executor thread and using * {@link Future#get()} method to wait for the sequence result. - * - * @deprecated This constructor should not be used because it creates a - * potential ambiguity when one of the two monitors is canceled. */ - @Deprecated - public Sequence(DsfExecutor executor, IProgressMonitor pm, String taskName, String rollbackTaskName, RequestMonitor rm) { + private Sequence(DsfExecutor executor, IProgressMonitor pm, String taskName, String rollbackTaskName, RequestMonitor rm) { fExecutor = executor; fProgressMonitor = pm; fTaskName = taskName; diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAExpressions.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAExpressions.java index d7991483bc7..09a8347db2c 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAExpressions.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAExpressions.java @@ -510,18 +510,6 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic } } - @SuppressWarnings("unchecked") - @Deprecated - public void getModelData(IDMContext dmc, DataRequestMonitor rm) { - if (dmc instanceof IExpressionDMContext) { - getExpressionData((IExpressionDMContext) dmc, (DataRequestMonitor) rm); - } else if (dmc instanceof FormattedValueDMContext) { - getFormattedExpressionValue((FormattedValueDMContext) dmc, (DataRequestMonitor) rm); - } else { - PDAPlugin.failRequest(rm, INVALID_HANDLE, "Unknown DMC type"); - } - } - @DsfServiceEventHandler public void eventDispatched(IResumedDMEvent e) { // Mark the cache as not available, so that data retrieval commands diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARunControl.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARunControl.java index 29772539cdb..65882bfb56f 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARunControl.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARunControl.java @@ -22,7 +22,6 @@ import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants; import org.eclipse.cdt.dsf.concurrent.Immutable; import org.eclipse.cdt.dsf.concurrent.RequestMonitor; import org.eclipse.cdt.dsf.datamodel.AbstractDMEvent; -import org.eclipse.cdt.dsf.datamodel.IDMContext; import org.eclipse.cdt.dsf.datamodel.IDMEvent; import org.eclipse.cdt.dsf.debug.service.IRunControl; import org.eclipse.cdt.dsf.debug.service.command.IEventListener; @@ -285,19 +284,6 @@ public class PDARunControl extends AbstractDsfService super.shutdown(rm); } - @Deprecated - @SuppressWarnings("unchecked") - public void getModelData(IDMContext dmc, DataRequestMonitor rm) { - // The getModelData() is deprecated and clients are expected to switch - // to getExecutionData() and other data retrieve methods directly. - // However the UI cache still uses it for now. - if (dmc instanceof IExecutionDMContext) { - getExecutionData((IExecutionDMContext)dmc, (DataRequestMonitor)rm); - } else { - PDAPlugin.failRequest(rm, INVALID_HANDLE, "Unknown DMC type"); - } - } - public void eventReceived(Object output) { if (!(output instanceof String)) return; String event = (String)output; diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java index ac6c401f637..5e86e56cb34 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java @@ -434,21 +434,6 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ IExecutionDMContext execCtx = DMContexts.getAncestorOfType(context, IExecutionDMContext.class); return execCtx != null && (fRunControl.isSuspended(execCtx) || (fRunControl.isStepping(execCtx))); } - - @SuppressWarnings("unchecked") - @Deprecated - public void getModelData(IDMContext dmc, DataRequestMonitor rm) { - // The getModelData() is deprecated and clients are expected to switch - // to getExecutionData() and other data retrieve methods directly. - // However the UI cache still uses it for now. - if (dmc instanceof IFrameDMContext) { - getFrameData((IFrameDMContext)dmc, (DataRequestMonitor)rm); - } else if (dmc instanceof IVariableDMContext) { - getVariableData((IVariableDMContext)dmc, (DataRequestMonitor)rm); - } else { - PDAPlugin.failRequest(rm, IDsfStatusConstants.INVALID_HANDLE, "Unknown context type"); - } - } /** * Returns a frame context for the given thread and level;