diff -Nru eclipse-platform-debug-4.18/debian/changelog eclipse-platform-debug-4.21/debian/changelog --- eclipse-platform-debug-4.18/debian/changelog 2020-12-28 10:12:44.000000000 +0000 +++ eclipse-platform-debug-4.21/debian/changelog 2021-10-18 08:05:42.000000000 +0000 @@ -1,3 +1,11 @@ +eclipse-platform-debug (4.21-1) unstable; urgency=medium + + * New upstream release + * Standards-Version updated to 4.6.0.1 + * Track the new releases from git.eclipse.org (the GitHub repository is gone) + + -- Emmanuel Bourg Mon, 18 Oct 2021 10:05:42 +0200 + eclipse-platform-debug (4.18-1) unstable; urgency=medium * New upstream release diff -Nru eclipse-platform-debug-4.18/debian/control eclipse-platform-debug-4.21/debian/control --- eclipse-platform-debug-4.18/debian/control 2020-12-28 10:12:40.000000000 +0000 +++ eclipse-platform-debug-4.21/debian/control 2021-10-18 08:03:56.000000000 +0000 @@ -31,7 +31,7 @@ libequinox-registry-java, libicu4j-java, libswt-gtk-4-java (>= 4.8) -Standards-Version: 4.5.1 +Standards-Version: 4.6.0.1 Vcs-Git: https://salsa.debian.org/java-team/eclipse-platform-debug.git Vcs-Browser: https://salsa.debian.org/java-team/eclipse-platform-debug Homepage: https://www.eclipse.org/eclipse/debug/ diff -Nru eclipse-platform-debug-4.18/debian/watch eclipse-platform-debug-4.21/debian/watch --- eclipse-platform-debug-4.18/debian/watch 2020-12-28 10:00:55.000000000 +0000 +++ eclipse-platform-debug-4.21/debian/watch 2021-10-18 08:03:56.000000000 +0000 @@ -1,3 +1,3 @@ version=4 opts="mode=git,repack,compression=xz,uversionmangle=s/_/./g" \ -https://github.com/eclipse/eclipse.platform.debug refs/tags/R([\d_]+[az]?) +https://git.eclipse.org/r/platform/eclipse.platform.debug refs/tags/R([\d_]+[az]?) diff -Nru eclipse-platform-debug-4.18/Jenkinsfile eclipse-platform-debug-4.21/Jenkinsfile --- eclipse-platform-debug-4.18/Jenkinsfile 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-platform-debug-4.21/Jenkinsfile 2021-08-12 12:34:19.000000000 +0000 @@ -0,0 +1,70 @@ +pipeline { + options { + timeout(time: 40, unit: 'MINUTES') + buildDiscarder(logRotator(numToKeepStr:'5')) + } + agent { + label "centos-latest" + } + tools { + maven 'apache-maven-latest' + jdk 'openjdk-jdk11-latest' + } + stages { + stage('initialize Gerrit review') { + steps { + gerritReview labels: [Verified: 0], message: "Build started $BUILD_URL" + } + } + stage('Build') { + steps { + wrap([$class: 'Xvnc', useXauthority: true]) { + sh """ + mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \ + -Pbuild-individual-bundles -Pbree-libs -Papi-check \ + -DskipTests=false -Dcompare-version-with-baselines.skip=false \ + -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true \ + -Dmaven.compiler.failOnWarning=true -Dproject.build.sourceEncoding=UTF-8 + """ + } + } + post { + always { + archiveArtifacts artifacts: '.*log,*/target/work/data/.metadata/.*log,*/tests/target/work/data/.metadata/.*log,apiAnalyzer-workspace/data/.metadata/.*log' + junit '**/target/surefire-reports/TEST-*.xml' + publishIssues issues:[scanForIssues(tool: java()), scanForIssues(tool: mavenConsole())] + } + unstable { + gerritReview labels: [Verified: -1], message: "Build UNSTABLE (test failures) $BUILD_URL" + } + failure { + gerritReview labels: [Verified: -1], message: "Build FAILED $BUILD_URL" + } + } + } + stage('Check freeze period') { + when { + not { + branch 'master' + } + } + steps { + sh "wget https://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/plain/scripts/verifyFreezePeriod.sh" + sh "chmod +x verifyFreezePeriod.sh" + withCredentials([string(credentialsId: 'google-api-key', variable: 'GOOGLE_API_KEY')]) { + sh './verifyFreezePeriod.sh' + } + } + post { + failure { + gerritReview labels: [Verified: -1], message: "Build and test are OK, but Eclipse project is currently in a code freeze period.\nPlease wait for end of code freeze period before merging.\n $BUILD_URL" + } + } + } + } + post { + success { + gerritReview labels: [Verified: 1], message: "Build Succcess $BUILD_URL" + } + } +} diff -Nru eclipse-platform-debug-4.18/.mvn/extensions.xml eclipse-platform-debug-4.21/.mvn/extensions.xml --- eclipse-platform-debug-4.18/.mvn/extensions.xml 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/.mvn/extensions.xml 2021-08-12 12:34:19.000000000 +0000 @@ -3,6 +3,6 @@ org.eclipse.tycho.extras tycho-pomless - 2.1.0 + 2.4.0 \ No newline at end of file diff -Nru eclipse-platform-debug-4.18/org.eclipse.core.externaltools/.classpath eclipse-platform-debug-4.21/org.eclipse.core.externaltools/.classpath --- eclipse-platform-debug-4.18/org.eclipse.core.externaltools/.classpath 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.core.externaltools/.classpath 2021-08-12 12:34:19.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru eclipse-platform-debug-4.18/org.eclipse.core.externaltools/META-INF/MANIFEST.MF eclipse-platform-debug-4.21/org.eclipse.core.externaltools/META-INF/MANIFEST.MF --- eclipse-platform-debug-4.18/org.eclipse.core.externaltools/META-INF/MANIFEST.MF 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.core.externaltools/META-INF/MANIFEST.MF 2021-08-12 12:34:19.000000000 +0000 @@ -3,13 +3,13 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.core.externaltools;singleton:=true -Bundle-Version: 1.1.800.qualifier +Bundle-Version: 1.2.100.qualifier Bundle-Activator: org.eclipse.core.externaltools.internal.ExternalToolsCore Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.debug.core;bundle-version="[3.9.0,4.0.0)", org.eclipse.core.variables;bundle-version="[3.2.800,4.0.0)", org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Export-Package: org.eclipse.core.externaltools.internal;x-friends:="org.eclipse.ant.launching,org.eclipse.ui.externaltools,org.eclipse.ant.ui", diff -Nru eclipse-platform-debug-4.18/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.core.prefs eclipse-platform-debug-4.21/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.core.prefs --- eclipse-platform-debug-4.18/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.core.prefs 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.core.prefs 2021-08-12 12:34:19.000000000 +0000 @@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -38,6 +38,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=error @@ -96,6 +97,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled @@ -133,11 +135,13 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0 @@ -145,17 +149,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0 org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=0 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=0 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=0 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 @@ -239,11 +246,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -273,6 +281,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -297,13 +307,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -350,6 +364,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -386,9 +402,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -414,8 +433,12 @@ org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff -Nru eclipse-platform-debug-4.18/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.ui.prefs eclipse-platform-debug-4.21/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.ui.prefs --- eclipse-platform-debug-4.18/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.ui.prefs 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.core.externaltools/.settings/org.eclipse.jdt.ui.prefs 2021-08-12 12:34:19.000000000 +0000 @@ -1,55 +1,3 @@ -cleanup.add_default_serial_version_id=true -cleanup.add_generated_serial_version_id=false -cleanup.add_missing_annotations=true -cleanup.add_missing_deprecated_annotations=true -cleanup.add_missing_methods=false -cleanup.add_missing_nls_tags=false -cleanup.add_missing_override_annotations=true -cleanup.add_missing_override_annotations_interface_methods=true -cleanup.add_serial_version_id=false -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.convert_to_enhanced_for_loop=false -cleanup.correct_indentation=false -cleanup.format_source_code=true -cleanup.format_source_code_changes_only=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.never_use_blocks=false -cleanup.never_use_parentheses_in_expressions=true -cleanup.organize_imports=true -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=true -cleanup.qualify_static_method_accesses_with_declaring_class=false -cleanup.remove_private_constructors=true -cleanup.remove_trailing_whitespaces=true -cleanup.remove_trailing_whitespaces_all=true -cleanup.remove_trailing_whitespaces_ignore_empty=false -cleanup.remove_unnecessary_casts=true -cleanup.remove_unnecessary_nls_tags=true -cleanup.remove_unused_imports=true -cleanup.remove_unused_local_variables=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.sort_members=false -cleanup.sort_members_all=false -cleanup.use_blocks=true -cleanup.use_blocks_only_for_return_and_throw=false -cleanup.use_parentheses_in_expressions=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_profile=_Platform Debug Cleanups cleanup_settings_version=2 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true diff -Nru eclipse-platform-debug-4.18/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/BuilderCoreUtils.java eclipse-platform-debug-4.21/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/BuilderCoreUtils.java --- eclipse-platform-debug-4.18/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/BuilderCoreUtils.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/BuilderCoreUtils.java 2021-08-12 12:34:19.000000000 +0000 @@ -23,12 +23,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.DebugPlugin; @@ -246,44 +243,6 @@ return folder; } - /** - * Migrates the launch configuration working copy, which is based on an old- - * style external tool builder, to a new, saved launch configuration. The - * returned launch configuration will contain the same attributes as the - * given working copy with the exception of the configuration name, which - * may be changed during the migration. The name of the configuration will - * only be changed if the current name is not a valid name for a saved - * config. - * - * @param workingCopy - * the launch configuration containing attributes from an - * old-style project builder. - * @return ILaunchConfiguration a new, saved launch configuration whose - * attributes match those of the given working copy as well as - * possible - * @throws CoreException - * if an exception occurs while attempting to save the new - * launch configuration - */ - public static ILaunchConfiguration migrateBuilderConfiguration( - IProject project, ILaunchConfigurationWorkingCopy workingCopy) - throws CoreException { - workingCopy.setContainer(getBuilderFolder(project, true)); - // Before saving, make sure the name is valid - String name = workingCopy.getName(); - name = name.replace('/', '.'); - if (name.charAt(0) == ('.')) { - name = name.substring(1); - } - IStatus status = ResourcesPlugin.getWorkspace().validateName(name, - IResource.FILE); - if (!status.isOK()) { - name = "ExternalTool"; //$NON-NLS-1$ - } - name = DebugPlugin.getDefault().getLaunchManager().generateLaunchConfigurationName(name); - workingCopy.rename(name); - return workingCopy.doSave(); - } /** * Converts the build types string into an array of build kinds. diff -Nru eclipse-platform-debug-4.18/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java eclipse-platform-debug-4.21/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java --- eclipse-platform-debug-4.18/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java 2021-08-12 12:34:19.000000000 +0000 @@ -43,7 +43,7 @@ * build process. */ public final class ExternalToolBuilder extends IncrementalProjectBuilder { - private final class IgnoreTeamPrivateChanges implements IResourceDeltaVisitor { + private static final class IgnoreTeamPrivateChanges implements IResourceDeltaVisitor { private boolean[] fTrueChange; private IgnoreTeamPrivateChanges(boolean[] trueChange) { super(); diff -Nru eclipse-platform-debug-4.18/org.eclipse.core.variables/.classpath eclipse-platform-debug-4.21/org.eclipse.core.variables/.classpath --- eclipse-platform-debug-4.18/org.eclipse.core.variables/.classpath 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.core.variables/.classpath 2021-08-12 12:34:19.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru eclipse-platform-debug-4.18/org.eclipse.core.variables/META-INF/MANIFEST.MF eclipse-platform-debug-4.21/org.eclipse.core.variables/META-INF/MANIFEST.MF --- eclipse-platform-debug-4.18/org.eclipse.core.variables/META-INF/MANIFEST.MF 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.core.variables/META-INF/MANIFEST.MF 2021-08-12 12:34:19.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.variables; singleton:=true -Bundle-Version: 3.4.800.qualifier +Bundle-Version: 3.5.100.qualifier Bundle-Activator: org.eclipse.core.variables.VariablesPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,5 +10,5 @@ org.eclipse.core.variables Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.core.variables diff -Nru eclipse-platform-debug-4.18/org.eclipse.core.variables/.settings/org.eclipse.jdt.core.prefs eclipse-platform-debug-4.21/org.eclipse.core.variables/.settings/org.eclipse.jdt.core.prefs --- eclipse-platform-debug-4.18/org.eclipse.core.variables/.settings/org.eclipse.jdt.core.prefs 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.core.variables/.settings/org.eclipse.jdt.core.prefs 2021-08-12 12:34:19.000000000 +0000 @@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -38,6 +38,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=error @@ -96,6 +97,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled @@ -133,11 +135,13 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0 @@ -145,17 +149,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0 org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=0 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=0 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=0 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 @@ -239,11 +246,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -273,6 +281,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -297,13 +307,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -350,6 +364,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -386,9 +402,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -414,8 +433,12 @@ org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff -Nru eclipse-platform-debug-4.18/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/DynamicVariable.java eclipse-platform-debug-4.21/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/DynamicVariable.java --- eclipse-platform-debug-4.18/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/DynamicVariable.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/DynamicVariable.java 2021-08-12 12:34:19.000000000 +0000 @@ -73,7 +73,7 @@ @Override public boolean supportsArgument() { String arg = getConfigurationElement().getAttribute("supportsArgument"); //$NON-NLS-1$ - return arg == null || Boolean.valueOf(arg).booleanValue(); + return arg == null || Boolean.parseBoolean(arg); } } diff -Nru eclipse-platform-debug-4.18/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java eclipse-platform-debug-4.21/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java --- eclipse-platform-debug-4.18/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java 2021-08-12 12:34:19.000000000 +0000 @@ -56,7 +56,7 @@ */ private Deque fStack; - class VariableReference { + static class VariableReference { // the text inside the variable reference private StringBuilder fText; @@ -175,37 +175,35 @@ VariableReference tos = fStack.peek(); tos.append(expression.substring(pos)); pos = expression.length(); + } else if (start >= 0 && start < end) { + // start of a nested variable + int length = start - pos; + if (length > 0) { + VariableReference tos = fStack.peek(); + tos.append(expression.substring(pos, start)); + } + pos = start + 2; + fStack.push(new VariableReference()); } else { - if (start >= 0 && start < end) { - // start of a nested variable - int length = start - pos; - if (length > 0) { - VariableReference tos = fStack.peek(); - tos.append(expression.substring(pos, start)); - } - pos = start + 2; - fStack.push(new VariableReference()); + // end of variable reference + VariableReference tos = fStack.pop(); + String substring = expression.substring(pos, end); + tos.append(substring); + resolvedVariables.add(substring); + + pos = end + 1; + String value= resolve(tos, reportUndefinedVariables, resolveVariables, manager); + if (value == null) { + value = ""; //$NON-NLS-1$ + } + if (fStack.isEmpty()) { + // append to result + fResult.append(value); + state = SCAN_FOR_START; } else { - // end of variable reference - VariableReference tos = fStack.pop(); - String substring = expression.substring(pos, end); - tos.append(substring); - resolvedVariables.add(substring); - - pos = end + 1; - String value= resolve(tos, reportUndefinedVariables, resolveVariables, manager); - if (value == null) { - value = ""; //$NON-NLS-1$ - } - if (fStack.isEmpty()) { - // append to result - fResult.append(value); - state = SCAN_FOR_START; - } else { - // append to previous variable - tos = fStack.peek(); - tos.append(value); - } + // append to previous variable + tos = fStack.peek(); + tos.append(value); } } break; diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java 2021-08-12 12:34:19.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2019 IBM Corporation and others. + * Copyright (c) 2000, 2021 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -356,6 +356,21 @@ public static final String ATTR_PATH = PI_DEBUG_CORE + ".ATTR_PATH"; //$NON-NLS-1$ /** + * Launch configuration attribute that designates whether or not the + * descendants of the {@link IProcess} associated to a launch of this + * configuration should be terminated if the main-process is terminated. The + * descendants (also called child- or sub-processes) of a operating system + * process are the processes started by that process. + * + * Value is a string representing a boolean - true or + * false. When unspecified, the default value is considered + * true. + * + * @since 3.18 + */ + public static final String ATTR_TERMINATE_DESCENDANTS = PI_DEBUG_CORE + ".TERMINATE_DESCENDANTS"; //$NON-NLS-1$ + + /** * The singleton debug plug-in instance. */ private static DebugPlugin fgDebugPlugin= null; @@ -591,6 +606,9 @@ public synchronized ILaunchManager getLaunchManager() { if (fLaunchManager == null) { fLaunchManager = new LaunchManager(); + fLaunchManager.getAllLaunchConfigurations(); + // monitor launch configuration renames for launch groups + fLaunchManager.addLaunchConfigurationListener(new GroupMemberChangeListener()); } return fLaunchManager; } @@ -726,9 +744,6 @@ manager.registerAdapters(actionFactory, ILaunch.class); manager.registerAdapters(actionFactory, IProcess.class); manager.registerAdapters(actionFactory, IDebugElement.class); - - // monitor launch configuration renames for launch groups - getLaunchManager().addLaunchConfigurationListener(new GroupMemberChangeListener()); } /** @@ -937,12 +952,10 @@ } } p = pb.start(); + } else if (workingDirectory == null) { + p = Runtime.getRuntime().exec(cmdLine, envp); } else { - if (workingDirectory == null) { - p = Runtime.getRuntime().exec(cmdLine, envp); - } else { - p = Runtime.getRuntime().exec(cmdLine, envp, workingDirectory); - } + p = Runtime.getRuntime().exec(cmdLine, envp, workingDirectory); } } catch (IOException e) { Status status = new Status(IStatus.ERROR, getUniqueIdentifier(), ERROR, DebugCoreMessages.DebugPlugin_0, e); @@ -1640,6 +1653,8 @@ } else { buf.append('\\'); } + } else if (isWin32) { + backslashes = 0; } buf.append(ch); } diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java 2021-08-12 12:34:19.000000000 +0000 @@ -267,13 +267,11 @@ } catch (DebugException e) { status.merge(e.getStatus()); } - } else { - if (target.canDisconnect()) { - try { - target.disconnect(); - } catch (DebugException de) { - status.merge(de.getStatus()); - } + } else if (target.canDisconnect()) { + try { + target.disconnect(); + } catch (DebugException de) { + status.merge(de.getStatus()); } } } diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java 2021-08-12 12:34:19.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2020 IBM Corporation and others. + * Copyright (c) 2000, 2021 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -25,6 +25,7 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.PlatformObject; import org.eclipse.core.runtime.Status; @@ -102,6 +103,11 @@ private boolean fCaptureOutput = true; /** + * Whether the descendants of this process should be terminated too + */ + private boolean fTerminateDescendants = true; + + /** * Constructs a RuntimeProcess on the given system process * with the given name, adding this process to the given * launch. @@ -127,6 +133,15 @@ String captureOutput = launch.getAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT); fCaptureOutput = !("false".equals(captureOutput)); //$NON-NLS-1$ + try { + ILaunchConfiguration launchConfiguration = launch.getLaunchConfiguration(); + if (launchConfiguration != null) { + fTerminateDescendants = launchConfiguration.getAttribute(DebugPlugin.ATTR_TERMINATE_DESCENDANTS, true); + } + } catch (CoreException e) { + DebugPlugin.log(e); + } + fStreamsProxy = createStreamsProxy(); fMonitor = new ProcessMonitorThread(); fMonitor.start(); @@ -209,12 +224,13 @@ return; } - List descendants; // only a snapshot! - try { - descendants = process.descendants().collect(Collectors.toList()); - } catch (UnsupportedOperationException e) { - // JVM may not support toHandle() -> assume no descendants - descendants = Collections.emptyList(); + List descendants = Collections.emptyList(); + if (fTerminateDescendants) { + try { // List of descendants of process is only a snapshot! + descendants = process.descendants().collect(Collectors.toList()); + } catch (UnsupportedOperationException e) { + // JVM may not support toHandle() -> assume no descendants + } } process.destroy(); diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/core/RefreshUtil.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/core/RefreshUtil.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/core/RefreshUtil.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/core/RefreshUtil.java 2021-08-12 12:34:19.000000000 +0000 @@ -183,14 +183,12 @@ if (resource == null) { // empty selection return new IResource[]{}; - } else { - if (memento.equals(MEMENTO_SELECTED_RESOURCE)) { - return new IResource[] { resource }; - } else if (memento.equals(MEMENTO_SELECTED_CONTAINER)) { - return new IResource[] {resource.getParent()}; - } else if (memento.equals(MEMENTO_SELECTED_PROJECT)) { - return new IResource[] {resource.getProject()}; - } + } else if (memento.equals(MEMENTO_SELECTED_RESOURCE)) { + return new IResource[] { resource }; + } else if (memento.equals(MEMENTO_SELECTED_CONTAINER)) { + return new IResource[] {resource.getParent()}; + } else if (memento.equals(MEMENTO_SELECTED_PROJECT)) { + return new IResource[] {resource.getProject()}; } } throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), MessageFormat.format(DebugCoreMessages.RefreshUtil_0, memento))); diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java 2021-08-12 12:34:19.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -194,7 +194,7 @@ * * @since 3.5 */ - class DefaultImportParticipant implements IBreakpointImportParticipant { + static class DefaultImportParticipant implements IBreakpointImportParticipant { @Override public boolean matches(Map attributes, IBreakpoint breakpoint) throws CoreException { @@ -503,6 +503,8 @@ for (IBreakpoint breakpoint : remove) { bps.remove(breakpoint); fMarkersToBreakpoints.remove(breakpoint.getMarker()); + // If the breakpoint is a trigger point, remove else do nothing. + removeTriggerPoint(breakpoint); } fireUpdate(remove, null, REMOVED); refreshTriggerpointDisplay(); @@ -602,6 +604,10 @@ added.add(breakpoint); getBreakpoints0().add(breakpoint); fMarkersToBreakpoints.put(breakpoint.getMarker(), breakpoint); + if (breakpoint instanceof ITriggerPoint && ((ITriggerPoint) breakpoint).isTriggerPoint()) { + addTriggerPoint(breakpoint); + } + } else { // need to update the 'registered' and/or 'group' attributes update.add(breakpoint); diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugOptions.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugOptions.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugOptions.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugOptions.java 2021-08-12 12:34:19.000000000 +0000 @@ -56,8 +56,8 @@ public void optionsChanged(org.eclipse.osgi.service.debug.DebugOptions options) { fgDebugTrace = options.newDebugTrace(DebugPlugin.getUniqueIdentifier()); DEBUG = options.getBooleanOption(DEBUG_FLAG, false); - DEBUG_COMMANDS = DEBUG & options.getBooleanOption(DEBUG_FLAG_COMMANDS, false); - DEBUG_EVENTS = DEBUG & options.getBooleanOption(DEBUG_FLAG_EVENTS, false); + DEBUG_COMMANDS = DEBUG && options.getBooleanOption(DEBUG_FLAG_COMMANDS, false); + DEBUG_EVENTS = DEBUG && options.getBooleanOption(DEBUG_FLAG_EVENTS, false); } /** diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java 2021-08-12 12:34:19.000000000 +0000 @@ -126,10 +126,8 @@ // loop detected. report as appropriate and die. IStatusHandler cycleHandler = DebugPlugin.getDefault().getStatusHandler(GROUP_CYCLE); cycleHandler.handleStatus(GROUP_CYCLE, conf.getName()); - } else { - if (!launchChild(progress.newChild(1000 / launches.size()), group, le, conf, localMode, (i == launches.size() - 1))) { - break; - } + } else if (!launchChild(progress.newChild(1000 / launches.size()), group, le, conf, localMode, (i == launches.size() - 1))) { + break; } // in case the group has been terminated while waiting in the diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java 2021-08-12 12:34:19.000000000 +0000 @@ -913,10 +913,8 @@ if (strAttr1 == null && strAttr2 == null && !attr1.equals(attr2)) { return false; } - } else { - if (comp.compare(attr1, attr2) != 0) { - return false; - } + } else if (comp.compare(attr1, attr2) != 0) { + return false; } return true; } diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java 2021-08-12 12:34:19.000000000 +0000 @@ -262,7 +262,7 @@ } - boolean local = (Boolean.valueOf(localString)).booleanValue(); + boolean local = Boolean.parseBoolean(localString); IPath iPath = new Path(path); String name = getSimpleName(iPath.lastSegment()); IContainer container = null; @@ -601,7 +601,7 @@ Document doc = LaunchManager.getDocument(); Element node = doc.createElement(IConfigurationElementConstants.LAUNCH_CONFIGURATION); doc.appendChild(node); - node.setAttribute(IConfigurationElementConstants.LOCAL, (Boolean.valueOf(local)).toString()); + node.setAttribute(IConfigurationElementConstants.LOCAL, Boolean.toString(local)); node.setAttribute(IConfigurationElementConstants.PATH, relativePath.toString()); return LaunchManager.serializeDocument(doc); } catch (IOException ioe) { @@ -681,12 +681,10 @@ String memento = getAttribute(ATTR_SOURCE_LOCATOR_MEMENTO, (String)null); if (memento == null) { locator.initializeDefaults(this); + } else if(locator instanceof IPersistableSourceLocator2) { + ((IPersistableSourceLocator2)locator).initializeFromMemento(memento, this); } else { - if(locator instanceof IPersistableSourceLocator2) { - ((IPersistableSourceLocator2)locator).initializeFromMemento(memento, this); - } else { - locator.initializeFromMemento(memento); - } + locator.initializeFromMemento(memento); } launch.setSourceLocator(locator); } @@ -744,13 +742,11 @@ } if (launch == null) { launch = new Launch(this, mode, null); - } else { - // ensure the launch mode is valid - if (!mode.equals(launch.getLaunchMode())) { - IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.ERROR, - MessageFormat.format(DebugCoreMessages.LaunchConfiguration_14, mode, launch.getLaunchMode()), null); - throw new CoreException(status); - } + } else // ensure the launch mode is valid + if (!mode.equals(launch.getLaunchMode())) { + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.ERROR, + MessageFormat.format(DebugCoreMessages.LaunchConfiguration_14, mode, launch.getLaunchMode()), null); + throw new CoreException(status); } launch.setAttribute(DebugPlugin.ATTR_LAUNCH_TIMESTAMP, Long.toString(System.currentTimeMillis())); boolean captureOutput = getAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT, true); diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java 2021-08-12 12:34:19.000000000 +0000 @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import org.eclipse.core.filesystem.EFS; @@ -35,6 +36,7 @@ import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; @@ -608,13 +610,8 @@ } IContainer newContainer = getContainer(); IContainer originalContainer = ((LaunchConfiguration)getOriginal()).getContainer(); - if (newContainer == originalContainer) { - return false; - } - if (newContainer == null) { - return !originalContainer.equals(newContainer); - } - return !newContainer.equals(originalContainer); + + return !isSameContainerLocation(newContainer, originalContainer); } /** @@ -636,9 +633,22 @@ return fSuppressChange; } + private boolean isSameContainerLocation(IContainer newContainer, IContainer originalContainer) { + // Verify that containers are not nested + if (newContainer != null && originalContainer != null) { + IPath newPath = newContainer.getLocation(); + IPath originalPath = originalContainer.getLocation(); + + if (Objects.equals(newPath, originalPath)) { + return true; + } + } + return Objects.equals(newContainer, originalContainer); + } + @Override public void setContainer(IContainer container) { - if (equalOrNull(getContainer(), container)) { + if (isSameContainerLocation(container, getContainer())) { return; } super.setContainer(container); diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java 2021-08-12 12:34:19.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2020 IBM Corporation and others. + * Copyright (c) 2000, 2021 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -284,12 +284,10 @@ if (registered != null) { registered.add(fNotifierLaunches[j]); } - } else { - if (registered == null) { - registered = new ArrayList<>(fNotifierLaunches.length); - for (int k = 0; k < j; k++) { - registered.add(fNotifierLaunches[k]); - } + } else if (registered == null) { + registered = new ArrayList<>(fNotifierLaunches.length); + for (int k = 0; k < j; k++) { + registered.add(fNotifierLaunches[k]); } } } @@ -444,7 +442,7 @@ * Collects files whose extension matches the launch configuration file * extension. */ - class ResourceProxyVisitor implements IResourceProxyVisitor { + static class ResourceProxyVisitor implements IResourceProxyVisitor { private List fList; @@ -455,7 +453,7 @@ @Override public boolean visit(IResourceProxy proxy) { if (proxy.getType() == IResource.FILE) { - if (ILaunchConfiguration.LAUNCH_CONFIGURATION_FILE_EXTENSION.equalsIgnoreCase(proxy.requestFullPath().getFileExtension()) | ILaunchConfiguration.LAUNCH_CONFIGURATION_PROTOTYPE_FILE_EXTENSION.equalsIgnoreCase(proxy.requestFullPath().getFileExtension())) { + if (ILaunchConfiguration.LAUNCH_CONFIGURATION_FILE_EXTENSION.equalsIgnoreCase(proxy.requestFullPath().getFileExtension()) || ILaunchConfiguration.LAUNCH_CONFIGURATION_PROTOTYPE_FILE_EXTENSION.equalsIgnoreCase(proxy.requestFullPath().getFileExtension())) { fList.add(proxy.requestResource()); } return false; @@ -469,7 +467,7 @@ * * @since 3.3 */ - class PreferredDelegate { + static class PreferredDelegate { private ILaunchDelegate fDelegate = null; private String fTypeid = null; private Set fModes = null; @@ -1120,7 +1118,7 @@ * * @return all launch configuration handles */ - private synchronized List getAllLaunchConfigurations() { + public synchronized List getAllLaunchConfigurations() { if (fLaunchConfigurationIndex == null) { try { fLaunchConfigurationIndex = new ArrayList<>(20); @@ -1366,13 +1364,11 @@ } } + } else if (store != null){ + throw createDebugException(MessageFormat.format(DebugCoreMessages.LaunchManager_does_not_exist, new Object[] { + config.getName(), store.toURI().toString() }), null); } else { - if (store != null){ - throw createDebugException(MessageFormat.format(DebugCoreMessages.LaunchManager_does_not_exist, new Object[] { - config.getName(), store.toURI().toString() }), null); - } else { - throw createDebugException(MessageFormat.format(DebugCoreMessages.LaunchManager_does_not_exist_no_store_found, new Object[] { config.getName() }), null); - } + throw createDebugException(MessageFormat.format(DebugCoreMessages.LaunchManager_does_not_exist_no_store_found, new Object[] { config.getName() }), null); } } return info; @@ -1666,7 +1662,7 @@ // compatibility. initializePreferredDelegates(); for (PreferredDelegate pd : fPreferredDelegates) { - if(pd.getModes().equals(modes) & pd.getTypeId().equals(typeid)) { + if (pd.getModes().equals(modes) && pd.getTypeId().equals(typeid)) { return pd.getDelegate(); } } @@ -2397,7 +2393,7 @@ try { for (ILaunch launch : launches) { for (ILaunchConfiguration config : configs) { - if(config.equals(launch.getLaunchConfiguration()) & launch.canTerminate()) { + if (config.equals(launch.getLaunchConfiguration()) && launch.canTerminate()) { launch.terminate(); } } diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java 2021-08-12 12:34:19.000000000 +0000 @@ -64,7 +64,7 @@ public void write(byte[] data, int offset, int length) throws IOException { } - private class NullStreamMonitor implements IBinaryStreamMonitor { + private static class NullStreamMonitor implements IBinaryStreamMonitor { private InputStream fStream; public NullStreamMonitor(InputStream stream) { diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java 2021-08-12 12:34:19.000000000 +0000 @@ -83,8 +83,6 @@ */ private boolean fKilled = false; - private long lastSleep; - private Charset fCharset; private StreamDecoder fDecoder; @@ -235,7 +233,7 @@ * publicly exposing a {@link Runnable#run()} method. */ private void internalRead() { - lastSleep = System.currentTimeMillis(); + long lastSleep = System.currentTimeMillis(); long currentTime = lastSleep; byte[] buffer = new byte[BUFFER_SIZE]; int read = 0; diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java --- eclipse-platform-debug-4.18/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java 2021-08-12 12:34:19.000000000 +0000 @@ -27,7 +27,7 @@ * @since 3.6 TODO can we roll this into general preference listening? */ public class PreferredDelegateModifyListener extends PreferenceModifyListener { - class Visitor implements IPreferenceNodeVisitor { + static class Visitor implements IPreferenceNodeVisitor { @Override public boolean visit(IEclipsePreferences node) throws BackingStoreException { diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/META-INF/MANIFEST.MF eclipse-platform-debug-4.21/org.eclipse.debug.core/META-INF/MANIFEST.MF --- eclipse-platform-debug-4.18/org.eclipse.debug.core/META-INF/MANIFEST.MF 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/META-INF/MANIFEST.MF 2021-08-12 12:34:19.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.debug.core; singleton:=true -Bundle-Version: 3.17.0.qualifier +Bundle-Version: 3.18.200.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.debug.core.DebugPlugin Bundle-Vendor: %providerName diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.core/.settings/.api_filters eclipse-platform-debug-4.21/org.eclipse.debug.core/.settings/.api_filters --- eclipse-platform-debug-4.18/org.eclipse.debug.core/.settings/.api_filters 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.core/.settings/.api_filters 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.core/.classpath eclipse-platform-debug-4.21/org.eclipse.debug.examples.core/.classpath --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.core/.classpath 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.core/.classpath 2021-08-12 12:34:19.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF eclipse-platform-debug-4.21/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF 2021-08-12 12:34:19.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.core;singleton:=true -Bundle-Version: 1.4.800.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-Activator: org.eclipse.debug.examples.core.pda.DebugCorePlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, @@ -19,7 +19,7 @@ org.eclipse.debug.examples.core.pda.protocol;x-friends:="org.eclipse.debug.examples.ui", org.eclipse.debug.examples.core.pda.sourcelookup;x-friends:="org.eclipse.debug.examples.ui", org.eclipse.debug.examples.pdavm;x-friends:="org.eclipse.debug.examples.ui" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.debug.examples.core diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs eclipse-platform-debug-4.21/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.core/.settings/org.eclipse.jdt.core.prefs 2021-08-12 12:34:19.000000000 +0000 @@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -38,6 +38,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=error @@ -96,6 +97,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled @@ -133,12 +135,13 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0 @@ -146,17 +149,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0 org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=0 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=0 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=0 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 @@ -240,11 +246,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -274,6 +281,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -298,13 +307,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -351,6 +364,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -387,9 +402,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -415,8 +433,12 @@ org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.memory/.classpath eclipse-platform-debug-4.21/org.eclipse.debug.examples.memory/.classpath --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.memory/.classpath 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.memory/.classpath 2021-08-12 12:34:19.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF eclipse-platform-debug-4.21/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF 2021-08-12 12:34:19.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.memory;singleton:=true -Bundle-Version: 1.102.200.qualifier +Bundle-Version: 1.103.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.debug.examples.internal.memory.MemoryViewSamplePlugin Bundle-Vendor: %Bundle-Vendor @@ -19,5 +19,5 @@ org.eclipse.core.resources, org.eclipse.jface.text Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.debug.examples.memory diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.memory/pom.xml eclipse-platform-debug-4.21/org.eclipse.debug.examples.memory/pom.xml --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.memory/pom.xml 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.memory/pom.xml 2021-08-12 12:34:19.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.debug eclipse.platform.debug - 4.18.0-SNAPSHOT + 4.21.0-SNAPSHOT org.eclipse.debug org.eclipse.debug.examples.memory - 1.102.200-SNAPSHOT + 1.103.0-SNAPSHOT eclipse-plugin true diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs eclipse-platform-debug-4.21/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs 2021-08-12 12:34:19.000000000 +0000 @@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -38,6 +38,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=error @@ -96,6 +97,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled @@ -133,11 +135,13 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0 @@ -145,17 +149,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0 org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=0 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=0 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=0 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 @@ -239,11 +246,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -273,6 +281,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -297,13 +307,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -350,6 +364,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -386,9 +402,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -414,8 +433,12 @@ org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.mixedmode/.classpath eclipse-platform-debug-4.21/org.eclipse.debug.examples.mixedmode/.classpath --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.mixedmode/.classpath 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.mixedmode/.classpath 2021-08-12 12:34:19.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF eclipse-platform-debug-4.21/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.mixedmode/META-INF/MANIFEST.MF 2021-08-12 12:34:19.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.mixedmode;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.eclipse.debug.internal.examples.mixedmode.Activator Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.ui, @@ -12,5 +12,5 @@ org.eclipse.ui.workbench.texteditor Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.debug.internal.examples.mixedmode;x-internal:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.debug.examples.mixedmode diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.mixedmode/pom.xml eclipse-platform-debug-4.21/org.eclipse.debug.examples.mixedmode/pom.xml --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.mixedmode/pom.xml 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.mixedmode/pom.xml 2021-08-12 12:34:19.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.debug eclipse.platform.debug - 4.18.0-SNAPSHOT + 4.21.0-SNAPSHOT org.eclipse.debug org.eclipse.debug.examples.mixedmode - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT eclipse-plugin true diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.mixedmode/.settings/org.eclipse.jdt.core.prefs eclipse-platform-debug-4.21/org.eclipse.debug.examples.mixedmode/.settings/org.eclipse.jdt.core.prefs --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.mixedmode/.settings/org.eclipse.jdt.core.prefs 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.mixedmode/.settings/org.eclipse.jdt.core.prefs 2021-08-12 12:34:19.000000000 +0000 @@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -38,6 +38,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=error @@ -96,6 +97,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled @@ -133,11 +135,13 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0 @@ -145,17 +149,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0 org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=0 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=0 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=0 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 @@ -239,11 +246,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -273,6 +281,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -297,13 +307,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -350,6 +364,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -386,9 +402,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -414,8 +433,12 @@ org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/.classpath eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/.classpath --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/.classpath 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/.classpath 2021-08-12 12:34:19.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/META-INF/MANIFEST.MF 2021-08-12 12:34:19.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.ui;singleton:=true -Bundle-Version: 1.6.400.qualifier +Bundle-Version: 1.7.100.qualifier Bundle-Activator: org.eclipse.debug.examples.ui.pda.DebugUIPlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)", org.eclipse.core.resources, @@ -26,7 +26,7 @@ org.eclipse.debug.examples.ui.pda.launcher;x-internal:=true, org.eclipse.debug.examples.ui.pda.presentation;x-internal:=true, org.eclipse.debug.examples.ui.pda.views;x-internal:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-ClassPath: . diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/.settings/org.eclipse.jdt.core.prefs 2021-08-12 12:34:19.000000000 +0000 @@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -38,6 +38,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=error @@ -96,6 +97,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled @@ -133,11 +135,13 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0 @@ -145,17 +149,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0 org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=0 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=0 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=0 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 @@ -239,11 +246,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -273,6 +281,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -297,13 +307,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -350,6 +364,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -386,9 +402,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -414,8 +433,12 @@ org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAVirtualFindAction.java 2021-08-12 12:34:19.000000000 +0000 @@ -67,7 +67,7 @@ private final TreeModelViewer fClientViewer; - protected class VirtualViewerListener implements IViewerUpdateListener, ILabelUpdateListener { + protected static class VirtualViewerListener implements IViewerUpdateListener, ILabelUpdateListener { private boolean fViewerUpdatesComplete = false; private boolean fLabelUpdatesComplete = false; diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/breakpoints/PDAToggleWatchpointsTarget.java 2021-08-12 12:34:19.000000000 +0000 @@ -54,11 +54,9 @@ public boolean canToggleWatchpoints(IWorkbenchPart part, ISelection selection) { if (super.canToggleWatchpoints(part, selection)) { return true; - } else { - if (selection instanceof IStructuredSelection) { - IStructuredSelection ss = (IStructuredSelection)selection; - return ss.getFirstElement() instanceof PDAVariable; - } + } else if (selection instanceof IStructuredSelection) { + IStructuredSelection ss = (IStructuredSelection)selection; + return ss.getFirstElement() instanceof PDAVariable; } return false; } diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/editor/PDAScanner.java 2021-08-12 12:34:19.000000000 +0000 @@ -39,7 +39,7 @@ /** * Detects potential keywords */ - class PDAWordDetector implements IWordDetector { + static class PDAWordDetector implements IWordDetector { @Override public boolean isWordStart(char c) { diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java --- eclipse-platform-debug-4.18/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/launcher/PDAMainTab.java 2021-08-12 12:34:19.000000000 +0000 @@ -178,10 +178,8 @@ if (member == null) { setErrorMessage("Specified program does not exist"); //$NON-NLS-1$ return false; - } else { - if (member.getType() != IResource.FILE) { - setWarningMessage("Specified program is not a file."); //$NON-NLS-1$ - } + } else if (member.getType() != IResource.FILE) { + setWarningMessage("Specified program is not a file."); //$NON-NLS-1$ } } else { setMessage("Specify a program"); //$NON-NLS-1$ diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.tests/META-INF/MANIFEST.MF eclipse-platform-debug-4.21/org.eclipse.debug.tests/META-INF/MANIFEST.MF --- eclipse-platform-debug-4.18/org.eclipse.debug.tests/META-INF/MANIFEST.MF 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.tests/META-INF/MANIFEST.MF 2021-08-12 12:34:19.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.debug.tests;singleton:=true -Bundle-Version: 3.12.0.qualifier +Bundle-Version: 3.12.300.qualifier Bundle-Activator: org.eclipse.debug.tests.TestsPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", @@ -15,7 +15,8 @@ org.eclipse.debug.core;bundle-version="[3.9.0,4.0.0)", org.eclipse.ui.externaltools;bundle-version="[3.3.0,4.0.0)", org.eclipse.ui.console;bundle-version="[3.7.0,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)" + org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.15.100,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: %providerName diff -Nru eclipse-platform-debug-4.18/org.eclipse.debug.tests/pom.xml eclipse-platform-debug-4.21/org.eclipse.debug.tests/pom.xml --- eclipse-platform-debug-4.18/org.eclipse.debug.tests/pom.xml 2020-11-23 06:50:46.000000000 +0000 +++ eclipse-platform-debug-4.21/org.eclipse.debug.tests/pom.xml 2021-08-12 12:34:19.000000000 +0000 @@ -1,6 +1,6 @@