mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 09:46:02 +02:00
Bug 540373: Cleanup: Remove redundant semicolons
This was done by selecting all projects in Eclipse then Source -> Clean Up... -> choosing: - Remove redundant semicolons and completing the wizard Change-Id: I3d3175cfdfadec4f815c551d486e42c9f57b80ce
This commit is contained in:
parent
caf2292768
commit
eeb3006e27
164 changed files with 683 additions and 693 deletions
|
@ -76,7 +76,7 @@ public class AutoconfSubstRule implements IPredicateRule {
|
||||||
// A valid id has some alphabetic character in it.
|
// A valid id has some alphabetic character in it.
|
||||||
isId = true;
|
isId = true;
|
||||||
} else if (c >= '0' && c <= '9' || c == '_') {
|
} else if (c >= '0' && c <= '9' || c == '_') {
|
||||||
; // continue
|
// continue
|
||||||
} else if (c == '@' && isId)
|
} else if (c == '@' && isId)
|
||||||
return getSuccessToken();
|
return getSuccessToken();
|
||||||
else
|
else
|
||||||
|
|
|
@ -130,7 +130,7 @@ public class AutotoolsCategoryPropertyOptionPage extends AbstractConfigureProper
|
||||||
super.doLoad();
|
super.doLoad();
|
||||||
isLoaded = true;
|
isLoaded = true;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
public void setToolTipText(String toolTip) {
|
public void setToolTipText(String toolTip) {
|
||||||
this.getLabelControl().setToolTipText(toolTip);
|
this.getLabelControl().setToolTipText(toolTip);
|
||||||
|
@ -154,7 +154,7 @@ public class AutotoolsCategoryPropertyOptionPage extends AbstractConfigureProper
|
||||||
protected void configureShell(Shell newShell) {
|
protected void configureShell(Shell newShell) {
|
||||||
super.configureShell(newShell);
|
super.configureShell(newShell);
|
||||||
newShell.setText(AutotoolsPropertyMessages.getString("NewEnvVarDialog.title"));
|
newShell.setText(AutotoolsPropertyMessages.getString("NewEnvVarDialog.title"));
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Control createDialogArea(Composite parent) {
|
protected Control createDialogArea(Composite parent) {
|
||||||
|
@ -195,7 +195,7 @@ public class AutotoolsCategoryPropertyOptionPage extends AbstractConfigureProper
|
||||||
gd.widthHint = fieldWidthHint;
|
gd.widthHint = fieldWidthHint;
|
||||||
fTextValue.setLayoutData(gd);
|
fTextValue.setLayoutData(gd);
|
||||||
return composite;
|
return composite;
|
||||||
};
|
}
|
||||||
|
|
||||||
// Obtain instance of OK button and set disabled.
|
// Obtain instance of OK button and set disabled.
|
||||||
@Override
|
@Override
|
||||||
|
@ -225,7 +225,7 @@ public class AutotoolsCategoryPropertyOptionPage extends AbstractConfigureProper
|
||||||
public String getValue() {
|
public String getValue() {
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getNewInputObject() {
|
protected String getNewInputObject() {
|
||||||
|
@ -309,7 +309,7 @@ public class AutotoolsCategoryPropertyOptionPage extends AbstractConfigureProper
|
||||||
}
|
}
|
||||||
return sb.toString().trim();
|
return sb.toString().trim();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
private List<FieldEditor> fieldEditors;
|
private List<FieldEditor> fieldEditors;
|
||||||
|
|
||||||
|
|
|
@ -90,5 +90,5 @@ public class ToolListLabelProvider extends LabelProvider {
|
||||||
if (descriptor != null && manager != null) {
|
if (descriptor != null && manager != null) {
|
||||||
manager.destroyImage(descriptor);
|
manager.destroyImage(descriptor);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,7 +97,7 @@ public class AutoconfTextHover implements ITextHover, ITextHoverExtension {
|
||||||
public Document[] getDocuments() {
|
public Document[] getDocuments() {
|
||||||
return documents;
|
return documents;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
private static Map<String, Document> acHoverDocs;
|
private static Map<String, Document> acHoverDocs;
|
||||||
private static Map<String, Document> amHoverDocs;
|
private static Map<String, Document> amHoverDocs;
|
||||||
|
|
|
@ -216,7 +216,7 @@ public class CMakePropertyPage extends PropertyPage {
|
||||||
|
|
||||||
public enum ParseState {
|
public enum ParseState {
|
||||||
INIT, SEENCOMMENT
|
INIT, SEENCOMMENT
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parse output of cmake -LAH call to determine options to show to user
|
* Parse output of cmake -LAH call to determine options to show to user
|
||||||
|
|
|
@ -239,7 +239,7 @@ public class MesonPropertyPage extends PropertyPage {
|
||||||
|
|
||||||
public enum ParseState {
|
public enum ParseState {
|
||||||
INIT, GROUP, OPTION, OPTION_WITH_VALUES, ARGS
|
INIT, GROUP, OPTION, OPTION_WITH_VALUES, ARGS
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean performOk() {
|
public boolean performOk() {
|
||||||
|
|
|
@ -78,7 +78,7 @@ public class QuickFixCreateNewClassTest {
|
||||||
return translationUnitViaWorkspace;
|
return translationUnitViaWorkspace;
|
||||||
}
|
}
|
||||||
throw new RuntimeException("Invalid marker");
|
throw new RuntimeException("Invalid marker");
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
when(toWorkingCopy.apply(translationUnitViaWorkspace)).thenReturn(translationUnitWorkingCopy);
|
when(toWorkingCopy.apply(translationUnitViaWorkspace)).thenReturn(translationUnitWorkingCopy);
|
||||||
|
|
|
@ -359,7 +359,7 @@ public class RemoveUnusedDeclarationsRefactoring extends CRefactoring {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
};
|
}
|
||||||
|
|
||||||
private static Collection<IASTName> getDeclaredNames(IASTDeclaration declaration) {
|
private static Collection<IASTName> getDeclaredNames(IASTDeclaration declaration) {
|
||||||
while (declaration instanceof ICPPASTTemplateDeclaration) {
|
while (declaration instanceof ICPPASTTemplateDeclaration) {
|
||||||
|
|
|
@ -89,7 +89,7 @@ public class AsyncViewerTest extends BaseUITestCase {
|
||||||
}
|
}
|
||||||
return n.fChildren;
|
return n.fChildren;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
private class MyLabelProvider extends LabelProvider {
|
private class MyLabelProvider extends LabelProvider {
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -106,4 +106,4 @@ public class BuildOptionsParser implements IWorkspaceRunnable, IMarkerGenerator
|
||||||
// do nothing
|
// do nothing
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|
|
@ -175,4 +175,4 @@ public class CompilerOptionParser implements IWorkspaceRunnable {
|
||||||
|
|
||||||
return currentFolder;
|
return currentFolder;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
|
@ -29,13 +29,13 @@ public interface ICWatchpointTarget {
|
||||||
int getSize(); // returns -1 if size not available
|
int getSize(); // returns -1 if size not available
|
||||||
|
|
||||||
void setSize(int size);
|
void setSize(int size);
|
||||||
};
|
}
|
||||||
|
|
||||||
interface CanCreateWatchpointRequest extends IRequest {
|
interface CanCreateWatchpointRequest extends IRequest {
|
||||||
boolean getCanCreate();
|
boolean getCanCreate();
|
||||||
|
|
||||||
void setCanCreate(boolean value);
|
void setCanCreate(boolean value);
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine if a watchpoint can be set on the element. The result does not
|
* Determine if a watchpoint can be set on the element. The result does not
|
||||||
|
|
|
@ -254,7 +254,7 @@ public class ExecutablesManager extends PlatformObject
|
||||||
this.projectsToRefresh = projectsToRefresh;
|
this.projectsToRefresh = projectsToRefresh;
|
||||||
super.schedule();
|
super.schedule();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/** The search job. We only let one of these run at any one time */
|
/** The search job. We only let one of these run at any one time */
|
||||||
private SearchJob searchJob = new SearchJob();
|
private SearchJob searchJob = new SearchJob();
|
||||||
|
|
|
@ -53,5 +53,5 @@ public interface ICBreakpointExtension {
|
||||||
*/
|
*/
|
||||||
default public String getExtensionMessage() {
|
default public String getExtensionMessage() {
|
||||||
return ""; //$NON-NLS-1$
|
return ""; //$NON-NLS-1$
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,7 @@ public interface IChangeReverseMethodHandler extends IReverseToggleHandler, IDeb
|
||||||
*/
|
*/
|
||||||
enum ReverseDebugMethod {
|
enum ReverseDebugMethod {
|
||||||
OFF, SOFTWARE, HARDWARE, BRANCH_TRACE, PROCESSOR_TRACE, GDB_TRACE
|
OFF, SOFTWARE, HARDWARE, BRANCH_TRACE, PROCESSOR_TRACE, GDB_TRACE
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the value for the reverse debugging method to be used when the button is toggled.
|
* Sets the value for the reverse debugging method to be used when the button is toggled.
|
||||||
|
|
|
@ -43,5 +43,5 @@ public interface IRegisterGroupDescriptor {
|
||||||
*/
|
*/
|
||||||
default String getContainerId() {
|
default String getContainerId() {
|
||||||
return null;
|
return null;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -170,7 +170,6 @@ public class AddMemoryBlocks implements IAddMemoryBlocksTarget {
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
;
|
|
||||||
PlatformAction action = new PlatformAction(site);
|
PlatformAction action = new PlatformAction(site);
|
||||||
action.run();
|
action.run();
|
||||||
action.dispose();
|
action.dispose();
|
||||||
|
|
|
@ -61,7 +61,7 @@ public class ReverseDebugAction extends AbstractBreakpointAction {
|
||||||
public static REVERSE_DEBUG_ACTIONS_ENUM getValue(int index) {
|
public static REVERSE_DEBUG_ACTIONS_ENUM getValue(int index) {
|
||||||
return REVERSE_DEBUG_ACTIONS_ENUM.values()[index];
|
return REVERSE_DEBUG_ACTIONS_ENUM.values()[index];
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
private REVERSE_DEBUG_ACTIONS_ENUM fOperation;
|
private REVERSE_DEBUG_ACTIONS_ENUM fOperation;
|
||||||
|
|
||||||
|
|
|
@ -555,7 +555,6 @@ abstract public class AbstractToggleBreakpointAdapter
|
||||||
job.schedule();
|
job.schedule();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
;
|
|
||||||
|
|
||||||
watchpointTarget.getSize(new GetSizeRequest());
|
watchpointTarget.getSize(new GetSizeRequest());
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ public class AddWatchpointOnVariableActionDelegate extends AddWatchpointActionDe
|
||||||
public void setCanCreate(boolean value) {
|
public void setCanCreate(boolean value) {
|
||||||
fCanCreate = value;
|
fCanCreate = value;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Record the target variable/expression
|
* Record the target variable/expression
|
||||||
|
|
|
@ -168,7 +168,7 @@ class DefaultCBreakpointUIContribution implements ICBreakpointsUIContribution {
|
||||||
|
|
||||||
public void addValue(String value, String valueLabel) {
|
public void addValue(String value, String valueLabel) {
|
||||||
valueLabels.put(value, valueLabel);
|
valueLabels.put(value, valueLabel);
|
||||||
};
|
}
|
||||||
|
|
||||||
public void addContionEquals(String property, String value) {
|
public void addContionEquals(String property, String value) {
|
||||||
conditions.put(property, value);
|
conditions.put(property, value);
|
||||||
|
|
|
@ -19,4 +19,4 @@ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model;
|
||||||
*/
|
*/
|
||||||
public enum VisualizerExecutionState {
|
public enum VisualizerExecutionState {
|
||||||
RUNNING, SUSPENDED, CRASHED, EXITED
|
RUNNING, SUSPENDED, CRASHED, EXITED
|
||||||
};
|
}
|
||||||
|
|
|
@ -786,12 +786,12 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer implements IPin
|
||||||
@Override
|
@Override
|
||||||
public void visualizerSelected() {
|
public void visualizerSelected() {
|
||||||
updateActions();
|
updateActions();
|
||||||
};
|
}
|
||||||
|
|
||||||
/** Invoked when another visualizer has been selected, hiding this one. */
|
/** Invoked when another visualizer has been selected, hiding this one. */
|
||||||
@Override
|
@Override
|
||||||
public void visualizerDeselected() {
|
public void visualizerDeselected() {
|
||||||
};
|
}
|
||||||
|
|
||||||
// --- workbench selection management ---
|
// --- workbench selection management ---
|
||||||
|
|
||||||
|
|
|
@ -177,7 +177,6 @@ public class DsfTerminateCommand implements ITerminateHandler {
|
||||||
class ScheduledFutureWrapper {
|
class ScheduledFutureWrapper {
|
||||||
ScheduledFuture<?> fFuture;
|
ScheduledFuture<?> fFuture;
|
||||||
}
|
}
|
||||||
;
|
|
||||||
|
|
||||||
final ScheduledFutureWrapper fFutureWrapper = new ScheduledFutureWrapper();
|
final ScheduledFutureWrapper fFutureWrapper = new ScheduledFutureWrapper();
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,7 @@ public class GdbDisconnectCommand implements IDisconnectHandler {
|
||||||
request.setEnabled(false);
|
request.setEnabled(false);
|
||||||
} else {
|
} else {
|
||||||
request.setEnabled(getData());
|
request.setEnabled(getData());
|
||||||
;
|
|
||||||
}
|
}
|
||||||
request.done();
|
request.done();
|
||||||
}
|
}
|
||||||
|
@ -226,7 +226,7 @@ public class GdbDisconnectCommand implements IDisconnectHandler {
|
||||||
rm.setData(contDmcs.toArray(new IContainerDMContext[contDmcs.size()]));
|
rm.setData(contDmcs.toArray(new IContainerDMContext[contDmcs.size()]));
|
||||||
}
|
}
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
rm.setStatus(new Status(IStatus.ERROR, GdbUIPlugin.PLUGIN_ID, "Service is not available.")); //$NON-NLS-1$
|
rm.setStatus(new Status(IStatus.ERROR, GdbUIPlugin.PLUGIN_ID, "Service is not available.")); //$NON-NLS-1$
|
||||||
|
|
|
@ -112,7 +112,7 @@ public class GdbRestartCommand implements IRestartHandler {
|
||||||
@Override
|
@Override
|
||||||
protected void handleCompleted() {
|
protected void handleCompleted() {
|
||||||
request.done();
|
request.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
request.done();
|
request.done();
|
||||||
|
|
|
@ -188,7 +188,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
|
||||||
|
|
||||||
return Status.OK_STATUS;
|
return Status.OK_STATUS;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This job will prompt the user for a path to the binary to use,
|
* This job will prompt the user for a path to the binary to use,
|
||||||
|
@ -253,7 +253,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
|
||||||
fProcessNameToBinaryMap.put(fProcName, finalBinaryPath);
|
fProcessNameToBinaryMap.put(fProcName, finalBinaryPath);
|
||||||
}
|
}
|
||||||
fRm.done();
|
fRm.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -380,7 +380,6 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
;
|
|
||||||
// Trigger the first query
|
// Trigger the first query
|
||||||
new ProcessRequestMonitor(ImmediateExecutor.getInstance()).done();
|
new ProcessRequestMonitor(ImmediateExecutor.getInstance()).done();
|
||||||
}
|
}
|
||||||
|
@ -641,7 +640,6 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
;
|
|
||||||
|
|
||||||
// Trigger the first attach.
|
// Trigger the first attach.
|
||||||
new AttachToProcessRequestMonitor().done();
|
new AttachToProcessRequestMonitor().done();
|
||||||
|
|
|
@ -137,7 +137,7 @@ public class GdbDebugNewExecutableCommand extends RefreshableDebugCommand implem
|
||||||
protected void handleCancel() {
|
protected void handleCancel() {
|
||||||
rm.cancel();
|
rm.cancel();
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void handleSuccess() {
|
protected void handleSuccess() {
|
||||||
|
@ -150,7 +150,7 @@ public class GdbDebugNewExecutableCommand extends RefreshableDebugCommand implem
|
||||||
rm.setStatus(e.getStatus());
|
rm.setStatus(e.getStatus());
|
||||||
rm.done();
|
rm.done();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
job.schedule();
|
job.schedule();
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,7 +75,7 @@ public class GdbSaveTraceDataCommand extends AbstractDebugCommand implements ISa
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
fileName[0] = promptForFileName();
|
fileName[0] = promptForFileName();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (fileName[0] != null) {
|
if (fileName[0] != null) {
|
||||||
|
|
|
@ -99,7 +99,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem
|
||||||
rm.done();
|
rm.done();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
rm.done();
|
rm.done();
|
||||||
|
@ -146,7 +146,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem
|
||||||
protected void handleSuccess() {
|
protected void handleSuccess() {
|
||||||
rm.setData(!getData());
|
rm.setData(!getData());
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
rm.setData(false);
|
rm.setData(false);
|
||||||
|
@ -156,7 +156,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem
|
||||||
rm.setData(false);
|
rm.setData(false);
|
||||||
rm.done();
|
rm.done();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
rm.setData(false);
|
rm.setData(false);
|
||||||
|
|
|
@ -93,7 +93,7 @@ public class GdbSelectPrevTraceRecordCommand extends AbstractDebugCommand implem
|
||||||
rm.done();
|
rm.done();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
rm.done();
|
rm.done();
|
||||||
|
@ -151,9 +151,9 @@ public class GdbSelectPrevTraceRecordCommand extends AbstractDebugCommand implem
|
||||||
protected void handleSuccess() {
|
protected void handleSuccess() {
|
||||||
// Can do visualization if we are tracing.
|
// Can do visualization if we are tracing.
|
||||||
rm.done(!getData());
|
rm.done(!getData());
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
rm.done(false);
|
rm.done(false);
|
||||||
|
|
|
@ -77,7 +77,7 @@ public class GdbStartTracingCommand extends AbstractDebugCommand implements ISta
|
||||||
@Override
|
@Override
|
||||||
protected void handleCompleted() {
|
protected void handleCompleted() {
|
||||||
traceControl.startTracing(dmc, rm);
|
traceControl.startTracing(dmc, rm);
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
traceControl.startTracing(dmc, rm);
|
traceControl.startTracing(dmc, rm);
|
||||||
|
|
|
@ -94,7 +94,7 @@ public class GdbMemoryBlockAddressInfoRetrieval implements IMemoryBlockAddressIn
|
||||||
@Override
|
@Override
|
||||||
protected void handleCompleted() {
|
protected void handleCompleted() {
|
||||||
request.done();
|
request.done();
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
for (final IGdbMemoryAddressInfoTypeRetrieval infoProvider : infoTypeProviders) {
|
for (final IGdbMemoryAddressInfoTypeRetrieval infoProvider : infoTypeProviders) {
|
||||||
|
|
|
@ -664,7 +664,7 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded
|
||||||
return fDirection * (v1.compareTo(v2));
|
return fDirection * (v1.compareTo(v2));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setFocus() {
|
public void setFocus() {
|
||||||
|
|
|
@ -144,7 +144,7 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements
|
||||||
validate();
|
validate();
|
||||||
updateDialogButtons();
|
updateDialogButtons();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
abstract class AbstractEditingSupport extends EditingSupport {
|
abstract class AbstractEditingSupport extends EditingSupport {
|
||||||
|
|
||||||
|
@ -189,7 +189,7 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements
|
||||||
abstract Object doGetValue(CommandTimeoutEntry entry);
|
abstract Object doGetValue(CommandTimeoutEntry entry);
|
||||||
|
|
||||||
abstract ICellEditorValidator getValidator();
|
abstract ICellEditorValidator getValidator();
|
||||||
};
|
}
|
||||||
|
|
||||||
private TableViewer fViewer;
|
private TableViewer fViewer;
|
||||||
private Button fAddButton;
|
private Button fAddButton;
|
||||||
|
|
|
@ -263,7 +263,7 @@ public class TraceControlModel {
|
||||||
rm.setData(null);
|
rm.setData(null);
|
||||||
}
|
}
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
@ -314,7 +314,7 @@ public class TraceControlModel {
|
||||||
rm.setStatus(new Status(IStatus.ERROR, GdbUIPlugin.PLUGIN_ID,
|
rm.setStatus(new Status(IStatus.ERROR, GdbUIPlugin.PLUGIN_ID,
|
||||||
IDsfStatusConstants.INVALID_STATE, "Backend error", e)); //$NON-NLS-1$
|
IDsfStatusConstants.INVALID_STATE, "Backend error", e)); //$NON-NLS-1$
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
FailedTraceVariableCreationException e = new FailedTraceVariableCreationException(
|
FailedTraceVariableCreationException e = new FailedTraceVariableCreationException(
|
||||||
|
@ -374,7 +374,7 @@ public class TraceControlModel {
|
||||||
new Hashtable<String, String>());
|
new Hashtable<String, String>());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -208,7 +208,7 @@ public class GdbVariableVMNode extends VariableVMNode {
|
||||||
}
|
}
|
||||||
return super.getAdapter(adapter);
|
return super.getAdapter(adapter);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
private static boolean isConvenienceVariable(String expr) {
|
private static boolean isConvenienceVariable(String expr) {
|
||||||
// GDB convenience variables are variables that start with a $ followed
|
// GDB convenience variables are variables that start with a $ followed
|
||||||
|
|
|
@ -166,7 +166,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement
|
||||||
? !prop.booleanValue() && pin_prop.booleanValue()
|
? !prop.booleanValue() && pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.RED)
|
&& pin_color_prop.equals(IPinElementColorDescriptor.RED)
|
||||||
: false;
|
: false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* RUNNING CONTAINER - GREEN PIN */
|
/* RUNNING CONTAINER - GREEN PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -186,7 +186,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement
|
||||||
? !prop.booleanValue() && pin_prop.booleanValue()
|
? !prop.booleanValue() && pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN)
|
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN)
|
||||||
: false;
|
: false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* RUNNING CONTAINER - BLUE PIN */
|
/* RUNNING CONTAINER - BLUE PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -206,7 +206,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement
|
||||||
? !prop.booleanValue() && pin_prop.booleanValue()
|
? !prop.booleanValue() && pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE)
|
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE)
|
||||||
: false;
|
: false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* RUNNING CONTAINER - NO PIN */
|
/* RUNNING CONTAINER - NO PIN */
|
||||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET)) {
|
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET)) {
|
||||||
|
@ -217,7 +217,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement
|
||||||
@Override
|
@Override
|
||||||
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
||||||
return Boolean.FALSE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED));
|
return Boolean.FALSE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED));
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/* SUSPENDED CONTAINER - RED PIN */
|
/* SUSPENDED CONTAINER - RED PIN */
|
||||||
|
@ -234,7 +234,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement
|
||||||
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
||||||
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.RED) : false;
|
&& pin_color_prop.equals(IPinElementColorDescriptor.RED) : false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* SUSPENDED CONTAINER - GREEN PIN */
|
/* SUSPENDED CONTAINER - GREEN PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -250,7 +250,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement
|
||||||
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
||||||
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false;
|
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* SUSPENDED CONTAINER - BLUE PIN */
|
/* SUSPENDED CONTAINER - BLUE PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -266,7 +266,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement
|
||||||
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
||||||
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false;
|
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* SUSPENDED CONTAINER - NO PIN */
|
/* SUSPENDED CONTAINER - NO PIN */
|
||||||
new LabelImage(DebugUITools
|
new LabelImage(DebugUITools
|
||||||
|
|
|
@ -143,7 +143,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP
|
||||||
? !prop.booleanValue() && pin_prop.booleanValue()
|
? !prop.booleanValue() && pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.RED)
|
&& pin_color_prop.equals(IPinElementColorDescriptor.RED)
|
||||||
: false;
|
: false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* RUNNING THREAD - GREEN PIN */
|
/* RUNNING THREAD - GREEN PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -163,7 +163,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP
|
||||||
? !prop.booleanValue() && pin_prop.booleanValue()
|
? !prop.booleanValue() && pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN)
|
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN)
|
||||||
: false;
|
: false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* RUNNING THREAD - BLUE PIN */
|
/* RUNNING THREAD - BLUE PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -183,7 +183,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP
|
||||||
? !prop.booleanValue() && pin_prop.booleanValue()
|
? !prop.booleanValue() && pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE)
|
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE)
|
||||||
: false;
|
: false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* RUNNING THREAD - NO PIN */
|
/* RUNNING THREAD - NO PIN */
|
||||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_RUNNING)) {
|
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_RUNNING)) {
|
||||||
|
@ -196,7 +196,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP
|
||||||
// prop has been seen to be null during session shutdown [313823]
|
// prop has been seen to be null during session shutdown [313823]
|
||||||
Boolean prop = (Boolean) properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED);
|
Boolean prop = (Boolean) properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED);
|
||||||
return (prop != null) ? !prop.booleanValue() : false;
|
return (prop != null) ? !prop.booleanValue() : false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* SUSPENDED THREAD - RED PIN */
|
/* SUSPENDED THREAD - RED PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -212,7 +212,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP
|
||||||
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
||||||
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.RED) : false;
|
&& pin_color_prop.equals(IPinElementColorDescriptor.RED) : false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* SUSPENDED THREAD - GREEN PIN */
|
/* SUSPENDED THREAD - GREEN PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -228,7 +228,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP
|
||||||
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
||||||
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false;
|
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* SUSPENDED THREAD - BLUE PIN */
|
/* SUSPENDED THREAD - BLUE PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -244,7 +244,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP
|
||||||
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
||||||
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false;
|
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* SUSPENDED THREAD - NO PIN */
|
/* SUSPENDED THREAD - NO PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
|
|
@ -95,7 +95,7 @@ public class GdbMemoryAddressInfoRegistersRetrieval implements IGdbMemoryAddress
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// no valid registers
|
// no valid registers
|
||||||
|
|
|
@ -463,7 +463,7 @@ public class FinalLaunchSequence extends ReflectionSequence {
|
||||||
// fCommandControl.queueCommand(
|
// fCommandControl.queueCommand(
|
||||||
// new MIGDBSetSysroot(fCommandControl.getContext()),
|
// new MIGDBSetSysroot(fCommandControl.getContext()),
|
||||||
// new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
|
// new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
requestMonitor.done();
|
requestMonitor.done();
|
||||||
|
|
|
@ -314,7 +314,7 @@ public class DebugNewProcessSequence extends ReflectionSequence {
|
||||||
|
|
||||||
return Status.OK_STATUS;
|
return Status.OK_STATUS;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If we are dealing with a postmortem session, connect to the core/trace file.
|
* If we are dealing with a postmortem session, connect to the core/trace file.
|
||||||
|
|
|
@ -325,18 +325,18 @@ public class GDBBackend extends AbstractDsfService implements IGDBBackend, IMIBa
|
||||||
@Override
|
@Override
|
||||||
public OutputStream getMIOutputStream() {
|
public OutputStream getMIOutputStream() {
|
||||||
return fProcess.getOutputStream();
|
return fProcess.getOutputStream();
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public InputStream getMIInputStream() {
|
public InputStream getMIInputStream() {
|
||||||
return fProcess.getInputStream();
|
return fProcess.getInputStream();
|
||||||
};
|
}
|
||||||
|
|
||||||
/** @since 4.1 */
|
/** @since 4.1 */
|
||||||
@Override
|
@Override
|
||||||
public InputStream getMIErrorStream() {
|
public InputStream getMIErrorStream() {
|
||||||
return fProcess.getErrorStream();
|
return fProcess.getErrorStream();
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getId() {
|
public String getId() {
|
||||||
|
|
|
@ -94,7 +94,7 @@ public class GDBBackend_7_12 extends GDBBackend {
|
||||||
return super.getMIOutputStream();
|
return super.getMIOutputStream();
|
||||||
}
|
}
|
||||||
return fMIPty.getOutputStream();
|
return fMIPty.getOutputStream();
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public InputStream getMIInputStream() {
|
public InputStream getMIInputStream() {
|
||||||
|
@ -102,7 +102,7 @@ public class GDBBackend_7_12 extends GDBBackend {
|
||||||
return super.getMIInputStream();
|
return super.getMIInputStream();
|
||||||
}
|
}
|
||||||
return fMIPty.getInputStream();
|
return fMIPty.getInputStream();
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public InputStream getMIErrorStream() {
|
public InputStream getMIErrorStream() {
|
||||||
|
@ -110,7 +110,7 @@ public class GDBBackend_7_12 extends GDBBackend {
|
||||||
return super.getMIErrorStream();
|
return super.getMIErrorStream();
|
||||||
}
|
}
|
||||||
return fDummyErrorStream;
|
return fDummyErrorStream;
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String[] getDebuggerCommandLine() {
|
protected String[] getDebuggerCommandLine() {
|
||||||
|
|
|
@ -54,7 +54,7 @@ public class GDBBreakpoints_7_2 extends GDBBreakpoints_7_0 {
|
||||||
|
|
||||||
private enum TracepointMode {
|
private enum TracepointMode {
|
||||||
FAST_THEN_NORMAL, FAST_ONLY, NORMAL_ONLY
|
FAST_THEN_NORMAL, FAST_ONLY, NORMAL_ONLY
|
||||||
};
|
}
|
||||||
|
|
||||||
private TracepointMode fTracepointMode = TracepointMode.NORMAL_ONLY;
|
private TracepointMode fTracepointMode = TracepointMode.NORMAL_ONLY;
|
||||||
|
|
||||||
|
|
|
@ -128,7 +128,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements
|
||||||
@Override
|
@Override
|
||||||
public IDMContext[] getParents() {
|
public IDMContext[] getParents() {
|
||||||
return fExprDelegate.getParents();
|
return fExprDelegate.getParents();
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> T getAdapter(Class<T> adapterType) {
|
public <T> T getAdapter(Class<T> adapterType) {
|
||||||
|
|
|
@ -1488,7 +1488,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse
|
||||||
}
|
}
|
||||||
|
|
||||||
rm.done(containerDmcs.toArray(new IMIContainerDMContext[containerDmcs.size()]));
|
rm.done(containerDmcs.toArray(new IMIContainerDMContext[containerDmcs.size()]));
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
fContainerCommandCache.execute(fCommandFactory.createMIListThreadGroups(controlDmc),
|
fContainerCommandCache.execute(fCommandFactory.createMIListThreadGroups(controlDmc),
|
||||||
|
@ -1776,9 +1776,9 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse
|
||||||
|
|
||||||
setData(getData());
|
setData(getData());
|
||||||
super.handleCompleted();
|
super.handleCompleted();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
IRunControl runControl = getServicesTracker().getService(IRunControl.class);
|
IRunControl runControl = getServicesTracker().getService(IRunControl.class);
|
||||||
|
|
|
@ -618,7 +618,7 @@ public class GDBProcesses_7_2 extends GDBProcesses_7_1 implements IMultiTerminat
|
||||||
// Detach failed
|
// Detach failed
|
||||||
getDetachedProcesses().remove(containerDmc.getGroupId());
|
getDetachedProcesses().remove(containerDmc.getGroupId());
|
||||||
super.handleFailure();
|
super.handleFailure();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1263,7 +1263,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService
|
||||||
this.steps = steps;
|
this.steps = steps;
|
||||||
this.rm = rm;
|
this.rm = rm;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
// The set of threads that we will actually be suspended to make the containers suspended.
|
// The set of threads that we will actually be suspended to make the containers suspended.
|
||||||
private Set<IMIExecutionDMContext> fExecutionDmcToSuspendSet = new HashSet<>();
|
private Set<IMIExecutionDMContext> fExecutionDmcToSuspendSet = new HashSet<>();
|
||||||
|
@ -1526,7 +1526,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Suspended all the threads we have selected.
|
* Suspended all the threads we have selected.
|
||||||
|
@ -1558,7 +1558,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService
|
||||||
// We weren't able to suspend, so abort the operation
|
// We weren't able to suspend, so abort the operation
|
||||||
fDisableNextSignalEventDmcSet.remove(thread);
|
fDisableNextSignalEventDmcSet.remove(thread);
|
||||||
super.handleFailure();
|
super.handleFailure();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1568,7 +1568,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService
|
||||||
Sequence.Step restoreStep = new RestoreTargetStateStep();
|
Sequence.Step restoreStep = new RestoreTargetStateStep();
|
||||||
restoreStep.execute(rm);
|
restoreStep.execute(rm);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This step of the sequence takes care of executing all the steps that
|
* This step of the sequence takes care of executing all the steps that
|
||||||
|
@ -1611,7 +1611,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService
|
||||||
executeSteps(fOperationsPending.poll());
|
executeSteps(fOperationsPending.poll());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If the sequence had to interrupt the execution context of interest,
|
* If the sequence had to interrupt the execution context of interest,
|
||||||
|
@ -1666,7 +1666,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/* ******************************************************************************
|
/* ******************************************************************************
|
||||||
* End of section to support operations even when the target is unavailable.
|
* End of section to support operations even when the target is unavailable.
|
||||||
|
|
|
@ -158,7 +158,7 @@ public interface IGDBTraceControl extends IDsfService {
|
||||||
|
|
||||||
public static enum STOP_REASON_ENUM {
|
public static enum STOP_REASON_ENUM {
|
||||||
REQUEST, PASSCOUNT, OVERFLOW, DISCONNECTION, ERROR, UNKNOWN
|
REQUEST, PASSCOUNT, OVERFLOW, DISCONNECTION, ERROR, UNKNOWN
|
||||||
};
|
}
|
||||||
|
|
||||||
public interface ITraceStatusDMData extends IDMData {
|
public interface ITraceStatusDMData extends IDMData {
|
||||||
boolean isTracingSupported();
|
boolean isTracingSupported();
|
||||||
|
|
|
@ -39,7 +39,7 @@ public interface IReverseRunControl {
|
||||||
* @return the new state of reverse mode.
|
* @return the new state of reverse mode.
|
||||||
*/
|
*/
|
||||||
boolean isReverseModeEnabled();
|
boolean isReverseModeEnabled();
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Establish if a reverse-resume operation is allowed on the specified context.
|
* Establish if a reverse-resume operation is allowed on the specified context.
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class StartOrRestartProcessSequence_7_12 extends StartOrRestartProcessSeq
|
||||||
fReverseService = tracker.getService(GDBRunControl_7_12.class);
|
fReverseService = tracker.getService(GDBRunControl_7_12.class);
|
||||||
tracker.dispose();
|
tracker.dispose();
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -805,7 +805,7 @@ public class GDBControl extends AbstractMIControl implements IGDBControl {
|
||||||
protected void handleErrorOrWarning() {
|
protected void handleErrorOrWarning() {
|
||||||
GdbPlugin.getDefault().getLog().log(getStatus());
|
GdbPlugin.getDefault().getLog().log(getStatus());
|
||||||
super.handleErrorOrWarning();
|
super.handleErrorOrWarning();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
IStatus status = new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, IGdbDebugConstants.STATUS_HANDLER_CODE,
|
IStatus status = new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, IGdbDebugConstants.STATUS_HANDLER_CODE,
|
||||||
|
@ -916,7 +916,7 @@ public class GDBControl extends AbstractMIControl implements IGDBControl {
|
||||||
protected void handleErrorOrWarning() {
|
protected void handleErrorOrWarning() {
|
||||||
GdbPlugin.getDefault().getLog().log(getStatus());
|
GdbPlugin.getDefault().getLog().log(getStatus());
|
||||||
super.handleErrorOrWarning();
|
super.handleErrorOrWarning();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ public interface IGDBControl extends IMICommandControl {
|
||||||
*/
|
*/
|
||||||
default Process getGDBBackendProcess() {
|
default Process getGDBBackendProcess() {
|
||||||
return getCLIProcess();
|
return getCLIProcess();
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated The return value of this method was too
|
* @deprecated The return value of this method was too
|
||||||
|
|
|
@ -28,7 +28,7 @@ public interface IMIBackend extends IDsfService {
|
||||||
|
|
||||||
public enum State {
|
public enum State {
|
||||||
NOT_INITIALIZED, STARTED, TERMINATED
|
NOT_INITIALIZED, STARTED, TERMINATED
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Event indicating that the back end process has started or terminated.
|
* Event indicating that the back end process has started or terminated.
|
||||||
|
|
|
@ -52,7 +52,7 @@ public interface IMIRunControl extends IRunControl2 {
|
||||||
* @since 4.0
|
* @since 4.0
|
||||||
*/
|
*/
|
||||||
public interface IRunMode {
|
public interface IRunMode {
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The run-modes supported by GDB.
|
* The run-modes supported by GDB.
|
||||||
|
@ -61,7 +61,7 @@ public interface IMIRunControl extends IRunControl2 {
|
||||||
*/
|
*/
|
||||||
public enum MIRunMode implements IRunMode {
|
public enum MIRunMode implements IRunMode {
|
||||||
ALL_STOP, NON_STOP
|
ALL_STOP, NON_STOP
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the RunMode that is currently being used by this RunControl service.
|
* Returns the RunMode that is currently being used by this RunControl service.
|
||||||
|
|
|
@ -55,7 +55,7 @@ public class MIBreakpointDMData implements IBreakpointDMData {
|
||||||
TRACEPOINT,
|
TRACEPOINT,
|
||||||
/** @since 4.4 */
|
/** @since 4.4 */
|
||||||
DYNAMICPRINTF
|
DYNAMICPRINTF
|
||||||
};
|
}
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// Constructors
|
// Constructors
|
||||||
|
|
|
@ -464,7 +464,7 @@ public class MIBreakpointsManager extends AbstractDsfService
|
||||||
((IMIBreakpointsTrackingListener) o).breakpointTrackingStarted(dmc);
|
((IMIBreakpointsTrackingListener) o).breakpointTrackingStarted(dmc);
|
||||||
}
|
}
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -1092,7 +1092,7 @@ public class MIBreakpointsManager extends AbstractDsfService
|
||||||
rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, INVALID_PARAMETER,
|
rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, INVALID_PARAMETER,
|
||||||
getStatus().getException()));
|
getStatus().getException()));
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -1158,7 +1158,7 @@ public class MIBreakpointsManager extends AbstractDsfService
|
||||||
protected void handleSuccess() {
|
protected void handleSuccess() {
|
||||||
addBreakpointProblemMarker(breakpoint, errorMessage, IMarker.SEVERITY_WARNING);
|
addBreakpointProblemMarker(breakpoint, errorMessage, IMarker.SEVERITY_WARNING);
|
||||||
updateRM.setDoneCount(0);
|
updateRM.setDoneCount(0);
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -1619,7 +1619,7 @@ public class MIBreakpointsManager extends AbstractDsfService
|
||||||
fBreakpointActionManager.executeActions(breakpoint,
|
fBreakpointActionManager.executeActions(breakpoint,
|
||||||
new BreakpointActionAdapter(getExecutor(), getServicesTracker(), context));
|
new BreakpointActionAdapter(getExecutor(), getServicesTracker(), context));
|
||||||
return Status.OK_STATUS;
|
return Status.OK_STATUS;
|
||||||
};
|
}
|
||||||
}.schedule();
|
}.schedule();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -532,7 +532,7 @@ public class MIBreakpointsSynchronizer extends AbstractDsfService
|
||||||
} else {
|
} else {
|
||||||
targetBreakpointModified(bpTargetDMC, plBpt, miBpt);
|
targetBreakpointModified(bpTargetDMC, plBpt, miBpt);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Some operations that are passed to platform require a number or delays before
|
* Some operations that are passed to platform require a number or delays before
|
||||||
|
|
|
@ -276,7 +276,7 @@ public class MIModules extends AbstractDsfService implements IModules2, ICaching
|
||||||
getProperties());
|
getProperties());
|
||||||
}
|
}
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -1049,7 +1049,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I
|
||||||
this.steps = steps;
|
this.steps = steps;
|
||||||
this.rm = rm;
|
this.rm = rm;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
// Keep track of if the target was available or not when we started the operation
|
// Keep track of if the target was available or not when we started the operation
|
||||||
private boolean fTargetAvailable;
|
private boolean fTargetAvailable;
|
||||||
|
@ -1323,7 +1323,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If the execution context of interest is not suspended, this step
|
* If the execution context of interest is not suspended, this step
|
||||||
|
@ -1351,7 +1351,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I
|
||||||
// We weren't able to suspend, so abort the operation
|
// We weren't able to suspend, so abort the operation
|
||||||
fDisableNextSignalEvent = false;
|
fDisableNextSignalEvent = false;
|
||||||
super.handleFailure();
|
super.handleFailure();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
rm.done();
|
rm.done();
|
||||||
|
@ -1363,7 +1363,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I
|
||||||
Sequence.Step restoreStep = new RestoreTargetStateStep();
|
Sequence.Step restoreStep = new RestoreTargetStateStep();
|
||||||
restoreStep.execute(rm);
|
restoreStep.execute(rm);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This step of the sequence takes care of executing all the steps that
|
* This step of the sequence takes care of executing all the steps that
|
||||||
|
@ -1406,7 +1406,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I
|
||||||
executeSteps(fOperationsPending.poll());
|
executeSteps(fOperationsPending.poll());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If the sequence had to interrupt the execution context of interest,
|
* If the sequence had to interrupt the execution context of interest,
|
||||||
|
@ -1459,7 +1459,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I
|
||||||
rm.done();
|
rm.done();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
/* ******************************************************************************
|
/* ******************************************************************************
|
||||||
* End of section to support operations even when the target is unavailable.
|
* End of section to support operations even when the target is unavailable.
|
||||||
|
|
|
@ -304,7 +304,6 @@ public class MIStack extends AbstractDsfService implements IStack, ICachingServi
|
||||||
} else {
|
} else {
|
||||||
clear();
|
clear();
|
||||||
}
|
}
|
||||||
;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public FramesCacheInfo getThreadFramesCache(String threadId) {
|
public FramesCacheInfo getThreadFramesCache(String threadId) {
|
||||||
|
@ -1120,7 +1119,7 @@ public class MIStack extends AbstractDsfService implements IStack, ICachingServi
|
||||||
// for more. There is chance that gdb will actually return correct frames later
|
// for more. There is chance that gdb will actually return correct frames later
|
||||||
// and one frame is not enough in many case to debug anything
|
// and one frame is not enough in many case to debug anything
|
||||||
rm.done(fFramesCache.getThreadFramesCache(threadId).getValidStackDepth());
|
rm.done(fFramesCache.getThreadFramesCache(threadId).getValidStackDepth());
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -500,14 +500,14 @@ public class MIVariableManager implements ICommandControl {
|
||||||
*/
|
*/
|
||||||
public MIDisplayHint getDisplayHint() {
|
public MIDisplayHint getDisplayHint() {
|
||||||
return fDisplayHint;
|
return fDisplayHint;
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @since 4.3
|
* @since 4.3
|
||||||
*/
|
*/
|
||||||
public void setDisplayHint(MIDisplayHint displayHint) {
|
public void setDisplayHint(MIDisplayHint displayHint) {
|
||||||
this.fDisplayHint = displayHint;
|
this.fDisplayHint = displayHint;
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @since 4.0
|
* @since 4.0
|
||||||
|
@ -2392,7 +2392,7 @@ public class MIVariableManager implements ICommandControl {
|
||||||
}
|
}
|
||||||
pendingRm.done();
|
pendingRm.done();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class MIReverseDebugEnabler implements IReverseDebugEnabler {
|
||||||
|
|
||||||
private static enum REVERSE_DEBUG_MODE {
|
private static enum REVERSE_DEBUG_MODE {
|
||||||
ENABLE, DISABLE, TOGGLE
|
ENABLE, DISABLE, TOGGLE
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param executor
|
* @param executor
|
||||||
|
|
|
@ -100,7 +100,7 @@ public abstract class AbstractCLIProcess extends Process implements IEventListen
|
||||||
// prompt but it isn't. So we do it ourselves.
|
// prompt but it isn't. So we do it ourselves.
|
||||||
private enum PromptType {
|
private enum PromptType {
|
||||||
IN_PRIMARY_PROMPT, IN_SECONDARY_PROMPT, IN_SECONDARY_PROMPT_MISSING
|
IN_PRIMARY_PROMPT, IN_SECONDARY_PROMPT, IN_SECONDARY_PROMPT_MISSING
|
||||||
};
|
}
|
||||||
|
|
||||||
private PromptType fPrompt = PromptType.IN_PRIMARY_PROMPT;
|
private PromptType fPrompt = PromptType.IN_PRIMARY_PROMPT;
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ public class CLIInfoBreak extends CLICommand<CLIInfoBreakInfo> {
|
||||||
|
|
||||||
public CLIInfoBreak(IDMContext ctx) {
|
public CLIInfoBreak(IDMContext ctx) {
|
||||||
super(ctx, INFO_BREAK);
|
super(ctx, INFO_BREAK);
|
||||||
};
|
}
|
||||||
|
|
||||||
public CLIInfoBreak(IDMContext ctx, int bpReference) {
|
public CLIInfoBreak(IDMContext ctx, int bpReference) {
|
||||||
super(ctx, INFO_BREAK + Integer.toString(bpReference));
|
super(ctx, INFO_BREAK + Integer.toString(bpReference));
|
||||||
|
|
|
@ -76,7 +76,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode {
|
||||||
? !prop.booleanValue() && pin_prop.booleanValue()
|
? !prop.booleanValue() && pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.RED)
|
&& pin_color_prop.equals(IPinElementColorDescriptor.RED)
|
||||||
: false;
|
: false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* RUNNING THREAD - GREEN PIN */
|
/* RUNNING THREAD - GREEN PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -96,7 +96,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode {
|
||||||
? !prop.booleanValue() && pin_prop.booleanValue()
|
? !prop.booleanValue() && pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN)
|
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN)
|
||||||
: false;
|
: false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* RUNNING THREAD - BLUE PIN */
|
/* RUNNING THREAD - BLUE PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -116,7 +116,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode {
|
||||||
? !prop.booleanValue() && pin_prop.booleanValue()
|
? !prop.booleanValue() && pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE)
|
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE)
|
||||||
: false;
|
: false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* RUNNING THREAD - NO PIN */
|
/* RUNNING THREAD - NO PIN */
|
||||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_RUNNING)) {
|
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_RUNNING)) {
|
||||||
|
@ -129,7 +129,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode {
|
||||||
// prop has been seen to be null during session shutdown [313823]
|
// prop has been seen to be null during session shutdown [313823]
|
||||||
Boolean prop = (Boolean) properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED);
|
Boolean prop = (Boolean) properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED);
|
||||||
return (prop != null) ? !prop.booleanValue() : false;
|
return (prop != null) ? !prop.booleanValue() : false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* SUSPENDED THREAD - RED PIN */
|
/* SUSPENDED THREAD - RED PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -145,7 +145,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode {
|
||||||
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
||||||
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.RED) : false;
|
&& pin_color_prop.equals(IPinElementColorDescriptor.RED) : false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* SUSPENDED THREAD - GREEN PIN */
|
/* SUSPENDED THREAD - GREEN PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -161,7 +161,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode {
|
||||||
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
||||||
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false;
|
&& pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* SUSPENDED THREAD - BLUE PIN */
|
/* SUSPENDED THREAD - BLUE PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
@ -177,7 +177,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode {
|
||||||
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR);
|
||||||
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue()
|
||||||
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false;
|
&& pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false;
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
/* SUSPENDED THREAD - NO PIN */
|
/* SUSPENDED THREAD - NO PIN */
|
||||||
new LabelImage(
|
new LabelImage(
|
||||||
|
|
|
@ -203,7 +203,7 @@ public class BaseTestCase {
|
||||||
* @param launch The launch in which we can find the gdb version
|
* @param launch The launch in which we can find the gdb version
|
||||||
*/
|
*/
|
||||||
protected void validateGdbVersion(GdbLaunch launch) throws Exception {
|
protected void validateGdbVersion(GdbLaunch launch) throws Exception {
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We listen for the target to stop at the main breakpoint. This listener is
|
* We listen for the target to stop at the main breakpoint. This listener is
|
||||||
|
|
|
@ -821,7 +821,7 @@ public class SyncUtil {
|
||||||
@Override
|
@Override
|
||||||
protected void handleSuccess() {
|
protected void handleSuccess() {
|
||||||
rm.done(localsDMData.toArray(new IVariableDMData[localsDMData.size()]));
|
rm.done(localsDMData.toArray(new IVariableDMData[localsDMData.size()]));
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
for (IVariableDMContext varDmc : varDmcs) {
|
for (IVariableDMContext varDmc : varDmcs) {
|
||||||
|
|
|
@ -148,7 +148,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase
|
||||||
@Override
|
@Override
|
||||||
protected void handleSuccess() {
|
protected void handleSuccess() {
|
||||||
rm.done(getData().getFormattedValue());
|
rm.done(getData().getFormattedValue());
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,7 @@ public class ITestConstants {
|
||||||
System.arraycopy(ALL_SUPPORTED_VERSIONS, 0, ALL_KNOWN_VERSIONS, 0, ALL_SUPPORTED_VERSIONS.length);
|
System.arraycopy(ALL_SUPPORTED_VERSIONS, 0, ALL_KNOWN_VERSIONS, 0, ALL_SUPPORTED_VERSIONS.length);
|
||||||
System.arraycopy(ALL_UNSUPPORTED_VERSIONS, 0, ALL_KNOWN_VERSIONS, ALL_SUPPORTED_VERSIONS.length,
|
System.arraycopy(ALL_UNSUPPORTED_VERSIONS, 0, ALL_KNOWN_VERSIONS, ALL_SUPPORTED_VERSIONS.length,
|
||||||
ALL_UNSUPPORTED_VERSIONS.length);
|
ALL_UNSUPPORTED_VERSIONS.length);
|
||||||
};
|
}
|
||||||
|
|
||||||
// Attribute that allows a test to request not to start gdbserver even if the session is a remote one
|
// Attribute that allows a test to request not to start gdbserver even if the session is a remote one
|
||||||
public static final String LAUNCH_GDB_SERVER = TestsPlugin.PLUGIN_ID + ".launchGdbServer";
|
public static final String LAUNCH_GDB_SERVER = TestsPlugin.PLUGIN_ID + ".launchGdbServer";
|
||||||
|
|
|
@ -606,7 +606,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase
|
||||||
shutdownEventWaitor.waitForEvent(TestsPlugin.massageTimeout(1000));
|
shutdownEventWaitor.waitForEvent(TestsPlugin.massageTimeout(1000));
|
||||||
|
|
||||||
IProcess[] launchProcesses = getGDBLaunch().getProcesses();
|
IProcess[] launchProcesses = getGDBLaunch().getProcesses();
|
||||||
;
|
|
||||||
for (IProcess proc : launchProcesses) {
|
for (IProcess proc : launchProcesses) {
|
||||||
if (proc instanceof InferiorRuntimeProcess) {
|
if (proc instanceof InferiorRuntimeProcess) {
|
||||||
assertThat(proc.getAttribute(IGdbDebugConstants.INFERIOR_EXITED_ATTR), is(notNullValue()));
|
assertThat(proc.getAttribute(IGdbDebugConstants.INFERIOR_EXITED_ATTR), is(notNullValue()));
|
||||||
|
|
|
@ -487,7 +487,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
|
||||||
@Override
|
@Override
|
||||||
protected void handleCompleted() {
|
protected void handleCompleted() {
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
int index;
|
int index;
|
||||||
|
@ -554,7 +554,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase {
|
||||||
@Override
|
@Override
|
||||||
protected void handleCompleted() {
|
protected void handleCompleted() {
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
int index;
|
int index;
|
||||||
|
|
|
@ -106,7 +106,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase {
|
||||||
|
|
||||||
private abstract class AsyncRunnable<V> {
|
private abstract class AsyncRunnable<V> {
|
||||||
public abstract void run(DataRequestMonitor<V> drm);
|
public abstract void run(DataRequestMonitor<V> drm);
|
||||||
};
|
}
|
||||||
|
|
||||||
private <V> V runAsyncCall(final AsyncRunnable<V> runnable) throws Exception {
|
private <V> V runAsyncCall(final AsyncRunnable<V> runnable) throws Exception {
|
||||||
return runAsyncCall(runnable, false);
|
return runAsyncCall(runnable, false);
|
||||||
|
|
|
@ -535,7 +535,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
|
||||||
} catch (CoreException e) {
|
} catch (CoreException e) {
|
||||||
failed(e);
|
failed(e);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -749,11 +749,11 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
|
||||||
} catch (CoreException e) {
|
} catch (CoreException e) {
|
||||||
failed(e);
|
failed(e);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -929,7 +929,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
|
||||||
notifyUser(getStatus().getMessage());
|
notifyUser(getStatus().getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -950,7 +950,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
|
||||||
notifyUser(getStatus().getMessage());
|
notifyUser(getStatus().getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -386,7 +386,7 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
|
||||||
}
|
}
|
||||||
|
|
||||||
detailComputed(null, finalResult.toString());
|
detailComputed(null, finalResult.toString());
|
||||||
};
|
}
|
||||||
}) });
|
}) });
|
||||||
}
|
}
|
||||||
}) });
|
}) });
|
||||||
|
|
|
@ -261,7 +261,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger {
|
||||||
rm.setData(Boolean.FALSE);
|
rm.setData(Boolean.FALSE);
|
||||||
}
|
}
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
int count = 0;
|
int count = 0;
|
||||||
for (final IContainerDMContext containerCtx : getData()) {
|
for (final IContainerDMContext containerCtx : getData()) {
|
||||||
|
@ -273,7 +273,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger {
|
||||||
rm.setData(Boolean.TRUE);
|
rm.setData(Boolean.TRUE);
|
||||||
}
|
}
|
||||||
crm.done();
|
crm.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
|
@ -340,7 +340,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger {
|
||||||
rm.setData(Boolean.FALSE);
|
rm.setData(Boolean.FALSE);
|
||||||
}
|
}
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
int count = 0;
|
int count = 0;
|
||||||
for (IExecutionDMContext execCtx : getData()) {
|
for (IExecutionDMContext execCtx : getData()) {
|
||||||
|
@ -353,7 +353,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger {
|
||||||
rm.setData(Boolean.TRUE);
|
rm.setData(Boolean.TRUE);
|
||||||
}
|
}
|
||||||
crm.done();
|
crm.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -918,7 +918,7 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
fController.doneStepping(dmc, DsfSourceDisplayAdapter.this);
|
fController.doneStepping(dmc, DsfSourceDisplayAdapter.this);
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} catch (RejectedExecutionException e) {
|
} catch (RejectedExecutionException e) {
|
||||||
// Session is shutdown
|
// Session is shutdown
|
||||||
|
|
|
@ -60,7 +60,7 @@ public class AbstractDebugVMAdapter extends AbstractDMVMAdapter implements IStep
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
fController.doneStepping(suspendedEvent.getDMContext(), AbstractDebugVMAdapter.this);
|
fController.doneStepping(suspendedEvent.getDMContext(), AbstractDebugVMAdapter.this);
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,5 +70,5 @@ public class ErrorLabelText extends LabelText {
|
||||||
return !status.isOK();
|
return !status.isOK();
|
||||||
}
|
}
|
||||||
return super.checkProperty(propertyName, status, properties);
|
return super.checkProperty(propertyName, status, properties);
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -163,7 +163,7 @@ public class BreakpointVMProvider extends AbstractVMProvider {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
private final Map<TreePath, ContainerBreakpointsCache> fContainerBreakpointsCacheMap = new HashMap<>();
|
private final Map<TreePath, ContainerBreakpointsCache> fContainerBreakpointsCacheMap = new HashMap<>();
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ import org.eclipse.debug.core.model.IBreakpoint;
|
||||||
public class BreakpointsChangedEvent {
|
public class BreakpointsChangedEvent {
|
||||||
public enum Type {
|
public enum Type {
|
||||||
ADDED, REMOVED, CHANGED
|
ADDED, REMOVED, CHANGED
|
||||||
};
|
}
|
||||||
|
|
||||||
private final Type fType;
|
private final Type fType;
|
||||||
private final IBreakpoint[] fBreakpoints;
|
private final IBreakpoint[] fBreakpoints;
|
||||||
|
|
|
@ -112,7 +112,7 @@ public abstract class AbstractContainerVMNode extends AbstractExecutionContextVM
|
||||||
@Override
|
@Override
|
||||||
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
||||||
return Boolean.TRUE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED));
|
return Boolean.TRUE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED));
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET)), }));
|
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET)), }));
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@ public abstract class AbstractThreadVMNode extends AbstractExecutionContextVMNod
|
||||||
@Override
|
@Override
|
||||||
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
||||||
return Boolean.FALSE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED));
|
return Boolean.FALSE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED));
|
||||||
};
|
}
|
||||||
}, new LabelImage(
|
}, new LabelImage(
|
||||||
DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_SUSPENDED)), }));
|
DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_SUSPENDED)), }));
|
||||||
return provider;
|
return provider;
|
||||||
|
|
|
@ -216,7 +216,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy {
|
||||||
rm.setData(getData()
|
rm.setData(getData()
|
||||||
.getStateChangeReason() == IRunControl.StateChangeReason.CONTAINER);
|
.getStateChangeReason() == IRunControl.StateChangeReason.CONTAINER);
|
||||||
rm.done();
|
rm.done();
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// If container is not suspended it's running, then do not override the selection.
|
// If container is not suspended it's running, then do not override the selection.
|
||||||
|
|
|
@ -169,7 +169,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
|
||||||
String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION);
|
String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION);
|
||||||
return line != null && line >= 0 && file != null && !file.isEmpty() && function != null
|
return line != null && line >= 0 && file != null && !file.isEmpty() && function != null
|
||||||
&& function.contains(")"); //$NON-NLS-1$
|
&& function.contains(")"); //$NON-NLS-1$
|
||||||
};
|
}
|
||||||
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__add_parens__text_format,
|
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__add_parens__text_format,
|
||||||
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION,
|
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION,
|
||||||
ILaunchVMConstants.PROP_FRAME_FILE, ILaunchVMConstants.PROP_FRAME_LINE,
|
ILaunchVMConstants.PROP_FRAME_FILE, ILaunchVMConstants.PROP_FRAME_LINE,
|
||||||
|
@ -181,7 +181,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
|
||||||
String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION);
|
String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION);
|
||||||
return line != null && line >= 0 && file != null && !file.isEmpty()
|
return line != null && line >= 0 && file != null && !file.isEmpty()
|
||||||
&& (function == null || !function.contains(")")); //$NON-NLS-1$
|
&& (function == null || !function.contains(")")); //$NON-NLS-1$
|
||||||
};
|
}
|
||||||
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_line__text_format,
|
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_line__text_format,
|
||||||
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION,
|
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION,
|
||||||
ILaunchVMConstants.PROP_FRAME_MODULE }) {
|
ILaunchVMConstants.PROP_FRAME_MODULE }) {
|
||||||
|
@ -191,7 +191,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
|
||||||
String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE);
|
String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE);
|
||||||
return function != null && !function.isEmpty() && function.contains(")") && //$NON-NLS-1$
|
return function != null && !function.isEmpty() && function.contains(")") && //$NON-NLS-1$
|
||||||
module != null && !module.isEmpty();
|
module != null && !module.isEmpty();
|
||||||
};
|
}
|
||||||
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_line__add_parens__text_format,
|
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_line__add_parens__text_format,
|
||||||
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION,
|
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION,
|
||||||
ILaunchVMConstants.PROP_FRAME_MODULE }) {
|
ILaunchVMConstants.PROP_FRAME_MODULE }) {
|
||||||
|
@ -201,14 +201,14 @@ public class StackFramesVMNode extends AbstractDMVMNode
|
||||||
String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE);
|
String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE);
|
||||||
return function != null && !function.isEmpty() && !function.contains(")") && //$NON-NLS-1$
|
return function != null && !function.isEmpty() && !function.contains(")") && //$NON-NLS-1$
|
||||||
module != null && !module.isEmpty();
|
module != null && !module.isEmpty();
|
||||||
};
|
}
|
||||||
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_function__text_format,
|
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_function__text_format,
|
||||||
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_MODULE }) {
|
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_MODULE }) {
|
||||||
@Override
|
@Override
|
||||||
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
||||||
String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE);
|
String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE);
|
||||||
return module != null && !module.isEmpty();
|
return module != null && !module.isEmpty();
|
||||||
};
|
}
|
||||||
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_module__text_format,
|
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_module__text_format,
|
||||||
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS,
|
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS,
|
||||||
ILaunchVMConstants.PROP_FRAME_FUNCTION }) {
|
ILaunchVMConstants.PROP_FRAME_FUNCTION }) {
|
||||||
|
@ -216,7 +216,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
|
||||||
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
||||||
String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION);
|
String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION);
|
||||||
return function != null && !function.isEmpty() && function.contains(")"); //$NON-NLS-1$
|
return function != null && !function.isEmpty() && function.contains(")"); //$NON-NLS-1$
|
||||||
};
|
}
|
||||||
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_module__add_parens__text_format,
|
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_module__add_parens__text_format,
|
||||||
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS,
|
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS,
|
||||||
ILaunchVMConstants.PROP_FRAME_FUNCTION }) {
|
ILaunchVMConstants.PROP_FRAME_FUNCTION }) {
|
||||||
|
@ -224,7 +224,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
|
||||||
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
||||||
String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION);
|
String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION);
|
||||||
return function != null && !function.isEmpty() && !function.contains(")"); //$NON-NLS-1$
|
return function != null && !function.isEmpty() && !function.contains(")"); //$NON-NLS-1$
|
||||||
};
|
}
|
||||||
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__Address_only__text_format,
|
}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__Address_only__text_format,
|
||||||
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS }),
|
new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS }),
|
||||||
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_STACKFRAME_RUNNING)) {
|
new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_STACKFRAME_RUNNING)) {
|
||||||
|
@ -235,7 +235,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
|
||||||
@Override
|
@Override
|
||||||
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
||||||
return Boolean.FALSE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED));
|
return Boolean.FALSE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED));
|
||||||
};
|
}
|
||||||
}, new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_STACKFRAME)) }));
|
}, new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_STACKFRAME)) }));
|
||||||
|
|
||||||
return provider;
|
return provider;
|
||||||
|
|
|
@ -104,7 +104,7 @@ public class ModulesVMNode extends AbstractDMVMNode implements IElementLabelProv
|
||||||
return Boolean.TRUE.equals(properties.get(propertyName));
|
return Boolean.TRUE.equals(properties.get(propertyName));
|
||||||
}
|
}
|
||||||
return super.checkProperty(propertyName, status, properties);
|
return super.checkProperty(propertyName, status, properties);
|
||||||
};
|
}
|
||||||
}, new DsfUILabelImage(IDsfDebugUIConstants.IMG_OBJS_SHARED_LIBRARY_SYMBOLS_UNLOADED),
|
}, new DsfUILabelImage(IDsfDebugUIConstants.IMG_OBJS_SHARED_LIBRARY_SYMBOLS_UNLOADED),
|
||||||
new StaleDataLabelBackground(), new LabelFont(JFaceResources
|
new StaleDataLabelBackground(), new LabelFont(JFaceResources
|
||||||
.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0]) }));
|
.getFontDescriptor(IDebugUIConstants.PREF_VARIABLE_TEXT_FONT).getFontData()[0]) }));
|
||||||
|
|
|
@ -546,7 +546,7 @@ public class FormattedValueRetriever {
|
||||||
// Note: we must not call the update's done method, instead call counting RM done.
|
// Note: we must not call the update's done method, instead call counting RM done.
|
||||||
countingRm.done();
|
countingRm.done();
|
||||||
|
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -425,7 +425,7 @@ public class FormattedValueVMUtil {
|
||||||
countingRm.done();
|
countingRm.done();
|
||||||
|
|
||||||
// Note: we must not call the update's done method
|
// Note: we must not call the update's done method
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class NumberFormatsPropertyTester extends PropertyTester {
|
||||||
AVAILABLE_FORMATS.add(IFormattedValues.OCTAL_FORMAT);
|
AVAILABLE_FORMATS.add(IFormattedValues.OCTAL_FORMAT);
|
||||||
AVAILABLE_FORMATS.add(IFormattedValues.BINARY_FORMAT);
|
AVAILABLE_FORMATS.add(IFormattedValues.BINARY_FORMAT);
|
||||||
AVAILABLE_FORMATS.add(IFormattedValues.STRING_FORMAT);
|
AVAILABLE_FORMATS.add(IFormattedValues.STRING_FORMAT);
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
|
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
|
||||||
|
|
|
@ -485,7 +485,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
|
||||||
for (int i = 0; i < updates.length; i++) {
|
for (int i = 0; i < updates.length; i++) {
|
||||||
updates[i].done();
|
updates[i].done();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
|
@ -543,7 +543,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
|
||||||
for (final IPropertiesUpdate update : updates) {
|
for (final IPropertiesUpdate update : updates) {
|
||||||
update.done();
|
update.done();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
|
|
|
@ -459,7 +459,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
|
||||||
for (int i = 0; i < updates.length; i++) {
|
for (int i = 0; i < updates.length; i++) {
|
||||||
updates[i].done();
|
updates[i].done();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
|
@ -522,7 +522,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
|
||||||
for (final IPropertiesUpdate update : updates) {
|
for (final IPropertiesUpdate update : updates) {
|
||||||
update.done();
|
update.done();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
|
|
|
@ -398,7 +398,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
||||||
+ FormattedValueVMUtil.getPropertyForFormatId(IFormattedValues.STRING_FORMAT));
|
+ FormattedValueVMUtil.getPropertyForFormatId(IFormattedValues.STRING_FORMAT));
|
||||||
return Boolean.TRUE.equals(stringChanged)
|
return Boolean.TRUE.equals(stringChanged)
|
||||||
|| (Boolean.TRUE.equals(activeChanged) && !Boolean.TRUE.equals(activeFormatChanged));
|
|| (Boolean.TRUE.equals(activeChanged) && !Boolean.TRUE.equals(activeFormatChanged));
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
columnNoColumnsBackground = new LabelBackground(
|
columnNoColumnsBackground = new LabelBackground(
|
||||||
|
@ -511,7 +511,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
||||||
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) {
|
||||||
Boolean changed = (Boolean) properties.get(PROP_VARIABLE_ADDRESS_CHANGED);
|
Boolean changed = (Boolean) properties.get(PROP_VARIABLE_ADDRESS_CHANGED);
|
||||||
return Boolean.TRUE.equals(changed);
|
return Boolean.TRUE.equals(changed);
|
||||||
};
|
}
|
||||||
}, new StaleDataLabelForeground(), new VariableLabelFont(), }));
|
}, new StaleDataLabelForeground(), new VariableLabelFont(), }));
|
||||||
|
|
||||||
// Description column is shown in the expression view, but is not supported for variables.
|
// Description column is shown in the expression view, but is not supported for variables.
|
||||||
|
@ -615,7 +615,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
||||||
Boolean activeChanged = (Boolean) properties
|
Boolean activeChanged = (Boolean) properties
|
||||||
.get(IDebugVMConstants.PROP_IS_ACTIVE_FORMATTED_VALUE_CHANGED);
|
.get(IDebugVMConstants.PROP_IS_ACTIVE_FORMATTED_VALUE_CHANGED);
|
||||||
return Boolean.TRUE.equals(stringChanged) || Boolean.TRUE.equals(activeChanged);
|
return Boolean.TRUE.equals(stringChanged) || Boolean.TRUE.equals(activeChanged);
|
||||||
};
|
}
|
||||||
}, columnNoColumnsBackground, new StaleDataLabelBackground(), new VariableLabelFont(), }));
|
}, columnNoColumnsBackground, new StaleDataLabelBackground(), new VariableLabelFont(), }));
|
||||||
|
|
||||||
return provider;
|
return provider;
|
||||||
|
@ -654,7 +654,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
||||||
for (int i = 0; i < updates.length; i++) {
|
for (int i = 0; i < updates.length; i++) {
|
||||||
updates[i].done();
|
updates[i].done();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
|
@ -712,7 +712,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
|
||||||
for (final IPropertiesUpdate update : updates) {
|
for (final IPropertiesUpdate update : updates) {
|
||||||
update.done();
|
update.done();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
|
|
|
@ -451,7 +451,7 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fNodesListCache = list.toArray(new IVMNode[list.size()]);
|
fNodesListCache = list.toArray(new IVMNode[list.size()]);
|
||||||
;
|
|
||||||
return fNodesListCache;
|
return fNodesListCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -216,7 +216,7 @@ public class PropertiesUpdateStatus extends DsfMultiStatus {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return s1.getMessage().equals(s2.getMessage());
|
return s1.getMessage().equals(s2.getMessage());
|
||||||
};
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convenience method that returns and optionally creates a properties
|
* Convenience method that returns and optionally creates a properties
|
||||||
|
|
|
@ -48,7 +48,7 @@ public abstract class AbstractCache<V> implements ICache<V> {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
private RequestCanceledListener fRequestCanceledListener = new RequestCanceledListener();
|
private RequestCanceledListener fRequestCanceledListener = new RequestCanceledListener();
|
||||||
|
|
||||||
|
|
|
@ -121,5 +121,5 @@ public class CountingRequestMonitor extends RequestMonitor {
|
||||||
if ((getStatus() instanceof MultiStatus)) {
|
if ((getStatus() instanceof MultiStatus)) {
|
||||||
((MultiStatus) getStatus()).add(status);
|
((MultiStatus) getStatus()).add(status);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,7 +84,7 @@ abstract public class Query<V> extends DsfRunnable implements Future<V> {
|
||||||
fExecuted = true;
|
fExecuted = true;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
private final QueryRm fRm = new QueryRm();
|
private final QueryRm fRm = new QueryRm();
|
||||||
|
|
||||||
|
|
|
@ -150,7 +150,7 @@ abstract public class ReflectionSequence extends Sequence {
|
||||||
assert executeMethod != null;
|
assert executeMethod != null;
|
||||||
|
|
||||||
fExecuteMethod = executeMethod;
|
fExecuteMethod = executeMethod;
|
||||||
;
|
|
||||||
fRollbackMethod = rollbackMethod;
|
fRollbackMethod = rollbackMethod;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ public abstract class RequestCache<V> extends AbstractCache<V> {
|
||||||
@Override
|
@Override
|
||||||
public boolean isCanceled() {
|
public boolean isCanceled() {
|
||||||
return super.isCanceled() || RequestCache.this.isCanceled();
|
return super.isCanceled() || RequestCache.this.isCanceled();
|
||||||
};
|
}
|
||||||
};
|
};
|
||||||
retrieve(fRm);
|
retrieve(fRm);
|
||||||
}
|
}
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue