-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix files that have been checked in with \r\n to use only \n
- Loading branch information
Showing
6 changed files
with
175 additions
and
175 deletions.
There are no files selected for viewing
48 changes: 24 additions & 24 deletions
48
ant/org.eclipse.ant.launching/.externalToolBuilders/build remote support [Builder].launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> | ||
| <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="after_clean,"/> | ||
| <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> | ||
| <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> | ||
| <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.ant.launching/lib" type="2"/> </resources>}"/> | ||
| <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> | ||
| <listEntry value="/org.eclipse.ant.launching/buildfiles/buildRemote.xml"/> | ||
| </listAttribute> | ||
| <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> | ||
| <listEntry value="1"/> | ||
| </listAttribute> | ||
| <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ant.launching"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> | ||
| <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.ant.launching/buildfiles/buildRemote.xml" type="1"/> <item path="/org.eclipse.ant.launching/remote" type="2"/> </resources>}"/> | ||
| <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.launching/buildfiles/buildRemote.xml}"/> | ||
| <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/> | ||
| <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> | ||
| <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> | ||
| </launchConfiguration> | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> | ||
| <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="after_clean,"/> | ||
| <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> | ||
| <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> | ||
| <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.ant.launching/lib" type="2"/> </resources>}"/> | ||
| <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> | ||
| <listEntry value="/org.eclipse.ant.launching/buildfiles/buildRemote.xml"/> | ||
| </listAttribute> | ||
| <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> | ||
| <listEntry value="1"/> | ||
| </listAttribute> | ||
| <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ant.launching"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> | ||
| <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.ant.launching/buildfiles/buildRemote.xml" type="1"/> <item path="/org.eclipse.ant.launching/remote" type="2"/> </resources>}"/> | ||
| <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.launching/buildfiles/buildRemote.xml}"/> | ||
| <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/> | ||
| <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> | ||
| <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> | ||
| </launchConfiguration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| Copyright (c) 2020 Michael Schnell 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: | ||
| Michael Schnell - initial API and implementation | ||
| --> | ||
| <project name="TOP" default="Middle.Base.DoBase"> | ||
| <include> | ||
| <javaresource name="BaseBuild.xml" classpath="." /> | ||
| </include> | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| Copyright (c) 2020 Michael Schnell 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: | ||
| Michael Schnell - initial API and implementation | ||
| --> | ||
| <project name="TOP" default="Middle.Base.DoBase"> | ||
| <include> | ||
| <javaresource name="BaseBuild.xml" classpath="." /> | ||
| </include> | ||
| </project> |
36 changes: 18 additions & 18 deletions
36
ant/org.eclipse.ant.tests.ui/testbuildfiles/BaseBaseBuild.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| Copyright (c) 2020 Michael Schnell 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: | ||
| Michael Schnell - initial API and implementation | ||
| --> | ||
| <project name="Base"> | ||
| <target name="DoBase"> | ||
| <echo message="Hello ANT" /> | ||
| </target> | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| Copyright (c) 2020 Michael Schnell 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: | ||
| Michael Schnell - initial API and implementation | ||
| --> | ||
| <project name="Base"> | ||
| <target name="DoBase"> | ||
| <echo message="Hello ANT" /> | ||
| </target> | ||
| </project> |
44 changes: 22 additions & 22 deletions
44
ant/org.eclipse.ant.tests.ui/testbuildfiles/BaseBuild.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,23 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| Copyright (c) 2020 Michael Schnell 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: | ||
| Michael Schnell - initial API and implementation | ||
| --> | ||
| <project name="Middle"> | ||
| <include> | ||
| <javaresource name="BaseBaseBuild.xml" classpath="." /> | ||
| </include> | ||
|
|
||
| <target name="DoMore"> | ||
| <echo message="Hello ANT" /> | ||
| </target> | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| Copyright (c) 2020 Michael Schnell 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: | ||
| Michael Schnell - initial API and implementation | ||
| --> | ||
| <project name="Middle"> | ||
| <include> | ||
| <javaresource name="BaseBaseBuild.xml" classpath="." /> | ||
| </include> | ||
|
|
||
| <target name="DoMore"> | ||
| <echo message="Hello ANT" /> | ||
| </target> | ||
| </project> |
72 changes: 36 additions & 36 deletions
72
debug/org.eclipse.debug.ui.launchview/.settings/org.eclipse.pde.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
114 changes: 57 additions & 57 deletions
114
...ebug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/view/TerminateAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<ILaunchObject> 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<ILaunchObject> elements = view.get(); | ||
| return !elements.isEmpty() && elements.stream().allMatch(m -> m.canTerminate()); | ||
| } | ||
|
|
||
| @Execute | ||
| public void run() { | ||
| view.get().forEach(e -> e.terminate()); | ||
| } | ||
|
|
||
| } |