diff options
Diffstat (limited to 'dsf')
69 files changed, 784 insertions, 224 deletions
diff --git a/dsf/org.eclipse.cdt.dsf.ui/.settings/org.eclipse.jdt.ui.prefs b/dsf/org.eclipse.cdt.dsf.ui/.settings/org.eclipse.jdt.ui.prefs index e44576346c4..d35ba9b5231 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/dsf/org.eclipse.cdt.dsf.ui/.settings/org.eclipse.jdt.ui.prefs @@ -1,3 +1,4 @@ +cleanup.add_all=false cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -11,25 +12,72 @@ cleanup.always_use_blocks=true cleanup.always_use_parentheses_in_expressions=false cleanup.always_use_this_for_non_static_field_access=false cleanup.always_use_this_for_non_static_method_access=false +cleanup.array_with_curly=false +cleanup.arrays_fill=false +cleanup.bitwise_conditional_expression=false +cleanup.boolean_literal=false +cleanup.boolean_value_rather_than_comparison=false +cleanup.break_loop=false +cleanup.collection_cloning=false +cleanup.comparing_on_criteria=false +cleanup.comparison_statement=false +cleanup.controlflow_merge=false cleanup.convert_functional_interfaces=false cleanup.convert_to_enhanced_for_loop=false +cleanup.convert_to_enhanced_for_loop_if_loop_var_used=true +cleanup.convert_to_switch_expressions=false cleanup.correct_indentation=false +cleanup.do_while_rather_than_while=true +cleanup.double_negation=false +cleanup.else_if=false +cleanup.embedded_if=false +cleanup.evaluate_nullable=false +cleanup.extract_increment=false cleanup.format_source_code=true cleanup.format_source_code_changes_only=false +cleanup.hash=false +cleanup.if_condition=false cleanup.insert_inferred_type_arguments=false +cleanup.instanceof=false +cleanup.instanceof_keyword=false +cleanup.invert_equals=false +cleanup.join=false +cleanup.lazy_logical_operator=false cleanup.make_local_variable_final=true cleanup.make_parameters_final=false cleanup.make_private_fields_final=true cleanup.make_type_abstract_if_missing_method=false cleanup.make_variable_declarations_final=false +cleanup.map_cloning=false +cleanup.merge_conditional_blocks=false +cleanup.multi_catch=false cleanup.never_use_blocks=false cleanup.never_use_parentheses_in_expressions=true +cleanup.no_string_creation=false +cleanup.no_super=false +cleanup.number_suffix=false +cleanup.objects_equals=false +cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false +cleanup.operand_factorization=false cleanup.organize_imports=true +cleanup.overridden_assignment=false +cleanup.plain_replacement=false +cleanup.precompile_regex=false +cleanup.primitive_comparison=false +cleanup.primitive_parsing=false +cleanup.primitive_rather_than_wrapper=false +cleanup.primitive_serialization=false +cleanup.pull_out_if_from_if_else=false +cleanup.pull_up_assignment=false +cleanup.push_down_negation=false cleanup.qualify_static_field_accesses_with_declaring_class=false cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true cleanup.qualify_static_member_accesses_with_declaring_class=false cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.reduce_indentation=false +cleanup.redundant_comparator=false +cleanup.redundant_falling_through_block_end=false cleanup.remove_private_constructors=true cleanup.remove_redundant_modifiers=false cleanup.remove_redundant_semicolons=true @@ -37,25 +85,57 @@ cleanup.remove_redundant_type_arguments=true cleanup.remove_trailing_whitespaces=true cleanup.remove_trailing_whitespaces_all=true cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_array_creation=false cleanup.remove_unnecessary_casts=true cleanup.remove_unnecessary_nls_tags=false cleanup.remove_unused_imports=true cleanup.remove_unused_local_variables=false +cleanup.remove_unused_method_parameters=false cleanup.remove_unused_private_fields=true cleanup.remove_unused_private_members=false cleanup.remove_unused_private_methods=true cleanup.remove_unused_private_types=true +cleanup.return_expression=false +cleanup.simplify_lambda_expression_and_method_ref=false +cleanup.single_used_field=false cleanup.sort_members=false cleanup.sort_members_all=false +cleanup.standard_comparison=false +cleanup.static_inner_class=false +cleanup.strictly_equal_or_different=false +cleanup.stringbuffer_to_stringbuilder=false +cleanup.stringbuilder=false +cleanup.stringbuilder_for_local_vars=true +cleanup.stringconcat_to_textblock=false +cleanup.substring=false +cleanup.switch=false +cleanup.system_property=false +cleanup.system_property_boolean=false +cleanup.system_property_file_encoding=false +cleanup.system_property_file_separator=false +cleanup.system_property_line_separator=false +cleanup.system_property_path_separator=false +cleanup.ternary_operator=false +cleanup.try_with_resource=false +cleanup.unlooped_while=false +cleanup.unreachable_block=false cleanup.use_anonymous_class_creation=false +cleanup.use_autoboxing=false cleanup.use_blocks=false cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_directly_map_method=false cleanup.use_lambda=true cleanup.use_parentheses_in_expressions=false +cleanup.use_string_is_blank=false cleanup.use_this_for_non_static_field_access=false cleanup.use_this_for_non_static_field_access_only_if_necessary=true cleanup.use_this_for_non_static_method_access=false cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_unboxing=false +cleanup.use_var=false +cleanup.useless_continue=false +cleanup.useless_return=false +cleanup.valueof_rather_than_instantiation=false cleanup_profile=_CDT cleanup_settings_version=2 eclipse.preferences.version=1 diff --git a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF index 303edf8b4dd..046408b0853 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.cdt.dsf.ui;singleton:=true -Bundle-Version: 2.6.300.qualifier +Bundle-Version: 2.6.500.qualifier Bundle-Activator: org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui;bundle-version="3.5.0", diff --git a/dsf/org.eclipse.cdt.dsf.ui/about.html b/dsf/org.eclipse.cdt.dsf.ui/about.html index 164f781a8fd..b3134865230 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/about.html +++ b/dsf/org.eclipse.cdt.dsf.ui/about.html @@ -1,10 +1,11 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>About</title> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> + <title>About</title> </head> + <body lang="EN-US"> <h2>About This Content</h2> @@ -16,7 +17,7 @@ ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is - available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>. + available at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean the Content. </p> @@ -29,8 +30,9 @@ license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a - href="http://www.eclipse.org/">http://www.eclipse.org</a>. + href="https://www.eclipse.org/">https://www.eclipse.org</a>. </p> </body> + </html>
\ No newline at end of file diff --git a/dsf/org.eclipse.cdt.dsf.ui/build.properties b/dsf/org.eclipse.cdt.dsf.ui/build.properties index 086f5702a79..58590f0008e 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/build.properties +++ b/dsf/org.eclipse.cdt.dsf.ui/build.properties @@ -19,5 +19,6 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html,\ icons/,\ - .options + .options,\ + css/ src.includes = about.html diff --git a/dsf/org.eclipse.cdt.dsf.ui/css/e4-dark_dsf.css b/dsf/org.eclipse.cdt.dsf.ui/css/e4-dark_dsf.css new file mode 100644 index 00000000000..1c231ab78f7 --- /dev/null +++ b/dsf/org.eclipse.cdt.dsf.ui/css/e4-dark_dsf.css @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2022 STMicroelectronics and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + ******************************************************************************/ + +IEclipsePreferences#org-eclipse-cdt-dsf-ui:org-eclipse-cdt-dsf-ui { + preferences: + "disassembly.functionOffsetsColor=221,40,103" + "disassembly.addressColor=0,170,0" + "disassembly.codeBytesColor=221,40,103" + "disassembly.rulerBackgroundColor=47,47,47" + "disassembly.errorColor=221,40,103" + "disassembly.instructionColor=18,144,195" + "disassembly.sourceColor=200,200,200" + "disassembly.labelColor=255,191,38" +} diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml index 9d638579552..301d9cce2a5 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml +++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml @@ -1024,4 +1024,13 @@ id="org.eclipse.cdt.dsf.ui.simpleMapPersistableFactory"> </factory> </extension> + <extension + point="org.eclipse.e4.ui.css.swt.theme"> + <stylesheet + uri="css/e4-dark_dsf.css"> + <themeid + refid="org.eclipse.e4.ui.css.theme.e4_dark"> + </themeid> + </stylesheet> + </extension> </plugin> diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java index c6a4a5f84ac..868939de060 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java @@ -47,7 +47,7 @@ public class CSourceNotFoundDescriptionFactory implements IAdapterFactory { public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) { if (adapterType.equals(ICSourceNotFoundDescription.class) && adaptableObject instanceof IFrameDMContext) { final IFrameDMContext frameDMC = (IFrameDMContext) adaptableObject; - Query<IStack.IFrameDMData> query = new Query<IStack.IFrameDMData>() { + Query<IStack.IFrameDMData> query = new Query<>() { @Override protected void execute(DataRequestMonitor<IStack.IFrameDMData> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ExpressionInformationControlCreator.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ExpressionInformationControlCreator.java index 3682639f2ec..55bad139fc7 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ExpressionInformationControlCreator.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ExpressionInformationControlCreator.java @@ -33,6 +33,10 @@ import org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContaine import org.eclipse.debug.ui.AbstractDebugView; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.jface.preference.JFacePreferences; +import org.eclipse.jface.resource.ColorRegistry; +import org.eclipse.jface.resource.JFaceColors; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.text.AbstractInformationControl; import org.eclipse.jface.text.IInformationControl; import org.eclipse.jface.text.IInformationControlCreator; @@ -50,6 +54,7 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tree; @@ -125,6 +130,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC */ private Object fVariable; + private IPresentationContext fContext; private TreeModelViewer fViewer; private SashForm fSashForm; private Composite fDetailPaneComposite; @@ -188,8 +194,8 @@ public class ExpressionInformationControlCreator implements IInformationControlC @Override public void paneChanged(String newPaneID) { if (DefaultDetailPane.ID.equals(newPaneID)) { - fDetailPane.getCurrentControl() - .setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); + fDetailPane.getCurrentControl().setForeground(getSystemForegroundColor()); + fDetailPane.getCurrentControl().setBackground(getSystemBackgroundColor()); } } @@ -265,7 +271,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC private IDialogSettings getDialogSettings(boolean create) { IDialogSettings settings = DsfUIPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(this.getClass().getName()); - if (section == null & create) { + if (section == null && create) { section = settings.addNewSection(this.getClass().getName()); } return section; @@ -289,6 +295,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC @Override public void dispose() { persistSettings(getShell()); + fContext.dispose(); super.dispose(); } @@ -339,8 +346,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC // update presentation context AbstractDebugView view = getViewToEmulate(); - IPresentationContext context = new ExpressionHoverPresentationContext( - IDsfDebugUIConstants.ID_EXPRESSION_HOVER); + fContext = new ExpressionHoverPresentationContext(IDsfDebugUIConstants.ID_EXPRESSION_HOVER); if (view != null) { // copy over properties IPresentationContext copy = ((TreeModelViewer) view.getViewer()).getPresentationContext(); @@ -348,14 +354,14 @@ public class ExpressionInformationControlCreator implements IInformationControlC String[] properties = copy.getProperties(); for (int i = 0; i < properties.length; i++) { String key = properties[i]; - context.setProperty(key, copy.getProperty(key)); + fContext.setProperty(key, copy.getProperty(key)); } } catch (NoSuchMethodError e) { // ignore } } - fViewer = new TreeModelViewer(fSashForm, SWT.MULTI | SWT.VIRTUAL | SWT.FULL_SELECTION, context); + fViewer = new TreeModelViewer(fSashForm, SWT.MULTI | SWT.VIRTUAL | SWT.FULL_SELECTION, fContext); fViewer.setAutoExpandLevel(fExpansionLevel); if (view != null) { @@ -430,8 +436,8 @@ public class ExpressionInformationControlCreator implements IInformationControlC fViewer.addViewerUpdateListener(fViewerUpdateListener); - setForegroundColor(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND)); - setBackgroundColor(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); + setForegroundColor(getSystemForegroundColor()); + setBackgroundColor(getSystemBackgroundColor()); } /** @@ -537,7 +543,6 @@ public class ExpressionInformationControlCreator implements IInformationControlC public void viewerInputComplete(IViewerInputUpdate update) { fViewer.setInput(fVariable = update.getInputElement()); } - } protected final boolean fShowDetailPane; @@ -572,4 +577,26 @@ public class ExpressionInformationControlCreator implements IInformationControlC return new ExpressionInformationControl(parent, false); } + private static Color getSystemForegroundColor() { + ColorRegistry colorRegistry = JFaceResources.getColorRegistry(); + Color foreground = colorRegistry.get(JFacePreferences.INFORMATION_FOREGROUND_COLOR); + + if (foreground == null) { + return JFaceColors.getInformationViewerForegroundColor(Display.getDefault()); + } + + return foreground; + } + + public static Color getSystemBackgroundColor() { + ColorRegistry colorRegistry = JFaceResources.getColorRegistry(); + Color background = colorRegistry.get(JFacePreferences.INFORMATION_BACKGROUND_COLOR); + + if (background == null) { + return JFaceColors.getInformationViewerBackgroundColor(Display.getDefault()); + } + + return background; + } + } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java index 7ed3bb22309..5a2f11438cb 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java @@ -202,7 +202,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler { protected boolean canAddRegisterGroup(IWorkbenchPart part, IStructuredSelection selection) { try { final SelectionDMContext selectionContext = new SelectionDMContext(selection); - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { IRegisters2 registersService; @@ -267,7 +267,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler { return false; } - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<Boolean> rm) { IRegisters2 registersService; @@ -346,7 +346,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler { } //Prepare to Query the service and check if the selected groups can be removed - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { IRegisters2 regService; @@ -422,7 +422,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler { } //Prepare to Query the service - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { IRegisters2 regService; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java index cb55025b976..511e1dc64f3 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java @@ -51,7 +51,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress { DsfSession session = DsfSession.getSession(fContext.getSessionId()); if (session != null && session.isActive()) { try { - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), @@ -84,7 +84,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress { if (session != null && session.isActive()) { Throwable exception = null; try { - Query<Object> query = new Query<Object>() { + Query<Object> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<Object> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), @@ -125,7 +125,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress { DsfSession session = DsfSession.getSession(fContext.getSessionId()); if (session != null && session.isActive()) { try { - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), @@ -158,7 +158,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress { if (session != null && session.isActive()) { Throwable exception = null; try { - Query<Object> query = new Query<Object>() { + Query<Object> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<Object> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java index 9f388774a1a..68fa7f274ac 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java @@ -57,7 +57,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress { DsfSession session = DsfSession.getSession(fContext.getSessionId()); if (session != null && session.isActive()) { try { - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), @@ -95,7 +95,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress { if (session != null && session.isActive()) { Throwable exception = null; try { - Query<Object> query = new Query<Object>() { + Query<Object> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<Object> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), @@ -136,7 +136,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress { DsfSession session = DsfSession.getSession(fContext.getSessionId()); if (session != null && session.isActive()) { try { - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), @@ -169,7 +169,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress { if (session != null && session.isActive()) { Throwable exception = null; try { - Query<Object> query = new Query<Object>() { + Query<Object> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<Object> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java index f40fa3b7bb6..a734c6d2679 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java @@ -60,7 +60,7 @@ public class RunToLine implements IRunToLine, IRunToAddress { DsfSession session = DsfSession.getSession(fContext.getSessionId()); if (session != null && session.isActive()) { try { - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), @@ -99,7 +99,7 @@ public class RunToLine implements IRunToLine, IRunToAddress { if (session != null && session.isActive()) { Throwable exception = null; try { - Query<Object> query = new Query<Object>() { + Query<Object> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<Object> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), @@ -140,7 +140,7 @@ public class RunToLine implements IRunToLine, IRunToAddress { DsfSession session = DsfSession.getSession(fContext.getSessionId()); if (session != null && session.isActive()) { try { - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), @@ -173,7 +173,7 @@ public class RunToLine implements IRunToLine, IRunToAddress { if (session != null && session.isActive()) { Throwable exception = null; try { - Query<Object> query = new Query<Object>() { + Query<Object> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<Object> rm) { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java index fd877d30db0..d61cf3309da 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java @@ -25,6 +25,7 @@ import static org.eclipse.cdt.debug.internal.ui.disassembly.dsf.DisassemblyUtils import java.math.BigInteger; import java.text.MessageFormat; +import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; @@ -45,6 +46,7 @@ import org.eclipse.cdt.dsf.concurrent.ImmediateDataRequestMonitor; import org.eclipse.cdt.dsf.concurrent.Query; import org.eclipse.cdt.dsf.datamodel.DMContexts; import org.eclipse.cdt.dsf.datamodel.IDMContext; +import org.eclipse.cdt.dsf.debug.service.ICachingService; import org.eclipse.cdt.dsf.debug.service.IDisassembly; import org.eclipse.cdt.dsf.debug.service.IDisassembly.IDisassemblyDMContext; import org.eclipse.cdt.dsf.debug.service.IDisassembly2; @@ -71,6 +73,7 @@ import org.eclipse.cdt.dsf.debug.service.ISourceLookup.ISourceLookupDMContext; import org.eclipse.cdt.dsf.debug.service.IStack; import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMContext; import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMData; +import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlRefreshAllDMEvent; import org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin; import org.eclipse.cdt.dsf.service.DsfServiceEventHandler; import org.eclipse.cdt.dsf.service.DsfServicesTracker; @@ -131,7 +134,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements tracker.dispose(); return disassSvc != null; } - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { try { @@ -419,7 +422,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements return runControl.isSuspended(fTargetContext); } } - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { try { @@ -460,6 +463,15 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements } @DsfServiceEventHandler + public void handleEvent(ICommandControlRefreshAllDMEvent event) { + if (fTargetContext == null) { + return; + } + + fCallback.asyncExec(() -> fCallback.refresh()); + } + + @DsfServiceEventHandler public void handleEvent(IExitedDMEvent event) { if (fTargetContext == null) { return; @@ -564,7 +576,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements public void handleCompleted() { final BigInteger finalStartAddress = getData(); if (mixed) { - final DataRequestMonitor<IMixedInstruction[]> disassemblyRequest = new DataRequestMonitor<IMixedInstruction[]>( + final DataRequestMonitor<IMixedInstruction[]> disassemblyRequest = new DataRequestMonitor<>( executor, null) { @Override public void handleCompleted() { @@ -616,8 +628,8 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements }); } } else { - final DataRequestMonitor<IInstruction[]> disassemblyRequest = new DataRequestMonitor<IInstruction[]>( - executor, null) { + final DataRequestMonitor<IInstruction[]> disassemblyRequest = new DataRequestMonitor<>(executor, + null) { @Override public void handleCompleted() { if (!isCanceled() && getData() != null) { @@ -934,10 +946,10 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements Object sourceElement = null; final ISourceLookupDMContext ctx = DMContexts.getAncestorOfType(fTargetContext, ISourceLookupDMContext.class); final DsfExecutor executor = getSession().getExecutor(); - Query<Object> query = new Query<Object>() { + Query<Object> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<Object> rm) { - final DataRequestMonitor<Object> request = new DataRequestMonitor<Object>(executor, rm) { + final DataRequestMonitor<Object> request = new DataRequestMonitor<>(executor, rm) { @Override protected void handleSuccess() { rm.setData(getData()); @@ -984,7 +996,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements if (!hasFrameContext()) { return null; } - Query<BigInteger> query = new Query<BigInteger>() { + Query<BigInteger> query = new Query<>() { @Override protected void execute(DataRequestMonitor<BigInteger> rm) { evaluateAddressExpression(symbol, suppressError, rm); @@ -1082,10 +1094,10 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements // try reverse lookup final ISourceLookupDMContext ctx = DMContexts.getAncestorOfType(fTargetContext, ISourceLookupDMContext.class); final DsfExecutor executor = getSession().getExecutor(); - Query<String> query = new Query<String>() { + Query<String> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<String> rm) { - final DataRequestMonitor<String> request = new DataRequestMonitor<String>(executor, rm) { + final DataRequestMonitor<String> request = new DataRequestMonitor<>(executor, rm) { @Override protected void handleSuccess() { rm.setData(getData()); @@ -1108,8 +1120,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements final IDisassemblyDMContext context = DMContexts.getAncestorOfType(fTargetContext, IDisassemblyDMContext.class); final String finalFile = debuggerPath; - final DataRequestMonitor<IMixedInstruction[]> disassemblyRequest = new DataRequestMonitor<IMixedInstruction[]>( - executor, null) { + final DataRequestMonitor<IMixedInstruction[]> disassemblyRequest = new DataRequestMonitor<>(executor, null) { @Override public void handleCompleted() { final IMixedInstruction[] data = getData(); @@ -1151,7 +1162,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements return null; } final DsfExecutor executor = DsfSession.getSession(fDsfSessionId).getExecutor(); - Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() { + Query<FormattedValueDMData> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<FormattedValueDMData> rm) { IExecutionDMContext exeCtx = DMContexts.getAncestorOfType(fTargetFrameContext, @@ -1202,7 +1213,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements } final DsfExecutor executor = DsfSession.getSession(fDsfSessionId).getExecutor(); - Query<FormattedValueDMData> query = new Query<FormattedValueDMData>() { + Query<FormattedValueDMData> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<FormattedValueDMData> rm) { IExecutionDMContext exeCtx = DMContexts.getAncestorOfType(fTargetFrameContext, @@ -1308,4 +1319,23 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements protected void handleError(IStatus status) { DsfUIPlugin.log(status); } + + @Override + public void clearCaches() { + final DsfExecutor executor = getSession().getExecutor(); + executor.execute(new DsfRunnable() { + @Override + public void run() { + List.of(IStack.class, IDisassembly.class, IExpressions.class, IRunControl.class, IRegisters.class, + ISourceLookup.class).forEach((clazz) -> { + Object o = getService(clazz); + if (o instanceof ICachingService) { + ICachingService cs = (ICachingService) o; + cs.flushCache(getExecutionDMContext()); + } + }); + } + }); + + } } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java index 5f0fcdf2a68..73ab03b6f63 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java @@ -2933,9 +2933,10 @@ public abstract class DisassemblyPart extends WorkbenchPart } // update pc history trail if (fPCHistory.size() > 1) { + final double bgLuminance = new HSL(fViewer.getTextWidget().getBackground().getRGB()).luminance; HSL hsv = new HSL(fPCAnnotationRGB); - double luminanceStep = (1 - hsv.luminance) / (fPCHistorySizeMax + 1); - hsv.luminance = 1 - luminanceStep * (fPCHistorySizeMax - fPCHistory.size()); + double luminanceStep = (bgLuminance - hsv.luminance) / (fPCHistorySizeMax + 1); + hsv.luminance = bgLuminance - luminanceStep * (fPCHistorySizeMax - fPCHistory.size()); for (ListIterator<AddressRangePosition> listIt = fPCHistory.listIterator(fPCHistory.size()); listIt .hasPrevious();) { AddressRangePosition pcPos = listIt.previous(); @@ -3277,9 +3278,9 @@ public abstract class DisassemblyPart extends WorkbenchPart @Override public void refresh() { + fBackend.clearCaches(); asyncExec(() -> { - fPCLastAddress = getTopAddress(); - refreshView(10); + updatePC(PC_UNKNOWN); }); } } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyRulerColumn.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyRulerColumn.java index 35ca013667b..a8b970c1e8c 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyRulerColumn.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblyRulerColumn.java @@ -73,18 +73,12 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple */ class InternalListener implements IViewportListener, ITextListener, ISelectionChangedListener { - /* - * @see IViewportListener#viewportChanged(int) - */ @Override public void viewportChanged(int verticalPosition) { if (verticalPosition != fScrollPos) redraw(); } - /* - * @see ITextListener#textChanged(TextEvent) - */ @Override public void textChanged(TextEvent event) { @@ -102,9 +96,6 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple } - /* - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ @Override public void selectionChanged(SelectionChangedEvent event) { postRedraw(); @@ -125,9 +116,6 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple /** The auto scroll direction */ private int fAutoScrollDirection; - /* - * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseUp(MouseEvent event) { // see bug 45700 @@ -138,9 +126,6 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple } } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseDown(MouseEvent event) { fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y); @@ -150,9 +135,6 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple } } - /* - * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseDoubleClick(MouseEvent event) { fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y); @@ -160,9 +142,6 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple stopAutoScroll(); } - /* - * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseMove(MouseEvent event) { if (!autoScroll(event)) { @@ -171,23 +150,14 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple } } - /* - * @see org.eclipse.swt.events.MouseTrackListener#mouseEnter(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseEnter(MouseEvent event) { } - /* - * @see org.eclipse.swt.events.MouseTrackListener#mouseExit(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseExit(MouseEvent event) { } - /* - * @see org.eclipse.swt.events.MouseTrackListener#mouseHover(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseHover(MouseEvent event) { } @@ -478,17 +448,11 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple return DsfUIPlugin.getDefault().getPreferenceStore(); } - /* - * @see IVerticalRulerColumn#getControl() - */ @Override public Control getControl() { return fCanvas; } - /* - * @see IVerticalRuleColumnr#getWidth - */ @Override public int getWidth() { return fIndentation[0]; @@ -587,9 +551,6 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple } } - /* - * @see IVerticalRulerColumn#createControl(CompositeRuler, Composite) - */ @Override public Control createControl(CompositeRuler parentRuler, Composite parentControl) { @@ -932,9 +893,8 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple int widgetBaseline = fCachedTextWidget.getBaseline(); FontMetrics fm = gc.getFontMetrics(); int fontBaseline = fm.getAscent() + fm.getLeading(); - Assert.isTrue(widgetBaseline >= fontBaseline); int baselineBias = widgetBaseline - fontBaseline; - return baselineBias; + return Math.max(0, baselineBias); } /** @@ -977,9 +937,6 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple } } - /* - * @see IVerticalRulerColumn#redraw() - */ @Override public void redraw() { @@ -995,16 +952,10 @@ public class DisassemblyRulerColumn extends AbstractContributedRulerColumn imple } } - /* - * @see IVerticalRulerColumn#setModel(IAnnotationModel) - */ @Override public void setModel(IAnnotationModel model) { } - /* - * @see IVerticalRulerColumn#setFont(Font) - */ @Override public void setFont(Font font) { fFont = font; diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java index b8fbf964aa2..9fbcafff3a6 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java @@ -230,7 +230,7 @@ abstract public class AbstractDsfDebugTextHover extends AbstractDebugTextHover i if (frameDmc != null) { final DsfSession dsfSession = DsfSession.getSession(frameDmc.getSessionId()); if (dsfSession != null) { - Callable<IExpressionDMContext> callable = new Callable<IExpressionDMContext>() { + Callable<IExpressionDMContext> callable = new Callable<>() { @Override public IExpressionDMContext call() throws Exception { DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionCommand.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionCommand.java index 38693c6db1a..b3a4f03d8fc 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionCommand.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionCommand.java @@ -118,7 +118,7 @@ public class DsfStepIntoSelectionCommand extends AbstractDebugCommand if (fSession != null && fSession.isActive()) { try { - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { IRunControl3 runControl = fTracker.getService(IRunControl3.class); @@ -149,7 +149,7 @@ public class DsfStepIntoSelectionCommand extends AbstractDebugCommand if (fSession != null && fSession.isActive()) { Throwable exception = null; try { - Query<Object> query = new Query<Object>() { + Query<Object> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<Object> rm) { IRunControl3 runControl = fTracker.getService(IRunControl3.class); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java index 0e7bb3a9552..d2c9f815c51 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java @@ -43,6 +43,7 @@ import org.eclipse.cdt.dsf.debug.service.IRunControl.StateChangeReason; import org.eclipse.cdt.dsf.debug.service.IStack; import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMContext; import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMData; +import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService; import org.eclipse.cdt.dsf.debug.sourcelookup.DsfSourceLookupParticipant; import org.eclipse.cdt.dsf.debug.ui.viewmodel.SteppingController; import org.eclipse.cdt.dsf.debug.ui.viewmodel.SteppingController.ISteppingControlParticipant; @@ -376,7 +377,7 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl } private boolean shouldCancelSelectionChange() { - Query<Boolean> delaySelectionChangeQuery = new Query<Boolean>() { + Query<Boolean> delaySelectionChangeQuery = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { IExecutionDMContext execCtx = DMContexts.getAncestorOfType(fFrameData.fDmc, @@ -986,6 +987,28 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl startAnnotationClearingJob(e.getDMContext()); } + /** + * @noreference This method is not intended to be referenced by clients. + */ + @DsfServiceEventHandler + public void eventDispatched(final ICommandControlService.ICommandControlRefreshAllDMEvent e) { + if (DEBUG) { + System.out.println("[DsfSourceDisplayAdapter] eventDispatched e=" + e); //$NON-NLS-1$ + } + // trigger source display immediately (should be optional?) + Display.getDefault().asyncExec(() -> { + Object context = DebugUITools.getDebugContext(); + if (context instanceof IDMVMContext) { + final IDMContext dmc = ((IDMVMContext) context).getDMContext(); + if (dmc instanceof IFrameDMContext && DMContexts.isAncestorOf(dmc, e.getDMContext())) { + IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); + doDisplaySource((IFrameDMContext) dmc, page, false, true); + return; + } + } + }); + } + @DsfServiceEventHandler public void eventDispatched(final IRunControl.ISuspendedDMEvent e) { updateStepTiming(); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java index 41bef3ced22..62c26174917 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java @@ -166,7 +166,7 @@ public class BreakpointVMProvider extends AbstractCachingVMProvider { private final Map<TreePath, ContainerBreakpointsCache> fContainerBreakpointsCacheMap = new HashMap<>(); - private DataCache<IBreakpoint[]> fFilteredBreakpointsCache = new DataCache<IBreakpoint[]>(getExecutor()) { + private DataCache<IBreakpoint[]> fFilteredBreakpointsCache = new DataCache<>(getExecutor()) { @Override protected void retrieve(org.eclipse.cdt.dsf.concurrent.DataRequestMonitor<IBreakpoint[]> rm) { calcFileteredBreakpoints(rm); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/DataCache.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/DataCache.java index aa199baa743..92cc9f49dd4 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/DataCache.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/DataCache.java @@ -110,7 +110,7 @@ abstract class DataCache<V> { boolean first = fWaitingList.isEmpty(); fWaitingList.add(rm); if (first) { - fRm = new DataRequestMonitor<V>(fExecutor, null) { + fRm = new DataRequestMonitor<>(fExecutor, null) { @Override protected void handleCompleted() { if (!isCanceled()) { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java index dc953cceef6..a2f7e8a561f 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java @@ -80,7 +80,7 @@ public abstract class AbstractExpressionVMNode extends AbstractDMVMNode implemen } else { final List<Object> elements = getData(); - final MultiRequestMonitor<DataRequestMonitor<Boolean>> multiRm = new MultiRequestMonitor<DataRequestMonitor<Boolean>>( + final MultiRequestMonitor<DataRequestMonitor<Boolean>> multiRm = new MultiRequestMonitor<>( getExecutor(), null) { @Override protected void handleCompleted() { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java index 58fa493b258..15d5ae00482 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java @@ -197,7 +197,7 @@ public class ExpressionManagerVMNode extends AbstractVMNode implements IElementL // the request monitor when it is finished. The request monitor // will in turn set the element in the update argument in this method. ((ExpressionVMProvider) getVMProvider()).update(new VMExpressionUpdate(update, expression, - new DataRequestMonitor<Object>(getVMProvider().getExecutor(), multiRm) { + new DataRequestMonitor<>(getVMProvider().getExecutor(), multiRm) { @Override protected void handleSuccess() { update.setChild(getData(), childIndex); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java index 3d264891909..e6a2c345c43 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java @@ -51,7 +51,7 @@ public class ExpressionVMProviderContentStragegy extends DefaultVMContentProvide private void updateExpressionWithNode(final IExpressionVMNode node, final IExpressionUpdate update) { // Call the expression node to parse the expression and fill in the value. node.update(new VMExpressionUpdate(update, update.getExpression(), - new ViewerDataRequestMonitor<Object>(getVMProvider().getExecutor(), update) { + new ViewerDataRequestMonitor<>(getVMProvider().getExecutor(), update) { @Override protected void handleSuccess() { // Check if the evaluated node has child expression nodes. @@ -63,17 +63,18 @@ public class ExpressionVMProviderContentStragegy extends DefaultVMContentProvide update.getExpression()); if (matchingNode != null && !matchingNode.equals(node)) { - updateExpressionWithNode(matchingNode, new VMExpressionUpdate( - update.getElementPath().createChildPath(getData()), update.getViewerInput(), - update.getPresentationContext(), update.getExpression(), - new ViewerDataRequestMonitor<Object>(getVMProvider().getExecutor(), update) { + updateExpressionWithNode(matchingNode, + new VMExpressionUpdate(update.getElementPath().createChildPath(getData()), + update.getViewerInput(), update.getPresentationContext(), + update.getExpression(), + new ViewerDataRequestMonitor<>(getVMProvider().getExecutor(), update) { - @Override - protected void handleSuccess() { - update.setExpressionElement(getData()); - update.done(); - } - })); + @Override + protected void handleSuccess() { + update.setExpressionElement(getData()); + update.done(); + } + })); } else { update.setExpressionElement(getData()); update.done(); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java index 48d1f80c96b..a8d76d4516a 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java @@ -97,22 +97,22 @@ public class ExpressionVMProviderModelProxyStrategy extends DefaultVMModelProxyS buildNodeDeltaForExpression(matchingNode, expression, expressionElementIdx, event, parentDelta, path, rm); } else { - getExpressionVMProvider().update(new VMExpressionUpdate(parentDelta, - getVMProvider().getPresentationContext(), expression, - new DataRequestMonitor<Object>(getVMProvider().getExecutor(), rm) { - @Override - protected void handleSuccess() { - buildDeltaForExpressionElement(node, expression, getData(), - expressionElementIdx, event, parentDelta, path, rm); - } - - @Override - protected void handleErrorOrWarning() { - // Avoid propagating the error to avoid processing the delta by - // all nodes. - rm.done(); - } - })); + getExpressionVMProvider().update( + new VMExpressionUpdate(parentDelta, getVMProvider().getPresentationContext(), + expression, new DataRequestMonitor<>(getVMProvider().getExecutor(), rm) { + @Override + protected void handleSuccess() { + buildDeltaForExpressionElement(node, expression, getData(), + expressionElementIdx, event, parentDelta, path, rm); + } + + @Override + protected void handleErrorOrWarning() { + // Avoid propagating the error to avoid processing the delta by + // all nodes. + rm.done(); + } + })); } } }); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java index 0af115c765f..9c51a4fe6b6 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java @@ -219,7 +219,7 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa // the request monitor when it is finished. The request monitor // will in turn set the element in the update argument in this method. ((ExpressionVMProvider) getVMProvider()).update(new VMExpressionUpdate(update, expression, - new ViewerDataRequestMonitor<Object>(getVMProvider().getExecutor(), update) { + new ViewerDataRequestMonitor<>(getVMProvider().getExecutor(), update) { @Override protected void handleSuccess() { update.setChild(getData(), 0); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java index 8d96619db13..5320a0ea20e 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java @@ -126,7 +126,7 @@ public class WatchExpressionCellModifier implements ICellModifier { if (session == null) { return null; } - Query<String> query = new Query<String>() { + Query<String> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<String> rm) { // Since cell modifier does not provide the fully qualified diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java index cfce1eb28d3..25694859256 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java @@ -100,7 +100,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy { final IExecutionDMContext execContext = DMContexts.getAncestorOfType(dmContext, IExecutionDMContext.class); if (execContext != null) { - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(DataRequestMonitor<Boolean> rm) { DsfServicesTracker servicesTracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), @@ -197,7 +197,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy { return false; } - Query<Boolean> query = new Query<Boolean>() { + Query<Boolean> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<Boolean> rm) { DsfServicesTracker servicesTracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java index 9ac123bc867..f3234e3b89c 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java @@ -190,7 +190,7 @@ public class StackFramesVMNode extends AbstractDMVMNode String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION); String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE); return function != null && !function.isEmpty() && function.contains(")") && //$NON-NLS-1$ - module != null && !module.isEmpty(); + module != null && !module.isEmpty(); } }, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_line__add_parens__text_format, new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION, @@ -200,7 +200,7 @@ public class StackFramesVMNode extends AbstractDMVMNode String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION); String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE); return function != null && !function.isEmpty() && !function.contains(")") && //$NON-NLS-1$ - module != null && !module.isEmpty(); + module != null && !module.isEmpty(); } }, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_function__text_format, new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_MODULE }) { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java index 2f3507146e4..c57b7e435cf 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java @@ -437,7 +437,8 @@ public class FormattedValueRetriever { elementFormatMap); if (update.getProperties().contains(PROP_ACTIVE_FORMAT)) { - assert activeFormat != null : "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$ + assert activeFormat != null + : "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$ update.setProperty(PROP_ACTIVE_FORMAT, activeFormat); } List<String> requestedFormats = calcRequestedFormats(update, activeFormat, availableFormatsMap.get(update)); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java index d08ae709890..c600a63b8b4 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java @@ -364,7 +364,8 @@ public class FormattedValueVMUtil { final String activeFormat = _activeFormat; // null means we don't need to know what the active format is if (update.getProperties().contains(IDebugVMConstants.PROP_FORMATTED_VALUE_ACTIVE_FORMAT)) { - assert activeFormat != null : "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$ + assert activeFormat != null + : "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$ update.setProperty(IDebugVMConstants.PROP_FORMATTED_VALUE_ACTIVE_FORMAT, activeFormat); } @@ -376,7 +377,8 @@ public class FormattedValueVMUtil { boolean activeFormatValueRequested = false; // does the update object ask for PROP_FORMATTED_VALUE_ACTIVE_FORMAT_VALUE? boolean activeFormatValueHandled = false; // have we come across a specific format request that is the active format? if (update.getProperties().contains(IDebugVMConstants.PROP_FORMATTED_VALUE_ACTIVE_FORMAT_VALUE)) { - assert activeFormat != null : "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$ + assert activeFormat != null + : "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$ activeFormatValueRequested = true; // we may end up making an additional run } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java index 79f2443d29b..3ae1bb979b9 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java @@ -1016,8 +1016,7 @@ public class VariableVMNode extends AbstractExpressionVMNode // Call IExpressions.getSubExpressions() to get an Iterable of IExpressionDMContext objects representing // the sub-expressions of the expression represented by the current expression node. - final DataRequestMonitor<IExpressionDMContext[]> rm = new ViewerDataRequestMonitor<IExpressionDMContext[]>( - dsfExecutor, update) { + final DataRequestMonitor<IExpressionDMContext[]> rm = new ViewerDataRequestMonitor<>(dsfExecutor, update) { @Override public void handleCompleted() { if (!isSuccess()) { @@ -1077,8 +1076,7 @@ public class VariableVMNode extends AbstractExpressionVMNode // Call IStack.getLocals() to get an array of IVariableDMContext objects representing the local // variables in the stack frame represented by frameDmc. - final DataRequestMonitor<IVariableDMContext[]> rm = new ViewerDataRequestMonitor<IVariableDMContext[]>( - dsfExecutor, update) { + final DataRequestMonitor<IVariableDMContext[]> rm = new ViewerDataRequestMonitor<>(dsfExecutor, update) { @Override public void handleCompleted() { if (!isSuccess()) { @@ -1147,7 +1145,7 @@ public class VariableVMNode extends AbstractExpressionVMNode // IVariableDMData object to the localsDMData List for later processing (see above). for (IVariableDMContext localDMC : localsDMCs) { - DataRequestMonitor<IVariableDMData> rm = new DataRequestMonitor<IVariableDMData>(dsfExecutor, crm) { + DataRequestMonitor<IVariableDMData> rm = new DataRequestMonitor<>(dsfExecutor, crm) { @Override public void handleSuccess() { localsDMData.add(getData()); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java index 1be706b500c..09a12eabb14 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java @@ -107,7 +107,7 @@ public class DisplayDsfExecutor extends DefaultDsfExecutor { ((DsfExecutable) callable).setSubmitted(); } - return new Callable<V>() { + return new Callable<>() { @Override @SuppressWarnings("unchecked") public V call() throws Exception { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java index df0b8a9a40b..9113c824c35 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java @@ -141,7 +141,7 @@ public class DefaultVMContentProviderStrategy implements IElementContentProvider for (int i = 0; i < updates.length; i++) { final IHasChildrenUpdate update = updates[i]; - final MultiRequestMonitor<DataRequestMonitor<Boolean>> hasChildrenMultiRequestMon = new MultiRequestMonitor<DataRequestMonitor<Boolean>>( + final MultiRequestMonitor<DataRequestMonitor<Boolean>> hasChildrenMultiRequestMon = new MultiRequestMonitor<>( getVMProvider().getExecutor(), null) { @Override protected void handleCompleted() { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java index 930035664d2..0ac8e4b992b 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java @@ -123,8 +123,8 @@ public class VMPropertiesUpdate extends VMViewerUpdate implements IPropertiesUpd } else if ((getStatus() instanceof PropertiesUpdateStatus)) { ((PropertiesUpdateStatus) getStatus()).add(status); } else { - assert getStatus() - .getSeverity() == IStatus.CANCEL : "VMPropertiesUpdate status should always be a PropertiesUpdateStatus unless update is canceled."; //$NON-NLS-1$ + assert getStatus().getSeverity() == IStatus.CANCEL + : "VMPropertiesUpdate status should always be a PropertiesUpdateStatus unless update is canceled."; //$NON-NLS-1$ } } diff --git a/dsf/org.eclipse.cdt.dsf/.settings/org.eclipse.jdt.ui.prefs b/dsf/org.eclipse.cdt.dsf/.settings/org.eclipse.jdt.ui.prefs index e44576346c4..d35ba9b5231 100644 --- a/dsf/org.eclipse.cdt.dsf/.settings/org.eclipse.jdt.ui.prefs +++ b/dsf/org.eclipse.cdt.dsf/.settings/org.eclipse.jdt.ui.prefs @@ -1,3 +1,4 @@ +cleanup.add_all=false cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -11,25 +12,72 @@ cleanup.always_use_blocks=true cleanup.always_use_parentheses_in_expressions=false cleanup.always_use_this_for_non_static_field_access=false cleanup.always_use_this_for_non_static_method_access=false +cleanup.array_with_curly=false +cleanup.arrays_fill=false +cleanup.bitwise_conditional_expression=false +cleanup.boolean_literal=false +cleanup.boolean_value_rather_than_comparison=false +cleanup.break_loop=false +cleanup.collection_cloning=false +cleanup.comparing_on_criteria=false +cleanup.comparison_statement=false +cleanup.controlflow_merge=false cleanup.convert_functional_interfaces=false cleanup.convert_to_enhanced_for_loop=false +cleanup.convert_to_enhanced_for_loop_if_loop_var_used=true +cleanup.convert_to_switch_expressions=false cleanup.correct_indentation=false +cleanup.do_while_rather_than_while=true +cleanup.double_negation=false +cleanup.else_if=false +cleanup.embedded_if=false +cleanup.evaluate_nullable=false +cleanup.extract_increment=false cleanup.format_source_code=true cleanup.format_source_code_changes_only=false +cleanup.hash=false +cleanup.if_condition=false cleanup.insert_inferred_type_arguments=false +cleanup.instanceof=false +cleanup.instanceof_keyword=false +cleanup.invert_equals=false +cleanup.join=false +cleanup.lazy_logical_operator=false cleanup.make_local_variable_final=true cleanup.make_parameters_final=false cleanup.make_private_fields_final=true cleanup.make_type_abstract_if_missing_method=false cleanup.make_variable_declarations_final=false +cleanup.map_cloning=false +cleanup.merge_conditional_blocks=false +cleanup.multi_catch=false cleanup.never_use_blocks=false cleanup.never_use_parentheses_in_expressions=true +cleanup.no_string_creation=false +cleanup.no_super=false +cleanup.number_suffix=false +cleanup.objects_equals=false +cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false +cleanup.operand_factorization=false cleanup.organize_imports=true +cleanup.overridden_assignment=false +cleanup.plain_replacement=false +cleanup.precompile_regex=false +cleanup.primitive_comparison=false +cleanup.primitive_parsing=false +cleanup.primitive_rather_than_wrapper=false +cleanup.primitive_serialization=false +cleanup.pull_out_if_from_if_else=false +cleanup.pull_up_assignment=false +cleanup.push_down_negation=false cleanup.qualify_static_field_accesses_with_declaring_class=false cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true cleanup.qualify_static_member_accesses_with_declaring_class=false cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.reduce_indentation=false +cleanup.redundant_comparator=false +cleanup.redundant_falling_through_block_end=false cleanup.remove_private_constructors=true cleanup.remove_redundant_modifiers=false cleanup.remove_redundant_semicolons=true @@ -37,25 +85,57 @@ cleanup.remove_redundant_type_arguments=true cleanup.remove_trailing_whitespaces=true cleanup.remove_trailing_whitespaces_all=true cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_array_creation=false cleanup.remove_unnecessary_casts=true cleanup.remove_unnecessary_nls_tags=false cleanup.remove_unused_imports=true cleanup.remove_unused_local_variables=false +cleanup.remove_unused_method_parameters=false cleanup.remove_unused_private_fields=true cleanup.remove_unused_private_members=false cleanup.remove_unused_private_methods=true cleanup.remove_unused_private_types=true +cleanup.return_expression=false +cleanup.simplify_lambda_expression_and_method_ref=false +cleanup.single_used_field=false cleanup.sort_members=false cleanup.sort_members_all=false +cleanup.standard_comparison=false +cleanup.static_inner_class=false +cleanup.strictly_equal_or_different=false +cleanup.stringbuffer_to_stringbuilder=false +cleanup.stringbuilder=false +cleanup.stringbuilder_for_local_vars=true +cleanup.stringconcat_to_textblock=false +cleanup.substring=false +cleanup.switch=false +cleanup.system_property=false +cleanup.system_property_boolean=false +cleanup.system_property_file_encoding=false +cleanup.system_property_file_separator=false +cleanup.system_property_line_separator=false +cleanup.system_property_path_separator=false +cleanup.ternary_operator=false +cleanup.try_with_resource=false +cleanup.unlooped_while=false +cleanup.unreachable_block=false cleanup.use_anonymous_class_creation=false +cleanup.use_autoboxing=false cleanup.use_blocks=false cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_directly_map_method=false cleanup.use_lambda=true cleanup.use_parentheses_in_expressions=false +cleanup.use_string_is_blank=false cleanup.use_this_for_non_static_field_access=false cleanup.use_this_for_non_static_field_access_only_if_necessary=true cleanup.use_this_for_non_static_method_access=false cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_unboxing=false +cleanup.use_var=false +cleanup.useless_continue=false +cleanup.useless_return=false +cleanup.valueof_rather_than_instantiation=false cleanup_profile=_CDT cleanup_settings_version=2 eclipse.preferences.version=1 diff --git a/dsf/org.eclipse.cdt.dsf/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.dsf/META-INF/MANIFEST.MF index 97536dcb9c7..cc1f1c6defb 100644 --- a/dsf/org.eclipse.cdt.dsf/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.dsf/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.cdt.dsf;singleton:=true -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.200.qualifier Bundle-Activator: org.eclipse.cdt.dsf.internal.DsfPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, diff --git a/dsf/org.eclipse.cdt.dsf/about.html b/dsf/org.eclipse.cdt.dsf/about.html index 164f781a8fd..b3134865230 100644 --- a/dsf/org.eclipse.cdt.dsf/about.html +++ b/dsf/org.eclipse.cdt.dsf/about.html @@ -1,10 +1,11 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>About</title> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> + <title>About</title> </head> + <body lang="EN-US"> <h2>About This Content</h2> @@ -16,7 +17,7 @@ ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is - available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>. + available at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean the Content. </p> @@ -29,8 +30,9 @@ license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a - href="http://www.eclipse.org/">http://www.eclipse.org</a>. + href="https://www.eclipse.org/">https://www.eclipse.org</a>. </p> </body> + </html>
\ No newline at end of file diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java index 13bb598ff50..80531741e0b 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java @@ -162,7 +162,7 @@ abstract public class RangeCache<V> { List<Request> requests = getRequests(offset, count); - RequestCache<List<V>> range = new RequestCache<List<V>>(fExecutor) { + RequestCache<List<V>> range = new RequestCache<>(fExecutor) { @Override protected void retrieve(DataRequestMonitor<List<V>> rm) { new RangeTransaction(offset, count).request(rm); diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java index 3755a20cdfe..a95e1d1c9b3 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java @@ -44,7 +44,7 @@ public abstract class RequestCache<V> extends AbstractCache<V> { fRm.cancel(); } - fRm = new DataRequestMonitor<V>(getImmediateInDsfExecutor(), null) { + fRm = new DataRequestMonitor<>(getImmediateInDsfExecutor(), null) { @Override protected void handleCompleted() { diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java index 7d2488024c3..034086a22df 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java @@ -478,7 +478,7 @@ public class DsfMemoryBlockRetrieval extends PlatformObject implements IMemoryBl protected BigInteger resolveMemoryAddress(final IDMContext dmc, final String expression) throws DebugException { // Use a Query to "synchronize" the downstream calls - Query<BigInteger> query = new Query<BigInteger>() { + Query<BigInteger> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<BigInteger> drm) { // Lookup for the ExpressionService diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/ICommandControlService.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/ICommandControlService.java index 2cad8387ae4..463d0d29f1d 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/ICommandControlService.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/ICommandControlService.java @@ -85,6 +85,7 @@ public interface ICommandControlService extends ICommandControl, IDsfService { * @since 2.10 */ default public void flushAllCachesAndRefresh(RequestMonitor rm) { + rm.done(); } } diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java index e078b8d3bdd..77b0ab0808e 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java @@ -153,7 +153,7 @@ public class DsfSourceLookupParticipant extends AbstractSourceLookupParticipant } final IDMContext dmc = (IDMContext) object; - Query<String> query = new Query<String>() { + Query<String> query = new Query<>() { @Override protected void execute(final DataRequestMonitor<String> rm) { getSourceNameOnDispatchThread(dmc, rm); diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java index 65cf4066799..cc23aea5811 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java @@ -542,7 +542,8 @@ public class DsfSession { } catch (IllegalAccessException e) { DsfPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, DsfPlugin.PLUGIN_ID, -1, "Security exception when calling a service event handler method", e)); //$NON-NLS-1$ - assert false : "IServiceEventListener.ServiceHandlerMethod method not accessible, is listener declared public?"; //$NON-NLS-1$ + assert false + : "IServiceEventListener.ServiceHandlerMethod method not accessible, is listener declared public?"; //$NON-NLS-1$ } catch (InvocationTargetException e) { DsfPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, DsfPlugin.PLUGIN_ID, -1, "Invocation exception when calling a service event handler method", e)); //$NON-NLS-1$ diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml index ce945864e7e..c1c7666a31f 100644 --- a/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml +++ b/dsf/org.eclipse.cdt.examples.dsf-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.cdt.examples.dsf" label="%featureName" - version="10.5.0.qualifier" + version="10.7.0.qualifier" provider-name="%providerName" plugin="org.eclipse.cdt.examples.dsf" license-feature="org.eclipse.license" diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml index 37ac7d115aa..d8b1a9f17ba 100644 --- a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml +++ b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.cdt</groupId> <artifactId>cdt-parent</artifactId> - <version>10.5.0-SNAPSHOT</version> + <version>10.7.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/.settings/org.eclipse.jdt.ui.prefs b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/.settings/org.eclipse.jdt.ui.prefs index e44576346c4..d35ba9b5231 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/.settings/org.eclipse.jdt.ui.prefs @@ -1,3 +1,4 @@ +cleanup.add_all=false cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -11,25 +12,72 @@ cleanup.always_use_blocks=true cleanup.always_use_parentheses_in_expressions=false cleanup.always_use_this_for_non_static_field_access=false cleanup.always_use_this_for_non_static_method_access=false +cleanup.array_with_curly=false +cleanup.arrays_fill=false +cleanup.bitwise_conditional_expression=false +cleanup.boolean_literal=false +cleanup.boolean_value_rather_than_comparison=false +cleanup.break_loop=false +cleanup.collection_cloning=false +cleanup.comparing_on_criteria=false +cleanup.comparison_statement=false +cleanup.controlflow_merge=false cleanup.convert_functional_interfaces=false cleanup.convert_to_enhanced_for_loop=false +cleanup.convert_to_enhanced_for_loop_if_loop_var_used=true +cleanup.convert_to_switch_expressions=false cleanup.correct_indentation=false +cleanup.do_while_rather_than_while=true +cleanup.double_negation=false +cleanup.else_if=false +cleanup.embedded_if=false +cleanup.evaluate_nullable=false +cleanup.extract_increment=false cleanup.format_source_code=true cleanup.format_source_code_changes_only=false +cleanup.hash=false +cleanup.if_condition=false cleanup.insert_inferred_type_arguments=false +cleanup.instanceof=false +cleanup.instanceof_keyword=false +cleanup.invert_equals=false +cleanup.join=false +cleanup.lazy_logical_operator=false cleanup.make_local_variable_final=true cleanup.make_parameters_final=false cleanup.make_private_fields_final=true cleanup.make_type_abstract_if_missing_method=false cleanup.make_variable_declarations_final=false +cleanup.map_cloning=false +cleanup.merge_conditional_blocks=false +cleanup.multi_catch=false cleanup.never_use_blocks=false cleanup.never_use_parentheses_in_expressions=true +cleanup.no_string_creation=false +cleanup.no_super=false +cleanup.number_suffix=false +cleanup.objects_equals=false +cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false +cleanup.operand_factorization=false cleanup.organize_imports=true +cleanup.overridden_assignment=false +cleanup.plain_replacement=false +cleanup.precompile_regex=false +cleanup.primitive_comparison=false +cleanup.primitive_parsing=false +cleanup.primitive_rather_than_wrapper=false +cleanup.primitive_serialization=false +cleanup.pull_out_if_from_if_else=false +cleanup.pull_up_assignment=false +cleanup.push_down_negation=false cleanup.qualify_static_field_accesses_with_declaring_class=false cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true cleanup.qualify_static_member_accesses_with_declaring_class=false cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.reduce_indentation=false +cleanup.redundant_comparator=false +cleanup.redundant_falling_through_block_end=false cleanup.remove_private_constructors=true cleanup.remove_redundant_modifiers=false cleanup.remove_redundant_semicolons=true @@ -37,25 +85,57 @@ cleanup.remove_redundant_type_arguments=true cleanup.remove_trailing_whitespaces=true cleanup.remove_trailing_whitespaces_all=true cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_array_creation=false cleanup.remove_unnecessary_casts=true cleanup.remove_unnecessary_nls_tags=false cleanup.remove_unused_imports=true cleanup.remove_unused_local_variables=false +cleanup.remove_unused_method_parameters=false cleanup.remove_unused_private_fields=true cleanup.remove_unused_private_members=false cleanup.remove_unused_private_methods=true cleanup.remove_unused_private_types=true +cleanup.return_expression=false +cleanup.simplify_lambda_expression_and_method_ref=false +cleanup.single_used_field=false cleanup.sort_members=false cleanup.sort_members_all=false +cleanup.standard_comparison=false +cleanup.static_inner_class=false +cleanup.strictly_equal_or_different=false +cleanup.stringbuffer_to_stringbuilder=false +cleanup.stringbuilder=false +cleanup.stringbuilder_for_local_vars=true +cleanup.stringconcat_to_textblock=false +cleanup.substring=false +cleanup.switch=false +cleanup.system_property=false +cleanup.system_property_boolean=false +cleanup.system_property_file_encoding=false +cleanup.system_property_file_separator=false +cleanup.system_property_line_separator=false +cleanup.system_property_path_separator=false +cleanup.ternary_operator=false +cleanup.try_with_resource=false +cleanup.unlooped_while=false +cleanup.unreachable_block=false cleanup.use_anonymous_class_creation=false +cleanup.use_autoboxing=false cleanup.use_blocks=false cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_directly_map_method=false cleanup.use_lambda=true cleanup.use_parentheses_in_expressions=false +cleanup.use_string_is_blank=false cleanup.use_this_for_non_static_field_access=false cleanup.use_this_for_non_static_field_access_only_if_necessary=true cleanup.use_this_for_non_static_method_access=false cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_unboxing=false +cleanup.use_var=false +cleanup.useless_continue=false +cleanup.useless_return=false +cleanup.valueof_rather_than_instantiation=false cleanup_profile=_CDT cleanup_settings_version=2 eclipse.preferences.version=1 diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF index 6891010b636..7128f624b33 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.examples.dsf.pda.ui;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.2.100.qualifier Bundle-Activator: org.eclipse.cdt.examples.dsf.pda.ui.PDAUIPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/about.html b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/about.html index 164f781a8fd..b3134865230 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/about.html +++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/about.html @@ -1,10 +1,11 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>About</title> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> + <title>About</title> </head> + <body lang="EN-US"> <h2>About This Content</h2> @@ -16,7 +17,7 @@ ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is - available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>. + available at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean the Content. </p> @@ -29,8 +30,9 @@ license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a - href="http://www.eclipse.org/">http://www.eclipse.org</a>. + href="https://www.eclipse.org/">https://www.eclipse.org</a>. </p> </body> + </html>
\ No newline at end of file diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/.settings/org.eclipse.jdt.ui.prefs b/dsf/org.eclipse.cdt.examples.dsf.pda/.settings/org.eclipse.jdt.ui.prefs index e44576346c4..d35ba9b5231 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/.settings/org.eclipse.jdt.ui.prefs +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/.settings/org.eclipse.jdt.ui.prefs @@ -1,3 +1,4 @@ +cleanup.add_all=false cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -11,25 +12,72 @@ cleanup.always_use_blocks=true cleanup.always_use_parentheses_in_expressions=false cleanup.always_use_this_for_non_static_field_access=false cleanup.always_use_this_for_non_static_method_access=false +cleanup.array_with_curly=false +cleanup.arrays_fill=false +cleanup.bitwise_conditional_expression=false +cleanup.boolean_literal=false +cleanup.boolean_value_rather_than_comparison=false +cleanup.break_loop=false +cleanup.collection_cloning=false +cleanup.comparing_on_criteria=false +cleanup.comparison_statement=false +cleanup.controlflow_merge=false cleanup.convert_functional_interfaces=false cleanup.convert_to_enhanced_for_loop=false +cleanup.convert_to_enhanced_for_loop_if_loop_var_used=true +cleanup.convert_to_switch_expressions=false cleanup.correct_indentation=false +cleanup.do_while_rather_than_while=true +cleanup.double_negation=false +cleanup.else_if=false +cleanup.embedded_if=false +cleanup.evaluate_nullable=false +cleanup.extract_increment=false cleanup.format_source_code=true cleanup.format_source_code_changes_only=false +cleanup.hash=false +cleanup.if_condition=false cleanup.insert_inferred_type_arguments=false +cleanup.instanceof=false +cleanup.instanceof_keyword=false +cleanup.invert_equals=false +cleanup.join=false +cleanup.lazy_logical_operator=false cleanup.make_local_variable_final=true cleanup.make_parameters_final=false cleanup.make_private_fields_final=true cleanup.make_type_abstract_if_missing_method=false cleanup.make_variable_declarations_final=false +cleanup.map_cloning=false +cleanup.merge_conditional_blocks=false +cleanup.multi_catch=false cleanup.never_use_blocks=false cleanup.never_use_parentheses_in_expressions=true +cleanup.no_string_creation=false +cleanup.no_super=false +cleanup.number_suffix=false +cleanup.objects_equals=false +cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false +cleanup.operand_factorization=false cleanup.organize_imports=true +cleanup.overridden_assignment=false +cleanup.plain_replacement=false +cleanup.precompile_regex=false +cleanup.primitive_comparison=false +cleanup.primitive_parsing=false +cleanup.primitive_rather_than_wrapper=false +cleanup.primitive_serialization=false +cleanup.pull_out_if_from_if_else=false +cleanup.pull_up_assignment=false +cleanup.push_down_negation=false cleanup.qualify_static_field_accesses_with_declaring_class=false cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true cleanup.qualify_static_member_accesses_with_declaring_class=false cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.reduce_indentation=false +cleanup.redundant_comparator=false +cleanup.redundant_falling_through_block_end=false cleanup.remove_private_constructors=true cleanup.remove_redundant_modifiers=false cleanup.remove_redundant_semicolons=true @@ -37,25 +85,57 @@ cleanup.remove_redundant_type_arguments=true cleanup.remove_trailing_whitespaces=true cleanup.remove_trailing_whitespaces_all=true cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_array_creation=false cleanup.remove_unnecessary_casts=true cleanup.remove_unnecessary_nls_tags=false cleanup.remove_unused_imports=true cleanup.remove_unused_local_variables=false +cleanup.remove_unused_method_parameters=false cleanup.remove_unused_private_fields=true cleanup.remove_unused_private_members=false cleanup.remove_unused_private_methods=true cleanup.remove_unused_private_types=true +cleanup.return_expression=false +cleanup.simplify_lambda_expression_and_method_ref=false +cleanup.single_used_field=false cleanup.sort_members=false cleanup.sort_members_all=false +cleanup.standard_comparison=false +cleanup.static_inner_class=false +cleanup.strictly_equal_or_different=false +cleanup.stringbuffer_to_stringbuilder=false +cleanup.stringbuilder=false +cleanup.stringbuilder_for_local_vars=true +cleanup.stringconcat_to_textblock=false +cleanup.substring=false +cleanup.switch=false +cleanup.system_property=false +cleanup.system_property_boolean=false +cleanup.system_property_file_encoding=false +cleanup.system_property_file_separator=false +cleanup.system_property_line_separator=false +cleanup.system_property_path_separator=false +cleanup.ternary_operator=false +cleanup.try_with_resource=false +cleanup.unlooped_while=false +cleanup.unreachable_block=false cleanup.use_anonymous_class_creation=false +cleanup.use_autoboxing=false cleanup.use_blocks=false cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_directly_map_method=false cleanup.use_lambda=true cleanup.use_parentheses_in_expressions=false +cleanup.use_string_is_blank=false cleanup.use_this_for_non_static_field_access=false cleanup.use_this_for_non_static_field_access_only_if_necessary=true cleanup.use_this_for_non_static_method_access=false cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_unboxing=false +cleanup.use_var=false +cleanup.useless_continue=false +cleanup.useless_return=false +cleanup.valueof_rather_than_instantiation=false cleanup_profile=_CDT cleanup_settings_version=2 eclipse.preferences.version=1 diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF index 23d1922391e..ee446c9f25d 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.examples.dsf.pda;singleton:=true -Bundle-Version: 2.2.200.qualifier +Bundle-Version: 2.2.300.qualifier Bundle-Activator: org.eclipse.cdt.examples.dsf.pda.PDAPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/about.html b/dsf/org.eclipse.cdt.examples.dsf.pda/about.html index 164f781a8fd..b3134865230 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/about.html +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/about.html @@ -1,10 +1,11 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>About</title> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> + <title>About</title> </head> + <body lang="EN-US"> <h2>About This Content</h2> @@ -16,7 +17,7 @@ ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is - available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>. + available at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean the Content. </p> @@ -29,8 +30,9 @@ license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a - href="http://www.eclipse.org/">http://www.eclipse.org</a>. + href="https://www.eclipse.org/">https://www.eclipse.org</a>. </p> </body> + </html>
\ No newline at end of file diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java index d545b74d59f..2f86c777754 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java @@ -176,7 +176,7 @@ public class PDAPlugin extends Plugin { if (launch instanceof PDALaunch && !((PDALaunch) launch).isShutDown()) { final PDALaunch pdaLaunch = (PDALaunch) launch; - Query<Object> launchShutdownQuery = new Query<Object>() { + Query<Object> launchShutdownQuery = new Query<>() { @Override protected void execute(DataRequestMonitor<Object> rm) { pdaLaunch.shutdownServices(rm); diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java index ce67c99d3e6..25240ca26e1 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java @@ -102,7 +102,7 @@ public class PDALaunchDelegate extends LaunchConfigurationDelegate { */ private void initServices(final PDALaunch pdaLaunch, final String program) throws CoreException { // Synchronization object to use when waiting for the services initialization. - Query<Object> initQuery = new Query<Object>() { + Query<Object> initQuery = new Query<>() { @Override protected void execute(DataRequestMonitor<Object> rm) { pdaLaunch.initializeServices(program, rm); @@ -125,7 +125,7 @@ public class PDALaunchDelegate extends LaunchConfigurationDelegate { private void createProcess(final PDALaunch pdaLaunch) throws CoreException { // Synchronization object to use when waiting for the services initialization. - Query<Object[]> initQuery = new Query<Object[]>() { + Query<Object[]> initQuery = new Query<>() { @Override protected void execute(DataRequestMonitor<Object[]> rm) { DsfServicesTracker tracker = new DsfServicesTracker(PDAPlugin.getBundleContext(), diff --git a/dsf/org.eclipse.cdt.examples.dsf/.settings/org.eclipse.jdt.ui.prefs b/dsf/org.eclipse.cdt.examples.dsf/.settings/org.eclipse.jdt.ui.prefs index e44576346c4..d35ba9b5231 100644 --- a/dsf/org.eclipse.cdt.examples.dsf/.settings/org.eclipse.jdt.ui.prefs +++ b/dsf/org.eclipse.cdt.examples.dsf/.settings/org.eclipse.jdt.ui.prefs @@ -1,3 +1,4 @@ +cleanup.add_all=false cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -11,25 +12,72 @@ cleanup.always_use_blocks=true cleanup.always_use_parentheses_in_expressions=false cleanup.always_use_this_for_non_static_field_access=false cleanup.always_use_this_for_non_static_method_access=false +cleanup.array_with_curly=false +cleanup.arrays_fill=false +cleanup.bitwise_conditional_expression=false +cleanup.boolean_literal=false +cleanup.boolean_value_rather_than_comparison=false +cleanup.break_loop=false +cleanup.collection_cloning=false +cleanup.comparing_on_criteria=false +cleanup.comparison_statement=false +cleanup.controlflow_merge=false cleanup.convert_functional_interfaces=false cleanup.convert_to_enhanced_for_loop=false +cleanup.convert_to_enhanced_for_loop_if_loop_var_used=true +cleanup.convert_to_switch_expressions=false cleanup.correct_indentation=false +cleanup.do_while_rather_than_while=true +cleanup.double_negation=false +cleanup.else_if=false +cleanup.embedded_if=false +cleanup.evaluate_nullable=false +cleanup.extract_increment=false cleanup.format_source_code=true cleanup.format_source_code_changes_only=false +cleanup.hash=false +cleanup.if_condition=false cleanup.insert_inferred_type_arguments=false +cleanup.instanceof=false +cleanup.instanceof_keyword=false +cleanup.invert_equals=false +cleanup.join=false +cleanup.lazy_logical_operator=false cleanup.make_local_variable_final=true cleanup.make_parameters_final=false cleanup.make_private_fields_final=true cleanup.make_type_abstract_if_missing_method=false cleanup.make_variable_declarations_final=false +cleanup.map_cloning=false +cleanup.merge_conditional_blocks=false +cleanup.multi_catch=false cleanup.never_use_blocks=false cleanup.never_use_parentheses_in_expressions=true +cleanup.no_string_creation=false +cleanup.no_super=false +cleanup.number_suffix=false +cleanup.objects_equals=false +cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false +cleanup.operand_factorization=false cleanup.organize_imports=true +cleanup.overridden_assignment=false +cleanup.plain_replacement=false +cleanup.precompile_regex=false +cleanup.primitive_comparison=false +cleanup.primitive_parsing=false +cleanup.primitive_rather_than_wrapper=false +cleanup.primitive_serialization=false +cleanup.pull_out_if_from_if_else=false +cleanup.pull_up_assignment=false +cleanup.push_down_negation=false cleanup.qualify_static_field_accesses_with_declaring_class=false cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true cleanup.qualify_static_member_accesses_with_declaring_class=false cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.reduce_indentation=false +cleanup.redundant_comparator=false +cleanup.redundant_falling_through_block_end=false cleanup.remove_private_constructors=true cleanup.remove_redundant_modifiers=false cleanup.remove_redundant_semicolons=true @@ -37,25 +85,57 @@ cleanup.remove_redundant_type_arguments=true cleanup.remove_trailing_whitespaces=true cleanup.remove_trailing_whitespaces_all=true cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_array_creation=false cleanup.remove_unnecessary_casts=true cleanup.remove_unnecessary_nls_tags=false cleanup.remove_unused_imports=true cleanup.remove_unused_local_variables=false +cleanup.remove_unused_method_parameters=false cleanup.remove_unused_private_fields=true cleanup.remove_unused_private_members=false cleanup.remove_unused_private_methods=true cleanup.remove_unused_private_types=true +cleanup.return_expression=false +cleanup.simplify_lambda_expression_and_method_ref=false +cleanup.single_used_field=false cleanup.sort_members=false cleanup.sort_members_all=false +cleanup.standard_comparison=false +cleanup.static_inner_class=false +cleanup.strictly_equal_or_different=false +cleanup.stringbuffer_to_stringbuilder=false +cleanup.stringbuilder=false +cleanup.stringbuilder_for_local_vars=true +cleanup.stringconcat_to_textblock=false +cleanup.substring=false +cleanup.switch=false +cleanup.system_property=false +cleanup.system_property_boolean=false +cleanup.system_property_file_encoding=false +cleanup.system_property_file_separator=false +cleanup.system_property_line_separator=false +cleanup.system_property_path_separator=false +cleanup.ternary_operator=false +cleanup.try_with_resource=false +cleanup.unlooped_while=false +cleanup.unreachable_block=false cleanup.use_anonymous_class_creation=false +cleanup.use_autoboxing=false cleanup.use_blocks=false cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_directly_map_method=false cleanup.use_lambda=true cleanup.use_parentheses_in_expressions=false +cleanup.use_string_is_blank=false cleanup.use_this_for_non_static_field_access=false cleanup.use_this_for_non_static_field_access_only_if_necessary=true cleanup.use_this_for_non_static_method_access=false cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_unboxing=false +cleanup.use_var=false +cleanup.useless_continue=false +cleanup.useless_return=false +cleanup.valueof_rather_than_instantiation=false cleanup_profile=_CDT cleanup_settings_version=2 eclipse.preferences.version=1 diff --git a/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF index 901033354ce..f0518924713 100644 --- a/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.cdt.examples.dsf;singleton:=true -Bundle-Version: 2.3.100.qualifier +Bundle-Version: 2.3.300.qualifier Bundle-Activator: org.eclipse.cdt.examples.dsf.DsfExamplesPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff --git a/dsf/org.eclipse.cdt.examples.dsf/about.html b/dsf/org.eclipse.cdt.examples.dsf/about.html index 164f781a8fd..b3134865230 100644 --- a/dsf/org.eclipse.cdt.examples.dsf/about.html +++ b/dsf/org.eclipse.cdt.examples.dsf/about.html @@ -1,10 +1,11 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>About</title> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> + <title>About</title> </head> + <body lang="EN-US"> <h2>About This Content</h2> @@ -16,7 +17,7 @@ ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is - available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>. + available at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean the Content. </p> @@ -29,8 +30,9 @@ license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a - href="http://www.eclipse.org/">http://www.eclipse.org</a>. + href="https://www.eclipse.org/">https://www.eclipse.org</a>. </p> </body> + </html>
\ No newline at end of file diff --git a/dsf/org.eclipse.cdt.examples.dsf/about.properties b/dsf/org.eclipse.cdt.examples.dsf/about.properties index fa80ddd9531..378dfeb5796 100644 --- a/dsf/org.eclipse.cdt.examples.dsf/about.properties +++ b/dsf/org.eclipse.cdt.examples.dsf/about.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2009, 2021 Contributors to the Eclipse Foundation +# Copyright (c) 2009, 2022 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. @@ -24,7 +24,7 @@ blurb=C/C++ Debugger Services Framework (DSF) Examples\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -Copyright (c) 2009, 2021 Contributors to the Eclipse Foundation +Copyright (c) 2009, 2022 Contributors to the Eclipse Foundation \n\ See the NOTICE file(s) distributed with this work for additional\n\ information regarding copyright ownership.\n\ diff --git a/dsf/org.eclipse.cdt.tests.dsf/.settings/org.eclipse.jdt.ui.prefs b/dsf/org.eclipse.cdt.tests.dsf/.settings/org.eclipse.jdt.ui.prefs index e44576346c4..d35ba9b5231 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/.settings/org.eclipse.jdt.ui.prefs +++ b/dsf/org.eclipse.cdt.tests.dsf/.settings/org.eclipse.jdt.ui.prefs @@ -1,3 +1,4 @@ +cleanup.add_all=false cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -11,25 +12,72 @@ cleanup.always_use_blocks=true cleanup.always_use_parentheses_in_expressions=false cleanup.always_use_this_for_non_static_field_access=false cleanup.always_use_this_for_non_static_method_access=false +cleanup.array_with_curly=false +cleanup.arrays_fill=false +cleanup.bitwise_conditional_expression=false +cleanup.boolean_literal=false +cleanup.boolean_value_rather_than_comparison=false +cleanup.break_loop=false +cleanup.collection_cloning=false +cleanup.comparing_on_criteria=false +cleanup.comparison_statement=false +cleanup.controlflow_merge=false cleanup.convert_functional_interfaces=false cleanup.convert_to_enhanced_for_loop=false +cleanup.convert_to_enhanced_for_loop_if_loop_var_used=true +cleanup.convert_to_switch_expressions=false cleanup.correct_indentation=false +cleanup.do_while_rather_than_while=true +cleanup.double_negation=false +cleanup.else_if=false +cleanup.embedded_if=false +cleanup.evaluate_nullable=false +cleanup.extract_increment=false cleanup.format_source_code=true cleanup.format_source_code_changes_only=false +cleanup.hash=false +cleanup.if_condition=false cleanup.insert_inferred_type_arguments=false +cleanup.instanceof=false +cleanup.instanceof_keyword=false +cleanup.invert_equals=false +cleanup.join=false +cleanup.lazy_logical_operator=false cleanup.make_local_variable_final=true cleanup.make_parameters_final=false cleanup.make_private_fields_final=true cleanup.make_type_abstract_if_missing_method=false cleanup.make_variable_declarations_final=false +cleanup.map_cloning=false +cleanup.merge_conditional_blocks=false +cleanup.multi_catch=false cleanup.never_use_blocks=false cleanup.never_use_parentheses_in_expressions=true +cleanup.no_string_creation=false +cleanup.no_super=false +cleanup.number_suffix=false +cleanup.objects_equals=false +cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false +cleanup.operand_factorization=false cleanup.organize_imports=true +cleanup.overridden_assignment=false +cleanup.plain_replacement=false +cleanup.precompile_regex=false +cleanup.primitive_comparison=false +cleanup.primitive_parsing=false +cleanup.primitive_rather_than_wrapper=false +cleanup.primitive_serialization=false +cleanup.pull_out_if_from_if_else=false +cleanup.pull_up_assignment=false +cleanup.push_down_negation=false cleanup.qualify_static_field_accesses_with_declaring_class=false cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true cleanup.qualify_static_member_accesses_with_declaring_class=false cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.reduce_indentation=false +cleanup.redundant_comparator=false +cleanup.redundant_falling_through_block_end=false cleanup.remove_private_constructors=true cleanup.remove_redundant_modifiers=false cleanup.remove_redundant_semicolons=true @@ -37,25 +85,57 @@ cleanup.remove_redundant_type_arguments=true cleanup.remove_trailing_whitespaces=true cleanup.remove_trailing_whitespaces_all=true cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_array_creation=false cleanup.remove_unnecessary_casts=true cleanup.remove_unnecessary_nls_tags=false cleanup.remove_unused_imports=true cleanup.remove_unused_local_variables=false +cleanup.remove_unused_method_parameters=false cleanup.remove_unused_private_fields=true cleanup.remove_unused_private_members=false cleanup.remove_unused_private_methods=true cleanup.remove_unused_private_types=true +cleanup.return_expression=false +cleanup.simplify_lambda_expression_and_method_ref=false +cleanup.single_used_field=false cleanup.sort_members=false cleanup.sort_members_all=false +cleanup.standard_comparison=false +cleanup.static_inner_class=false +cleanup.strictly_equal_or_different=false +cleanup.stringbuffer_to_stringbuilder=false +cleanup.stringbuilder=false +cleanup.stringbuilder_for_local_vars=true +cleanup.stringconcat_to_textblock=false +cleanup.substring=false +cleanup.switch=false +cleanup.system_property=false +cleanup.system_property_boolean=false +cleanup.system_property_file_encoding=false +cleanup.system_property_file_separator=false +cleanup.system_property_line_separator=false +cleanup.system_property_path_separator=false +cleanup.ternary_operator=false +cleanup.try_with_resource=false +cleanup.unlooped_while=false +cleanup.unreachable_block=false cleanup.use_anonymous_class_creation=false +cleanup.use_autoboxing=false cleanup.use_blocks=false cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_directly_map_method=false cleanup.use_lambda=true cleanup.use_parentheses_in_expressions=false +cleanup.use_string_is_blank=false cleanup.use_this_for_non_static_field_access=false cleanup.use_this_for_non_static_field_access_only_if_necessary=true cleanup.use_this_for_non_static_method_access=false cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_unboxing=false +cleanup.use_var=false +cleanup.useless_continue=false +cleanup.useless_return=false +cleanup.valueof_rather_than_instantiation=false cleanup_profile=_CDT cleanup_settings_version=2 eclipse.preferences.version=1 diff --git a/dsf/org.eclipse.cdt.tests.dsf/about.html b/dsf/org.eclipse.cdt.tests.dsf/about.html index 164f781a8fd..b3134865230 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/about.html +++ b/dsf/org.eclipse.cdt.tests.dsf/about.html @@ -1,10 +1,11 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> + <head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>About</title> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> + <title>About</title> </head> + <body lang="EN-US"> <h2>About This Content</h2> @@ -16,7 +17,7 @@ ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is - available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>. + available at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean the Content. </p> @@ -29,8 +30,9 @@ license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a - href="http://www.eclipse.org/">http://www.eclipse.org</a>. + href="https://www.eclipse.org/">https://www.eclipse.org</a>. </p> </body> + </html>
\ No newline at end of file diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java index e441e1d573e..0b87f7b665a 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java @@ -94,7 +94,7 @@ public class BreakpointMediatorTests { }, // Initialize breakpoints service - new InitializeServiceStep<DsfTestBreakpoints>(DsfTestBreakpoints.class) { + new InitializeServiceStep<>(DsfTestBreakpoints.class) { @Override protected void setService(DsfTestBreakpoints service) { fBreakpoints = service; diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java index 65ef583c423..102cda2a744 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java @@ -556,7 +556,7 @@ public class CacheTests { }; // Request data from cache - Query<Integer> q = new Query<Integer>() { + Query<Integer> q = new Query<>() { @Override protected void execute(final DataRequestMonitor<Integer> rm) { @@ -625,7 +625,7 @@ public class CacheTests { // Create a client request with a badly behaved cancel implementation. final RequestMonitor[] rmBad = new RequestMonitor[1]; final boolean qBadCanceled[] = new boolean[] { false }; - Query<Integer> qBad = new Query<Integer>() { + Query<Integer> qBad = new Query<>() { @Override protected void execute(final DataRequestMonitor<Integer> rm) { rmBad[0] = new RequestMonitor(ImmediateExecutor.getInstance(), rm) { diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java index 79ad3a95487..046f6c29f39 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java @@ -65,7 +65,7 @@ public class DsfQueryTests { @Test public void simpleGetTest() throws InterruptedException, ExecutionException { - Query<Integer> q = new Query<Integer>() { + Query<Integer> q = new Query<>() { @Override protected void execute(DataRequestMonitor<Integer> rm) { rm.setData(1); @@ -89,7 +89,7 @@ public class DsfQueryTests { public void getErrorTest() throws InterruptedException, ExecutionException { final String error_message = "Test Error"; - Query<Integer> q = new Query<Integer>() { + Query<Integer> q = new Query<>() { @Override protected void execute(DataRequestMonitor<Integer> rm) { rm.setStatus(new Status(IStatus.ERROR, DsfTestPlugin.PLUGIN_ID, IDsfStatusConstants.INTERNAL_ERROR, @@ -119,7 +119,7 @@ public class DsfQueryTests { @Test public void doneExceptionTest() throws InterruptedException, ExecutionException { - Query<Integer> q = new Query<Integer>() { + Query<Integer> q = new Query<>() { @SuppressWarnings("deprecation") @Override protected void execute(DataRequestMonitor<Integer> rm) { @@ -147,7 +147,7 @@ public class DsfQueryTests { @Test public void getWithMultipleDispatchesTest() throws InterruptedException, ExecutionException { - Query<Integer> q = new Query<Integer>() { + Query<Integer> q = new Query<>() { @Override protected void execute(final DataRequestMonitor<Integer> rm) { fExecutor.execute(new DsfRunnable() { @@ -175,7 +175,7 @@ public class DsfQueryTests { @Test(expected = ExecutionException.class) public void exceptionOnGetTest() throws InterruptedException, ExecutionException { - Query<Integer> q = new Query<Integer>() { + Query<Integer> q = new Query<>() { @Override protected void execute(final DataRequestMonitor<Integer> rm) { rm.setStatus(new Status(IStatus.ERROR, DsfTestPlugin.PLUGIN_ID, -1, "", null)); //$NON-NLS-1$ @@ -195,7 +195,7 @@ public class DsfQueryTests { @Test public void cancelBeforeWaitingTest() throws InterruptedException, ExecutionException { - final Query<Integer> q = new Query<Integer>() { + final Query<Integer> q = new Query<>() { @Override protected void execute(final DataRequestMonitor<Integer> rm) { fail("Query was cancelled, it should not be called."); //$NON-NLS-1$ @@ -229,7 +229,7 @@ public class DsfQueryTests { final DataRequestMonitor<?>[] rmHolder = new DataRequestMonitor<?>[1]; final Boolean[] cancelCalled = new Boolean[] { Boolean.FALSE }; - final Query<Integer> q = new Query<Integer>() { + final Query<Integer> q = new Query<>() { @Override protected void execute(final DataRequestMonitor<Integer> rm) { synchronized (rmHolder) { @@ -298,7 +298,7 @@ public class DsfQueryTests { @Test public void getTimeoutTest() throws InterruptedException, ExecutionException { - final Query<Integer> q = new Query<Integer>() { + final Query<Integer> q = new Query<>() { @Override protected void execute(final DataRequestMonitor<Integer> rm) { // Call done with a delay of 1 second, to avoid stalling the tests. diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java index b6cc4739ac8..80b44ebec13 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java @@ -137,7 +137,7 @@ public class TransactionTests { public void singleTransactionTest() throws InterruptedException, ExecutionException { final TestSingleTransaction testTransaction = new TestSingleTransaction(); // Request data from cache - Query<Integer> q = new Query<Integer>() { + Query<Integer> q = new Query<>() { @Override protected void execute(DataRequestMonitor<Integer> rm) { testTransaction.request(rm); @@ -160,7 +160,7 @@ public class TransactionTests { final TestSumTransaction testTransaction = new TestSumTransaction(); // Request data from cache - Query<Integer> q = new Query<Integer>() { + Query<Integer> q = new Query<>() { @Override protected void execute(DataRequestMonitor<Integer> rm) { testTransaction.request(rm); diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java index eac07d119c4..7856757e8b6 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java @@ -122,7 +122,7 @@ public class VMTest1 extends VMTestBase implements IViewerUpdatesListenerConstan Assert.assertNotNull(containerPropProvider); // Check if container is suspended. - Query<Map<String, Object>> suspendedQuery = new Query<Map<String, Object>>() { + Query<Map<String, Object>> suspendedQuery = new Query<>() { @Override protected void execute(DataRequestMonitor<Map<String, Object>> rm) { Set<String> properties = new HashSet<>(); diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java index d34814e66ab..0308d97b87c 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java @@ -105,7 +105,7 @@ public class BasicTests extends CommandControlTestsBase { final PDATestCommand testCommand = new PDATestCommand(fCommandControl.getContext(), "data 1"); // Test sending the command and checking all listeners were called. - Query<PDACommandResult> sendCommandQuery = new Query<PDACommandResult>() { + Query<PDACommandResult> sendCommandQuery = new Query<>() { @Override protected void execute(DataRequestMonitor<PDACommandResult> rm) { fCommandControl.queueCommand(testCommand, rm); @@ -124,7 +124,7 @@ public class BasicTests extends CommandControlTestsBase { // Test queuing then removing command listener.reset(); - Query<Object> queueRemoveCommandQuery = new Query<Object>() { + Query<Object> queueRemoveCommandQuery = new Query<>() { @Override protected void execute(DataRequestMonitor<Object> rm) { ICommandToken token = fCommandControl.queueCommand(testCommand, diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java index 0e9ce935a0b..103089dba10 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java @@ -133,7 +133,7 @@ public class CommandControlTestsBase { final PDATestCommand testCommand = new PDATestCommand(fCommandControl.getContext(), command); // Test sending the command and checking all listeners were called. - Query<PDACommandResult> sendCommandQuery = new Query<PDACommandResult>() { + Query<PDACommandResult> sendCommandQuery = new Query<>() { @Override protected void execute(DataRequestMonitor<PDACommandResult> rm) { fCommandControl.queueCommand(testCommand, rm); diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java index de0a07630c4..8331ba09456 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java @@ -185,7 +185,7 @@ abstract public class FormattedValueTests extends TestCase } private void initializeService(final IDsfService service) throws InterruptedException, ExecutionException { - Query<Object> initQuery = new Query<Object>() { + Query<Object> initQuery = new Query<>() { @Override protected void execute(DataRequestMonitor<Object> rm) { rm.setData(new Object()); @@ -227,7 +227,7 @@ abstract public class FormattedValueTests extends TestCase } private void shutdownService(final IDsfService service) throws InterruptedException, ExecutionException { - Query<Object> shutdownQuery = new Query<Object>() { + Query<Object> shutdownQuery = new Query<>() { @Override protected void execute(DataRequestMonitor<Object> rm) { rm.setData(new Object()); diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java index d28c4ead9cc..2b4cf36b215 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java @@ -30,7 +30,7 @@ import org.eclipse.jface.viewers.TreePath; */ public class TestModelUpdatesListener extends ViewerUpdatesListener { - private final static Comparator<String> fStringComparator = new Comparator<String>() { + private final static Comparator<String> fStringComparator = new Comparator<>() { @Override public int compare(String s1, String s2) { @@ -63,7 +63,7 @@ public class TestModelUpdatesListener extends ViewerUpdatesListener { }; }; - private final static Comparator<TreePath> fTestElementVMCComparator = new Comparator<TreePath>() { + private final static Comparator<TreePath> fTestElementVMCComparator = new Comparator<>() { @Override public int compare(TreePath p1, TreePath p2) { int l1 = p1.getSegmentCount(); diff --git a/dsf/pom.xml b/dsf/pom.xml index 378d01da90f..dd1bbce9280 100644 --- a/dsf/pom.xml +++ b/dsf/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.cdt</groupId> <artifactId>cdt-parent</artifactId> - <version>10.5.0-SNAPSHOT</version> + <version>10.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.cdt.dsf-parent</artifactId> |