diff options
Diffstat (limited to 'dsf-gdb')
136 files changed, 491 insertions, 491 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCPU.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCPU.java index 518868a6d43..f46ab084044 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCPU.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerCPU.java @@ -46,8 +46,8 @@ public class VisualizerCPU implements Comparable<VisualizerCPU>, IVisualizerMode /** Constructor */ public VisualizerCPU(int id) { m_id = id; - m_cores = new ArrayList<VisualizerCore>(); - m_coreMap = new Hashtable<Integer, VisualizerCore>(); + m_cores = new ArrayList<>(); + m_coreMap = new Hashtable<>(); } /** Dispose method */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerModel.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerModel.java index 9543be19a0e..4993789bb66 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerModel.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/model/VisualizerModel.java @@ -54,9 +54,9 @@ public class VisualizerModel { /** Constructor */ public VisualizerModel(String sessionId) { m_sessionId = sessionId; - m_cpus = new ArrayList<VisualizerCPU>(); - m_cpuMap = new Hashtable<Integer, VisualizerCPU>(); - m_threads = new ArrayList<VisualizerThread>(); + m_cpus = new ArrayList<>(); + m_cpuMap = new Hashtable<>(); + m_threads = new ArrayList<>(); } /** Dispose method */ @@ -189,7 +189,7 @@ public class VisualizerModel { for (VisualizerThread thread : m_threads) { if (thread.getPID() == processId) { if (result == null) - result = new ArrayList<VisualizerThread>(); + result = new ArrayList<>(); result.add(thread); } } 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 9376dad9532..eaaa834912c 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 @@ -286,7 +286,7 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer implements IPin @Override public void initializeVisualizer() { fEventListener = new MulticoreVisualizerEventListener(this); - m_cpuCoreContextsCache = new ArrayList<IDMContext>(); + m_cpuCoreContextsCache = new ArrayList<>(); m_visualizerInstanceId = getViewer().getView().getViewSite().getSecondaryId(); // The first visualizer view will have a null secondary id - override that @@ -514,7 +514,7 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer implements IPin // enable the load meter sub-menu m_enableLoadMetersAction.setEnabled(true); - m_setLoadMeterPeriodActions = new ArrayList<SetLoadMeterPeriodAction>(); + m_setLoadMeterPeriodActions = new ArrayList<>(); m_setLoadMeterPeriodActions.add(new SetLoadMeterPeriodAction( MulticoreVisualizerUIPlugin.getString("MulticoreVisualizer.actions.SetLoadMeterPeriod.fast.text"), //$NON-NLS-1$ LOAD_METER_TIMER_FAST)); @@ -965,7 +965,7 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer implements IPin VisualizerModel model = m_canvas.getModel(); if (model != null) { - Set<Object> selected = new HashSet<Object>(); + Set<Object> selected = new HashSet<>(); for (Object item : items) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCPU.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCPU.java index d90a5cd9be3..1df20214f3a 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCPU.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCPU.java @@ -50,7 +50,7 @@ public class MulticoreVisualizerCPU extends MulticoreVisualizerGraphicObject { /** Constructor */ public MulticoreVisualizerCPU(int id) { m_id = id; - m_cores = new ArrayList<MulticoreVisualizerCore>(); + m_cores = new ArrayList<>(); // default load meter m_loadMeter = new MulticoreVisualizerLoadMeter(null, null); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java index 367d001c54d..1aa787b6b44 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java @@ -166,16 +166,16 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas implements ISelecti setFont(m_textFont); // initialize cached state storage - m_cpus = new ArrayList<MulticoreVisualizerCPU>(); - m_cpuMap = new Hashtable<VisualizerCPU, MulticoreVisualizerCPU>(); + m_cpus = new ArrayList<>(); + m_cpuMap = new Hashtable<>(); - m_cores = new ArrayList<MulticoreVisualizerCore>(); - m_coreMap = new Hashtable<VisualizerCore, MulticoreVisualizerCore>(); + m_cores = new ArrayList<>(); + m_coreMap = new Hashtable<>(); - m_threads = new ArrayList<MulticoreVisualizerThread>(); - m_threadMap = new Hashtable<VisualizerThread, MulticoreVisualizerThread>(); + m_threads = new ArrayList<>(); + m_threadMap = new Hashtable<>(); - m_selectedPIDs = new HashSet<Integer>(); + m_selectedPIDs = new HashSet<>(); // mouse-drag monitor m_mouseMonitor = new MouseMonitor(this) { @@ -827,7 +827,7 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas implements ISelecti * Otherwise, selects item(s) and deselects other items. */ public void selectPoint(int x, int y, boolean addToSelection, boolean toggleSelection) { - List<MulticoreVisualizerGraphicObject> selectedObjects = new ArrayList<MulticoreVisualizerGraphicObject>(); + List<MulticoreVisualizerGraphicObject> selectedObjects = new ArrayList<>(); List<MulticoreVisualizerGraphicObject> selectableObjects = getSelectableObjects(); // the list of selectable objects is ordered to have contained objects @@ -938,7 +938,7 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas implements ISelecti /** Saves current canvas selection as list of model objects. */ protected void updateSelection(boolean raiseEvent) { // get model objects (if any) corresponding to canvas selection - HashSet<Object> selectedObjects = new HashSet<Object>(); + HashSet<Object> selectedObjects = new HashSet<>(); // threads if (m_threads != null) { @@ -1001,7 +1001,7 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas implements ISelecti * For instance, threads are before cores and cores before CPUs. */ protected List<MulticoreVisualizerGraphicObject> getSelectableObjects() { - List<MulticoreVisualizerGraphicObject> selectableObjects = new ArrayList<MulticoreVisualizerGraphicObject>(); + List<MulticoreVisualizerGraphicObject> selectableObjects = new ArrayList<>(); selectableObjects.addAll(m_threads); selectableObjects.addAll(m_cores); selectableObjects.addAll(m_cpus); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvasFilter.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvasFilter.java index 93283d006e2..eb3578413ae 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvasFilter.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvasFilter.java @@ -112,8 +112,8 @@ public class MulticoreVisualizerCanvasFilter { clearFilter(); } - m_filterList = new ArrayList<IVisualizerModelObject>(); - m_dynamicFilterList = new ArrayList<IVisualizerModelObject>(); + m_filterList = new ArrayList<>(); + m_dynamicFilterList = new ArrayList<>(); m_filterActive = true; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvasFilterManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvasFilterManager.java index 82ef92bf0d7..65b9be20dc4 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvasFilterManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvasFilterManager.java @@ -36,7 +36,7 @@ public class MulticoreVisualizerCanvasFilterManager implements SessionEndedListe /** Constructor */ public MulticoreVisualizerCanvasFilterManager(MulticoreVisualizerCanvas canvas) { - m_filterSessionMap = new Hashtable<String, MulticoreVisualizerCanvasFilter>(); + m_filterSessionMap = new Hashtable<>(); m_canvas = canvas; // add listener to be notified when a debug session ends DsfSession.addSessionEndedListener(this); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCore.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCore.java index 5f2ab47c33f..1a572621018 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCore.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCore.java @@ -52,7 +52,7 @@ public class MulticoreVisualizerCore extends MulticoreVisualizerGraphicObject { if (m_cpu != null) m_cpu.addCore(this); m_id = id; - m_threads = new ArrayList<MulticoreVisualizerThread>(); + m_threads = new ArrayList<>(); // default load meter m_loadMeter = new MulticoreVisualizerLoadMeter(null, null); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerSelectionFinder.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerSelectionFinder.java index 591fda6cb2c..5d9761afb44 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerSelectionFinder.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerSelectionFinder.java @@ -68,7 +68,7 @@ public class MulticoreVisualizerSelectionFinder extends DebugViewTreeWalker { public ISelection findSelection(ISelection selection) { m_selection = SelectionUtils.getSelectedObjects(selection); - m_result = new HashSet<Object>(); + m_result = new HashSet<>(); walk(); ISelection found = SelectionUtils.toSelection(m_result); return found; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFSessionState.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFSessionState.java index cff6e9ddfbc..0d92af792c0 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFSessionState.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DSFSessionState.java @@ -45,7 +45,7 @@ public class DSFSessionState { public DSFSessionState(String sessionId) { m_sessionId = sessionId; - m_sessionListeners = new ArrayList<Object>(); + m_sessionListeners = new ArrayList<>(); m_servicesTracker = new DsfServicesTracker(MulticoreVisualizerUIPlugin.getBundleContext(), m_sessionId); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DebugViewTreeWalker.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DebugViewTreeWalker.java index 2e298f5e97c..e1773818d41 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DebugViewTreeWalker.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DebugViewTreeWalker.java @@ -112,7 +112,7 @@ public class DebugViewTreeWalker { * Note: each returned path is the root of a distinct debug session */ public TreePath[] getRootPaths() { - List<TreePath> paths = new ArrayList<TreePath>(); + List<TreePath> paths = new ArrayList<>(); if (m_viewer != null) { Tree tree = (Tree) m_viewer.getControl(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/PersistentSettingsManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/PersistentSettingsManager.java index 878dfc4046a..5130ef29530 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/PersistentSettingsManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/PersistentSettingsManager.java @@ -431,7 +431,7 @@ public class PersistentSettingsManager { T defaultValue) { PersistentParameter<T> setting; // build the final store key with category, parameter label and specific instance, if applicable - setting = new PersistentParameter<T>(clazz, perInstance, getStorageKey(perInstance) + "." + label); //$NON-NLS-1$ + setting = new PersistentParameter<>(clazz, perInstance, getStorageKey(perInstance) + "." + label); //$NON-NLS-1$ // check that we're dealing with one of a few supported types if (setting.isTypeSupported(clazz)) { setting.setDefault(defaultValue); @@ -453,7 +453,7 @@ public class PersistentSettingsManager { List<T> defaultValue) { PersistentListParameter<T> setting; // build the final store key with category, parameter label and specific instance, if applicable - setting = new PersistentListParameter<T>(clazz, perInstance, getStorageKey(perInstance) + "." + label); //$NON-NLS-1$ + setting = new PersistentListParameter<>(clazz, perInstance, getStorageKey(perInstance) + "." + label); //$NON-NLS-1$ // check that we're dealing with one of a few supported types if (setting.isTypeSupported(clazz)) { setting.setDefault(defaultValue); @@ -475,7 +475,7 @@ public class PersistentSettingsManager { Map<String, T> defaultValue) { PersistentMapParameter<T> setting; // build the final store key with category, parameter label and specific instance, if applicable - setting = new PersistentMapParameter<T>(clazz, perInstance, getStorageKey(perInstance) + "." + label); //$NON-NLS-1$ + setting = new PersistentMapParameter<>(clazz, perInstance, getStorageKey(perInstance) + "." + label); //$NON-NLS-1$ // check that we're dealing with one of a few supported types if (setting.isTypeSupported(clazz)) { setting.setDefault(defaultValue); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java index 49ef3c2d2ad..36d23292870 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java @@ -38,7 +38,7 @@ public class TestMICommandConstructCommand { @Test public void multipleParametersShouldHaveCorrectSeparators() { // Setup - MICommand<MIInfo> target = new MICommand<MIInfo>(new TestContext(), "-test-operation"); + MICommand<MIInfo> target = new MICommand<>(new TestContext(), "-test-operation"); target.setOptions(new String[] { "-a a_test\\with slashes", "-b \"hello\"", "-c c_test" }); target.setParameters(new String[] { "-param1 param", "param2", "-param3" }); 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 8f83bac2471..840406179bd 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 @@ -235,7 +235,7 @@ public class DsfTerminateCommand implements ITerminateHandler { } private IProcessDMContext[] getProcessDMContexts(Object[] elements) { - final Set<IProcessDMContext> procDmcs = new HashSet<IProcessDMContext>(); + final Set<IProcessDMContext> procDmcs = new HashSet<>(); for (Object obj : elements) { if (obj instanceof IDMVMContext) { IProcessDMContext procDmc = DMContexts.getAncestorOfType(((IDMVMContext) obj).getDMContext(), 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 1f8ced9e17f..6ebf4b46036 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 @@ -184,7 +184,7 @@ public class GdbDisconnectCommand implements IDisconnectHandler { private void getContainerDMContexts(Object[] elements, final DataRequestMonitor<IContainerDMContext[]> rm) { GdbLaunch launch = null; - final Set<IContainerDMContext> contDmcs = new HashSet<IContainerDMContext>(); + final Set<IContainerDMContext> contDmcs = new HashSet<>(); for (Object obj : elements) { if (obj instanceof GdbLaunch) { launch = (GdbLaunch) obj; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleDynamicPrintfTarget.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleDynamicPrintfTarget.java index e42e3247f43..4db6fc84d29 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleDynamicPrintfTarget.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleDynamicPrintfTarget.java @@ -49,7 +49,7 @@ public class DisassemblyToggleDynamicPrintfTarget extends AbstractDisassemblyBre protected void createLineBreakpointInteractive(IWorkbenchPart part, String sourceHandle, IResource resource, int lineNumber) throws CoreException { ICDynamicPrintf dprintf = (ICDynamicPrintf) CDIDebugModel.createBlankLineDynamicPrintf(); - Map<String, Object> attributes = new HashMap<String, Object>(); + Map<String, Object> attributes = new HashMap<>(); CDIDebugModel.setLineBreakpointAttributes(attributes, sourceHandle, getBreakpointType(), lineNumber, true, 0, ""); //$NON-NLS-1$ @@ -89,7 +89,7 @@ public class DisassemblyToggleDynamicPrintfTarget extends AbstractDisassemblyBre protected void createAddressBreakpointInteractive(IWorkbenchPart part, IResource resource, IAddress address) throws CoreException { ICDynamicPrintf dprintf = (ICDynamicPrintf) CDIDebugModel.createBlankAddressDynamicPrintf(); - Map<String, Object> attributes = new HashMap<String, Object>(); + Map<String, Object> attributes = new HashMap<>(); CDIDebugModel.setAddressBreakpointAttributes(attributes, null, null, getBreakpointType(), -1, address, true, 0, ""); //$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleTracepointsTarget.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleTracepointsTarget.java index f2d4d80f32e..70aafa7ded5 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleTracepointsTarget.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleTracepointsTarget.java @@ -44,7 +44,7 @@ public class DisassemblyToggleTracepointsTarget extends AbstractDisassemblyBreak protected void createLineBreakpointInteractive(IWorkbenchPart part, String sourceHandle, IResource resource, int lineNumber) throws CoreException { ICLineBreakpoint lineBp = CDIDebugModel.createBlankLineTracepoint(); - Map<String, Object> attributes = new HashMap<String, Object>(); + Map<String, Object> attributes = new HashMap<>(); CDIDebugModel.setLineBreakpointAttributes(attributes, sourceHandle, getBreakpointType(), lineNumber, true, 0, ""); //$NON-NLS-1$ openBreakpointPropertiesDialog(lineBp, part, resource, attributes); @@ -63,7 +63,7 @@ public class DisassemblyToggleTracepointsTarget extends AbstractDisassemblyBreak protected void createAddressBreakpointInteractive(IWorkbenchPart part, IResource resource, IAddress address) throws CoreException { ICLineBreakpoint lineBp = CDIDebugModel.createBlankAddressTracepoint(); - Map<String, Object> attributes = new HashMap<String, Object>(); + Map<String, Object> attributes = new HashMap<>(); CDIDebugModel.setAddressBreakpointAttributes(attributes, null, null, getBreakpointType(), -1, address, true, 0, ""); //$NON-NLS-1$ openBreakpointPropertiesDialog(lineBp, part, resource, attributes); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java index 10e2e8663bd..fa7680944d2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java @@ -141,7 +141,7 @@ public class GdbThreadFilterEditor { } if (parent instanceof ILaunchManager) { - List<Object> children = new ArrayList<Object>(); + List<Object> children = new ArrayList<>(); ILaunch[] launches = ((ILaunchManager) parent).getLaunches(); IContainerDMContext[] targetArray; for (int i = 0; i < launches.length; i++) { @@ -276,7 +276,7 @@ public class GdbThreadFilterEditor { if (!(input instanceof ILaunchManager)) { return new IContainerDMContext[0]; } - List<Object> targets = new ArrayList<Object>(); + List<Object> targets = new ArrayList<>(); ILaunch[] launches = ((ILaunchManager) input).getLaunches(); IContainerDMContext[] targetArray; for (int i = 0; i < launches.length; i++) { @@ -343,7 +343,7 @@ public class GdbThreadFilterEditor { private IExecutionDMContext[] getTargetThreadFilters(IContainerDMContext target) { Object[] threads = ((ITreeContentProvider) getThreadViewer().getContentProvider()).getChildren(target); - ArrayList<Object> list = new ArrayList<Object>(threads.length); + ArrayList<Object> list = new ArrayList<>(threads.length); for (int i = 0; i < threads.length; ++i) { if (getThreadViewer().getChecked(threads[i])) list.add(threads[i]); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleDynamicPrintfTargetFactory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleDynamicPrintfTargetFactory.java index 6a9f1193941..61ec294d7ab 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleDynamicPrintfTargetFactory.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleDynamicPrintfTargetFactory.java @@ -48,7 +48,7 @@ public class ToggleDynamicPrintfTargetFactory implements IToggleBreakpointsTarge public static final String TOGGLE_C_DYNAMICPRINTF_TARGET_ID = CDebugUIPlugin.PLUGIN_ID + ".toggleCDynamicPrintfTarget"; //$NON-NLS-1$ - private static final Set<String> TOGGLE_TARGET_IDS_ALL = new HashSet<String>(1); + private static final Set<String> TOGGLE_TARGET_IDS_ALL = new HashSet<>(1); static { TOGGLE_TARGET_IDS_ALL.add(TOGGLE_C_DYNAMICPRINTF_TARGET_ID); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleTracepointsTargetFactory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleTracepointsTargetFactory.java index 1a81de7abf5..e2af9cc455e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleTracepointsTargetFactory.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleTracepointsTargetFactory.java @@ -46,7 +46,7 @@ public class ToggleTracepointsTargetFactory implements IToggleBreakpointsTargetF */ public static final String TOGGLE_C_TRACEPOINT_TARGET_ID = CDebugUIPlugin.PLUGIN_ID + ".toggleCTracepointTarget"; //$NON-NLS-1$ - private static final Set<String> TOGGLE_TARGET_IDS_ALL = new HashSet<String>(1); + private static final Set<String> TOGGLE_TARGET_IDS_ALL = new HashSet<>(1); static { TOGGLE_TARGET_IDS_ALL.add(TOGGLE_C_TRACEPOINT_TARGET_ID); } 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 f825dd5a1fa..b8bd0ed1830 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 @@ -90,7 +90,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne // reset it by using a new debug session. // This map is only needed for remote sessions, since we don't need to specify // the binary location for a local attach session. - private Map<String, String> fProcessNameToBinaryMap = new HashMap<String, String>(); + private Map<String, String> fProcessNameToBinaryMap = new HashMap<>(); public GdbConnectCommand(DsfSession session, ILaunch launch) { fLaunch = launch; @@ -408,7 +408,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne @Override protected void handleSuccess() { - final List<IProcessExtendedInfo> procInfoList = new ArrayList<IProcessExtendedInfo>(); + final List<IProcessExtendedInfo> procInfoList = new ArrayList<>(); final CountingRequestMonitor countingRm = new CountingRequestMonitor(fExecutor, rm) { @@ -555,7 +555,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne // Create a list of all our processes so we can attach to one at a time. // We need to create a new list so that we can remove elements from it. - final List<IProcessExtendedInfo> procList = new ArrayList<IProcessExtendedInfo>(Arrays.asList(processes)); + final List<IProcessExtendedInfo> procList = new ArrayList<>(Arrays.asList(processes)); // Create a one element array to remember what process we are trying to attach to, so that we can // use it in case of error. final IProcessExtendedInfo[] previousProcAttempt = new IProcessExtendedInfo[1]; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/NewExecutableInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/NewExecutableInfo.java index cc5ae917434..d2813555904 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/NewExecutableInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/NewExecutableInfo.java @@ -35,7 +35,7 @@ public class NewExecutableInfo { final private SessionType fSessionType; private String fHostPath = ""; //$NON-NLS-1$ - private Map<String, Object> fAttributes = new HashMap<String, Object>(); + private Map<String, Object> fAttributes = new HashMap<>(); public NewExecutableInfo(SessionType sessionType) { super(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java index 965e4f943d7..c526ae5a189 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java @@ -316,7 +316,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu @SuppressWarnings("unchecked") List<String> values = configuration.getAttribute( IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST); - ArrayList<Path> paths = new ArrayList<Path>(values.size()); + ArrayList<Path> paths = new ArrayList<>(values.size()); Iterator<String> it = values.iterator(); while (it.hasNext()) { paths.add(new Path(it.next())); @@ -337,7 +337,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu List<String> autoSolibs = configuration .getAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB_LIST, Collections.EMPTY_LIST); - List<File> list = new ArrayList<File>(autoSolibs.size()); + List<File> list = new ArrayList<>(autoSolibs.size()); Iterator<String> it = autoSolibs.iterator(); while (it.hasNext()) { list.add(new File(it.next())); @@ -363,14 +363,14 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu @SuppressWarnings("unchecked") List<IPath> elements = fDirList.getElements(); - ArrayList<String> values = new ArrayList<String>(elements.size()); + ArrayList<String> values = new ArrayList<>(elements.size()); Iterator<IPath> it = elements.iterator(); while (it.hasNext()) { values.add((it.next()).toOSString()); } configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, values); } - ArrayList<String> autoLibs = new ArrayList<String>(fAutoSolibs.length); + ArrayList<String> autoLibs = new ArrayList<>(fAutoSolibs.length); for (int i = 0; i < fAutoSolibs.length; ++i) autoLibs.add(fAutoSolibs[i].getPath()); configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB_LIST, autoLibs); @@ -467,7 +467,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu @SuppressWarnings("unchecked") List<IPath> dirList = fDirList.getSelectedElements(); - final HashSet<IPath> libs = new HashSet<IPath>(10); + final HashSet<IPath> libs = new HashSet<>(10); if (generateLibraryList(dirList.toArray(new IPath[dirList.size()]), libs)) { ITreeContentProvider cp = new ITreeContentProvider() { @Override diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java index 1849e4c3ba6..e180d301939 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java @@ -147,7 +147,7 @@ public class AttachProcessHandler extends AbstractHandler implements IHandler { // Use a set of process. It is possible to have multiple entries // with the same pid, e.g. threads with same process id - Set<String> process_ids = new LinkedHashSet<String>(); + Set<String> process_ids = new LinkedHashSet<>(); for (Object sel : ((IStructuredSelection) selection).toList()) { IResourcesInformation ri = (IResourcesInformation) sel; if (pidColumn >= 0) { @@ -163,7 +163,7 @@ public class AttachProcessHandler extends AbstractHandler implements IHandler { } final ICommandControlDMContext context = ((OSResourcesView) part).getSessionContext(); - final List<Sequence.Step> attach_steps = new ArrayList<Sequence.Step>(process_ids.size()); + final List<Sequence.Step> attach_steps = new ArrayList<>(process_ids.size()); for (final String p : process_ids) { attach_steps.add(new Sequence.Step() { @Override diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/ColumnLayout.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/ColumnLayout.java index 097c760b3ac..b2b1dd24977 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/ColumnLayout.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/ColumnLayout.java @@ -25,8 +25,8 @@ import org.eclipse.jface.dialogs.IDialogSettings; */ class ColumnLayout { private String fResourceClass; - private Map<String, Boolean> fVisible = new HashMap<String, Boolean>(); - private Map<String, Integer> fWidth = new HashMap<String, Integer>(); + private Map<String, Boolean> fVisible = new HashMap<>(); + private Map<String, Integer> fWidth = new HashMap<>(); private Integer fSortColumn = null; private Integer fSortDirection = null; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSData.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSData.java index 4ab8142f4b6..84c6cd78904 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSData.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSData.java @@ -38,7 +38,7 @@ class OSData extends LabelProvider implements ITableLabelProvider, IStructuredCo this.data = data; determineColumnTypes(); - remap = new ArrayList<Integer>(data.getColumnNames().length); + remap = new ArrayList<>(data.getColumnNames().length); for (int i = 0; i < data.getColumnNames().length; ++i) remap.add(i); 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 a6d7a98415c..622a992a63e 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 @@ -91,7 +91,7 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded // The data model for the selected session, or null if no session is // selected. private SessionOSData fSessionData; - private Map<String, SessionOSData> fSessionDataCache = new HashMap<String, SessionOSData>(); + private Map<String, SessionOSData> fSessionDataCache = new HashMap<>(); // The data presently shown by table viewer. private OSData fTableShownData = null; // The data which was used to populate column selector menu @@ -112,7 +112,7 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded private Action fRefreshAction; // Map from resource class name to table column layout. - private Map<String, ColumnLayout> fColumnLayouts = new HashMap<String, ColumnLayout>(); + private Map<String, ColumnLayout> fColumnLayouts = new HashMap<>(); private ColumnLayout fColumnLayout = null; @@ -553,7 +553,7 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded fViewer.getTable().setEnabled(true); if (fViewer.getContentProvider() == null) { - ContentLabelProviderWrapper<OSData> wrapper = new ContentLabelProviderWrapper<OSData>(data); + ContentLabelProviderWrapper<OSData> wrapper = new ContentLabelProviderWrapper<>(data); fViewer.setContentProvider(wrapper); fViewer.setLabelProvider(wrapper); } else { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java index fcb235617c0..7227c39c6a6 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java @@ -55,8 +55,8 @@ public class SessionOSData { private ICommandControlDMContext fContext; private IResourceClass[] fResourceClasses = new IResourceClass[0]; - private Map<String, OSData> fExistingData = new HashMap<String, OSData>(); - private Map<String, Date> fTimestamp = new HashMap<String, Date>(); + private Map<String, OSData> fExistingData = new HashMap<>(); + private Map<String, Date> fTimestamp = new HashMap<>(); private Listener fUIListener; private Control fUIControl; 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 6298aac88fd..1c7e36d23a1 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 @@ -228,7 +228,7 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements AdvancedTimeoutSettingsDialog(Shell parentShell, Set<Map.Entry<String, Integer>> entries) { super(parentShell); setShellStyle(getShellStyle() | SWT.RESIZE); - fEntries = new LinkedList<CommandTimeoutEntry>(); + fEntries = new LinkedList<>(); for (Map.Entry<String, Integer> entry : entries) { fEntries.add(new CommandTimeoutEntry(entry.getKey(), entry.getValue())); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointActionDialog.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointActionDialog.java index 09ec33f5b62..22e1510d2f2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointActionDialog.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointActionDialog.java @@ -157,7 +157,7 @@ public class TracepointActionDialog extends Dialog { }); combo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - tracepointActions = new Vector<ITracepointAction>(TRACEPOINT_ACTIONS_COUNT); + tracepointActions = new Vector<>(TRACEPOINT_ACTIONS_COUNT); tracepointActions.add(new CollectAction()); tracepointActions.add(new EvaluateAction()); // Sub actions of whileStepping cannot be whileStepping diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/AbstractImageRegistry.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/AbstractImageRegistry.java index 2b506899f72..599e0e20d87 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/AbstractImageRegistry.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/AbstractImageRegistry.java @@ -35,8 +35,8 @@ import org.osgi.framework.Bundle; * @since 2.1 */ public abstract class AbstractImageRegistry extends ImageRegistry { - private HashMap<String, String> fPlugins = new HashMap<String, String>(); - private HashMap<String, String[]> fLocations = new HashMap<String, String[]>(); + private HashMap<String, String> fPlugins = new HashMap<>(); + private HashMap<String, String[]> fLocations = new HashMap<>(); private URL fBaseUrl; protected AbstractImageRegistry(Plugin plugin) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TracepointImageRegistry.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TracepointImageRegistry.java index e90abca9111..a9d5dbc255e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TracepointImageRegistry.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TracepointImageRegistry.java @@ -26,7 +26,7 @@ import org.eclipse.jface.resource.ImageDescriptor; * @since 2.1 */ public class TracepointImageRegistry extends AbstractImageRegistry { - private static List<Object[]> fStore = new ArrayList<Object[]>(); + private static List<Object[]> fStore = new ArrayList<>(); private static String add(String plugin, String[] dirs, String name) { String key = plugin + '/' + dirs[0] + '/' + name; 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 1fe6d290a0f..31b2871d205 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 @@ -294,7 +294,7 @@ public class GdbVariableVMNode extends VariableVMNode { /** * Maps expressions to their current limit on the maximum number of children. */ - private Map<IExpressionDMContext, Integer> childCountLimits = new HashMap<IExpressionDMContext, Integer>(); + private Map<IExpressionDMContext, Integer> childCountLimits = new HashMap<>(); /** * Utility method to create an IStatus object for an internal error @@ -418,7 +418,7 @@ public class GdbVariableVMNode extends VariableVMNode { @Override public void update(IPropertiesUpdate[] updates) { - List<IPropertiesUpdate> realExpressions = new ArrayList<IPropertiesUpdate>(); + List<IPropertiesUpdate> realExpressions = new ArrayList<>(); for (IPropertiesUpdate update : updates) { if (update.getElement() instanceof IncompleteChildrenVMC) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/breakpoints/GdbBreakpointVMProvider.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/breakpoints/GdbBreakpointVMProvider.java index 0994819ade3..f2d31424529 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/breakpoints/GdbBreakpointVMProvider.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/breakpoints/GdbBreakpointVMProvider.java @@ -122,7 +122,7 @@ public class GdbBreakpointVMProvider extends BreakpointVMProvider { ISelection debugContext = getDebugContext(); if (debugContext instanceof IStructuredSelection) { // Use a set to avoid duplicates - final Set<IBreakpoint> bps = new HashSet<IBreakpoint>(); + final Set<IBreakpoint> bps = new HashSet<>(); int count = 0; final ImmediateCountingRequestMonitor crm = new ImmediateCountingRequestMonitor(rm) { @@ -167,7 +167,7 @@ public class GdbBreakpointVMProvider extends BreakpointVMProvider { } else { // Original behavior of bp filtering. Return all bp of type ICBreakpoint IBreakpoint[] allBreakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(); - List<IBreakpoint> filteredBPs = new ArrayList<IBreakpoint>(allBreakpoints.length); + List<IBreakpoint> filteredBPs = new ArrayList<>(allBreakpoints.length); for (IBreakpoint bp : allBreakpoints) { if (bp instanceof ICBreakpoint && bp.getModelIdentifier().equals(CDebugCorePlugin.PLUGIN_ID)) { filteredBPs.add(bp); @@ -293,7 +293,7 @@ public class GdbBreakpointVMProvider extends BreakpointVMProvider { } if (getData().length > 0) { - final Set<IBreakpoint> bps = new HashSet<IBreakpoint>(getData().length); + final Set<IBreakpoint> bps = new HashSet<>(getData().length); final CountingRequestMonitor crm = new CountingRequestMonitor( ImmediateExecutor.getInstance(), rm) { 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 5d904de1fb3..cf58fccda4b 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 @@ -280,7 +280,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP return; } - List<IExecutionDMContext> execDmcsNotRunning = new ArrayList<IExecutionDMContext>(); + List<IExecutionDMContext> execDmcsNotRunning = new ArrayList<>(); for (IExecutionDMContext execDmc : execDmcs) { // Keep suspended or stepping threads if (runControl.isSuspended(execDmc) || runControl.isStepping(execDmc)) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/breakpoints/CBreakpointGdbThreadsFilterExtension.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/breakpoints/CBreakpointGdbThreadsFilterExtension.java index fe1c79de813..7018137333c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/breakpoints/CBreakpointGdbThreadsFilterExtension.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/breakpoints/CBreakpointGdbThreadsFilterExtension.java @@ -104,7 +104,7 @@ public class CBreakpointGdbThreadsFilterExtension implements IDsfBreakpointExten public void setThreadFilters(IExecutionDMContext[] threads) throws CoreException { if (threads != null && threads.length > 0) { IContainerDMContext target = DMContexts.getAncestorOfType(threads[0], IContainerDMContext.class); - fFilteredThreadsByTarget.put(target, new HashSet<IExecutionDMContext>(Arrays.asList(threads))); + fFilteredThreadsByTarget.put(target, new HashSet<>(Arrays.asList(threads))); } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/CoreList.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/CoreList.java index 35bd9a7dbaf..0b091fd9ea8 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/CoreList.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/CoreList.java @@ -79,7 +79,7 @@ public class CoreList { private void getCoreListFromFile() { File cpuInfo = new File(fCoreFileName); - Vector<ICoreInfo> coreInfo = new Vector<ICoreInfo>(); + Vector<ICoreInfo> coreInfo = new Vector<>(); BufferedReader reader = null; try { String processorId = null; @@ -134,7 +134,7 @@ public class CoreList { } private void getCoreListFromResourceInfo() { - Vector<ICoreInfo> coreInfo = new Vector<ICoreInfo>(); + Vector<ICoreInfo> coreInfo = new Vector<>(); int processorIdIndex = -1; int physicalIdIndex = -1; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/GdbDebugOptions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/GdbDebugOptions.java index 05ec17c3be8..3e2c646cb82 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/GdbDebugOptions.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/GdbDebugOptions.java @@ -51,7 +51,7 @@ public class GdbDebugOptions implements DebugOptionsListener { * Constructor */ public GdbDebugOptions(BundleContext context) { - Hashtable<String, String> props = new Hashtable<String, String>(2); + Hashtable<String, String> props = new Hashtable<>(2); props.put(org.eclipse.osgi.service.debug.DebugOptions.LISTENER_SYMBOLICNAME, GdbPlugin.getUniqueIdentifier()); context.registerService(DebugOptionsListener.class.getName(), this, props); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCoreLoads.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCoreLoads.java index 9315a3ffe78..fcabd048633 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCoreLoads.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCoreLoads.java @@ -25,7 +25,7 @@ public class ProcStatCoreLoads { private Map<String, Float> m_coreLoads; public ProcStatCoreLoads() { - m_coreLoads = new HashMap<String, Float>(); + m_coreLoads = new HashMap<>(); } public void put(String coreId, Float load) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCounters.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCounters.java index c6266e8f674..4a47d1acfe7 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCounters.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatCounters.java @@ -22,7 +22,7 @@ import java.util.Map; * TODO: extend to more than the tick counters. */ public class ProcStatCounters { - private Map<String, OneCoreTickCounters> fTickCounters = new HashMap<String, OneCoreTickCounters>(); + private Map<String, OneCoreTickCounters> fTickCounters = new HashMap<>(); /** * An object of this class holds one set of core/CPU tick counter values, for a single CPU core @@ -70,7 +70,7 @@ public class ProcStatCounters { * */ public ProcStatCounters() { - fTickCounters = new HashMap<String, OneCoreTickCounters>(); + fTickCounters = new HashMap<>(); } /** diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatParser.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatParser.java index beedd9c562f..f54af2e537a 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatParser.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/ProcStatParser.java @@ -67,7 +67,7 @@ public class ProcStatParser { // catch "cpu" lines from /proc/stat Matcher matcherCpu = patternCpu.matcher(line); if (matcherCpu.find()) { - Vector<Integer> ticks = new Vector<Integer>(); + Vector<Integer> ticks = new Vector<>(); coreId = matcherCpu.group(1); // extract the counters for current cpu line for (String tick : matcherCpu.group(2).trim().split("\\s+")) { //$NON-NLS-1$ 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 6baf5cbaf47..ed8aeed455e 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 @@ -118,7 +118,7 @@ public class GdbMemoryAddressInfoRegistersRetrieval implements IGdbMemoryAddress // memSpaceId = ((IMemorySpaceAwareMemoryBlock) memBlock).getMemorySpaceID(); // } - List<IMemoryBlockAddressInfoItem> items = new ArrayList<IMemoryBlockAddressInfoItem>(); + List<IMemoryBlockAddressInfoItem> items = new ArrayList<>(); // Remove all items with value zero for (IMemoryBlockAddressInfoItem item : regDataContainers) { if (item.getAddress().intValue() != 0) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoVariablesRetrieval.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoVariablesRetrieval.java index 9b5274e8e0c..94a890453cb 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoVariablesRetrieval.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryAddressInfoVariablesRetrieval.java @@ -136,7 +136,7 @@ public class GdbMemoryAddressInfoVariablesRetrieval implements IGdbMemoryAddress // Create a List in which we store the DM data objects for the local variables. This is // necessary because there is no MultiDataRequestMonitor. :) - final List<IVariableDMData> localsDMData = new ArrayList<IVariableDMData>(); + final List<IVariableDMData> localsDMData = new ArrayList<>(); // Create the MultiRequestMonitor to handle completion of the set of getModelData() calls. @@ -262,7 +262,7 @@ public class GdbMemoryAddressInfoVariablesRetrieval implements IGdbMemoryAddress String ctxDefaultMemSpaceId) { int length = contentsBins.length; - final List<IMemoryBlockAddressInfoItem> infoItems = new ArrayList<IMemoryBlockAddressInfoItem>(); + final List<IMemoryBlockAddressInfoItem> infoItems = new ArrayList<>(); // Resolve the memory space id of the memory block String memBlockMemSpaceId = EMPTY_STRING; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java index 087efd478c0..c0f8e14f2e7 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/memory/GdbMemoryBlockRetrieval.java @@ -466,7 +466,7 @@ public class GdbMemoryBlockRetrieval extends DsfMemoryBlockRetrieval implements // Process the block list specific to this memory context // FIXME: (Bug228573) We only process the first entry... if (root.getAttribute(ATTR_EXPRESSION_LIST_CONTEXT).equals(CONTEXT_RESERVED)) { - List<IMemoryBlock> blocks = new ArrayList<IMemoryBlock>(); + List<IMemoryBlock> blocks = new ArrayList<>(); NodeList expressionList = root.getChildNodes(); int length = expressionList.getLength(); for (int i = 0; i < length; ++i) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/tracepointactions/TracepointActionManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/tracepointactions/TracepointActionManager.java index 0fa2c688af3..02de3bb747c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/tracepointactions/TracepointActionManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/tracepointactions/TracepointActionManager.java @@ -74,7 +74,7 @@ public class TracepointActionManager { public ArrayList<ITracepointAction> getActions() { if (tracepointActions == null) { - tracepointActions = new ArrayList<ITracepointAction>(); + tracepointActions = new ArrayList<>(); loadActionData(); } return tracepointActions; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_0.java index f4d2d140116..0a0a83e62a4 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_0.java @@ -57,7 +57,7 @@ public class FinalLaunchSequence_7_0 extends FinalLaunchSequence { if (GROUP_TOP_LEVEL.equals(group)) { // Initialize the list with the base class' steps // We need to create a list that we can modify, which is why we create our own ArrayList. - List<String> orderList = new ArrayList<String>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); + List<String> orderList = new ArrayList<>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); // Now insert our steps right after the initialization of the base class. orderList.add(orderList.indexOf("stepInitializeFinalLaunchSequence") + 1, //$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_12.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_12.java index a3932deb844..3cd02b138e2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_12.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_12.java @@ -52,7 +52,7 @@ public class FinalLaunchSequence_7_12 extends FinalLaunchSequence_7_7 { if (GROUP_TOP_LEVEL.equals(group)) { // Initialize the list with the base class' steps // We need to create a list that we can modify, which is why we create our own ArrayList. - List<String> orderList = new ArrayList<String>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); + List<String> orderList = new ArrayList<>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); // Now insert our steps right after the initialization of the base class. orderList.add(orderList.indexOf("stepInitializeFinalLaunchSequence_7_7") + 1, //$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_2.java index 41763985f82..96276634c92 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_2.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_2.java @@ -52,7 +52,7 @@ public class FinalLaunchSequence_7_2 extends FinalLaunchSequence_7_0 { if (GROUP_TOP_LEVEL.equals(group)) { // Initialize the list with the base class' steps // We need to create a list that we can modify, which is why we create our own ArrayList. - List<String> orderList = new ArrayList<String>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); + List<String> orderList = new ArrayList<>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); // Now insert our steps right after the initialization of the base class. orderList.add(orderList.indexOf("stepInitializeFinalLaunchSequence_7_0") + 1, //$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_7.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_7.java index 98bc35f9a78..3a42f5782c8 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_7.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_7.java @@ -49,7 +49,7 @@ public class FinalLaunchSequence_7_7 extends FinalLaunchSequence_7_2 { if (GROUP_TOP_LEVEL.equals(group)) { // Initialize the list with the base class' steps // We need to create a list that we can modify, which is why we create our own ArrayList. - List<String> orderList = new ArrayList<String>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); + List<String> orderList = new ArrayList<>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); // Now insert our steps right after the initialization of the base class. orderList.add(orderList.indexOf("stepInitializeFinalLaunchSequence_7_2") + 1, //$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java index 9b7af989956..9208008cc9d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java @@ -223,7 +223,7 @@ public class GdbLaunch extends DsfLaunch implements ITerminate, IDisconnect, ITr // the overrideable process factory to allow others to override. // First set attribute to specify we want to create the gdb process. // Bug 210366 - Map<String, String> attributes = new HashMap<String, String>(); + Map<String, String> attributes = new HashMap<>(); attributes.put(IGdbDebugConstants.PROCESS_TYPE_CREATION_ATTR, IGdbDebugConstants.GDB_PROCESS_CREATION_VALUE); DebugPlugin.newProcess(this, gdbProc, label, attributes); @@ -633,7 +633,7 @@ public class GdbLaunch extends DsfLaunch implements ITerminate, IDisconnect, ITr public String[] getLaunchEnvironment() throws CoreException { IProject project = getProject(); - HashMap<String, String> envMap = new HashMap<String, String>(); + HashMap<String, String> envMap = new HashMap<>(); ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(project, false); if (projDesc != null) { String buildConfigID = getLaunchConfiguration() @@ -675,7 +675,7 @@ public class GdbLaunch extends DsfLaunch implements ITerminate, IDisconnect, ITr } // Turn it into an envp format - List<String> strings = new ArrayList<String>(envMap.size()); + List<String> strings = new ArrayList<>(envMap.size()); for (Entry<String, String> entry : envMap.entrySet()) { StringBuilder buffer = new StringBuilder(entry.getKey()); buffer.append('=').append(entry.getValue()); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java index 9b777cb2bd9..b67cc2665b0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java @@ -529,7 +529,7 @@ public class LaunchUtils { } // Environment variables and inherited vars - HashMap<String, String> envMap = new HashMap<String, String>(); + HashMap<String, String> envMap = new HashMap<>(); IEnvironmentVariable[] vars = CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cfg, true); for (IEnvironmentVariable var : vars) { envMap.put(var.getName(), var.getValue()); @@ -551,7 +551,7 @@ public class LaunchUtils { } // Turn it into an envp format - List<String> strings = new ArrayList<String>(envMap.size()); + List<String> strings = new ArrayList<>(envMap.size()); for (Entry<String, String> entry : envMap.entrySet()) { StringBuilder buffer = new StringBuilder(entry.getKey()); buffer.append('=').append(entry.getValue()); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ShutdownSequence.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ShutdownSequence.java index 3833bdff77e..ce8729b5cbb 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ShutdownSequence.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ShutdownSequence.java @@ -90,7 +90,7 @@ public class ShutdownSequence extends Sequence { String.format("(%s=%s)", IDsfService.PROP_SESSION_ID, fSessionId).intern()); //$NON-NLS-1$ if (serviceRefs != null) { - List<IDsfService> services = new ArrayList<IDsfService>(serviceRefs.length); + List<IDsfService> services = new ArrayList<>(serviceRefs.length); for (ServiceReference<?> ref : serviceRefs) { Object serviceObj = GdbPlugin.getBundleContext().getService(ref); if (serviceObj instanceof IDsfService) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence_7_2.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence_7_2.java index c2918cbda48..ea63c59f8d5 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence_7_2.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence_7_2.java @@ -66,7 +66,7 @@ public class DebugNewProcessSequence_7_2 extends DebugNewProcessSequence { if (GROUP_TOP_LEVEL.equals(group)) { // Initialize the list with the base class' steps // We need to create a list that we can modify, which is why we create our own ArrayList. - List<String> orderList = new ArrayList<String>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); + List<String> orderList = new ArrayList<>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); // Now insert our steps right after the initialization of the base class. orderList.add(orderList.indexOf("stepInitializeBaseSequence") + 1, "stepInitializeSequence_7_2"); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java index 2b52817c0fe..0b7ed1dd454 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBreakpoints_7_0.java @@ -288,7 +288,7 @@ public class GDBBreakpoints_7_0 extends MIBreakpoints { // Also, tracepoints are created with no passcount. // We have to set the passcount manually now. // Same for commands. - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(MIBreakpoints.IS_ENABLED, getProperty(attributes, MIBreakpoints.IS_ENABLED, true)); delta.put(MIBreakpoints.PASS_COUNT, @@ -393,7 +393,7 @@ public class GDBBreakpoints_7_0 extends MIBreakpoints { return; } - ArrayList<String> actionStrings = new ArrayList<String>(); + ArrayList<String> actionStrings = new ArrayList<>(); for (ITracepointAction action : actions) { if (action != null) { actionStrings.add(action.getSummary()); 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 5e0491fc403..c3006c344a7 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 @@ -256,7 +256,7 @@ public class GDBBreakpoints_7_2 extends GDBBreakpoints_7_0 { // the same thing as ignore-count, which is not supported by // tracepoints). We have to set the passcount manually now. // Same for commands. - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(MIBreakpoints.PASS_COUNT, getProperty(attributes, MIBreakpoints.PASS_COUNT, 0)); delta.put(MIBreakpoints.COMMANDS, getProperty(attributes, MIBreakpoints.COMMANDS, "")); //$NON-NLS-1$ modifyBreakpoint(dmc, delta, drm, false); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBHardwareAndOS.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBHardwareAndOS.java index 20012763ca3..7b7f2c5422a 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBHardwareAndOS.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBHardwareAndOS.java @@ -289,7 +289,7 @@ public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardware // handle getting the required cpu info fFetchCPUInfoCache = new CommandCache(getSession(), new CPUInfoManager()); fFetchCPUInfoCache.setContextAvailable(fCommandControl.getContext(), true); - fLoadInfoRequestCache = new HashMap<IDMContext, DataRequestMonitor<ILoadInfo>>(); + fLoadInfoRequestCache = new HashMap<>(); getSession().addServiceEventListener(this, null); @@ -400,7 +400,7 @@ public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardware * Parse the CoreInfo and create the CPU Contexts for the hardwareTarget context. */ ICPUDMContext[] parseCoresInfoForCPUs(IHardwareTargetDMContext dmc, ICoreInfo[] coresInfo) { - Set<String> cpuIds = new HashSet<String>(); + Set<String> cpuIds = new HashSet<>(); ICPUDMContext[] CPUs; for (ICoreInfo core : coresInfo) { @@ -420,7 +420,7 @@ public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardware */ ICoreDMContext[] parseCoresInfoForCores(ICPUDMContext cpuDmc, ICoreInfo[] coresInfo) { - Vector<ICoreDMContext> coreDmcs = new Vector<ICoreDMContext>(); + Vector<ICoreDMContext> coreDmcs = new Vector<>(); for (ICoreInfo core : coresInfo) { if (core.getPhysicalId().equals(cpuDmc.getId())) { // This core belongs to the right CPU @@ -476,7 +476,7 @@ public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardware * information we need. */ private class CPUInfoManager implements ICommandControl { - private final List<ICommandListener> fCommandProcessors = new ArrayList<ICommandListener>(); + private final List<ICommandListener> fCommandProcessors = new ArrayList<>(); @Override public <V extends ICommandResult> ICommandToken queueCommand(final ICommand<V> command, @@ -533,7 +533,7 @@ public class GDBHardwareAndOS extends AbstractDsfService implements IGDBHardware @Override protected void handleSuccess() { // First extract the string id for every core GDB reports - Set<String> coreIds = new HashSet<String>(); + Set<String> coreIds = new HashSet<>(); IThreadGroupInfo[] groups = getData().getGroupList(); for (IThreadGroupInfo group : groups) { coreIds.addAll(Arrays.asList(group.getCores())); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBMemory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBMemory.java index 7576a4ff969..449385045fd 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBMemory.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBMemory.java @@ -60,12 +60,12 @@ public class GDBMemory extends MIMemory implements IGDBMemory2 { /** * Cache of the address sizes for each memory context. */ - private Map<IMemoryDMContext, Integer> fAddressSizes = new HashMap<IMemoryDMContext, Integer>(); + private Map<IMemoryDMContext, Integer> fAddressSizes = new HashMap<>(); /** * Cache of the addressable sizes for each memory context. */ - private Map<IMemoryDMContext, Integer> fAddressableSizes = new HashMap<IMemoryDMContext, Integer>(); + private Map<IMemoryDMContext, Integer> fAddressableSizes = new HashMap<>(); /** * Cache of the endianness for each memory context. @@ -136,7 +136,7 @@ public class GDBMemory extends MIMemory implements IGDBMemory2 { private Step[] steps = null; private void determineSteps() { - ArrayList<Step> stepsList = new ArrayList<Step>(); + ArrayList<Step> stepsList = new ArrayList<>(); if (fAddressSizes.get(memContext) == null) { stepsList.add(new Step() { 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 79a778f04e2..283436182db 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 @@ -197,7 +197,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements @Override public Map<String, Integer> getEnumerations() { - return new HashMap<String, Integer>(); + return new HashMap<>(); } @Override @@ -618,7 +618,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements // Remove any extra whitespace from each resulting expression, // and ignore any empty expressions. - List<String> expressions = new ArrayList<String>(splitExpressions.length); + List<String> expressions = new ArrayList<>(splitExpressions.length); for (String expr : splitExpressions) { expr = expr.trim(); if (!expr.isEmpty()) { @@ -643,10 +643,10 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements final DataRequestMonitor<IExpressionDMContext[]> rm) { // First separate the group into different expressions. // We need to create a new list, as we will modify it during our processing. - final List<String> exprList = new ArrayList<String>(splitExpressionsInGroup(exprGroupDmc)); + final List<String> exprList = new ArrayList<>(splitExpressionsInGroup(exprGroupDmc)); // List to store the final result, which is all the sub-expressions of this group - final ArrayList<IExpressionDMContext> subExprList = new ArrayList<IExpressionDMContext>(); + final ArrayList<IExpressionDMContext> subExprList = new ArrayList<>(); final int startIndex1 = (startIndex < 0) ? 0 : startIndex; final int length1 = (length < 0) ? Integer.MAX_VALUE : length; @@ -662,7 +662,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements // Not only does selecting the element jump back and forth between the duplicates, // but children of duplicated elements are not always right. Because of this, we // remove all duplicates here. - LinkedHashSet<IExpressionDMContext> uniqueSubExprSet = new LinkedHashSet<IExpressionDMContext>( + LinkedHashSet<IExpressionDMContext> uniqueSubExprSet = new LinkedHashSet<>( subExprList); subExprList.clear(); subExprList.addAll(uniqueSubExprSet); @@ -777,7 +777,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements @Override protected void handleSuccess() { final List<IExpressionDMContext> exprList = getData() != null ? getData() - : new ArrayList<IExpressions.IExpressionDMContext>(); + : new ArrayList<>(); matchLocals(exprDmc, new ImmediateDataRequestMonitor<List<IExpressionDMContext>>(rm) { @Override protected void handleSuccess() { @@ -815,7 +815,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements @Override protected void handleSuccess() { assert getData() instanceof MIRegisterDMC[]; - ArrayList<IExpressionDMContext> matches = new ArrayList<IExpressionDMContext>(); + ArrayList<IExpressionDMContext> matches = new ArrayList<>(); String fullExpr = globDmc.getExpression().trim(); if (fullExpr.startsWith(GLOB_EXPRESSION_PREFIX)) { @@ -865,7 +865,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements final CountingRequestMonitor varNameCRM = new CountingRequestMonitor(getExecutor(), rm) { @Override public void handleSuccess() { - ArrayList<IExpressionDMContext> matches = new ArrayList<IExpressionDMContext>( + ArrayList<IExpressionDMContext> matches = new ArrayList<>( localsDMData.length); String fullExpr = globDmc.getExpression().trim(); @@ -954,7 +954,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements final CountingRequestMonitor varNameCRM = new CountingRequestMonitor(getExecutor(), rm) { @Override public void handleSuccess() { - final ArrayList<IExpressionDMContext> matches = new ArrayList<IExpressionDMContext>(); + final ArrayList<IExpressionDMContext> matches = new ArrayList<>(); final CountingRequestMonitor elementMatchesCRM = new CountingRequestMonitor(getExecutor(), rm) { @Override public void handleSuccess() { @@ -1025,7 +1025,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements protected void handleCompleted() { boolean isArray = isSuccess() && getData().getBasicType().equals(IExpressionDMData.BasicType.array); - final ArrayList<IExpressionDMContext> elements = new ArrayList<IExpressionDMContext>(); + final ArrayList<IExpressionDMContext> elements = new ArrayList<>(); if (isArray) { // we must now create the elements based on the indices @@ -1053,7 +1053,7 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements * could be a valid expression (i.e., the index 3-2=1 in this case) */ protected List<IExpressionDMContext> createArrayIndicesExpression(IExpressionDMContext arrayDmc, String indexSpec) { - ArrayList<IExpressionDMContext> expressionDMCs = new ArrayList<IExpressionDMContext>(); + ArrayList<IExpressionDMContext> expressionDMCs = new ArrayList<>(); String arrayName = arrayDmc.getExpression(); IDMContext parentDmc = arrayDmc.getParents()[0]; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java index fc70fe604b7..daf39b69c06 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java @@ -91,7 +91,7 @@ public class GDBProcesses extends MIProcesses implements IGDBProcesses { // A map of pid to names. It is filled when we get all the // processes that are running - private Map<Integer, String> fProcessNames = new HashMap<Integer, String>(); + private Map<Integer, String> fProcessNames = new HashMap<>(); // Id of our process. Currently, we only know it for an attach session. private String fProcId; @@ -573,7 +573,7 @@ public class GDBProcesses extends MIProcesses implements IGDBProcesses { // the overrideable process factory to allow others to override. // First set attribute to specify we want to create an inferior process. // Bug 210366 - Map<String, String> attributes = new HashMap<String, String>(); + Map<String, String> attributes = new HashMap<>(); attributes.put(IGdbDebugConstants.PROCESS_TYPE_CREATION_ATTR, IGdbDebugConstants.INFERIOR_PROCESS_CREATION_VALUE); IProcess runtimeInferior = DebugPlugin.newProcess(launch, inferior, label, attributes); 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 82288507b27..c277dadd323 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 @@ -611,11 +611,11 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse /** * A map of thread id to thread group id. We use this to find out to which threadGroup a thread belongs. */ - private Map<String, String> fThreadToGroupMap = new HashMap<String, String>(); + private Map<String, String> fThreadToGroupMap = new HashMap<>(); /** * A map of thread group id to process id. We use this to find out to which pid a group refers. */ - private Map<String, String> fGroupToPidMap = new HashMap<String, String>(); + private Map<String, String> fGroupToPidMap = new HashMap<>(); private IGDBControl fCommandControl; private IGDBBackend fBackend; @@ -969,7 +969,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse } String groupId = containerDmc.getGroupId(); - List<IMIExecutionDMContext> execDmcList = new ArrayList<IMIExecutionDMContext>(); + List<IMIExecutionDMContext> execDmcList = new ArrayList<>(); Iterator<Map.Entry<String, String>> iterator = getThreadToGroupMap().entrySet().iterator(); while (iterator.hasNext()) { Map.Entry<String, String> entry = iterator.next(); @@ -1553,7 +1553,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse // -list-thread-groups // ^done,groups=[{id="i1",type="process"}] // Just ignore that entry - List<IMIContainerDMContext> containerDmcs = new ArrayList<IMIContainerDMContext>(groups.length); + List<IMIContainerDMContext> containerDmcs = new ArrayList<>(groups.length); for (IThreadGroupInfo group : groups) { if (group.getPid() == null || group.getPid().isEmpty() || group.getPid().equals("0")) { //$NON-NLS-1$ continue; @@ -1855,7 +1855,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse // First set attribute to specify we want to create an inferior process. // Bug 210366 ILaunch launch = (ILaunch) getSession().getModelAdapter(ILaunch.class); - Map<String, String> attributes = new HashMap<String, String>(); + Map<String, String> attributes = new HashMap<>(); attributes.put(IGdbDebugConstants.PROCESS_TYPE_CREATION_ATTR, IGdbDebugConstants.INFERIOR_PROCESS_CREATION_VALUE); IProcess runtimeInferior = DebugPlugin.newProcess(launch, inferior, label != null ? label : "", //$NON-NLS-1$ 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 0fb2509259b..9269d384465 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 @@ -186,7 +186,7 @@ public class GDBProcesses_7_2 extends GDBProcesses_7_1 implements IMultiTerminat * We use this set for such things as not removing breakpoints * because we know the process will be restarted. */ - private Set<IContainerDMContext> fProcRestarting = new HashSet<IContainerDMContext>(); + private Set<IContainerDMContext> fProcRestarting = new HashSet<>(); /** * Indicates that we are currently visualizing trace data. @@ -810,7 +810,7 @@ public class GDBProcesses_7_2 extends GDBProcesses_7_1 implements IMultiTerminat * @since 4.6 */ protected void canDetachFromProcesses(IDMContext[] dmcs, boolean all, DataRequestMonitor<Boolean> rm) { - Set<IMIContainerDMContext> contDmcs = new HashSet<IMIContainerDMContext>(); + Set<IMIContainerDMContext> contDmcs = new HashSet<>(); for (IDMContext c : dmcs) { IMIContainerDMContext contDmc = DMContexts.getAncestorOfType(c, IMIContainerDMContext.class); if (contDmc != null) { @@ -832,7 +832,7 @@ public class GDBProcesses_7_2 extends GDBProcesses_7_1 implements IMultiTerminat */ @Override public void detachDebuggerFromProcesses(IDMContext[] dmcs, final RequestMonitor rm) { - Set<IMIContainerDMContext> contDmcs = new HashSet<IMIContainerDMContext>(); + Set<IMIContainerDMContext> contDmcs = new HashSet<>(); for (IDMContext c : dmcs) { IMIContainerDMContext contDmc = DMContexts.getAncestorOfType(c, IMIContainerDMContext.class); if (contDmc != null) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRegisters.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRegisters.java index 05e2f1f9536..118749443f9 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRegisters.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRegisters.java @@ -72,20 +72,20 @@ public class GDBRegisters extends MIRegisters implements IRegisters2 { * References to all groups related to a given context. Different programs may use different sets of registers e.g. * 32/64 bits */ - private final ContextToGroupsMap<IContainerDMContext, MIRegisterGroupDMC[]> fContextToGroupsMap = new ContextToGroupsMap<IContainerDMContext, MIRegisterGroupDMC[]>(); + private final ContextToGroupsMap<IContainerDMContext, MIRegisterGroupDMC[]> fContextToGroupsMap = new ContextToGroupsMap<>(); /** * Used to save base list of Registers associated to a group, these registers can not be used as is for * "getRegisters" since the execution context may change e.g. The current selection points to a process or a running * thread or a different frame, all information besides the execution context is valid. */ - private final GroupRegistersMap<MIRegisterGroupDMC, MIRegisterDMC[]> fGroupToRegistersMap = new GroupRegistersMap<MIRegisterGroupDMC, MIRegisterDMC[]>(); + private final GroupRegistersMap<MIRegisterGroupDMC, MIRegisterDMC[]> fGroupToRegistersMap = new GroupRegistersMap<>(); /** * Saves the Group number to RegisterGroupDescriptor created from the serialized memento, The group number is used across contexts as the * key:Integer uses a booking number incremented across container contexts */ - private final Map<Integer, IRegisterGroupDescriptor> fGroupMementoDescriptorIndex = new HashMap<Integer, IRegisterGroupDescriptor>(); + private final Map<Integer, IRegisterGroupDescriptor> fGroupMementoDescriptorIndex = new HashMap<>(); public GDBRegisters(DsfSession session) { super(session); @@ -93,7 +93,7 @@ public class GDBRegisters extends MIRegisters implements IRegisters2 { private class ContextToGroupsMap<K, V> extends HashMap<IContainerDMContext, MIRegisterGroupDMC[]> { private static final long serialVersionUID = 1L; - private final Map<IContainerDMContext, Map<String, MIRegisterGroupDMC>> fNameToGroupMap = new HashMap<IContainerDMContext, Map<String, MIRegisterGroupDMC>>(); + private final Map<IContainerDMContext, Map<String, MIRegisterGroupDMC>> fNameToGroupMap = new HashMap<>(); @Override public MIRegisterGroupDMC[] put(IContainerDMContext key, MIRegisterGroupDMC[] value) { @@ -131,7 +131,7 @@ public class GDBRegisters extends MIRegisters implements IRegisters2 { Map<String, MIRegisterGroupDMC> nameMap = fNameToGroupMap.get(key); if (nameMap == null) { // cache not resolved, rebuild - nameMap = new HashMap<String, MIRegisterGroupDMC>(); + nameMap = new HashMap<>(); MIRegisterGroupDMC[] groupsArr = super.get(key); // If the container context exist, build the name map if (groupsArr != null) { @@ -175,7 +175,7 @@ public class GDBRegisters extends MIRegisters implements IRegisters2 { */ private class GroupRegistersMap<K, V> extends HashMap<MIRegisterGroupDMC, MIRegisterDMC[]> { private static final long serialVersionUID = 1L; - private final Map<MIRegisterGroupDMC, Map<String, MIRegisterDMC>> fNameToRegisterMap = new HashMap<MIRegisterGroupDMC, Map<String, MIRegisterDMC>>(); + private final Map<MIRegisterGroupDMC, Map<String, MIRegisterDMC>> fNameToRegisterMap = new HashMap<>(); @Override public MIRegisterDMC[] put(MIRegisterGroupDMC key, MIRegisterDMC[] value) { @@ -216,7 +216,7 @@ public class GDBRegisters extends MIRegisters implements IRegisters2 { return null; } - Map<String, MIRegisterDMC> registerNameMap = new HashMap<String, MIRegisterDMC>(); + Map<String, MIRegisterDMC> registerNameMap = new HashMap<>(); for (IRegisterDMContext register : registers) { assert (register instanceof MIRegisterDMC); MIRegisterDMC registerDmc = (MIRegisterDMC) register; @@ -761,7 +761,7 @@ public class GDBRegisters extends MIRegisters implements IRegisters2 { * Cast to MI and sort them ascending order by register index */ private MIRegisterDMC[] arrangeRegisters(IRegisterDMContext[] iRegisters) { - TreeMap<Integer, MIRegisterDMC> sortedRegisters = new TreeMap<Integer, MIRegisterDMC>(); + TreeMap<Integer, MIRegisterDMC> sortedRegisters = new TreeMap<>(); for (int i = 0; i < iRegisters.length; i++) { assert (iRegisters[i] instanceof MIRegisterDMC); MIRegisterDMC register = (MIRegisterDMC) iRegisters[i]; @@ -781,7 +781,7 @@ public class GDBRegisters extends MIRegisters implements IRegisters2 { private void removeRegisterGroups(IRegisterGroupDMContext[] groups, boolean removeRoot, RequestMonitor rm) { if (groups != null) { // Save a list of updated containers to only send an update event for each of them - final Set<IContainerDMContext> updatedContainers = new HashSet<IContainerDMContext>(); + final Set<IContainerDMContext> updatedContainers = new HashSet<>(); for (IRegisterGroupDMContext group : groups) { if (!removeRoot) { @@ -808,7 +808,7 @@ public class GDBRegisters extends MIRegisters implements IRegisters2 { assert (groupsCtx != null); if (groupsCtx != null) { - List<MIRegisterGroupDMC> groupsList = new ArrayList<MIRegisterGroupDMC>(Arrays.asList(groupsCtx)); + List<MIRegisterGroupDMC> groupsList = new ArrayList<>(Arrays.asList(groupsCtx)); // Removing a single group groupsList.remove(group); @@ -875,7 +875,7 @@ public class GDBRegisters extends MIRegisters implements IRegisters2 { IRegisterGroupDescriptor[] buildDescriptors() { // use a tree map to sort the entries by group number - TreeMap<Integer, MIRegisterGroupDMC> sortedGroups = new TreeMap<Integer, MIRegisterGroupDMC>(); + TreeMap<Integer, MIRegisterGroupDMC> sortedGroups = new TreeMap<>(); for (MIRegisterGroupDMC group : fGroupToRegistersMap.keySet()) { sortedGroups.put(Integer.valueOf(group.getGroupNo()), group); @@ -923,7 +923,7 @@ public class GDBRegisters extends MIRegisters implements IRegisters2 { return new MIRegisterGroupDMC[0]; } - List<MIRegisterGroupDMC> groups = new ArrayList<MIRegisterGroupDMC>(); + List<MIRegisterGroupDMC> groups = new ArrayList<>(); for (IRegisterGroupDescriptor group : groupDescriptions) { fGroupMementoDescriptorIndex.put(fGroupBookingCount, group); groups.add(new MIRegisterGroupDMC(this, contDmc, fGroupBookingCount, group.getName())); @@ -1001,7 +1001,7 @@ public class GDBRegisters extends MIRegisters implements IRegisters2 { */ private MIRegisterDMC[] resolveRegisters(IRegisterGroupDescriptor grpDescriptor, IDMContext ctx) throws CoreException { - final List<MIRegisterDMC> registerContexts = new ArrayList<MIRegisterDMC>(); + final List<MIRegisterDMC> registerContexts = new ArrayList<>(); final IContainerDMContext containerDmc = DMContexts.getAncestorOfType(ctx, IContainerDMContext.class); final MIRegisterGroupDMC groupDmc = DMContexts.getAncestorOfType(ctx, MIRegisterGroupDMC.class); 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 51c5dede46e..592b80bb3f4 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 @@ -383,7 +383,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService private boolean fTerminated = false; // ThreadStates indexed by the execution context - protected Map<IMIExecutionDMContext, MIThreadRunState> fThreadRunStates = new HashMap<IMIExecutionDMContext, MIThreadRunState>(); + protected Map<IMIExecutionDMContext, MIThreadRunState> fThreadRunStates = new HashMap<>(); private RunToLineActiveOperation fRunToLineActiveOperation = null; @@ -402,15 +402,15 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService /** * Set of threads for which the next MIRunning event should be silenced. */ - private Set<IMIExecutionDMContext> fDisableNextRunningEventDmcSet = new HashSet<IMIExecutionDMContext>(); + private Set<IMIExecutionDMContext> fDisableNextRunningEventDmcSet = new HashSet<>(); /** * Set of threads for which the next MISignal (MIStopped) event should be silenced. */ - private Set<IMIExecutionDMContext> fDisableNextSignalEventDmcSet = new HashSet<IMIExecutionDMContext>(); + private Set<IMIExecutionDMContext> fDisableNextSignalEventDmcSet = new HashSet<>(); /** * Map that stores the silenced MIStopped event for the specified thread, in case we need to use it for a failure. */ - private Map<IMIExecutionDMContext, MIStoppedEvent> fSilencedSignalEventMap = new HashMap<IMIExecutionDMContext, MIStoppedEvent>(); + private Map<IMIExecutionDMContext, MIStoppedEvent> fSilencedSignalEventMap = new HashMap<>(); /** * This variable allows us to know if run control operation @@ -1266,7 +1266,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService }; // The set of threads that we will actually be suspended to make the containers suspended. - private Set<IMIExecutionDMContext> fExecutionDmcToSuspendSet = new HashSet<IMIExecutionDMContext>(); + private Set<IMIExecutionDMContext> fExecutionDmcToSuspendSet = new HashSet<>(); // Do we currently have an executeWithTargetAvailable() operation ongoing? private boolean fOngoingOperation; @@ -1288,7 +1288,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService // and we can complete the operation. private int fNumStepsStillExecuting; // Queue of executeWithTargetAvailable() operations that need to be processed. - private LinkedList<TargetAvailableOperationInfo> fOperationsPending = new LinkedList<TargetAvailableOperationInfo>(); + private LinkedList<TargetAvailableOperationInfo> fOperationsPending = new LinkedList<>(); /** * Returns whether there is currently an ExecuteWithTargetAvailable() operation ongoing. @@ -2211,7 +2211,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService resumeAtLocation(context, location, rm); } else { // Create the breakpoint attributes - Map<String, Object> attr = new HashMap<String, Object>(); + Map<String, Object> attr = new HashMap<>(); attr.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.BREAKPOINT); attr.put(MIBreakpoints.FILE_NAME, debuggerPath); attr.put(MIBreakpoints.LINE_NUMBER, lineNumber); @@ -2255,7 +2255,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService resumeAtLocation(context, location, rm); else { // Create the breakpoint attributes - Map<String, Object> attr = new HashMap<String, Object>(); + Map<String, Object> attr = new HashMap<>(); attr.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.BREAKPOINT); attr.put(MIBreakpoints.ADDRESS, "0x" + address.toString(16)); //$NON-NLS-1$ attr.put(MIBreakpointDMData.IS_TEMPORARY, true); @@ -2592,10 +2592,10 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService */ private List<IExecutionDMContext> extractContextsForOperation(IExecutionDMContext[] contexts) { // Remove duplicate contexts by using a set - Set<IExecutionDMContext> specifiedExedDmcSet = new HashSet<IExecutionDMContext>(Arrays.asList(contexts)); + Set<IExecutionDMContext> specifiedExedDmcSet = new HashSet<>(Arrays.asList(contexts)); // A list that ignores threads for which the process is also present - List<IExecutionDMContext> execDmcForOperationList = new ArrayList<IExecutionDMContext>( + List<IExecutionDMContext> execDmcForOperationList = new ArrayList<>( specifiedExedDmcSet.size()); // Check for the case of a process selected along with some of its threads diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_0.java index 2fe91716e45..ac18ef3e340 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_0.java @@ -132,7 +132,7 @@ public class StartOrRestartProcessSequence_7_0 extends ReflectionSequence { assert containerDmc != null; if (attributes == null) { // If no attributes are specified, simply use an empty map. - attributes = new HashMap<String, Object>(); + attributes = new HashMap<>(); } fContainerDmc = containerDmc; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_10.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_10.java index 9e8a4a1ae3c..22bd18b83ba 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_10.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/StartOrRestartProcessSequence_7_10.java @@ -57,7 +57,7 @@ public class StartOrRestartProcessSequence_7_10 extends StartOrRestartProcessSeq if (GROUP_TOP_LEVEL.equals(group)) { // Initialize the list with the base class' steps // We need to create a list that we can modify, which is why we create our own ArrayList. - List<String> orderList = new ArrayList<String>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); + List<String> orderList = new ArrayList<>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); // Insert the new stepSetReverseMode after stepSetReverseOff orderList.add(orderList.indexOf("stepSetReverseOff") + 1, "stepSetReverseMode"); //$NON-NLS-1$ //$NON-NLS-2$ 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 a1288c0385d..d8918a0e575 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 @@ -59,7 +59,7 @@ public class StartOrRestartProcessSequence_7_12 extends StartOrRestartProcessSeq if (GROUP_TOP_LEVEL.equals(group)) { // Initialize the list with the base class' steps // We need to create a list that we can modify, which is why we create our own ArrayList. - List<String> orderList = new ArrayList<String>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); + List<String> orderList = new ArrayList<>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); // Need to insert reverse mode off before ordering the reverse start at a specified location orderList.add(orderList.indexOf("stepCreateConsole") + 1, "stepSetReverseOff2"); //$NON-NLS-1$ //$NON-NLS-2$ 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 11cbc0d9c2b..ca54d11a493 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 @@ -207,7 +207,7 @@ public class GDBControl extends AbstractMIControl implements IGDBControl { * is available in 6.8, it does not report anything we care about, so * return empty list. */ - private final List<String> fFeatures = new ArrayList<String>(); + private final List<String> fFeatures = new ArrayList<>(); private Sequence fInitializationSequence; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GdbCommandTimeoutManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GdbCommandTimeoutManager.java index 7e38a27d6be..087f4d4bc9c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GdbCommandTimeoutManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GdbCommandTimeoutManager.java @@ -222,7 +222,7 @@ public class GdbCommandTimeoutManager implements ICommandListener, IPreferenceCh private boolean fTimeoutEnabled = false; private int fTimeout = 0; private TimerThread fTimerThread; - private BlockingQueue<QueueEntry> fCommandQueue = new LinkedBlockingQueue<QueueEntry>(); + private BlockingQueue<QueueEntry> fCommandQueue = new LinkedBlockingQueue<>(); private CustomTimeoutsMap fCustomTimeouts = new CustomTimeoutsMap(); private ListenerList fListeners; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/CSourceLookup.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/CSourceLookup.java index 169e5de5e14..25638044357 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/CSourceLookup.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/CSourceLookup.java @@ -52,7 +52,7 @@ import org.osgi.framework.BundleContext; * ISourceLookup service implementation based on the CDT CSourceLookupDirector. */ public class CSourceLookup extends AbstractDsfService implements ISourceLookup { - private Map<ISourceLookupDMContext, CSourceLookupDirector> fDirectors = new HashMap<ISourceLookupDMContext, CSourceLookupDirector>(); + private Map<ISourceLookupDMContext, CSourceLookupDirector> fDirectors = new HashMap<>(); ICommandControl fConnection; private CommandFactory fCommandFactory; @@ -79,7 +79,7 @@ public class CSourceLookup extends AbstractDsfService implements ISourceLookup { } private List<String> getSourceLookupPath(ISourceContainer[] containers) { - ArrayList<String> list = new ArrayList<String>(containers.length); + ArrayList<String> list = new ArrayList<>(containers.length); for (ISourceContainer container : containers) { if (container instanceof CProjectSourceContainer) { 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 a00c3cd5685..76c884b68cf 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 @@ -71,7 +71,7 @@ public class MIBreakpointDMData implements IBreakpointDMData { public MIBreakpointDMData(MIBreakpointDMData other) { fBreakpoint = new MIBreakpoint(other.fBreakpoint); - fProperties = new HashMap<String, Object>(other.fProperties); + fProperties = new HashMap<>(other.fProperties); } /** @@ -81,7 +81,7 @@ public class MIBreakpointDMData implements IBreakpointDMData { * @since 5.3 */ public MIBreakpointDMData copy() { - return new MIBreakpointDMData(new MIBreakpoint(fBreakpoint), new HashMap<String, Object>(fProperties)); + return new MIBreakpointDMData(new MIBreakpoint(fBreakpoint), new HashMap<>(fProperties)); } /** @@ -98,7 +98,7 @@ public class MIBreakpointDMData implements IBreakpointDMData { if (properties != null) { fProperties = properties; } else { - fProperties = new HashMap<String, Object>(); + fProperties = new HashMap<>(); if (dsfMIBreakpoint.isTracepoint()) { // Generic breakpoint attributes diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java index ee834d1a4c9..13aa31b9c37 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java @@ -595,7 +595,7 @@ public class MIBreakpoints extends AbstractDsfService public void getExecutionContextBreakpoints(IExecutionDMContext ctx, DataRequestMonitor<IBreakpointDMContext[]> rm) { IBreakpointDMContext[] bps = fBreakpointHitMap.get(ctx); if (bps == null && ctx instanceof IContainerDMContext) { - List<IBreakpointDMContext> bpsList = new ArrayList<IBreakpointDMContext>(1); + List<IBreakpointDMContext> bpsList = new ArrayList<>(1); for (Map.Entry<IExecutionDMContext, IBreakpointDMContext[]> entry : fBreakpointHitMap.entrySet()) { if (DMContexts.isAncestorOf(entry.getKey(), ctx)) { @@ -748,7 +748,7 @@ public class MIBreakpoints extends AbstractDsfService // By default the breakpoint is enabled at creation // If it wasn't supposed to be, then disable it right away - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IS_ENABLED, getProperty(attributes, IS_ENABLED, true)); modifyBreakpoint(dmc, delta, rm, false); } @@ -844,7 +844,7 @@ public class MIBreakpoints extends AbstractDsfService // Condition, ignore count and state can not be specified at watchpoint creation time. // Therefore, we have to update the watchpoint if any of these is present - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION, getProperty(attributes, CONDITION, NULL_STRING)); delta.put(IGNORE_COUNT, getProperty(attributes, IGNORE_COUNT, 0)); delta.put(IS_ENABLED, getProperty(attributes, IS_ENABLED, true)); @@ -941,7 +941,7 @@ public class MIBreakpoints extends AbstractDsfService // Condition, ignore count and state cannot be specified at creation time. // Therefore, we have to update the catchpoint if any of these is present - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION, getProperty(attributes, CONDITION, NULL_STRING)); delta.put(IGNORE_COUNT, getProperty(attributes, IGNORE_COUNT, 0)); delta.put(IS_ENABLED, getProperty(attributes, IS_ENABLED, true)); @@ -1109,7 +1109,7 @@ public class MIBreakpoints extends AbstractDsfService protected void modifyBreakpoint(final IBreakpointDMContext dmc, Map<String, Object> attributes, final RequestMonitor rm, final boolean generateUpdateEvent) { // Use a working copy of the attributes since we are going to tamper happily with them - Map<String, Object> properties = new HashMap<String, Object>(attributes); + Map<String, Object> properties = new HashMap<>(attributes); // Retrieve the breakpoint parameters // At this point, we know their are OK so there is no need to re-validate 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 2e613488674..e66a5adb7ae 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 @@ -1958,7 +1958,7 @@ public class MIBreakpointsManager extends AbstractDsfService */ protected Map<String, Object> convertToPlatformAttributes(Map<String, Object> cdtAttributes) { - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); // IBreakpoint attributes if (cdtAttributes.containsKey(ATTR_DEBUGGER_PATH)) { @@ -2311,8 +2311,8 @@ public class MIBreakpointsManager extends AbstractDsfService } private String[] compareAttributes(Map<String, Object> oldAttr, Map<String, Object> newAttr, String[] exclude) { - List<String> list = new ArrayList<String>(); - Set<String> names = new HashSet<String>(oldAttr.keySet()); + List<String> list = new ArrayList<>(); + Set<String> names = new HashSet<>(oldAttr.keySet()); names.addAll(newAttr.keySet()); for (String n : names) { if (exclude != null && Arrays.asList(exclude).contains(n)) { 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 9a5d7e7269e..53a2b470ce9 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 @@ -186,10 +186,10 @@ public class MIBreakpointsSynchronizer extends AbstractDsfService public MIBreakpointsSynchronizer(DsfSession session) { super(session); - fTrackedTargets = new HashSet<IBreakpointsTargetDMContext>(); - fCreatedTargetBreakpoints = new HashMap<IBreakpointsTargetDMContext, Map<String, MIBreakpoint>>(); - fDeletedTargetBreakpoints = new HashMap<IBreakpointsTargetDMContext, Set<String>>(); - fPendingModifications = new HashMap<IBreakpointsTargetDMContext, Map<String, MIBreakpoint>>(); + fTrackedTargets = new HashSet<>(); + fCreatedTargetBreakpoints = new HashMap<>(); + fDeletedTargetBreakpoints = new HashMap<>(); + fPendingModifications = new HashMap<>(); } @Override @@ -451,7 +451,7 @@ public class MIBreakpointsSynchronizer extends AbstractDsfService // when addBreakpoint() is called. Map<String, MIBreakpoint> targetMap = fCreatedTargetBreakpoints.get(bpTargetDMC); if (targetMap == null) { - targetMap = new HashMap<String, MIBreakpoint>(); + targetMap = new HashMap<>(); fCreatedTargetBreakpoints.put(bpTargetDMC, targetMap); } targetMap.put(miBpt.getNumber(), miBpt); @@ -594,7 +594,7 @@ public class MIBreakpointsSynchronizer extends AbstractDsfService if (plBpt instanceof ICBreakpoint) { Set<String> set = fDeletedTargetBreakpoints.get(bpTargetDMC); if (set == null) { - set = new HashSet<String>(); + set = new HashSet<>(); fDeletedTargetBreakpoints.put(bpTargetDMC, set); } set.add(id); @@ -619,7 +619,7 @@ public class MIBreakpointsSynchronizer extends AbstractDsfService } IExecutionDMContext[] execDMCs = bpExtension.getThreadFilters(contDMC); - List<IExecutionDMContext> list = new ArrayList<IExecutionDMContext>(execDMCs.length); + List<IExecutionDMContext> list = new ArrayList<>(execDMCs.length); for (IExecutionDMContext c : execDMCs) { if (c instanceof IMIExecutionDMContext && !((IMIExecutionDMContext) c).getThreadId().equals(threadId)) { @@ -724,7 +724,7 @@ public class MIBreakpointsSynchronizer extends AbstractDsfService // modification data, it will be picked up later. Map<String, MIBreakpoint> map = fPendingModifications.get(bpTargetDMC); if (map == null) { - map = new HashMap<String, MIBreakpoint>(); + map = new HashMap<>(); fPendingModifications.put(bpTargetDMC, map); } map.put(miBpt.getNumber(), miBpt); @@ -1437,7 +1437,7 @@ public class MIBreakpointsSynchronizer extends AbstractDsfService * @param commands list of gdb tracepoint commands separated by TracepointActionManager.TRACEPOINT_ACTION_DELIMITER */ private ITracepointAction[] getActionsFromCommands(String[] commands) { - List<ITracepointAction> list = new ArrayList<ITracepointAction>(); + List<ITracepointAction> list = new ArrayList<>(); TracepointActionManager tam = TracepointActionManager.getInstance(); WhileSteppingAction whileStepping = null; List<ITracepointAction> subActions = null; @@ -1465,7 +1465,7 @@ public class MIBreakpointsSynchronizer extends AbstractDsfService } else if (command.startsWith(TC_WHILE_STEPPING)) { whileStepping = createWhileSteppingAction(command.substring(TC_WHILE_STEPPING.length())); if (whileStepping != null) { - subActions = new ArrayList<ITracepointAction>(); + subActions = new ArrayList<>(); } } else if (command.equals(TC_END)) { if (whileStepping == null || subActions == null) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java index 1a636b2ae70..ec715092b54 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java @@ -741,7 +741,7 @@ public class MIExpressions extends AbstractDsfService implements IMIExpressions, @Override public Map<String, Integer> getEnumerations() { - return new HashMap<String, Integer>(); + return new HashMap<>(); } @Override @@ -859,20 +859,20 @@ public class MIExpressions extends AbstractDsfService implements IMIExpressions, * storing the return value, e.g., $1 -> "foo() returned" * This map allows to quickly find the alias to be used for return value variables. */ - private Map<String, String> fExpressionAliasesMap = new HashMap<String, String>(); + private Map<String, String> fExpressionAliasesMap = new HashMap<>(); /** * Map of thread to aliases expression list. This map allows to know which aliases are related * to a thread of execution. This is important to allow us to delete aliases when a * thread exits. Note that we need a list because we keep all previous aliases until * the thread exits. */ - private Map<IMIExecutionDMContext, List<String>> fThreadToAliasedExpressionsMap = new HashMap<IMIExecutionDMContext, List<String>>(); + private Map<IMIExecutionDMContext, List<String>> fThreadToAliasedExpressionsMap = new HashMap<>(); /** * Map of thread to the name of the method the thread last stopped in. * This allows us to create the alias based on the method the thread was in * before it returned out of the method. */ - private Map<IMIExecutionDMContext, String> fThreadToTopMethodName = new HashMap<IMIExecutionDMContext, String>(); + private Map<IMIExecutionDMContext, String> fThreadToTopMethodName = new HashMap<>(); /** * Create an alias for expr with respect to threadDmc. @@ -889,7 +889,7 @@ public class MIExpressions extends AbstractDsfService implements IMIExpressions, List<String> aliasedExprList = fThreadToAliasedExpressionsMap.get(threadDmc); if (aliasedExprList == null) { - aliasedExprList = new ArrayList<String>(); + aliasedExprList = new ArrayList<>(); fThreadToAliasedExpressionsMap.put(threadDmc, aliasedExprList); } aliasedExprList.add(expr); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIMemory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIMemory.java index 52f90903777..a6b615577f3 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIMemory.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIMemory.java @@ -157,7 +157,7 @@ public class MIMemory extends AbstractDsfService implements IMemory, ICachingSer register(new String[] { MIMemory.class.getName(), IMemory.class.getName() }, new Hashtable<String, String>()); - fMemoryCaches = new HashMap<IMemoryDMContext, MIMemoryCache>(); + fMemoryCaches = new HashMap<>(); getSession().addServiceEventListener(this, null); @@ -722,7 +722,7 @@ public class MIMemory extends AbstractDsfService implements IMemory, ICachingSer private List<MemoryBlock> getListOfMissingBlocks(IAddress reqBlockStart, int wordCount, int wordSize) { int octetCount = wordCount * wordSize; - LinkedList<MemoryBlock> list = new LinkedList<MemoryBlock>(); + LinkedList<MemoryBlock> list = new LinkedList<>(); ListIterator<MemoryBlock> it = fMemoryBlockList.listIterator(); // Look for holes in the list of memory blocks diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRegisters.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRegisters.java index ea906867ac7..1ff3a3851a5 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRegisters.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRegisters.java @@ -251,7 +251,7 @@ public class MIRegisters extends AbstractDsfService implements IRegisters, ICach private CommandFactory fCommandFactory; //One Group per container process - private final Map<IContainerDMContext, MIRegisterGroupDMC> fContainerToGroupMap = new HashMap<IContainerDMContext, MIRegisterGroupDMC>(); + private final Map<IContainerDMContext, MIRegisterGroupDMC> fContainerToGroupMap = new HashMap<>(); private CommandCache fRegisterNameCache; // Cache for holding the Register Names in the single Group private CommandCache fRegisterValueCache; // Cache for holding the Register Values @@ -559,7 +559,7 @@ public class MIRegisters extends AbstractDsfService implements IRegisters, ICach // Wraps a list of registers in DMContexts. private MIRegisterDMC[] makeRegisterDMCs(MIRegisterGroupDMC groupDmc, IFrameDMContext frameDmc, String[] regNames) { - List<MIRegisterDMC> regDmcList = new ArrayList<MIRegisters.MIRegisterDMC>(regNames.length); + List<MIRegisterDMC> regDmcList = new ArrayList<>(regNames.length); int regNo = 0; for (String regName : regNames) { if (regName != null && !regName.isEmpty()) { 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 00b89388e19..b76cb26d717 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 @@ -1075,7 +1075,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I // and we can complete the operation. private int fNumStepsStillExecuting; // Queue of executeWithTargetAvailable() operations that need to be processed. - private LinkedList<TargetAvailableOperationInfo> fOperationsPending = new LinkedList<TargetAvailableOperationInfo>(); + private LinkedList<TargetAvailableOperationInfo> fOperationsPending = new LinkedList<>(); /** * Returns whether the target is available to perform operations @@ -1587,7 +1587,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I resumeAtLocation(context, location, rm); } else { // Create the breakpoint attributes - Map<String, Object> attr = new HashMap<String, Object>(); + Map<String, Object> attr = new HashMap<>(); attr.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.BREAKPOINT); attr.put(MIBreakpoints.FILE_NAME, debuggerPath); attr.put(MIBreakpoints.LINE_NUMBER, lineNumber); @@ -1633,7 +1633,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I resumeAtLocation(context, location, rm); else { // Create the breakpoint attributes - Map<String, Object> attr = new HashMap<String, Object>(); + Map<String, Object> attr = new HashMap<>(); attr.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.BREAKPOINT); attr.put(MIBreakpoints.ADDRESS, "0x" + address.toString(16)); //$NON-NLS-1$ attr.put(MIBreakpointDMData.IS_TEMPORARY, true); 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 e27079fe6af..e57157c0d8b 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 @@ -195,7 +195,7 @@ public class MIStack extends AbstractDsfService implements IStack, ICachingServi private boolean limited = true; // The actual depth we received private int stackDepth = -1; - private final List<FrameData> frames = new ArrayList<FrameData>(); + private final List<FrameData> frames = new ArrayList<>(); /** * Return currently cached stack depth if cache value if valid, otherwise return -1. @@ -349,7 +349,7 @@ public class MIStack extends AbstractDsfService implements IStack, ICachingServi * A return value is stored when the user performs a step-return, * and it cleared as soon as that thread executes again. */ - private Map<IMIExecutionDMContext, VariableData> fThreadToReturnVariable = new HashMap<IMIExecutionDMContext, VariableData>(); + private Map<IMIExecutionDMContext, VariableData> fThreadToReturnVariable = new HashMap<>(); public MIStack(DsfSession session) { super(session); @@ -949,7 +949,7 @@ public class MIStack extends AbstractDsfService implements IStack, ICachingServi // We don't currently support variables with the same name in the same frame, // so we only keep the first one. // Bug 327621 and 328573 - Map<String, MIVariableDMC> variableNames = new LinkedHashMap<String, MIVariableDMC>(); + Map<String, MIVariableDMC> variableNames = new LinkedHashMap<>(); for (int i = 0; i < miArgs.length; i++) { String name = miArgs[i].getName(); @@ -984,7 +984,7 @@ public class MIStack extends AbstractDsfService implements IStack, ICachingServi @Override public void getLocals(final IFrameDMContext frameDmc, final DataRequestMonitor<IVariableDMContext[]> rm) { - final List<IVariableDMContext> localsList = new ArrayList<IVariableDMContext>(); + final List<IVariableDMContext> localsList = new ArrayList<>(); final CountingRequestMonitor countingRm = new CountingRequestMonitor(getExecutor(), rm) { @Override 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 cc5f756b122..2f481d962cc 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 @@ -2179,7 +2179,7 @@ public class MIVariableManager implements ICommandControl { public MIRootVariableObject(VariableObjectId id) { super(id, null); currentState = STATE_NOT_CREATED; - modifiableDescendants = new HashMap<String, MIVariableObject>(); + modifiableDescendants = new HashMap<>(); } public ICommandControlDMContext getControlDMContext() { @@ -2634,13 +2634,13 @@ public class MIVariableManager implements ICommandControl { private IExpressions fExpressionService; // Typically, there will only be one listener, since only the ExpressionService will use this class - private final List<ICommandListener> fCommandProcessors = new ArrayList<ICommandListener>(); + private final List<ICommandListener> fCommandProcessors = new ArrayList<>(); /** Our least recently used cache */ private final LRUVariableCache lruVariableList; /** The list of root variable objects that have been updated */ - private final LinkedList<MIRootVariableObject> updatedRootList = new LinkedList<MIRootVariableObject>(); + private final LinkedList<MIRootVariableObject> updatedRootList = new LinkedList<>(); /** * MIVariableManager constructor diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java index 2a40598826e..e8077abde6b 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractMIControl.java @@ -104,7 +104,7 @@ public abstract class AbstractMIControl extends AbstractDsfService implements IM // Since GDB.7.1 private boolean fUseThreadGroupOption; - private final BlockingQueue<CommandHandle> fTxCommands = new LinkedBlockingQueue<CommandHandle>(); + private final BlockingQueue<CommandHandle> fTxCommands = new LinkedBlockingQueue<>(); private final Map<Integer, CommandHandle> fRxCommands = Collections .synchronizedMap(new HashMap<Integer, CommandHandle>()); @@ -119,14 +119,14 @@ public abstract class AbstractMIControl extends AbstractDsfService implements IM * what the control object is doing. */ - private final List<ICommandListener> fCommandProcessors = new ArrayList<ICommandListener>(); - private final List<IEventListener> fEventProcessors = new ArrayList<IEventListener>(); + private final List<ICommandListener> fCommandProcessors = new ArrayList<>(); + private final List<IEventListener> fEventProcessors = new ArrayList<>(); /** * Current command which have not been handed off to the backend yet. */ - private final List<CommandHandle> fCommandQueue = new ArrayList<CommandHandle>(); + private final List<CommandHandle> fCommandQueue = new ArrayList<>(); /** * Flag indicating that the command control has stopped processing commands. @@ -294,7 +294,7 @@ public abstract class AbstractMIControl extends AbstractDsfService implements IM /* * Now handle any requests which have not been transmitted, but weconsider them handed off. */ - List<CommandHandle> txCommands = new ArrayList<CommandHandle>(); + List<CommandHandle> txCommands = new ArrayList<>(); fTxCommands.drainTo(txCommands); for (CommandHandle commandHandle : txCommands) { if (commandHandle.getRequestMonitor() == null) @@ -748,7 +748,7 @@ public abstract class AbstractMIControl extends AbstractDsfService implements IM * List of out of band records since the last result record. Out of band * records are required for processing the results of CLI commands. */ - private final List<MIOOBRecord> fAccumulatedOOBRecords = new LinkedList<MIOOBRecord>(); + private final List<MIOOBRecord> fAccumulatedOOBRecords = new LinkedList<>(); /** * List of stream records since the last result record, not including @@ -756,7 +756,7 @@ public abstract class AbstractMIControl extends AbstractDsfService implements IM * a subset of {@link #fAccumulatedOOBRecords}, as a stream record is a * particular type of OOB record. */ - private final List<MIStreamRecord> fAccumulatedStreamRecords = new LinkedList<MIStreamRecord>(); + private final List<MIStreamRecord> fAccumulatedStreamRecords = new LinkedList<>(); public RxThread(InputStream inputStream) { super("MI RX Thread"); //$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java index e700ff075ac..a1aef544584 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java @@ -500,21 +500,21 @@ public class CommandFactory { public ICommand<MIDataEvaluateExpressionInfo> createMIDataEvaluateExpression(ICommandControlDMContext ctx, String expr) { - return new MIDataEvaluateExpression<MIDataEvaluateExpressionInfo>(ctx, expr); + return new MIDataEvaluateExpression<>(ctx, expr); } public ICommand<MIDataEvaluateExpressionInfo> createMIDataEvaluateExpression(IMIExecutionDMContext execDmc, String expr) { - return new MIDataEvaluateExpression<MIDataEvaluateExpressionInfo>(execDmc, expr); + return new MIDataEvaluateExpression<>(execDmc, expr); } public ICommand<MIDataEvaluateExpressionInfo> createMIDataEvaluateExpression(IFrameDMContext frameDmc, String expr) { - return new MIDataEvaluateExpression<MIDataEvaluateExpressionInfo>(frameDmc, expr); + return new MIDataEvaluateExpression<>(frameDmc, expr); } public ICommand<MIDataEvaluateExpressionInfo> createMIDataEvaluateExpression(IExpressionDMContext exprDmc) { - return new MIDataEvaluateExpression<MIDataEvaluateExpressionInfo>(exprDmc); + return new MIDataEvaluateExpression<>(exprDmc); } public ICommand<MIDataListRegisterNamesInfo> createMIDataListRegisterNames(IContainerDMContext ctx) { @@ -931,11 +931,11 @@ public class CommandFactory { } public ICommand<MIInfo> createMIInterpreterExec(IDMContext ctx, String interpreter, String cmd) { - return new MIInterpreterExec<MIInfo>(ctx, interpreter, cmd); + return new MIInterpreterExec<>(ctx, interpreter, cmd); } public ICommand<MIInfo> createMIInterpreterExecConsole(IDMContext ctx, String cmd) { - return new MIInterpreterExecConsole<MIInfo>(ctx, cmd); + return new MIInterpreterExecConsole<>(ctx, cmd); } /** @since 4.0 */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIBackendCLIProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIBackendCLIProcess.java index c9ed9f08796..b896dd5ce7e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIBackendCLIProcess.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIBackendCLIProcess.java @@ -66,7 +66,7 @@ public class MIBackendCLIProcess extends AbstractCLIProcess { } public class BackedExitedEventListener { - private final List<RequestMonitor> fWaitForRMs = new ArrayList<RequestMonitor>(); + private final List<RequestMonitor> fWaitForRMs = new ArrayList<>(); @DsfServiceEventHandler public void eventDispatched(BackendStateChangedEvent event) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java index a2ce531140e..8665bd15401 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java @@ -121,7 +121,7 @@ public class MIRunControlEventProcessor implements IEventProcessor { @Override public void eventReceived(Object output) { for (MIOOBRecord oobr : ((MIOutput) output).getMIOOBRecords()) { - List<MIEvent<?>> events = new LinkedList<MIEvent<?>>(); + List<MIEvent<?>> events = new LinkedList<>(); if (oobr instanceof MIExecAsyncOutput) { MIExecAsyncOutput exec = (MIExecAsyncOutput) oobr; // Change of state. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java index 3726a94c4d2..5c598ca948e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java @@ -123,7 +123,7 @@ public class MIRunControlEventProcessor_7_0 implements IEventProcessor { @Override public void eventReceived(Object output) { for (MIOOBRecord oobr : ((MIOutput) output).getMIOOBRecords()) { - List<MIEvent<?>> events = new LinkedList<MIEvent<?>>(); + List<MIEvent<?>> events = new LinkedList<>(); if (oobr instanceof MIExecAsyncOutput) { MIExecAsyncOutput exec = (MIExecAsyncOutput) oobr; // Change of state. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDPrintfInsert.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDPrintfInsert.java index 78305277abc..1320c12f6ad 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDPrintfInsert.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDPrintfInsert.java @@ -131,7 +131,7 @@ public class MIDPrintfInsert extends MICommand<MIBreakInsertInfo> { } private Adjustable[] createParameters(String location, String printfStr) { - List<Adjustable> paramsList = new ArrayList<Adjustable>(); + List<Adjustable> paramsList = new ArrayList<>(); paramsList.add(new MIStandardParameterAdjustable(location)); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java index 7c4497eb694..25d4b8192d0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java @@ -37,7 +37,7 @@ public class MIGDBSetArgs extends MIGDBSet { /** @since 4.0 */ public MIGDBSetArgs(IMIContainerDMContext dmc, String[] arguments) { super(dmc, null); - fParameters = new ArrayList<Adjustable>(); + fParameters = new ArrayList<>(); fParameters.add(new MIStandardParameterAdjustable("args")); //$NON-NLS-1$ /* * GDB-MI terminates the -gdb-set on the newline, so we have to encode diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIListThreadGroups.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIListThreadGroups.java index cb849383243..9275c0af2f9 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIListThreadGroups.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIListThreadGroups.java @@ -110,7 +110,7 @@ public class MIListThreadGroups extends MICommand<MIListThreadGroupsInfo> { assert !((groupId != null) && listAll); // see comment above - final ArrayList<String> arguments = new ArrayList<String>(); + final ArrayList<String> arguments = new ArrayList<>(); if (listAll) { arguments.add("--available"); //$NON-NLS-1$ } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoBreakInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoBreakInfo.java index 5ee62d2db72..6194a89e568 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoBreakInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoBreakInfo.java @@ -56,7 +56,7 @@ import java.util.Set; */ public class CLIInfoBreakInfo extends MIInfo { - private Map<String, String[]> fBreakpointToGroupMap = new HashMap<String, String[]>(); + private Map<String, String[]> fBreakpointToGroupMap = new HashMap<>(); public CLIInfoBreakInfo(MIOutput out) { super(out); @@ -86,7 +86,7 @@ public class CLIInfoBreakInfo extends MIInfo { String bpIdStr = line.split("[\\s\\.]", 2)[0]; //$NON-NLS-1$ String[] groups = fBreakpointToGroupMap.get(bpIdStr); - Set<String> groupIdList = new HashSet<String>(); + Set<String> groupIdList = new HashSet<>(); if (groups != null) { // Since we already know about this breakpoint id we must retain the list // we have been building diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoSharedLibraryInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoSharedLibraryInfo.java index dbdfd5abcd0..4cde03fe9ee 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoSharedLibraryInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoSharedLibraryInfo.java @@ -71,7 +71,7 @@ public class CLIInfoSharedLibraryInfo extends MIInfo { } void parse() { - List<DsfMISharedInfo> aList = new ArrayList<DsfMISharedInfo>(); + List<DsfMISharedInfo> aList = new ArrayList<>(); if (isDone()) { MIOutput out = getMIOutput(); MIOOBRecord[] oobs = out.getMIOOBRecords(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoThreadsInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoThreadsInfo.java index 543ad3ca2b9..31db26571ad 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoThreadsInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIInfoThreadsInfo.java @@ -104,7 +104,7 @@ public class CLIInfoThreadsInfo extends MIInfo { } protected void parse() { - info = new ArrayList<ThreadInfo>(); + info = new ArrayList<>(); if (isDone()) { MIOutput out = getMIOutput(); MIOOBRecord[] oobs = out.getMIOOBRecords(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIArg.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIArg.java index 0899b1cd329..2daf16e88a6 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIArg.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIArg.java @@ -45,7 +45,7 @@ public class MIArg { * [{name="xxx"},{name="xxx"}] */ public static MIArg[] getMIArgs(MIList miList) { - List<MIArg> aList = new ArrayList<MIArg>(); + List<MIArg> aList = new ArrayList<>(); MIValue[] values = miList.getMIValues(); for (int i = 0; i < values.length; i++) { if (values[i] instanceof MITuple) { @@ -73,7 +73,7 @@ public class MIArg { * {{name="xxx"},{name="xxx"}} */ public static MIArg[] getMIArgs(MITuple miTuple) { - List<MIArg> aList = new ArrayList<MIArg>(); + List<MIArg> aList = new ArrayList<>(); MIValue[] values = miTuple.getMIValues(); for (int i = 0; i < values.length; i++) { if (values[i] instanceof MITuple) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakInsertInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakInsertInfo.java index 94bd7103a9b..3b26e72b5df 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakInsertInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakInsertInfo.java @@ -35,7 +35,7 @@ public class MIBreakInsertInfo extends MIInfo { public MIBreakInsertInfo(MIOutput record) { super(record); breakpoints = null; - List<MIBreakpoint> aList = new ArrayList<MIBreakpoint>(1); + List<MIBreakpoint> aList = new ArrayList<>(1); if (isDone()) { MIResultRecord rr = record.getMIResultRecord(); if (rr != null) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakListInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakListInfo.java index 6052cda1d15..ff02b7742a2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakListInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakListInfo.java @@ -41,7 +41,7 @@ public class MIBreakListInfo extends MIInfo { } void parse() { - List<MIBreakpoint> aList = new ArrayList<MIBreakpoint>(1); + List<MIBreakpoint> aList = new ArrayList<>(1); if (isDone()) { MIOutput out = getMIOutput(); MIResultRecord rr = out.getMIResultRecord(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java index 17c10c95475..1b224b946b3 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIBreakpoint.java @@ -657,7 +657,7 @@ public class MIBreakpoint { } private void parseGroups(MIList list) { - List<String> groups = new ArrayList<String>(); + List<String> groups = new ArrayList<>(); MIValue[] values = list.getMIValues(); for (int i = 0; i < values.length; i++) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataDisassembleInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataDisassembleInfo.java index 0aab7da1ea8..7a3a8b9f754 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataDisassembleInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataDisassembleInfo.java @@ -79,8 +79,8 @@ public class MIDataDisassembleInfo extends MIInfo { * parse its value. */ private void parse() { - List<MIInstruction> asmList = new ArrayList<MIInstruction>(); - List<MIMixedInstruction> srcList = new ArrayList<MIMixedInstruction>(); + List<MIInstruction> asmList = new ArrayList<>(); + List<MIMixedInstruction> srcList = new ArrayList<>(); if (isDone()) { MIOutput out = getMIOutput(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataListRegisterNamesInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataListRegisterNamesInfo.java index 713a15ffe01..5efc567be15 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataListRegisterNamesInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataListRegisterNamesInfo.java @@ -29,7 +29,7 @@ public class MIDataListRegisterNamesInfo extends MIInfo { public MIDataListRegisterNamesInfo(MIOutput rr) { super(rr); names = null; - List<String> aList = new ArrayList<String>(); + List<String> aList = new ArrayList<>(); if (isDone()) { MIOutput out = getMIOutput(); MIResultRecord outr = out.getMIResultRecord(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataListRegisterValuesInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataListRegisterValuesInfo.java index 1c25c653efb..ca99b8b0cd4 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataListRegisterValuesInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIDataListRegisterValuesInfo.java @@ -76,7 +76,7 @@ public class MIDataListRegisterValuesInfo extends MIInfo { public <V extends ICommandResult> V getSubsetResult(ICommand<V> cmd) { if (cmd instanceof MIDataListRegisterValues) { MIDataListRegisterValues command = (MIDataListRegisterValues) cmd; - List<MIRegisterValue> aList = new ArrayList<MIRegisterValue>(); + List<MIRegisterValue> aList = new ArrayList<>(); int[] wantedRegNos = command.getRegList(); /* diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInfoOsInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInfoOsInfo.java index a71ddde4f88..00903d184bb 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInfoOsInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInfoOsInfo.java @@ -101,7 +101,7 @@ public class MIInfoOsInfo extends MIInfo { } private void parseResourceClasses() { - List<IResourceClass> classes = new ArrayList<IResourceClass>(); + List<IResourceClass> classes = new ArrayList<>(); MITuple table = (MITuple) get(getMIOutput(), "OSDataTable"); //$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIListFeaturesInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIListFeaturesInfo.java index 9bfcb387441..0205a621957 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIListFeaturesInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIListFeaturesInfo.java @@ -25,7 +25,7 @@ import java.util.List; */ public class MIListFeaturesInfo extends MIInfo { - private List<String> fFeatures = new ArrayList<String>(); + private List<String> fFeatures = new ArrayList<>(); public MIListFeaturesInfo(MIOutput out) { super(out); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIListThreadGroupsInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIListThreadGroupsInfo.java index 7309ec5f2cc..7e8bbf5759d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIListThreadGroupsInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIListThreadGroupsInfo.java @@ -501,7 +501,7 @@ public class MIListThreadGroupsInfo extends MIInfo { /** @since 4.4 */ protected String[] parseCores(MIList list) { - List<String> cores = new ArrayList<String>(); + List<String> cores = new ArrayList<>(); MIValue[] values = list.getMIValues(); for (int i = 0; i < values.length; i++) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIMixedInstruction.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIMixedInstruction.java index 5f57239776c..883e38eb216 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIMixedInstruction.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIMixedInstruction.java @@ -62,7 +62,7 @@ public class MIMixedInstruction implements IMixedInstruction { * ] */ private void parse(MITuple tuple) { - List<MIInstruction> instructions = new ArrayList<MIInstruction>(); + List<MIInstruction> instructions = new ArrayList<>(); MIResult[] results = tuple.getMIResults(); for (int i = 0; i < results.length; i++) { String var = results[i].getVariable(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIParser.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIParser.java index 7e0b3c5b48e..b4ba93be734 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIParser.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIParser.java @@ -266,7 +266,7 @@ public class MIParser { * Extract the MI Result comma seperated responses. */ private MIResult[] processMIResults(FSB buffer) { - List<MIResult> aList = new ArrayList<MIResult>(); + List<MIResult> aList = new ArrayList<>(); MIResult result = processMIResult(buffer); if (result != null) { aList.add(result); @@ -340,8 +340,8 @@ public class MIParser { */ private MIValue processMITuple(FSB buffer) { MITuple tuple = new MITuple(); - List<MIValue> valueList = new ArrayList<MIValue>(); - List<MIResult> resultList = new ArrayList<MIResult>(); + List<MIValue> valueList = new ArrayList<>(); + List<MIResult> resultList = new ArrayList<>(); // Catch closing '}' while (buffer.length() > 0 && buffer.charAt(0) != '}') { // Try for the DsfMIValue first @@ -374,8 +374,8 @@ public class MIParser { */ private MIValue processMIList(FSB buffer) { MIList list = new MIList(); - List<MIValue> valueList = new ArrayList<MIValue>(); - List<MIResult> resultList = new ArrayList<MIResult>(); + List<MIValue> valueList = new ArrayList<>(); + List<MIResult> resultList = new ArrayList<>(); // catch closing ']' while (buffer.length() > 0 && buffer.charAt(0) != ']') { // Try for the DsfMIValue first diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIRegisterValue.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIRegisterValue.java index f1ad6e91557..55a27d530db 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIRegisterValue.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIRegisterValue.java @@ -51,7 +51,7 @@ public class MIRegisterValue { * [{number="1",value="0xffff"},{number="xxx",value="yyy"},..] */ public static MIRegisterValue[] getMIRegisterValues(MIList miList) { - List<MIRegisterValue> aList = new ArrayList<MIRegisterValue>(); + List<MIRegisterValue> aList = new ArrayList<>(); MIValue[] values = miList.getMIValues(); for (int i = 0; i < values.length; i++) { if (values[i] instanceof MITuple) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStackListArgumentsInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStackListArgumentsInfo.java index 73f5766fc46..e0e852c4e40 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStackListArgumentsInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStackListArgumentsInfo.java @@ -28,7 +28,7 @@ public class MIStackListArgumentsInfo extends MIInfo { public MIStackListArgumentsInfo(MIOutput out) { super(out); frames = null; - List<MIFrame> aList = new ArrayList<MIFrame>(1); + List<MIFrame> aList = new ArrayList<>(1); if (isDone()) { MIResultRecord rr = out.getMIResultRecord(); if (rr != null) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStackListFramesInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStackListFramesInfo.java index 6b7e2858ab6..ff9b048a4f2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStackListFramesInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStackListFramesInfo.java @@ -27,7 +27,7 @@ public class MIStackListFramesInfo extends MIInfo { public MIStackListFramesInfo(MIOutput out) { super(out); frames = null; - List<MIFrame> aList = new ArrayList<MIFrame>(1); + List<MIFrame> aList = new ArrayList<>(1); if (isDone()) { MIResultRecord rr = out.getMIResultRecord(); if (rr != null) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStringHandler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStringHandler.java index af9f9aef5a6..d9f0f76a2b6 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStringHandler.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIStringHandler.java @@ -35,7 +35,7 @@ public class MIStringHandler { * corresponding Unicode code point (i.e. character code). */ // Use a LinkedHashMap to preserve order, so as to get 'e' and not 'E' - private static Map<Character, Integer> fSpecialCharactersToCodePointMap = new LinkedHashMap<Character, Integer>(); + private static Map<Character, Integer> fSpecialCharactersToCodePointMap = new LinkedHashMap<>(); static { fSpecialCharactersToCodePointMap.put('a', 0x07); // Alert (bell) character fSpecialCharactersToCodePointMap.put('b', 0x08); // Backspace character diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceListVariablesInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceListVariablesInfo.java index 2362560b7ed..fc233a0c791 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceListVariablesInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITraceListVariablesInfo.java @@ -60,7 +60,7 @@ public class MITraceListVariablesInfo extends MIInfo { } private void parse() { - List<MITraceVariableInfo> aList = new ArrayList<MITraceVariableInfo>(1); + List<MITraceVariableInfo> aList = new ArrayList<>(1); if (isDone()) { MIOutput out = getMIOutput(); MIResultRecord rr = out.getMIResultRecord(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITuple.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITuple.java index 148469c6cd7..33d926375ee 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITuple.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MITuple.java @@ -50,7 +50,7 @@ public class MITuple extends MIValue { */ public MIValue getField(String name) { if (name2value == null) { - name2value = new HashMap<String, MIValue>(); + name2value = new HashMap<>(); for (MIResult r : results) { name2value.put(r.getVariable(), r.getMIValue()); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVarListChildrenInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVarListChildrenInfo.java index f0417d5deca..2282001ca28 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVarListChildrenInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVarListChildrenInfo.java @@ -31,7 +31,7 @@ public class MIVarListChildrenInfo extends MIInfo { public MIVarListChildrenInfo(MIOutput record) { super(record); - List<MIVar> aList = new ArrayList<MIVar>(); + List<MIVar> aList = new ArrayList<>(); if (isDone()) { MIOutput out = getMIOutput(); MIResultRecord rr = out.getMIResultRecord(); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVarUpdateInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVarUpdateInfo.java index a24e25510c6..ef1d66834eb 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVarUpdateInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVarUpdateInfo.java @@ -29,7 +29,7 @@ public class MIVarUpdateInfo extends MIInfo { public MIVarUpdateInfo(MIOutput record) { super(record); - List<MIVarChange> aList = new ArrayList<MIVarChange>(); + List<MIVarChange> aList = new ArrayList<>(); if (isDone()) { MIOutput out = getMIOutput(); MIResultRecord rr = out.getMIResultRecord(); @@ -123,7 +123,7 @@ public class MIVarUpdateInfo extends MIInfo { } } else if (var.equals("new_children")) { //$NON-NLS-1$ if (change != null) { - List<MIVar> newChildren = new ArrayList<MIVar>(); + List<MIVar> newChildren = new ArrayList<>(); parseNewChildren(value, newChildren); change.setNewChildren(newChildren.toArray(new MIVar[newChildren.size()])); } diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/launch/GdbExtendedFinalLaunchSequence.java b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/launch/GdbExtendedFinalLaunchSequence.java index 53f47d0bc67..e2e41250ee0 100644 --- a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/launch/GdbExtendedFinalLaunchSequence.java +++ b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/launch/GdbExtendedFinalLaunchSequence.java @@ -47,7 +47,7 @@ public class GdbExtendedFinalLaunchSequence extends FinalLaunchSequence_7_12 { if (GROUP_TOP_LEVEL.equals(group)) { // Initialize the list with the base class' steps // We need to create a list that we can modify, which is why we create our own ArrayList. - List<String> orderList = new ArrayList<String>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); + List<String> orderList = new ArrayList<>(Arrays.asList(super.getExecutionOrder(GROUP_TOP_LEVEL))); // Now insert our init step right after the initialization of the base class. orderList.add(orderList.indexOf("stepInitializeFinalLaunchSequence_7_7") + 1, //$NON-NLS-1$ 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 2ecca984887..e4bdc6edcdd 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 @@ -127,7 +127,7 @@ public class BaseTestCase { // This allows a SuiteGdb to set an attribute // The suite is responsible for clearing those attributes // once it is finished - private static Map<String, Object> globalLaunchAttributes = new HashMap<String, Object>(); + private static Map<String, Object> globalLaunchAttributes = new HashMap<>(); private static Process gdbserverProc; @@ -362,7 +362,7 @@ public class BaseTestCase { protected void setLaunchAttributes() { // Clear all launch attributes before starting a new test - launchAttributes = new HashMap<String, Object>(); + launchAttributes = new HashMap<>(); launchAttributes.put(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, EXEC_PATH + DEFAULT_EXEC_NAME); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/OnceOnlySuite.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/OnceOnlySuite.java index ca2f1fd3fa1..bf63f193a12 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/OnceOnlySuite.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/OnceOnlySuite.java @@ -36,7 +36,7 @@ import org.junit.runners.model.RunnerBuilder; */ @SuppressWarnings("restriction") public class OnceOnlySuite extends Suite { - private static Set<Class<?>> alreadySeen = new HashSet<Class<?>>(); + private static Set<Class<?>> alreadySeen = new HashSet<>(); public OnceOnlySuite(Class<?> testClass, final RunnerBuilder builder) throws InitializationError { super(testClass, new RunnerBuilder() { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java index f1bfeef0c02..5528b8cddeb 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/ServiceEventWaitor.java @@ -106,7 +106,7 @@ public class ServiceEventWaitor<V> { */ public synchronized List<V> waitForEvents(int period) { long startMs = System.currentTimeMillis(); - List<V> events = new ArrayList<V>(); + List<V> events = new ArrayList<>(); //Timeout exception will exit the loop and return the resulting list of events while (true) { 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 1c1c7338e01..74042b75e41 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 @@ -170,7 +170,7 @@ public class SyncUtil { public static MIStoppedEvent step(final IExecutionDMContext dmc, final StepType stepType, boolean reverse, int massagedTimeout) throws Throwable { - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); if (!reverse) { @@ -280,7 +280,7 @@ public class SyncUtil { private static MIStoppedEvent resumeUntilStopped(final IExecutionDMContext dmc, int massagedTimeout) throws Throwable { - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); fRunControl.getExecutor().submit(new Runnable() { @@ -308,7 +308,7 @@ public class SyncUtil { } public static MIRunningEvent resume(final IExecutionDMContext dmc, int massagedTimeout) throws Throwable { - final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<MIRunningEvent>(fSession, + final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIRunningEvent.class); fRunControl.getExecutor().submit(new Runnable() { @@ -378,7 +378,7 @@ public class SyncUtil { // if there is a sleep in the code between the resume and the time // it stops; this will give us plenty of time to call this method. public static MIStoppedEvent waitForStop(int timeout) throws Throwable { - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); // Wait for the execution to suspend @@ -592,7 +592,7 @@ public class SyncUtil { * we allows 10 seconds, which is probably ample in most cases. Tests * can provide larger values as needed in specific SyncUtil calls. */ - private static Map<ETimeout, Integer> sTimeouts = new HashMap<ETimeout, Integer>(); + private static Map<ETimeout, Integer> sTimeouts = new HashMap<>(); static { sTimeouts.put(ETimeout.addBreakpoint, 1000); sTimeouts.put(ETimeout.deleteBreakpoint, 1000); @@ -778,7 +778,7 @@ public class SyncUtil { } // Now wait for the stopped event of the restart - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); // Perform the restart @@ -815,7 +815,7 @@ public class SyncUtil { protected void handleCompleted() { if (isSuccess()) { IVariableDMContext[] varDmcs = getData(); - final List<IVariableDMData> localsDMData = new ArrayList<IVariableDMData>(); + final List<IVariableDMData> localsDMData = new ArrayList<>(); final CountingRequestMonitor crm = new CountingRequestMonitor( ImmediateExecutor.getInstance(), rm) { @Override @@ -876,7 +876,7 @@ public class SyncUtil { // Remove registers with empty names since the service also // remove them. I don't know why GDB returns such empty names. - List<String> registerNames = new LinkedList<String>(); + List<String> registerNames = new LinkedList<>(); for (String name : names) { if (!name.isEmpty()) { registerNames.add(name); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java index 63f7e196b64..7555b477977 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java @@ -97,7 +97,7 @@ public class CommandTimeoutTest extends BaseParametrizedTestCase { doLaunch(); final DsfSession session = getGDBLaunch().getSession(); - ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<ICommandControlShutdownDMEvent>( + ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<>( session, ICommandControlShutdownDMEvent.class); // Send the command that will timeout diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java index bdea8c196e0..1ad33dc43e7 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleBreakpointsTest.java @@ -113,7 +113,7 @@ public class GDBConsoleBreakpointsTest extends BaseParametrizedTestCase { private IBreakpoints fBreakpointService; private MIBreakpointsSynchronizer fBreakpointsSynchronizer; - private List<IBreakpointsChangedEvent> fBreakpointEvents = new ArrayList<IBreakpointsChangedEvent>(); + private List<IBreakpointsChangedEvent> fBreakpointEvents = new ArrayList<>(); @Override @Before @@ -819,7 +819,7 @@ public class GDBConsoleBreakpointsTest extends BaseParametrizedTestCase { } private Map<String, Object> getLocationBreakpointAttributes(Class<? extends ICBreakpoint> type, boolean valid) { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); if (ICFunctionBreakpoint.class.equals(type)) { map.put(ATTR_FILE_NAME, (valid) ? SOURCE_NAME_VALID : SOURCE_NAME_INVALID); map.put(ATTR_FUNCTION, (valid) ? FUNCTION_VALID : FUNCTION_INVALID); @@ -837,7 +837,7 @@ public class GDBConsoleBreakpointsTest extends BaseParametrizedTestCase { public Map<String, Object> getWatchpointAttributes(Class<? extends ICWatchpoint> type, boolean read, boolean write) throws Throwable { Assert.assertTrue(read || write); - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put(ATTR_EXPRESSION, EXPRESSION_VALID); map.put(ATTR_READ, Boolean.valueOf(read)); map.put(ATTR_WRITE, Boolean.valueOf(write)); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleSynchronizingTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleSynchronizingTest.java index e9d67881067..cb4ed53ace9 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleSynchronizingTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBConsoleSynchronizingTest.java @@ -75,7 +75,7 @@ public class GDBConsoleSynchronizingTest extends BaseParametrizedTestCase { private IExpressions fExprService; private IRunControl fRunControl; - private List<IDMEvent<? extends IDMContext>> fEventsReceived = new ArrayList<IDMEvent<? extends IDMContext>>(); + private List<IDMEvent<? extends IDMContext>> fEventsReceived = new ArrayList<>(); @Override protected void setLaunchAttributes() { 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 1bd1b8242bf..3d359d35006 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 @@ -1500,7 +1500,7 @@ public class GDBPatternMatchingExpressionsTest extends BaseParametrizedTestCase @Test public void testGroupGetSubExpressions() throws Throwable { final String exprString = "$eax;*"; - List<String> list = new LinkedList<String>(); + List<String> list = new LinkedList<>(); list.add("$eax"); list.addAll(Arrays.asList(fAllVariables)); final String[] children = list.toArray(new String[list.size()]); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java index 1c5aa1baa81..71dbd000b33 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBRemoteTracepointsTest.java @@ -659,7 +659,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { getLineForTag("4_BYTE"), getLineForTag("5_BYTE") }; for (int i = 0; i < lineNumbers.length; i++) { - attributes = new HashMap<String, Object>(); + attributes = new HashMap<>(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_NAME); attributes.put(MIBreakpoints.LINE_NUMBER, lineNumbers[i]); @@ -739,7 +739,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { passed.add(byteCount); } } - assertEquals("Some byte length were not seen", new HashSet<Integer>(Arrays.asList(1, 2, 3, 4, 5)), passed); + assertEquals("Some byte length were not seen", new HashSet<>(Arrays.asList(1, 2, 3, 4, 5)), passed); } catch (AssertionError | Exception e) { throw new AssertionError( "Failed to verify instruction lengths. Output from GDB's disassemble:\n" + miInfo.toString(), e); @@ -785,7 +785,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { public void disableTracepoints() throws Throwable { createTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(MIBreakpoints.IS_ENABLED, false); // Disable all tracepoints for (IBreakpointDMContext tp : fTracepoints) { @@ -804,7 +804,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { public void enableTracepoints() throws Throwable { disableTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(MIBreakpoints.IS_ENABLED, true); // Enable all tracepoints for (IBreakpointDMContext tp : fTracepoints) { @@ -823,7 +823,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { public void tracepointPasscount() throws Throwable { createTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); // Set passcount for all tracepoints for (int i = 0; i < fTracepoints.length; i++) { if (fTracepoints[i] == null) @@ -844,7 +844,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { public void tracepointCondition() throws Throwable { createTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); // Set conditions for all tracepoints for (int i = 0; i < fTracepoints.length; i++) { if (fTracepoints[i] == null) @@ -865,7 +865,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { public void tracepointActions() throws Throwable { createTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); // Set conditions for all tracepoints for (int i = 0; i < fTracepoints.length; i++) { if (fTracepoints[i] == null) @@ -949,7 +949,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { getLineForTag("4_BYTE"), getLineForTag("5_BYTE") }; for (int i = 0; i < lineNumbers.length; i++) { - attributes = new HashMap<String, Object>(); + attributes = new HashMap<>(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_NAME); attributes.put(MIBreakpoints.LINE_NUMBER, lineNumbers[i]); @@ -1237,7 +1237,7 @@ public class GDBRemoteTracepointsTest extends BaseParametrizedTestCase { createTracepoints(); - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); // Set conditions for all tracepoints delta.put(MIBreakpoints.COMMANDS, action1.getName()); updateBreakpoint(fTracepoints[0], delta); 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 1d35a5374a3..acf45f16b1d 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 @@ -331,7 +331,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase public void testSettingEnvironment() throws Throwable { setLaunchAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, true); - Map<String, String> map = new HashMap<String, String>(1); + Map<String, String> map = new HashMap<>(1); map.put("LAUNCHTEST", "IS SET"); setLaunchAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, map); doLaunch(); @@ -392,7 +392,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase public void testClearingAndSettingEnvironment() throws Throwable { setLaunchAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, false); - Map<String, String> map = new HashMap<String, String>(1); + Map<String, String> map = new HashMap<>(1); map.put("LAUNCHTEST", "IS SET"); setLaunchAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, map); doLaunch(); @@ -596,7 +596,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_3); doLaunch(); - ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<ICommandControlShutdownDMEvent>( + ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ICommandControlShutdownDMEvent.class); // The target is currently stopped. We resume to get it running @@ -714,7 +714,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase // Now step backwards to make sure reverse was enabled - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); final int REVERSE_NUM_STEPS = 2; @@ -780,7 +780,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase frame.getFunction().equals("stopAtOther")); // Now step backwards all the way to the start to make sure reverse was enabled from the very start - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); final int REVERSE_NUM_STEPS = 3; @@ -854,7 +854,7 @@ public class LaunchConfigurationAndRestartTest extends BaseParametrizedTestCase frame.getFunction().equals("main") && frame.getLine() == LAST_LINE_IN_MAIN); // Now step backwards all the way to the start to make sure reverse was enabled from the very start - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>(fSession, + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, MIStoppedEvent.class); final int REVERSE_NUM_STEPS = 3; diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java index b287e4d6073..18cce53ce65 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIBreakpointsTest.java @@ -484,7 +484,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { private IBreakpointDMContext insertAndRunToLineBreakpoint(int lineNumber) throws Throwable { clearEventCounters(); // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, lineNumber); @@ -800,7 +800,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_InvalidContext() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -820,7 +820,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidFileName() throws Throwable { assumeGdbVersionLowerThen(ITestConstants.SUFFIX_GDB_6_8); // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME + "_bad"); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -840,7 +840,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidLineNumber() throws Throwable { assumeGdbVersionLowerThen(ITestConstants.SUFFIX_GDB_7_4); // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, 0); @@ -860,7 +860,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidFunctionName() throws Throwable { assumeGdbVersionLowerThen(ITestConstants.SUFFIX_GDB_6_8); // Create a function breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(FUNCTION_TAG, "invalid-function-name"); @@ -879,7 +879,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_InvalidAddress() throws Throwable { // Create an address breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(ADDRESS_TAG, "0x0z"); @@ -899,7 +899,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_Address() throws Throwable { // Create an address breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); final BigInteger ADDRESS = new BigInteger("00affe00", 16); breakpoint.put(ADDRESS_TAG, "0x" + ADDRESS.toString(16)); @@ -933,7 +933,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_LineNumber() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -968,7 +968,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_Disabled() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1004,7 +1004,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_FunctionName() throws Throwable { // Create a function breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(FUNCTION_TAG, FUNCTION); @@ -1039,7 +1039,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_Condition() throws Throwable { // Create a conditional line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1075,7 +1075,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_IgnoreCnt() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1111,7 +1111,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_MultipleBreakpoints() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1131,7 +1131,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { validateBreakpoint(breakpoint1, SOURCE_NAME, LINE_NUMBER_1, NO_CONDITION, 0, true, false); // Create a function breakpoint - breakpoint = new HashMap<String, Object>(); + breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(FUNCTION_TAG, FUNCTION); @@ -1177,7 +1177,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertBreakpoint_Duplicate() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1247,7 +1247,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -1298,7 +1298,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, "Bad file name"); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -1343,7 +1343,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertWatchpoint_Write() throws Throwable { // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(WRITE_TAG, true); @@ -1378,7 +1378,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertWatchpoint_Read() throws Throwable { // Create a read watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(READ_TAG, true); @@ -1413,7 +1413,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void insertWatchpoint_Access() throws Throwable { // Create an access watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(READ_TAG, true); @@ -1458,7 +1458,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_3); watchpoint.put(WRITE_TAG, true); @@ -1506,7 +1506,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void removeBreakpoint_SimpleCase() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1553,7 +1553,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received " + fBreakpointEventCount, fBreakpointEventCount == 0); // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1631,7 +1631,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void removeBreakpoint_MixedCase() throws Throwable { // Create a line breakpoint for (int i = 0; i < 4; i++) { - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1 + i); @@ -1695,7 +1695,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -1740,7 +1740,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { IBreakpointDMContext invalid_ref = new MIBreakpointDMContext((MIBreakpoints) fBreakpointService, new IDMContext[] { fBreakpointsDmc }, "0.0"); // Update the invalid breakpoint - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); properties.put(FILE_NAME_TAG, SOURCE_NAME); properties.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1760,7 +1760,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_AddCondition() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1775,7 +1775,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Modify the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_1); updateBreakpoint(ref, delta); @@ -1800,7 +1800,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_RemoveCondition() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1816,7 +1816,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Remove the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, null); updateBreakpoint(ref, delta); @@ -1841,7 +1841,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_ModifyCondition() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -1857,7 +1857,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Update the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_2); updateBreakpoint(ref, delta); @@ -1891,7 +1891,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -1907,7 +1907,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Prepare to update the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_5); // Run the program SyncUtil.resume(); @@ -1944,7 +1944,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_1); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(WRITE_TAG, true); @@ -1959,7 +1959,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_1); updateBreakpoint(ref, delta); @@ -1986,7 +1986,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_1); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(WRITE_TAG, true); @@ -2002,7 +2002,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Remove the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, null); updateBreakpoint(ref, delta); @@ -2029,7 +2029,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_1); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(WRITE_TAG, true); @@ -2045,7 +2045,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Update the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_2); updateBreakpoint(ref, delta); @@ -2070,7 +2070,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_AddCount() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2085,7 +2085,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add a count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, IGNORE_COUNT_2); updateBreakpoint(ref, delta); @@ -2110,7 +2110,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_RemoveCount() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2126,7 +2126,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Remove the count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, null); updateBreakpoint(ref, delta); @@ -2150,7 +2150,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_ModifyCount() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2166,7 +2166,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Update the count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, IGNORE_COUNT_2); updateBreakpoint(ref, delta); @@ -2200,7 +2200,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -2216,7 +2216,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Prepare to update the count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, 0); // Run the program SyncUtil.resume(); @@ -2250,7 +2250,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_Disable() throws Throwable { // Create a first line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2258,7 +2258,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { IBreakpointDMContext ref1 = insertBreakpoint(fBreakpointsDmc, breakpoint); // Create a second line breakpoint - breakpoint = new HashMap<String, Object>(); + breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_2); @@ -2278,7 +2278,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { assertTrue("BreakpointService problem: breakpoint state error", breakpoint1.isEnabled() && breakpoint2.isEnabled()); // Disable the first breakpoint - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IS_ENABLED_TAG, false); updateBreakpoint(ref1, delta); @@ -2323,7 +2323,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -2342,7 +2342,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 2); clearEventCounters(); // Prepare to disable the breakpoint - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IS_ENABLED_TAG, false); // Run the program SyncUtil.resume(); @@ -2371,7 +2371,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void updateBreakpoint_Enable() throws Throwable { // Create a first line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2379,7 +2379,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { IBreakpointDMContext ref1 = insertBreakpoint(fBreakpointsDmc, breakpoint); // Create a second line breakpoint - breakpoint = new HashMap<String, Object>(); + breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_2); @@ -2399,7 +2399,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { assertTrue("BreakpointService problem: breakpoint state error", breakpoint1.isEnabled() && breakpoint2.isEnabled()); // Disable the first breakpoint - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IS_ENABLED_TAG, false); updateBreakpoint(ref1, delta); @@ -2426,7 +2426,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { assertTrue("BreakpointService problem: breakpoint mismatch", fBreakpointRef.equals(breakpoint2.getNumber())); clearEventCounters(); // Enable the first breakpoint - delta = new HashMap<String, Object>(); + delta = new HashMap<>(); delta.put(IS_ENABLED_TAG, true); updateBreakpoint(ref1, delta); @@ -2471,7 +2471,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { return; } // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); @@ -2487,7 +2487,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Prepare to enable the breakpoint - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IS_ENABLED_TAG, true); // Run the program SyncUtil.resume(); @@ -2621,7 +2621,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_LineNumber() throws Throwable { // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2656,7 +2656,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_Function() throws Throwable { // Create a function breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(FUNCTION_TAG, FUNCTION); @@ -2693,7 +2693,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_Condition() throws Throwable { // Create a conditional line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2735,7 +2735,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_UpdatedCondition() throws Throwable { // Create a conditional line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2750,7 +2750,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add the condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_1); updateBreakpoint(ref, delta); @@ -2788,7 +2788,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_Count() throws Throwable { // Create a conditional line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2830,7 +2830,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_UpdatedCount() throws Throwable { // Create a conditional line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -2845,7 +2845,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add a count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, IGNORE_COUNT_2); updateBreakpoint(ref, delta); @@ -2882,7 +2882,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_WriteWatchpoint() throws Throwable { // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(WRITE_TAG, true); @@ -2922,7 +2922,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_ReadWatchpoint() throws Throwable { // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(READ_TAG, true); @@ -2962,7 +2962,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { @Test public void breakpointHit_AccessWatchpoint() throws Throwable { // Create an access watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_1); watchpoint.put(READ_TAG, true); @@ -3005,7 +3005,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_4); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_2); watchpoint.put(WRITE_TAG, true); @@ -3020,7 +3020,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add a count - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(IGNORE_COUNT_TAG, IGNORE_COUNT_2); updateBreakpoint(ref, delta); @@ -3063,7 +3063,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_4); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_2); watchpoint.put(WRITE_TAG, true); @@ -3078,7 +3078,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1); clearEventCounters(); // Add a condition - Map<String, Object> delta = new HashMap<String, Object>(); + Map<String, Object> delta = new HashMap<>(); delta.put(CONDITION_TAG, CONDITION_3); updateBreakpoint(ref, delta); @@ -3118,7 +3118,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { // Run to the point where the variable is initialized insertAndRunToLineBreakpoint(LINE_NUMBER_4); // Create a write watchpoint - Map<String, Object> watchpoint = new HashMap<String, Object>(); + Map<String, Object> watchpoint = new HashMap<>(); watchpoint.put(BREAKPOINT_TYPE_TAG, WATCHPOINT_TAG); watchpoint.put(EXPRESSION_TAG, EXPRESSION_2); watchpoint.put(READ_TAG, true); @@ -3166,7 +3166,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidLineNumberPending() throws Throwable { assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_7_4); // Create a line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(LINE_NUMBER_TAG, 0); @@ -3191,7 +3191,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidFileNamePending() throws Throwable { assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_6_8); // Create an invalid line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME + "_bad"); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_1); @@ -3238,7 +3238,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { public void insertBreakpoint_InvalidFunctionNamePending() throws Throwable { assumeGdbVersionAtLeast(ITestConstants.SUFFIX_GDB_6_8); // Create an invalid function breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, SOURCE_NAME); breakpoint.put(FUNCTION_TAG, "invalid-function-name"); @@ -3293,7 +3293,7 @@ public class MIBreakpointsTest extends BaseParametrizedTestCase { } // Create an invalid line breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG); breakpoint.put(FILE_NAME_TAG, "Bad file name"); breakpoint.put(LINE_NUMBER_TAG, LINE_NUMBER_5); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java index 2ab9794c660..2eaac4b4c8d 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java @@ -595,7 +595,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { public void insertCatchpoint_InvalidContext() throws Throwable { // Attempt to create a catchpoint with an invalid execution context (should fail) - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.CATCHPOINT); breakpoint.put(MIBreakpoints.CATCHPOINT_TYPE, "throw"); insertBreakpoint(null, breakpoint); @@ -769,7 +769,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { // Set a throw catchpoint; don't use the utility method since it assumes // the target is running - Map<String, Object> bkptsProps = new HashMap<String, Object>(); + Map<String, Object> bkptsProps = new HashMap<>(); bkptsProps.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.CATCHPOINT); bkptsProps.put(MIBreakpoints.CATCHPOINT_TYPE, "throw"); insertBreakpoint(fBreakpointsDmc, bkptsProps); @@ -1289,7 +1289,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { IBreakpointDMContext[] bkptsBefore = getBreakpoints(fBreakpointsDmc); // Set the breakpoint - Map<String, Object> breakpoint = new HashMap<String, Object>(); + Map<String, Object> breakpoint = new HashMap<>(); breakpoint.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.BREAKPOINT); breakpoint.put(MIBreakpoints.FILE_NAME, SOURCE_NAME); breakpoint.put(MIBreakpoints.LINE_NUMBER, lineNumber); @@ -1302,7 +1302,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { assertEquals("Unexpected number of breakpoint-added events", 1, getBreakpointEventCount(BP_ADDED)); // Ensure the breakpoint service sees what we expect - List<IBreakpointDMContext> bkptsAfter = new LinkedList<IBreakpointDMContext>( + List<IBreakpointDMContext> bkptsAfter = new LinkedList<>( Arrays.asList(getBreakpoints(fBreakpointsDmc))); assertEquals("Breakpoints service reports unexpected number of breakpoints", bkptsBefore.length + 1, bkptsAfter.size()); @@ -1341,7 +1341,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { IBreakpointDMContext[] bkptsBefore = getBreakpoints(fBreakpointsDmc); // set the catchpoint - Map<String, Object> bkptsProps = new HashMap<String, Object>(); + Map<String, Object> bkptsProps = new HashMap<>(); bkptsProps.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.CATCHPOINT); bkptsProps.put(MIBreakpoints.CATCHPOINT_TYPE, event); if (condition != null) { @@ -1361,7 +1361,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { // Ensure the breakpoint service sees what we expect. Ask the breakpoint // service for the list of breakpoint against and make sure it differs // only by the newly added one - List<IBreakpointDMContext> bkptsAfter = new LinkedList<IBreakpointDMContext>( + List<IBreakpointDMContext> bkptsAfter = new LinkedList<>( Arrays.asList(getBreakpoints(fBreakpointsDmc))); assertEquals("Breakpoints service reports unexpected number of breakpoints", bkptsBefore.length + 1, bkptsAfter.size()); @@ -1432,7 +1432,7 @@ public class MICatchpointsTest extends BaseParametrizedTestCase { private void modifyBkptProperty(IBreakpointDMContext bkptRef, String property, Object value) throws Throwable { // Modify the catchpoint to not have an ignore count clearEventCounters(); - Map<String, Object> bkptProps = new HashMap<String, Object>(); + Map<String, Object> bkptProps = new HashMap<>(); bkptProps.put(property, value); updateBreakpoint(bkptRef, bkptProps); assertTrue(fWait.getMessage(), fWait.isOK()); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java index c9151a40fdd..bfed2af26bb 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java @@ -166,7 +166,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.runToLocation("testLocals"); // Create a map of expressions and their expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("0 + 0 - 0", new String[] { "0x0", "0", "0", "0", "0", "0" }); tests.put("3 + 4", new String[] { "0x7", "07", "111", "7", "7", "7" }); @@ -189,7 +189,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.runToLocation("testLocals"); // Create a map of expressions and their expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("3.14159 + 1.1111", new String[] { "0x4", "04", "100", "4", "4.2526", "4.2526" }); tests.put("100.0 / 3.0", new String[] { "0x21", "041", "100001", "33", "33.3333", "33.3333" }); @@ -215,7 +215,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.step(16, StepType.STEP_OVER); // Create a map of expressions to expected values. - Map<String, String[]> tests1 = new HashMap<String, String[]>(); + Map<String, String[]> tests1 = new HashMap<>(); tests1.put("lIntVar", new String[] { "0x3039", "030071", "11000000111001", "12345", "12345", "12345" }); tests1.put("lDoubleVar", new String[] { "0x3039", "030071", "11000000111001", "12345", "12345.123449999999", @@ -251,7 +251,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { stoppedEvent = SyncUtil.step(5, StepType.STEP_OVER); // Create a map of expressions to expected values. - Map<String, String[]> tests2 = new HashMap<String, String[]>(); + Map<String, String[]> tests2 = new HashMap<>(); tests2.put("lIntVar", new String[] { "0x1a85", "015205", "1101010000101", "6789", "6789", "6789" }); tests2.put("lDoubleArray[1]", new String[] { "0x1a85", "015205", "1101010000101", "6789", "6789.6788999999999", @@ -284,7 +284,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.step(2, StepType.STEP_OVER); IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("a", new String[] { "0x8", "010", "1000", "8", "8", "8" }); tests.put("b", new String[] { "0x1", "01", "1", "1", "1", "1" }); @@ -294,7 +294,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { // Now enter a subblock with the same variable names SyncUtil.step(2, StepType.STEP_OVER); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0xc", "014", "1100", "12", "12", "12" }); tests.put("b", new String[] { "0x1", "01", "1", "1", "1", "1" }); @@ -304,7 +304,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { // Now step to change the b variable SyncUtil.step(1, StepType.STEP_OVER); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0xc", "014", "1100", "12", "12", "12" }); tests.put("b", new String[] { "0xc", "014", "1100", "12", "12", "12" }); @@ -315,7 +315,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { // same b SyncUtil.step(1, StepType.STEP_OVER); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0x8", "010", "1000", "8", "8", "8" }); tests.put("b", new String[] { "0xc", "014", "1100", "12", "12", "12" }); @@ -1394,7 +1394,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.runToLocation("locals2"); // Create a map of expressions to expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); // Global variables tests.put("gIntVar", new String[] { "0x21F", "01037", "1000011111", "543", "543", "543" }); @@ -1440,21 +1440,21 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.step(1, StepType.STEP_OVER); IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("a", new String[] { "0x1", "01", "1", "1", "1", "1" }); executeExpressionSubTests(tests, frameDmc); SyncUtil.runToLocation("testName2"); stoppedEvent = SyncUtil.step(1, StepType.STEP_INTO); frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0x2", "02", "10", "2", "2", "2" }); executeExpressionSubTests(tests, frameDmc); SyncUtil.runToLocation("testName1"); stoppedEvent = SyncUtil.step(1, StepType.STEP_INTO); frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0x3", "03", "11", "3", "3", "3" }); executeExpressionSubTests(tests, frameDmc); } @@ -1469,21 +1469,21 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.step(2, StepType.STEP_INTO); IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("a", new String[] { "0x1", "01", "1", "1", "1", "1" }); executeExpressionSubTests(tests, frameDmc); SyncUtil.step(StepType.STEP_RETURN); stoppedEvent = SyncUtil.step(2, StepType.STEP_INTO); frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0x2", "02", "10", "2", "2", "2" }); executeExpressionSubTests(tests, frameDmc); SyncUtil.step(StepType.STEP_RETURN); stoppedEvent = SyncUtil.step(2, StepType.STEP_INTO); frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("a", new String[] { "0x3", "03", "11", "3", "3", "3" }); executeExpressionSubTests(tests, frameDmc); } @@ -1500,7 +1500,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { MIStoppedEvent stoppedEvent = SyncUtil.step(StepType.STEP_OVER); // Create a map of expressions to expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); // First make sure we have a different value on the other stack frame and that we select // a frame that is not the top frame @@ -1508,7 +1508,7 @@ public class MIExpressionsTest extends BaseParametrizedTestCase { executeExpressionSubTests(tests, SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 1)); // Now check that we get the same values as the top stack when selecting the thread only - tests = new HashMap<String, String[]>(); + tests = new HashMap<>(); tests.put("lIntVar", new String[] { "0x1a85", "015205", "1101010000101", "6789", "6789", "6789" }); executeExpressionSubTests(tests, stoppedEvent.getDMContext()); } diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java index e73002eb40c..08d58fdbaab 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java @@ -1164,7 +1164,7 @@ public class MIMemoryTest extends BaseParametrizedTestCase { } // Write asynchronously - ServiceEventWaitor<IMemoryChangedEvent> eventWaitor = new ServiceEventWaitor<IMemoryChangedEvent>(fSession, + ServiceEventWaitor<IMemoryChangedEvent> eventWaitor = new ServiceEventWaitor<>(fSession, IMemoryChangedEvent.class); MemoryWriteQuery writeQueries[] = new MemoryWriteQuery[BLOCK_SIZE]; for (int offset = 0; offset < BLOCK_SIZE; offset++) { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIModifiedServicesTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIModifiedServicesTest.java index 87e81666074..10d47f175a5 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIModifiedServicesTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIModifiedServicesTest.java @@ -224,7 +224,7 @@ public class MIModifiedServicesTest extends BaseParametrizedTestCase { private void resumeContainerContextExe() throws InterruptedException, ExecutionException, TimeoutException { - final ServiceEventWaitor<IResumedDMEvent> resumedWaitor = new ServiceEventWaitor<IResumedDMEvent>( + final ServiceEventWaitor<IResumedDMEvent> resumedWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IResumedDMEvent.class); Query<Void> query = new Query<Void>() { @@ -268,7 +268,7 @@ public class MIModifiedServicesTest extends BaseParametrizedTestCase { */ private void interruptRunningTargetExe() throws InterruptedException, Exception, ExecutionException, TimeoutException { - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); Query<MIInfo> requestSuspend = new Query<MIInfo>() { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java index 69f6bd79273..3118defa988 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java @@ -413,7 +413,7 @@ public class MIRegistersTest extends BaseParametrizedTestCase { */ private List<IRegistersChangedDMEvent> writeRegisterWaitNotication(final IRegisterDMContext registerDmc, final String regValue, final String formatId) throws Throwable { - ServiceEventWaitor<IRegistersChangedDMEvent> eventWaitor = new ServiceEventWaitor<IRegistersChangedDMEvent>( + ServiceEventWaitor<IRegistersChangedDMEvent> eventWaitor = new ServiceEventWaitor<>( fSession, IRegistersChangedDMEvent.class); writeRegister(registerDmc, regValue, formatId); 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 97504bc5132..50cb3ae547e 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 @@ -129,7 +129,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { // Now resume the target and check that we stop at the breakpoint. - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -159,7 +159,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } }; // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -236,7 +236,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { // Now resume the target three times and check that we stop three times. for (int i = 0; i < steps.length; i++) { - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -351,7 +351,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } }; // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -372,7 +372,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { // Wait up to 3 second for the target to suspend. Should happen within two seconds. suspendedEventWaitor.waitForEvent(TestsPlugin.massageTimeout(3000)); - suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(getGDBLaunch().getSession(), + suspendedEventWaitor = new ServiceEventWaitor<>(getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -425,7 +425,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } }; // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -505,7 +505,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { for (int i = 0; i < steps.length; i++) { // Now resume the target and check that we stop at all the breakpoints. - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -542,7 +542,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -575,7 +575,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { suspendedEventWaitor.waitForEvent(TestsPlugin.massageTimeout(3000)); // Now resume the target and check that we stop at all the breakpoints. - suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(getGDBLaunch().getSession(), + suspendedEventWaitor = new ServiceEventWaitor<>(getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -636,7 +636,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { for (int i = 0; i < 2; i++) { // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -686,7 +686,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } }; // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -707,7 +707,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { suspendedEventWaitor.waitForEvent(TestsPlugin.massageTimeout(3000)); // Now resume the target and check that we stop at all the breakpoints. - suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(getGDBLaunch().getSession(), + suspendedEventWaitor = new ServiceEventWaitor<>(getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -766,7 +766,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { for (int i = 0; i < 2; i++) { // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -814,7 +814,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { } }; // The target is currently stopped so we resume it - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); @@ -835,7 +835,7 @@ public class MIRunControlTargetAvailableTest extends BaseParametrizedTestCase { suspendedEventWaitor.waitForEvent(TestsPlugin.massageTimeout(3000)); // Now resume the target and check that we stop at all the breakpoints. - suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(getGDBLaunch().getSession(), + suspendedEventWaitor = new ServiceEventWaitor<>(getGDBLaunch().getSession(), ISuspendedDMEvent.class); SyncUtil.resume(); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java index f14babb9ccf..d19784ef8dc 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRunControlTest.java @@ -241,7 +241,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { ctxts.length); // The ordering of the contexts is not deterministic - LinkedList<Integer> ids = new LinkedList<Integer>(Arrays.asList(new Integer[] { 1 })); + LinkedList<Integer> ids = new LinkedList<>(Arrays.asList(new Integer[] { 1 })); if (sProgramIsCygwin) { ids.add(2); } @@ -277,7 +277,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { }; // Prepare a waiter to make sure we have received the thread started event - final ServiceEventWaitor<IStartedDMEvent> startedEventWaitor = new ServiceEventWaitor<IStartedDMEvent>( + final ServiceEventWaitor<IStartedDMEvent> startedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IStartedDMEvent.class); SyncUtil.runToLocation(SOURCE_NAME + ':' + getLineForTag("LINE_MAIN_AFTER_THREAD_START")); @@ -316,7 +316,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { Assert.assertEquals("Unexpected number of threads", sProgramIsCygwin ? 3 : 2, data.length); // The ordering of the contexts is not deterministic - LinkedList<Integer> ids = new LinkedList<Integer>(Arrays.asList(new Integer[] { 1, 2 })); + LinkedList<Integer> ids = new LinkedList<>(Arrays.asList(new Integer[] { 1, 2 })); if (sProgramIsCygwin) { ids.add(3); } @@ -580,7 +580,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { //TestsPlugin.debug("handleCompleted over"); } }; - final ServiceEventWaitor<IResumedDMEvent> eventWaitor = new ServiceEventWaitor<IResumedDMEvent>( + final ServiceEventWaitor<IResumedDMEvent> eventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IResumedDMEvent.class); final IContainerDMContext containerDmc = SyncUtil.getContainerContext(); @@ -629,7 +629,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { } }; - final ServiceEventWaitor<IResumedDMEvent> eventWaitor = new ServiceEventWaitor<IResumedDMEvent>( + final ServiceEventWaitor<IResumedDMEvent> eventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IResumedDMEvent.class); fRunCtrl.getExecutor().submit(new Runnable() { @@ -682,7 +682,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { public void runToLine() throws Throwable { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); fRunCtrl.getExecutor().submit(new Runnable() { @@ -726,7 +726,7 @@ public class MIRunControlTest extends BaseParametrizedTestCase { public void interruptRunningTarget() throws Throwable { final AsyncCompletionWaitor wait = new AsyncCompletionWaitor(); - ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>( + ServiceEventWaitor<ISuspendedDMEvent> suspendedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ISuspendedDMEvent.class); // Resume the target diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java index 958324ee03f..2d5d7303c3f 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java @@ -177,7 +177,7 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase // then we terminate, and confirm that we shutdown right away SyncUtil.resume(); - ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<ICommandControlShutdownDMEvent>( + ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ICommandControlShutdownDMEvent.class); // Don't use a query here. The terminate, because it kills GDB, may not return right away @@ -215,7 +215,7 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase // then we terminate the process, and confirm that there are no more processes SyncUtil.resume(); - ServiceEventWaitor<IExitedDMEvent> exitedEventWaitor = new ServiceEventWaitor<IExitedDMEvent>( + ServiceEventWaitor<IExitedDMEvent> exitedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IExitedDMEvent.class); Query<Object> query = new Query<Object>() { @@ -260,7 +260,7 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase // then we detach the process, and confirm that we are shutdown SyncUtil.resume(); - ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<ICommandControlShutdownDMEvent>( + ServiceEventWaitor<ICommandControlShutdownDMEvent> shutdownEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), ICommandControlShutdownDMEvent.class); // Don't use a query here. Because GDB will be killed, the call to detach may not return right away @@ -297,7 +297,7 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase // then we detach the process, and confirm that we are not longer running SyncUtil.resume(); - ServiceEventWaitor<IExitedDMEvent> exitedEventWaitor = new ServiceEventWaitor<IExitedDMEvent>( + ServiceEventWaitor<IExitedDMEvent> exitedEventWaitor = new ServiceEventWaitor<>( getGDBLaunch().getSession(), IExitedDMEvent.class); Query<Object> query = new Query<Object>() { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java index 4ad84e4fc14..2559a9104ef 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/PostMortemCoreTest.java @@ -320,7 +320,7 @@ public class PostMortemCoreTest extends BaseParametrizedTestCase { doLaunch(); // Create a map of expressions and their expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("0 + 0 - 0", new String[] { "0x0", "0", "0", "0", "0", "0" }); tests.put("3 + 4", new String[] { "0x7", "07", "111", "7", "7", "7" }); @@ -343,7 +343,7 @@ public class PostMortemCoreTest extends BaseParametrizedTestCase { doLaunch(); // Create a map of expressions and their expected values. - Map<String, String[]> tests = new HashMap<String, String[]>(); + Map<String, String[]> tests = new HashMap<>(); tests.put("3.14159 + 1.1111", new String[] { "0x4", "04", "100", "4", "4.2526", "4.2526" }); tests.put("100.0 / 3.0", new String[] { "0x21", "041", "100001", "33", "33.3333", "33.3333" }); @@ -367,7 +367,7 @@ public class PostMortemCoreTest extends BaseParametrizedTestCase { doLaunch(); // Create a map of expressions to expected values. - Map<String, String[]> tests1 = new HashMap<String, String[]>(); + Map<String, String[]> tests1 = new HashMap<>(); tests1.put("lIntVar", new String[] { "0x3039", "030071", "11000000111001", "12345", "12345", "12345" }); tests1.put("lDoubleVar", new String[] { "0x3039", "030071", "11000000111001", "12345", "12345.123449999999", diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java index c47f654d26b..297b5f211b4 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SourceLookupTest.java @@ -353,7 +353,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase { protected void addSourceContainer(AbstractSourceLookupDirector director, ISourceContainer container) throws CoreException { - ArrayList<ISourceContainer> containerList = new ArrayList<ISourceContainer>( + ArrayList<ISourceContainer> containerList = new ArrayList<>( Arrays.asList(director.getSourceContainers())); container.init(director); containerList.add(container); @@ -375,7 +375,7 @@ public class SourceLookupTest extends BaseParametrizedTestCase { } else { mapContainer.addMapEntry(fMapEntrySourceContainerN); } - ArrayList<ISourceContainer> containerList = new ArrayList<ISourceContainer>( + ArrayList<ISourceContainer> containerList = new ArrayList<>( Arrays.asList(commonSourceLookupDirector.getSourceContainers())); containerList.add(mapContainer); commonSourceLookupDirector diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/StepIntoSelectionTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/StepIntoSelectionTest.java index 00da7d80ce8..d7fe5dd96cc 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/StepIntoSelectionTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/StepIntoSelectionTest.java @@ -186,7 +186,7 @@ public class StepIntoSelectionTest extends BaseParametrizedTestCase { */ private ISuspendedDMEvent triggerStepIntoSelection(final IExecutionDMContext exeContext, final String sourceName, final int targetLine, final IFunctionDeclaration function, final boolean skipBreakPoints) throws Throwable { - ServiceEventWaitor<ISuspendedDMEvent> eventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(fSession, + ServiceEventWaitor<ISuspendedDMEvent> eventWaitor = new ServiceEventWaitor<>(fSession, ISuspendedDMEvent.class); Query<Object> query = new Query<Object>() { @@ -207,7 +207,7 @@ public class StepIntoSelectionTest extends BaseParametrizedTestCase { */ private ISuspendedDMEvent triggerRunToLine(final IExecutionDMContext exeContext, final String sourceName, final int targetLine, final boolean skipBreakPoints) throws Throwable { - ServiceEventWaitor<ISuspendedDMEvent> eventWaitor = new ServiceEventWaitor<ISuspendedDMEvent>(fSession, + ServiceEventWaitor<ISuspendedDMEvent> eventWaitor = new ServiceEventWaitor<>(fSession, ISuspendedDMEvent.class); Query<Object> query = new Query<Object>() { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java index 4b17bfbe7ba..f05f698ac84 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java @@ -418,7 +418,7 @@ public class TraceFileTest extends BaseParametrizedTestCase { } private MIBreakpointDMContext setBreakpointAtEndLine() throws Throwable { - Map<String, Object> attributes = new HashMap<String, Object>(); + Map<String, Object> attributes = new HashMap<>(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.BREAKPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_NAME); attributes.put(MIBreakpoints.FUNCTION, END_FUNCTION); @@ -445,7 +445,7 @@ public class TraceFileTest extends BaseParametrizedTestCase { evalAction.setName(String.format("Evaluate %s", TEVAL_STRING)); tam.addAction(evalAction); - Map<String, Object> attributes = new HashMap<String, Object>(); + Map<String, Object> attributes = new HashMap<>(); attributes.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.TRACEPOINT); attributes.put(MIBreakpoints.FILE_NAME, SOURCE_NAME); attributes.put(MIBreakpoints.LINE_NUMBER, getLineForTag("IF_X_NE_A")); 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 119923cacec..961cfa508d0 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 @@ -353,7 +353,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -463,7 +463,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -577,7 +577,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -696,7 +696,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts(); assertTrue("Expected a single thread but got " + threads.length, threads.length == 1); - final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -767,7 +767,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -777,7 +777,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts(); assertTrue("Expected two threads but got " + threads.length, threads.length == 2); - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -819,7 +819,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -829,7 +829,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts(); assertTrue("Expected two threads but got " + threads.length, threads.length == 2); - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -862,7 +862,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -876,7 +876,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts(); assertTrue("Expected two threads but got " + threads.length, threads.length == 2); - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -910,7 +910,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -927,7 +927,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IMIExecutionDMContext[] threads = SyncUtil.getExecutionContexts(); assertTrue("Expected two threads but got " + threads.length, threads.length == 2); - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -1000,7 +1000,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { }); assertFalse("expected no threads to be suspended, but found some", result); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -1031,7 +1031,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1069,7 +1069,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1113,7 +1113,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1169,7 +1169,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1444,7 +1444,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1553,7 +1553,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1666,7 +1666,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -1996,7 +1996,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2109,7 +2109,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2227,7 +2227,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2345,7 +2345,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2471,7 +2471,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2585,7 +2585,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2703,7 +2703,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2824,7 +2824,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { public void testResumeProcessOneThreadStopped() throws Throwable { final IExecutionDMContext[] processes = new IExecutionDMContext[] { SyncUtil.getContainerContext() }; - final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -2894,7 +2894,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2903,7 +2903,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] processes = new IExecutionDMContext[] { SyncUtil.getContainerContext() }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -2936,7 +2936,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2949,7 +2949,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] processes = new IExecutionDMContext[] { SyncUtil.getContainerContext() }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -2983,7 +2983,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -2999,7 +2999,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] processes = new IExecutionDMContext[] { SyncUtil.getContainerContext() }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -3082,7 +3082,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { }); assertFalse("expected no process to be suspended, but found some", result); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -3113,7 +3113,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3162,7 +3162,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3217,7 +3217,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3302,7 +3302,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -3347,7 +3347,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { }); assertFalse("expected no contexts to be suspended, but found some", result); - final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running processes @@ -3381,7 +3381,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3391,7 +3391,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -3427,7 +3427,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3441,7 +3441,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -3477,7 +3477,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3491,7 +3491,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(1) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -3526,7 +3526,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3543,7 +3543,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -3650,7 +3650,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { }); assertFalse("expected no process to be suspended, but found some", result); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -3682,7 +3682,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3733,7 +3733,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3790,7 +3790,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3847,7 +3847,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3937,7 +3937,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3947,7 +3947,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0), SyncUtil.getExecutionContext(1) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); runAsyncCall(new AsyncRunnable<Object>() { @@ -3983,7 +3983,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -3997,7 +3997,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0), SyncUtil.getExecutionContext(1) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -4032,7 +4032,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -4049,7 +4049,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { final IExecutionDMContext[] execDmcs = new IExecutionDMContext[] { SyncUtil.getContainerContext(), SyncUtil.getExecutionContext(0), SyncUtil.getExecutionContext(1) }; - final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<MIRunningEvent>( + final ServiceEventWaitor<MIRunningEvent> eventWaitorRunning = new ServiceEventWaitor<>( fMultiRun.getSession(), MIRunningEvent.class); // No error should be thrown, the call should ignore running threads @@ -4086,7 +4086,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -4137,7 +4137,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitorStopped = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); @@ -4194,7 +4194,7 @@ public class GDBMultiNonStopRunControlTest extends BaseParametrizedTestCase { // Run program until both threads are stopped SyncUtil.addBreakpoint("firstBreakpoint", false); - final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + final ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRun.getSession(), MIStoppedEvent.class); SyncUtil.resumeAll(); diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/ThreadStackFrameSyncTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/ThreadStackFrameSyncTest.java index 4584f0fb3ed..5b197e94896 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/ThreadStackFrameSyncTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/nonstop/ThreadStackFrameSyncTest.java @@ -68,7 +68,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase { private IGDBControl fCommandControl; private IGDBFocusSynchronizer fGdbSync; private DsfSession fSession; - private List<IDMEvent<? extends IDMContext>> fEventsReceived = new ArrayList<IDMEvent<? extends IDMContext>>(); + private List<IDMEvent<? extends IDMContext>> fEventsReceived = new ArrayList<>(); // Breakpoint tags in MultiThread.cc public static final String[] LINE_TAGS = new String[] { "LINE_MAIN_BEFORE_THREAD_START", // Just before StartThread @@ -157,7 +157,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase { */ @Test public void testChangingCurrentThreadCLINotification() throws Throwable { - ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRunControl.getSession(), MIStoppedEvent.class); // add a breakpoint in main @@ -193,7 +193,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase { */ @Test public void testChangingCurrentFrameCLINotification() throws Throwable { - ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRunControl.getSession(), MIStoppedEvent.class); // add a breakpoint in main @@ -229,7 +229,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase { */ @Test public void testGdbSyncServiceCanSwitchGDBThread() throws Throwable { - ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRunControl.getSession(), MIStoppedEvent.class); // add a breakpoint in main @@ -270,7 +270,7 @@ public class ThreadStackFrameSyncTest extends BaseParametrizedTestCase { */ @Test public void testGdbSyncServiceCanSwitchGDBStackFrame() throws Throwable { - ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<MIStoppedEvent>( + ServiceEventWaitor<MIStoppedEvent> eventWaitor = new ServiceEventWaitor<>( fMultiRunControl.getSession(), MIStoppedEvent.class); // add a breakpoint in main |