From 68aecfc67241b28bf4046c6efd751af5cab7651b Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Wed, 10 Jan 2024 12:44:01 +0100 Subject: [PATCH] Fix files that have been checked in with \r\n to use only \n --- .../build remote support [Builder].launch | 48 ++++---- .../testbuildfiles/Base.xml | 36 +++--- .../testbuildfiles/BaseBaseBuild.xml | 36 +++--- .../testbuildfiles/BaseBuild.xml | 44 +++---- .../.settings/org.eclipse.pde.prefs | 72 +++++------ .../internal/view/TerminateAction.java | 114 +++++++++--------- 6 files changed, 175 insertions(+), 175 deletions(-) diff --git a/ant/org.eclipse.ant.launching/.externalToolBuilders/build remote support [Builder].launch b/ant/org.eclipse.ant.launching/.externalToolBuilders/build remote support [Builder].launch index bfd4a3bde33..7a561b188c4 100644 --- a/ant/org.eclipse.ant.launching/.externalToolBuilders/build remote support [Builder].launch +++ b/ant/org.eclipse.ant.launching/.externalToolBuilders/build remote support [Builder].launch @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/Base.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/Base.xml index d48026e67ca..f490ea5d8c8 100644 --- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/Base.xml +++ b/ant/org.eclipse.ant.tests.ui/testbuildfiles/Base.xml @@ -1,19 +1,19 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/BaseBaseBuild.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/BaseBaseBuild.xml index 15d58872dda..3e31dab85d3 100644 --- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/BaseBaseBuild.xml +++ b/ant/org.eclipse.ant.tests.ui/testbuildfiles/BaseBaseBuild.xml @@ -1,19 +1,19 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/ant/org.eclipse.ant.tests.ui/testbuildfiles/BaseBuild.xml b/ant/org.eclipse.ant.tests.ui/testbuildfiles/BaseBuild.xml index ead82286c28..e827dfa8c07 100644 --- a/ant/org.eclipse.ant.tests.ui/testbuildfiles/BaseBuild.xml +++ b/ant/org.eclipse.ant.tests.ui/testbuildfiles/BaseBuild.xml @@ -1,23 +1,23 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/debug/org.eclipse.debug.ui.launchview/.settings/org.eclipse.pde.prefs b/debug/org.eclipse.debug.ui.launchview/.settings/org.eclipse.pde.prefs index 56e42fa489d..94791b4eaaf 100644 --- a/debug/org.eclipse.debug.ui.launchview/.settings/org.eclipse.pde.prefs +++ b/debug/org.eclipse.debug.ui.launchview/.settings/org.eclipse.pde.prefs @@ -1,36 +1,36 @@ -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=1 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=1 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=2 -compilers.p.discouraged-class=1 -compilers.p.illegal-att-value=0 -compilers.p.internal=1 -compilers.p.matching-pom-version=0 -compilers.p.missing-packages=0 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.not-externalized-att=0 -compilers.p.unknown-attribute=0 -compilers.p.unknown-class=1 -compilers.p.unknown-element=2 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=0 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.p.unused-element-or-attribute=1 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -compilers.use-project=true -eclipse.preferences.version=1 +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=1 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=2 +compilers.p.discouraged-class=1 +compilers.p.illegal-att-value=0 +compilers.p.internal=1 +compilers.p.matching-pom-version=0 +compilers.p.missing-packages=0 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 +compilers.p.no-required-att=0 +compilers.p.not-externalized-att=0 +compilers.p.unknown-attribute=0 +compilers.p.unknown-class=1 +compilers.p.unknown-element=2 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=0 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.p.unused-element-or-attribute=1 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +compilers.use-project=true +eclipse.preferences.version=1 diff --git a/debug/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/view/TerminateAction.java b/debug/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/view/TerminateAction.java index 419bac6391c..88f64d701b7 100644 --- a/debug/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/view/TerminateAction.java +++ b/debug/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/view/TerminateAction.java @@ -1,57 +1,57 @@ -/******************************************************************************* - * Copyright (c) 2017, 2019 SSI Schaefer IT Solutions GmbH and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * SSI Schaefer IT Solutions GmbH - *******************************************************************************/ -package org.eclipse.debug.ui.launchview.internal.view; - -import java.util.Set; - -import org.eclipse.debug.ui.launchview.internal.LaunchViewBundleInfo; -import org.eclipse.debug.ui.launchview.internal.LaunchViewMessages; -import org.eclipse.debug.ui.launchview.services.ILaunchObject; -import org.eclipse.e4.core.di.annotations.CanExecute; -import org.eclipse.e4.core.di.annotations.Execute; -import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem; -import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory; -import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem; - -public class TerminateAction { - - private final LaunchViewImpl view; - - public TerminateAction(LaunchViewImpl view) { - this.view = view; - } - - public MMenuItem asMMenuItem() { - MDirectMenuItem item = MMenuFactory.INSTANCE.createDirectMenuItem(); - item.setLabel(LaunchViewMessages.TerminateAction_Terminate); - item.setEnabled(isEnabled()); - item.setObject(this); - - item.setIconURI("platform:/plugin/" + LaunchViewBundleInfo.PLUGIN_ID + "/icons/terminate_co.png"); //$NON-NLS-1$ //$NON-NLS-2$ - - return item; - } - - @CanExecute - public boolean isEnabled() { - Set elements = view.get(); - return !elements.isEmpty() && elements.stream().allMatch(m -> m.canTerminate()); - } - - @Execute - public void run() { - view.get().forEach(e -> e.terminate()); - } - -} +/******************************************************************************* + * Copyright (c) 2017, 2019 SSI Schaefer IT Solutions GmbH and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * SSI Schaefer IT Solutions GmbH + *******************************************************************************/ +package org.eclipse.debug.ui.launchview.internal.view; + +import java.util.Set; + +import org.eclipse.debug.ui.launchview.internal.LaunchViewBundleInfo; +import org.eclipse.debug.ui.launchview.internal.LaunchViewMessages; +import org.eclipse.debug.ui.launchview.services.ILaunchObject; +import org.eclipse.e4.core.di.annotations.CanExecute; +import org.eclipse.e4.core.di.annotations.Execute; +import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem; +import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory; +import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem; + +public class TerminateAction { + + private final LaunchViewImpl view; + + public TerminateAction(LaunchViewImpl view) { + this.view = view; + } + + public MMenuItem asMMenuItem() { + MDirectMenuItem item = MMenuFactory.INSTANCE.createDirectMenuItem(); + item.setLabel(LaunchViewMessages.TerminateAction_Terminate); + item.setEnabled(isEnabled()); + item.setObject(this); + + item.setIconURI("platform:/plugin/" + LaunchViewBundleInfo.PLUGIN_ID + "/icons/terminate_co.png"); //$NON-NLS-1$ //$NON-NLS-2$ + + return item; + } + + @CanExecute + public boolean isEnabled() { + Set elements = view.get(); + return !elements.isEmpty() && elements.stream().allMatch(m -> m.canTerminate()); + } + + @Execute + public void run() { + view.get().forEach(e -> e.terminate()); + } + +}