From efc1ff847235116efb655bcc99bd322b701b4949 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Mon, 25 Mar 2024 21:26:38 +0100 Subject: [PATCH] Replace deprecated core.launcher.Main by equinox.launcher.Main Required for https://github.com/eclipse-equinox/equinox/pull/562 --- .../src/org/eclipse/core/tests/session/Setup.java | 2 +- .../src/org/eclipse/help/internal/standalone/Eclipse.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/Setup.java b/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/Setup.java index 118d811c038..fb5c371d5d8 100644 --- a/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/Setup.java +++ b/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/Setup.java @@ -236,7 +236,7 @@ public void fillCommandLine(List commandLine) { fillClassPath(commandLine); fillVMArgs(commandLine); fillSystemProperties(commandLine); - commandLine.add("org.eclipse.core.launcher.Main"); + commandLine.add("org.eclipse.equinox.launcher.Main"); fillEclipseArgs(commandLine); } diff --git a/ua/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java b/ua/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java index 30d3cfad71d..bc78c273632 100644 --- a/ua/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java +++ b/ua/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java @@ -22,7 +22,7 @@ /** * Eclipse launcher. Spawns eclipse executable or - * org.eclipse.core.launcher.Main. + * org.eclipse.equinox.launcher.Main. */ public class Eclipse extends Thread { // Eclipse exit codes @@ -81,7 +81,7 @@ private void prepareJavaCommand() throws Exception { } cmdarray[1 + vmArgs.size()] = "-cp"; //$NON-NLS-1$ cmdarray[2 + vmArgs.size()] = getStartupJar(); - cmdarray[3 + vmArgs.size()] = "org.eclipse.core.launcher.Main"; //$NON-NLS-1$ + cmdarray[3 + vmArgs.size()] = "org.eclipse.equinox.launcher.Main"; //$NON-NLS-1$ for (int i = 0; i < eclipseArgs.size(); i++) { cmdarray[4 + vmArgs.size() + i] = eclipseArgs.get(i); }