diff options
author | Jonah Graham | 2018-11-20 16:20:42 +0000 |
---|---|---|
committer | Jonah Graham | 2018-11-22 21:57:01 +0000 |
commit | eeb3006e271eac4f5b319f2ca8007226efaadb58 (patch) | |
tree | e45472eb548ae7e97c3fdc4e87350672c8d315c7 /dsf-gdb | |
parent | caf2292768deccd885b5b6989b731742e2e5edf4 (diff) | |
download | org.eclipse.cdt-eeb3006e271eac4f5b319f2ca8007226efaadb58.tar.gz org.eclipse.cdt-eeb3006e271eac4f5b319f2ca8007226efaadb58.tar.xz org.eclipse.cdt-eeb3006e271eac4f5b319f2ca8007226efaadb58.zip |
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
Diffstat (limited to 'dsf-gdb')
53 files changed, 105 insertions, 109 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerExecutionState.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerExecutionState.java index 7032fe99b3e..96a70216e48 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerExecutionState.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerExecutionState.java @@ -19,4 +19,4 @@ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.model; */ public enum VisualizerExecutionState { RUNNING, SUSPENDED, CRASHED, EXITED -}; +} diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizer.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizer.java index eaaa834912c..36b309643de 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizer.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizer.java @@ -786,12 +786,12 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer implements IPin @Override public void visualizerSelected() { updateActions(); - }; + } /** Invoked when another visualizer has been selected, hiding this one. */ @Override public void visualizerDeselected() { - }; + } // --- workbench selection management --- diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java index 840406179bd..a5e172ebf4d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java @@ -177,7 +177,6 @@ public class DsfTerminateCommand implements ITerminateHandler { class ScheduledFutureWrapper { ScheduledFuture<?> fFuture; } - ; final ScheduledFutureWrapper fFutureWrapper = new ScheduledFutureWrapper(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java index 6ebf4b46036..1bea0274341 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java @@ -80,7 +80,7 @@ public class GdbDisconnectCommand implements IDisconnectHandler { request.setEnabled(false); } else { request.setEnabled(getData()); - ; + } request.done(); } @@ -226,7 +226,7 @@ public class GdbDisconnectCommand implements IDisconnectHandler { rm.setData(contDmcs.toArray(new IContainerDMContext[contDmcs.size()])); } rm.done(); - }; + } }); } else { rm.setStatus(new Status(IStatus.ERROR, GdbUIPlugin.PLUGIN_ID, "Service is not available.")); //$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbRestartCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbRestartCommand.java index 60fa974eacf..7922ece5bc1 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbRestartCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbRestartCommand.java @@ -112,7 +112,7 @@ public class GdbRestartCommand implements IRestartHandler { @Override protected void handleCompleted() { request.done(); - }; + } }); } else { request.done(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java index b8bd0ed1830..17cb1a2a6b6 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java @@ -188,7 +188,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne return Status.OK_STATUS; } - }; + } /** * 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); } fRm.done(); - }; + } }); } else { @@ -380,7 +380,6 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne } } } - ; // Trigger the first query new ProcessRequestMonitor(ImmediateExecutor.getInstance()).done(); } @@ -641,7 +640,6 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne } } } - ; // Trigger the first attach. new AttachToProcessRequestMonitor().done(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java index ea1be6b6d12..d4948f90740 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java @@ -137,7 +137,7 @@ public class GdbDebugNewExecutableCommand extends RefreshableDebugCommand implem protected void handleCancel() { rm.cancel(); rm.done(); - }; + } @Override protected void handleSuccess() { @@ -150,7 +150,7 @@ public class GdbDebugNewExecutableCommand extends RefreshableDebugCommand implem rm.setStatus(e.getStatus()); rm.done(); } - }; + } }); job.schedule(); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java index a54f8528aea..0eb5c815633 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java @@ -75,7 +75,7 @@ public class GdbSaveTraceDataCommand extends AbstractDebugCommand implements ISa @Override public void run() { fileName[0] = promptForFileName(); - }; + } }); if (fileName[0] != null) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java index 8adbe0769f4..e5192e19f80 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java @@ -99,7 +99,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem rm.done(); } }); - }; + } }); } else { rm.done(); @@ -146,7 +146,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem protected void handleSuccess() { rm.setData(!getData()); rm.done(); - }; + } }); } else { rm.setData(false); @@ -156,7 +156,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem rm.setData(false); rm.done(); } - }; + } }); } else { rm.setData(false); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java index d5bf4b79c55..2fb085dcb5b 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java @@ -93,7 +93,7 @@ public class GdbSelectPrevTraceRecordCommand extends AbstractDebugCommand implem rm.done(); } }); - }; + } }); } else { rm.done(); @@ -151,9 +151,9 @@ public class GdbSelectPrevTraceRecordCommand extends AbstractDebugCommand implem protected void handleSuccess() { // Can do visualization if we are tracing. rm.done(!getData()); - }; + } }); - }; + } }); } else { rm.done(false); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java index 89f5dee0334..f52ade7deb0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java @@ -77,7 +77,7 @@ public class GdbStartTracingCommand extends AbstractDebugCommand implements ISta @Override protected void handleCompleted() { traceControl.startTracing(dmc, rm); - }; + } }); } else { traceControl.startTracing(dmc, rm); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/memory/GdbMemoryBlockAddressInfoRetrieval.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/memory/GdbMemoryBlockAddressInfoRetrieval.java index bfd23622594..1f71a6c8c29 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/memory/GdbMemoryBlockAddressInfoRetrieval.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/memory/GdbMemoryBlockAddressInfoRetrieval.java @@ -94,7 +94,7 @@ public class GdbMemoryBlockAddressInfoRetrieval implements IMemoryBlockAddressIn @Override protected void handleCompleted() { request.done(); - }; + } }; for (final IGdbMemoryAddressInfoTypeRetrieval infoProvider : infoTypeProviders) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java index 622a992a63e..36040994a26 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java @@ -664,7 +664,7 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded return fDirection * (v1.compareTo(v2)); } } - }; + } @Override public void setFocus() { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java index 1c7e36d23a1..9b2fb9821fc 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java @@ -144,7 +144,7 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements validate(); updateDialogButtons(); } - }; + } abstract class AbstractEditingSupport extends EditingSupport { @@ -189,7 +189,7 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements abstract Object doGetValue(CommandTimeoutEntry entry); abstract ICellEditorValidator getValidator(); - }; + } private TableViewer fViewer; private Button fAddButton; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java index fc55c146643..b6d3b87aeef 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java @@ -263,7 +263,7 @@ public class TraceControlModel { rm.setData(null); } rm.done(); - }; + } }); } else { @@ -314,7 +314,7 @@ public class TraceControlModel { rm.setStatus(new Status(IStatus.ERROR, GdbUIPlugin.PLUGIN_ID, IDsfStatusConstants.INVALID_STATE, "Backend error", e)); //$NON-NLS-1$ rm.done(); - }; + } }); } else { FailedTraceVariableCreationException e = new FailedTraceVariableCreationException( @@ -374,7 +374,7 @@ public class TraceControlModel { new Hashtable<String, String>()); } }); - }; + } }); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java index 31b2871d205..066d63777a9 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java @@ -208,7 +208,7 @@ public class GdbVariableVMNode extends VariableVMNode { } return super.getAdapter(adapter); } - }; + } private static boolean isConvenienceVariable(String expr) { // GDB convenience variables are variables that start with a $ followed diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java index f1f0849d98d..f3ad964a3a0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java @@ -166,7 +166,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* RUNNING CONTAINER - GREEN PIN */ new LabelImage( @@ -186,7 +186,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* RUNNING CONTAINER - BLUE PIN */ new LabelImage( @@ -206,7 +206,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* RUNNING CONTAINER - NO PIN */ new LabelImage(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET)) { @@ -217,7 +217,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement @Override public boolean isEnabled(IStatus status, java.util.Map<String, Object> properties) { return Boolean.FALSE.equals(properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED)); - }; + } }, /* 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); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* SUSPENDED CONTAINER - GREEN PIN */ new LabelImage( @@ -250,7 +250,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* SUSPENDED CONTAINER - BLUE PIN */ new LabelImage( @@ -266,7 +266,7 @@ public class ContainerVMNode extends AbstractContainerVMNode implements IElement Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* SUSPENDED CONTAINER - NO PIN */ new LabelImage(DebugUITools diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java index cf58fccda4b..fa9ad60d29e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java @@ -143,7 +143,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* RUNNING THREAD - GREEN PIN */ new LabelImage( @@ -163,7 +163,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* RUNNING THREAD - BLUE PIN */ new LabelImage( @@ -183,7 +183,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* RUNNING THREAD - NO PIN */ 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] Boolean prop = (Boolean) properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED); return (prop != null) ? !prop.booleanValue() : false; - }; + } }, /* SUSPENDED THREAD - RED PIN */ new LabelImage( @@ -212,7 +212,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* SUSPENDED THREAD - GREEN PIN */ new LabelImage( @@ -228,7 +228,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* SUSPENDED THREAD - BLUE PIN */ new LabelImage( @@ -244,7 +244,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* SUSPENDED THREAD - NO PIN */ new LabelImage( diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoRegistersRetrieval.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoRegistersRetrieval.java index ed8aeed455e..f7fa35c3a9c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoRegistersRetrieval.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoRegistersRetrieval.java @@ -95,7 +95,7 @@ public class GdbMemoryAddressInfoRegistersRetrieval implements IGdbMemoryAddress } }); - }; + } }); } else { // no valid registers diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java index 474c8f34977..64370c349e8 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence.java @@ -463,7 +463,7 @@ public class FinalLaunchSequence extends ReflectionSequence { // fCommandControl.queueCommand( // new MIGDBSetSysroot(fCommandControl.getContext()), // new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor)); - }; + } }); } else { requestMonitor.done(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java index 4f0aa852c3a..8523e08b046 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java @@ -314,7 +314,7 @@ public class DebugNewProcessSequence extends ReflectionSequence { return Status.OK_STATUS; } - }; + } /** * If we are dealing with a postmortem session, connect to the core/trace file. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java index 77a3d2ec311..9577e2ad277 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend.java @@ -325,18 +325,18 @@ public class GDBBackend extends AbstractDsfService implements IGDBBackend, IMIBa @Override public OutputStream getMIOutputStream() { return fProcess.getOutputStream(); - }; + } @Override public InputStream getMIInputStream() { return fProcess.getInputStream(); - }; + } /** @since 4.1 */ @Override public InputStream getMIErrorStream() { return fProcess.getErrorStream(); - }; + } @Override public String getId() { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java index 3f783563bd9..a1255e2d357 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java @@ -94,7 +94,7 @@ public class GDBBackend_7_12 extends GDBBackend { return super.getMIOutputStream(); } return fMIPty.getOutputStream(); - }; + } @Override public InputStream getMIInputStream() { @@ -102,7 +102,7 @@ public class GDBBackend_7_12 extends GDBBackend { return super.getMIInputStream(); } return fMIPty.getInputStream(); - }; + } @Override public InputStream getMIErrorStream() { @@ -110,7 +110,7 @@ public class GDBBackend_7_12 extends GDBBackend { return super.getMIErrorStream(); } return fDummyErrorStream; - }; + } @Override protected String[] getDebuggerCommandLine() { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java index c3006c344a7..f3111b18f8f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_2.java @@ -54,7 +54,7 @@ public class GDBBreakpoints_7_2 extends GDBBreakpoints_7_0 { private enum TracepointMode { FAST_THEN_NORMAL, FAST_ONLY, NORMAL_ONLY - }; + } private TracepointMode fTracepointMode = TracepointMode.NORMAL_ONLY; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java index 283436182db..0783c3d8732 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java @@ -128,7 +128,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements @Override public IDMContext[] getParents() { return fExprDelegate.getParents(); - }; + } @Override public <T> T getAdapter(Class<T> adapterType) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java index c277dadd323..50b1470ecc4 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java @@ -1488,7 +1488,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse } rm.done(containerDmcs.toArray(new IMIContainerDMContext[containerDmcs.size()])); - }; + } }; fContainerCommandCache.execute(fCommandFactory.createMIListThreadGroups(controlDmc), @@ -1776,9 +1776,9 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse setData(getData()); super.handleCompleted(); - }; + } }); - }; + } }; IRunControl runControl = getServicesTracker().getService(IRunControl.class); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java index 9269d384465..7abc6db0a06 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_2.java @@ -618,7 +618,7 @@ public class GDBProcesses_7_2 extends GDBProcesses_7_1 implements IMultiTerminat // Detach failed getDetachedProcesses().remove(containerDmc.getGroupId()); super.handleFailure(); - }; + } }); } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java index 592b80bb3f4..7bae81e398d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java @@ -1263,7 +1263,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService this.steps = steps; this.rm = rm; } - }; + } // The set of threads that we will actually be suspended to make the containers suspended. 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. @@ -1558,7 +1558,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService // We weren't able to suspend, so abort the operation fDisableNextSignalEventDmcSet.remove(thread); super.handleFailure(); - }; + } }); } } @@ -1568,7 +1568,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService Sequence.Step restoreStep = new RestoreTargetStateStep(); restoreStep.execute(rm); } - }; + } /** * 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()); } } - }; + } /** * 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. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java index ad757f61ff2..7aae7bb2c6f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IGDBTraceControl.java @@ -158,7 +158,7 @@ public interface IGDBTraceControl extends IDsfService { public static enum STOP_REASON_ENUM { REQUEST, PASSCOUNT, OVERFLOW, DISCONNECTION, ERROR, UNKNOWN - }; + } public interface ITraceStatusDMData extends IDMData { boolean isTracingSupported(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IReverseRunControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IReverseRunControl.java index e44f338ff8c..fe87d246369 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IReverseRunControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/IReverseRunControl.java @@ -39,7 +39,7 @@ public interface IReverseRunControl { * @return the new state of reverse mode. */ boolean isReverseModeEnabled(); - }; + } /** * Establish if a reverse-resume operation is allowed on the specified context. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_12.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_12.java index d8918a0e575..1cd49b35ac5 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_12.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_12.java @@ -50,7 +50,7 @@ public class StartOrRestartProcessSequence_7_12 extends StartOrRestartProcessSeq fReverseService = tracker.getService(GDBRunControl_7_12.class); tracker.dispose(); rm.done(); - }; + } }); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java index ca54d11a493..0424ae5ad77 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java @@ -805,7 +805,7 @@ public class GDBControl extends AbstractMIControl implements IGDBControl { protected void handleErrorOrWarning() { GdbPlugin.getDefault().getLog().log(getStatus()); super.handleErrorOrWarning(); - }; + } }); 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() { GdbPlugin.getDefault().getLog().log(getStatus()); super.handleErrorOrWarning(); - }; + } }); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java index b13e31dd6fe..d305eec564e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java @@ -38,7 +38,7 @@ public interface IGDBControl extends IMICommandControl { */ default Process getGDBBackendProcess() { return getCLIProcess(); - }; + } /** * @deprecated The return value of this method was too diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIBackend.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIBackend.java index 69fb2dd21ef..71230919bc0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIBackend.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIBackend.java @@ -28,7 +28,7 @@ public interface IMIBackend extends IDsfService { public enum State { NOT_INITIALIZED, STARTED, TERMINATED - }; + } /** * Event indicating that the back end process has started or terminated. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIRunControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIRunControl.java index d63f4a741a5..dee021c89f9 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIRunControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/IMIRunControl.java @@ -52,7 +52,7 @@ public interface IMIRunControl extends IRunControl2 { * @since 4.0 */ public interface IRunMode { - }; + } /** * The run-modes supported by GDB. @@ -61,7 +61,7 @@ public interface IMIRunControl extends IRunControl2 { */ public enum MIRunMode implements IRunMode { ALL_STOP, NON_STOP - }; + } /** * Returns the RunMode that is currently being used by this RunControl service. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java index 76c884b68cf..bbd1dd8cdc9 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointDMData.java @@ -55,7 +55,7 @@ public class MIBreakpointDMData implements IBreakpointDMData { TRACEPOINT, /** @since 4.4 */ DYNAMICPRINTF - }; + } /////////////////////////////////////////////////////////////////////////// // Constructors diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java index e66a5adb7ae..7ba106e31a4 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java @@ -464,7 +464,7 @@ public class MIBreakpointsManager extends AbstractDsfService ((IMIBreakpointsTrackingListener) o).breakpointTrackingStarted(dmc); } rm.done(); - }; + } }); } }); @@ -1092,7 +1092,7 @@ public class MIBreakpointsManager extends AbstractDsfService rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, REQUEST_FAILED, INVALID_PARAMETER, getStatus().getException())); rm.done(); - }; + } }); } }; @@ -1158,7 +1158,7 @@ public class MIBreakpointsManager extends AbstractDsfService protected void handleSuccess() { addBreakpointProblemMarker(breakpoint, errorMessage, IMarker.SEVERITY_WARNING); updateRM.setDoneCount(0); - }; + } }); } }; @@ -1619,7 +1619,7 @@ public class MIBreakpointsManager extends AbstractDsfService fBreakpointActionManager.executeActions(breakpoint, new BreakpointActionAdapter(getExecutor(), getServicesTracker(), context)); return Status.OK_STATUS; - }; + } }.schedule(); } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java index 53a2b470ce9..b87ceda8e07 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsSynchronizer.java @@ -532,7 +532,7 @@ public class MIBreakpointsSynchronizer extends AbstractDsfService } else { targetBreakpointModified(bpTargetDMC, plBpt, miBpt); } - }; + } /** * Some operations that are passed to platform require a number or delays before diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIModules.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIModules.java index 9b2ebc116e8..402f340b09e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIModules.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIModules.java @@ -276,7 +276,7 @@ public class MIModules extends AbstractDsfService implements IModules2, ICaching getProperties()); } rm.done(); - }; + } }); } }); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java index b76cb26d717..cb778923114 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java @@ -1049,7 +1049,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I this.steps = steps; this.rm = rm; } - }; + } // Keep track of if the target was available or not when we started the operation 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 @@ -1351,7 +1351,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I // We weren't able to suspend, so abort the operation fDisableNextSignalEvent = false; super.handleFailure(); - }; + } }); } else { rm.done(); @@ -1363,7 +1363,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I Sequence.Step restoreStep = new RestoreTargetStateStep(); restoreStep.execute(rm); } - }; + } /** * 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()); } } - }; + } /** * 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(); } } - }; + } /* ****************************************************************************** * End of section to support operations even when the target is unavailable. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java index e57157c0d8b..ae8580abde3 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIStack.java @@ -304,7 +304,6 @@ public class MIStack extends AbstractDsfService implements IStack, ICachingServi } else { clear(); } - ; } 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 // and one frame is not enough in many case to debug anything rm.done(fFramesCache.getThreadFramesCache(threadId).getValidStackDepth()); - }; + } }); } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java index 2f481d962cc..8b4e90f51e0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java @@ -500,14 +500,14 @@ public class MIVariableManager implements ICommandControl { */ public MIDisplayHint getDisplayHint() { return fDisplayHint; - }; + } /** * @since 4.3 */ public void setDisplayHint(MIDisplayHint displayHint) { this.fDisplayHint = displayHint; - }; + } /** * @since 4.0 @@ -2392,7 +2392,7 @@ public class MIVariableManager implements ICommandControl { } pendingRm.done(); } - }; + } }); } } else { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MIReverseDebugEnabler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MIReverseDebugEnabler.java index e0e424bd5aa..cc301e944f2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MIReverseDebugEnabler.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MIReverseDebugEnabler.java @@ -39,7 +39,7 @@ public class MIReverseDebugEnabler implements IReverseDebugEnabler { private static enum REVERSE_DEBUG_MODE { ENABLE, DISABLE, TOGGLE - }; + } /** * @param executor diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java index 6d997302e2c..f54726a6193 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java @@ -100,7 +100,7 @@ public abstract class AbstractCLIProcess extends Process implements IEventListen // prompt but it isn't. So we do it ourselves. private enum PromptType { IN_PRIMARY_PROMPT, IN_SECONDARY_PROMPT, IN_SECONDARY_PROMPT_MISSING - }; + } private PromptType fPrompt = PromptType.IN_PRIMARY_PROMPT; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoBreak.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoBreak.java index 0dde5725cfa..12389844802 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoBreak.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIInfoBreak.java @@ -33,7 +33,7 @@ public class CLIInfoBreak extends CLICommand<CLIInfoBreakInfo> { public CLIInfoBreak(IDMContext ctx) { super(ctx, INFO_BREAK); - }; + } public CLIInfoBreak(IDMContext ctx, int bpReference) { super(ctx, INFO_BREAK + Integer.toString(bpReference)); diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/viewmodel/GdbExtendedThreadVMNode.java b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/viewmodel/GdbExtendedThreadVMNode.java index 06ef21dfedb..6d389bac9be 100644 --- a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/viewmodel/GdbExtendedThreadVMNode.java +++ b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/viewmodel/GdbExtendedThreadVMNode.java @@ -76,7 +76,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* RUNNING THREAD - GREEN PIN */ new LabelImage( @@ -96,7 +96,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* RUNNING THREAD - BLUE PIN */ new LabelImage( @@ -116,7 +116,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { ? !prop.booleanValue() && pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* RUNNING THREAD - NO PIN */ 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] Boolean prop = (Boolean) properties.get(ILaunchVMConstants.PROP_IS_SUSPENDED); return (prop != null) ? !prop.booleanValue() : false; - }; + } }, /* SUSPENDED THREAD - RED PIN */ new LabelImage( @@ -145,7 +145,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.RED) : false; - }; + } }, /* SUSPENDED THREAD - GREEN PIN */ new LabelImage( @@ -161,7 +161,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.GREEN) : false; - }; + } }, /* SUSPENDED THREAD - BLUE PIN */ new LabelImage( @@ -177,7 +177,7 @@ public class GdbExtendedThreadVMNode extends ThreadVMNode { Object pin_color_prop = properties.get(IGdbLaunchVMConstants.PROP_PIN_COLOR); return (pin_prop != null && pin_color_prop != null) ? pin_prop.booleanValue() && pin_color_prop.equals(IPinElementColorDescriptor.BLUE) : false; - }; + } }, /* SUSPENDED THREAD - NO PIN */ new LabelImage( diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java index e4bdc6edcdd..bb467e61562 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java @@ -203,7 +203,7 @@ public class BaseTestCase { * @param launch The launch in which we can find the gdb version */ protected void validateGdbVersion(GdbLaunch launch) throws Exception { - }; + } /** * We listen for the target to stop at the main breakpoint. This listener is diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java index 74042b75e41..ea1c4fa5415 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/SyncUtil.java @@ -821,7 +821,7 @@ public class SyncUtil { @Override protected void handleSuccess() { rm.done(localsDMData.toArray(new IVariableDMData[localsDMData.size()])); - }; + } }; for (IVariableDMContext varDmc : varDmcs) { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java index 3d359d35006..f6ae6ff2003 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java @@ -148,7 +148,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase @Override protected void handleSuccess() { rm.done(getData().getFormattedValue()); - }; + } }); return; } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ITestConstants.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ITestConstants.java index c1439818630..ab964d53f29 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ITestConstants.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/ITestConstants.java @@ -55,7 +55,7 @@ public class ITestConstants { 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, ALL_UNSUPPORTED_VERSIONS.length); - }; + } // 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"; diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java index acf45f16b1d..7180a63026a 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/LaunchConfigurationAndRestartTest.java @@ -606,7 +606,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase shutdownEventWaitor.waitForEvent(TestsPlugin.massageTimeout(1000)); IProcess[] launchProcesses = getGDBLaunch().getProcesses(); - ; + for (IProcess proc : launchProcesses) { if (proc instanceof InferiorRuntimeProcess) { assertThat(proc.getAttribute(IGdbDebugConstants.INFERIOR_EXITED_ATTR), is(notNullValue())); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java index 50cb3ae547e..7c7671a07e0 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTargetAvailableTest.java @@ -487,7 +487,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { @Override protected void handleCompleted() { rm.done(); - }; + } }; int index; @@ -554,7 +554,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { @Override protected void handleCompleted() { rm.done(); - }; + } }; int index; diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java index 961cfa508d0..dce2138b3d1 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/GDBMultiNonStopRunControlTest.java @@ -106,7 +106,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { private abstract class AsyncRunnable<V> { public abstract void run(DataRequestMonitor<V> drm); - }; + } private <V> V runAsyncCall(final AsyncRunnable<V> runnable) throws Exception { return runAsyncCall(runnable, false); |