Skip to content

Commit 6219652

Browse files
committed
Reuse StartupTrace from org.eclipse.core.internal.runtime
Delete the local copy at org.eclipse.e4.ui.internal.workbench.StartupTrace and switch all call sites to the platform-provided class introduced by vogella/eclipse.platform#4, so workbench and platform bundles share one run file and one RUN_ID in ~/.eclipse/startup-trace.csv. Each affected bundle already Require-Bundles org.eclipse.core.runtime, so no MANIFEST changes are needed. Discouraged-access is set to warning in the workbench bundles, so no @SuppressWarnings is required either.
1 parent 6eaa1a7 commit 6219652

6 files changed

Lines changed: 5 additions & 170 deletions

File tree

bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
import org.eclipse.e4.ui.internal.workbench.ResourceHandler;
6565
import org.eclipse.e4.ui.internal.workbench.SelectionAggregator;
6666
import org.eclipse.e4.ui.internal.workbench.SelectionServiceImpl;
67-
import org.eclipse.e4.ui.internal.workbench.StartupTrace;
67+
import org.eclipse.core.internal.runtime.StartupTrace;
6868
import org.eclipse.e4.ui.internal.workbench.URIHelper;
6969
import org.eclipse.e4.ui.internal.workbench.WorkbenchLogger;
7070
import org.eclipse.e4.ui.model.application.MAddon;

bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/StartupTrace.java

Lines changed: 0 additions & 165 deletions
This file was deleted.

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
import org.eclipse.ui.internal.menus.WorkbenchMenuService;
227227
import org.eclipse.ui.internal.misc.Policy;
228228
import org.eclipse.ui.internal.misc.StatusUtil;
229-
import org.eclipse.e4.ui.internal.workbench.StartupTrace;
229+
import org.eclipse.core.internal.runtime.StartupTrace;
230230
import org.eclipse.ui.internal.misc.UIStats;
231231
import org.eclipse.ui.internal.model.ContributionService;
232232
import org.eclipse.ui.internal.progress.ProgressManager;

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import org.eclipse.ui.internal.help.HelpServiceImpl;
5959
import org.eclipse.ui.internal.intro.IIntroRegistry;
6060
import org.eclipse.ui.internal.intro.IntroRegistry;
61-
import org.eclipse.e4.ui.internal.workbench.StartupTrace;
61+
import org.eclipse.core.internal.runtime.StartupTrace;
6262
import org.eclipse.ui.internal.misc.StatusUtil;
6363
import org.eclipse.ui.internal.operations.WorkbenchOperationSupport;
6464
import org.eclipse.ui.internal.progress.ProgressManager;

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/registry/EditorRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
import org.eclipse.ui.internal.WorkbenchImages;
7777
import org.eclipse.ui.internal.WorkbenchMessages;
7878
import org.eclipse.ui.internal.WorkbenchPlugin;
79-
import org.eclipse.e4.ui.internal.workbench.StartupTrace;
79+
import org.eclipse.core.internal.runtime.StartupTrace;
8080
import org.eclipse.ui.internal.editorsupport.ComponentSupport;
8181
import org.eclipse.ui.internal.misc.ExternalProgramImageDescriptor;
8282
import org.eclipse.ui.internal.misc.ProgramImageDescriptor;

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/registry/ViewRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.eclipse.ui.IWorkbench;
3939
import org.eclipse.ui.activities.WorkbenchActivityHelper;
4040
import org.eclipse.ui.internal.IWorkbenchConstants;
41-
import org.eclipse.e4.ui.internal.workbench.StartupTrace;
41+
import org.eclipse.core.internal.runtime.StartupTrace;
4242
import org.eclipse.ui.internal.e4.compatibility.CompatibilityPart;
4343
import org.eclipse.ui.internal.menus.MenuHelper;
4444
import org.eclipse.ui.part.ViewPart;

0 commit comments

Comments
 (0)