mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-22 06:02:11 +02:00
Automatic code cleanup.
Change-Id: Iab803eb99f213e8e161d9d7928da146fca97772b
This commit is contained in:
parent
ecef51bc85
commit
7099ca2f16
2 changed files with 14 additions and 15 deletions
|
@ -131,7 +131,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
|
||||||
tracker.dispose();
|
tracker.dispose();
|
||||||
return disassSvc != null;
|
return disassSvc != null;
|
||||||
}
|
}
|
||||||
Query<Boolean> query = new Query<Boolean>() {
|
Query<Boolean> query = new Query<>() {
|
||||||
@Override
|
@Override
|
||||||
protected void execute(DataRequestMonitor<Boolean> rm) {
|
protected void execute(DataRequestMonitor<Boolean> rm) {
|
||||||
try {
|
try {
|
||||||
|
@ -419,7 +419,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
|
||||||
return runControl.isSuspended(fTargetContext);
|
return runControl.isSuspended(fTargetContext);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Query<Boolean> query = new Query<Boolean>() {
|
Query<Boolean> query = new Query<>() {
|
||||||
@Override
|
@Override
|
||||||
protected void execute(DataRequestMonitor<Boolean> rm) {
|
protected void execute(DataRequestMonitor<Boolean> rm) {
|
||||||
try {
|
try {
|
||||||
|
@ -564,7 +564,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
|
||||||
public void handleCompleted() {
|
public void handleCompleted() {
|
||||||
final BigInteger finalStartAddress = getData();
|
final BigInteger finalStartAddress = getData();
|
||||||
if (mixed) {
|
if (mixed) {
|
||||||
final DataRequestMonitor<IMixedInstruction[]> disassemblyRequest = new DataRequestMonitor<IMixedInstruction[]>(
|
final DataRequestMonitor<IMixedInstruction[]> disassemblyRequest = new DataRequestMonitor<>(
|
||||||
executor, null) {
|
executor, null) {
|
||||||
@Override
|
@Override
|
||||||
public void handleCompleted() {
|
public void handleCompleted() {
|
||||||
|
@ -616,8 +616,8 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
final DataRequestMonitor<IInstruction[]> disassemblyRequest = new DataRequestMonitor<IInstruction[]>(
|
final DataRequestMonitor<IInstruction[]> disassemblyRequest = new DataRequestMonitor<>(executor,
|
||||||
executor, null) {
|
null) {
|
||||||
@Override
|
@Override
|
||||||
public void handleCompleted() {
|
public void handleCompleted() {
|
||||||
if (!isCanceled() && getData() != null) {
|
if (!isCanceled() && getData() != null) {
|
||||||
|
@ -934,10 +934,10 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
|
||||||
Object sourceElement = null;
|
Object sourceElement = null;
|
||||||
final ISourceLookupDMContext ctx = DMContexts.getAncestorOfType(fTargetContext, ISourceLookupDMContext.class);
|
final ISourceLookupDMContext ctx = DMContexts.getAncestorOfType(fTargetContext, ISourceLookupDMContext.class);
|
||||||
final DsfExecutor executor = getSession().getExecutor();
|
final DsfExecutor executor = getSession().getExecutor();
|
||||||
Query<Object> query = new Query<Object>() {
|
Query<Object> query = new Query<>() {
|
||||||
@Override
|
@Override
|
||||||
protected void execute(final DataRequestMonitor<Object> rm) {
|
protected void execute(final DataRequestMonitor<Object> rm) {
|
||||||
final DataRequestMonitor<Object> request = new DataRequestMonitor<Object>(executor, rm) {
|
final DataRequestMonitor<Object> request = new DataRequestMonitor<>(executor, rm) {
|
||||||
@Override
|
@Override
|
||||||
protected void handleSuccess() {
|
protected void handleSuccess() {
|
||||||
rm.setData(getData());
|
rm.setData(getData());
|
||||||
|
@ -984,7 +984,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
|
||||||
if (!hasFrameContext()) {
|
if (!hasFrameContext()) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
Query<BigInteger> query = new Query<BigInteger>() {
|
Query<BigInteger> query = new Query<>() {
|
||||||
@Override
|
@Override
|
||||||
protected void execute(DataRequestMonitor<BigInteger> rm) {
|
protected void execute(DataRequestMonitor<BigInteger> rm) {
|
||||||
evaluateAddressExpression(symbol, suppressError, rm);
|
evaluateAddressExpression(symbol, suppressError, rm);
|
||||||
|
@ -1082,10 +1082,10 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
|
||||||
// try reverse lookup
|
// try reverse lookup
|
||||||
final ISourceLookupDMContext ctx = DMContexts.getAncestorOfType(fTargetContext, ISourceLookupDMContext.class);
|
final ISourceLookupDMContext ctx = DMContexts.getAncestorOfType(fTargetContext, ISourceLookupDMContext.class);
|
||||||
final DsfExecutor executor = getSession().getExecutor();
|
final DsfExecutor executor = getSession().getExecutor();
|
||||||
Query<String> query = new Query<String>() {
|
Query<String> query = new Query<>() {
|
||||||
@Override
|
@Override
|
||||||
protected void execute(final DataRequestMonitor<String> rm) {
|
protected void execute(final DataRequestMonitor<String> rm) {
|
||||||
final DataRequestMonitor<String> request = new DataRequestMonitor<String>(executor, rm) {
|
final DataRequestMonitor<String> request = new DataRequestMonitor<>(executor, rm) {
|
||||||
@Override
|
@Override
|
||||||
protected void handleSuccess() {
|
protected void handleSuccess() {
|
||||||
rm.setData(getData());
|
rm.setData(getData());
|
||||||
|
@ -1108,8 +1108,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
|
||||||
final IDisassemblyDMContext context = DMContexts.getAncestorOfType(fTargetContext, IDisassemblyDMContext.class);
|
final IDisassemblyDMContext context = DMContexts.getAncestorOfType(fTargetContext, IDisassemblyDMContext.class);
|
||||||
|
|
||||||
final String finalFile = debuggerPath;
|
final String finalFile = debuggerPath;
|
||||||
final DataRequestMonitor<IMixedInstruction[]> disassemblyRequest = new DataRequestMonitor<IMixedInstruction[]>(
|
final DataRequestMonitor<IMixedInstruction[]> disassemblyRequest = new DataRequestMonitor<>(executor, null) {
|
||||||
executor, null) {
|
|
||||||
@Override
|
@Override
|
||||||
public void handleCompleted() {
|
public void handleCompleted() {
|
||||||
final IMixedInstruction[] data = getData();
|
final IMixedInstruction[] data = getData();
|
||||||
|
@ -1151,7 +1150,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
final DsfExecutor executor = DsfSession.getSession(fDsfSessionId).getExecutor();
|
final DsfExecutor executor = DsfSession.getSession(fDsfSessionId).getExecutor();
|
||||||
Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
|
Query<FormattedValueDMData> query = new Query<>() {
|
||||||
@Override
|
@Override
|
||||||
protected void execute(final DataRequestMonitor<FormattedValueDMData> rm) {
|
protected void execute(final DataRequestMonitor<FormattedValueDMData> rm) {
|
||||||
IExecutionDMContext exeCtx = DMContexts.getAncestorOfType(fTargetFrameContext,
|
IExecutionDMContext exeCtx = DMContexts.getAncestorOfType(fTargetFrameContext,
|
||||||
|
@ -1202,7 +1201,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
|
||||||
}
|
}
|
||||||
final DsfExecutor executor = DsfSession.getSession(fDsfSessionId).getExecutor();
|
final DsfExecutor executor = DsfSession.getSession(fDsfSessionId).getExecutor();
|
||||||
|
|
||||||
Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() {
|
Query<FormattedValueDMData> query = new Query<>() {
|
||||||
@Override
|
@Override
|
||||||
protected void execute(final DataRequestMonitor<FormattedValueDMData> rm) {
|
protected void execute(final DataRequestMonitor<FormattedValueDMData> rm) {
|
||||||
IExecutionDMContext exeCtx = DMContexts.getAncestorOfType(fTargetFrameContext,
|
IExecutionDMContext exeCtx = DMContexts.getAncestorOfType(fTargetFrameContext,
|
||||||
|
|
|
@ -376,7 +376,7 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean shouldCancelSelectionChange() {
|
private boolean shouldCancelSelectionChange() {
|
||||||
Query<Boolean> delaySelectionChangeQuery = new Query<Boolean>() {
|
Query<Boolean> delaySelectionChangeQuery = new Query<>() {
|
||||||
@Override
|
@Override
|
||||||
protected void execute(DataRequestMonitor<Boolean> rm) {
|
protected void execute(DataRequestMonitor<Boolean> rm) {
|
||||||
IExecutionDMContext execCtx = DMContexts.getAncestorOfType(fFrameData.fDmc,
|
IExecutionDMContext execCtx = DMContexts.getAncestorOfType(fFrameData.fDmc,
|
||||||
|
|
Loading…
Add table
Reference in a new issue