Skip to content

Commit 1abb990

Browse files
authored
Restore the empty activity IDs (#1045)
In #974 I removed activities we were not using anymore, but it turns out if LaunchUtils.enableActivity is called on a removed id, strange things happen, such as other activities incorrectly being enabled. This may be a bug in platform, or just undefined behavior. But because extenders do have calls to LaunchUtils.enableActivity in their code, leave the empty activity ids behind. Fixes #1044
1 parent 5667224 commit 1abb990

File tree

2 files changed

+47
-0
lines changed

2 files changed

+47
-0
lines changed

releng/org.eclipse.cdt/plugin.properties

+9
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,12 @@ cheatsheet.helloworld.desc=Create a Hello World Program in C++
1717
cheatsheet.helloworld.name=Hello World
1818

1919
activity.name = Debug Update Modes
20+
activity.description.dsf = Debug Services Framework
21+
activity.name.dsf = CDT-DSF Debug Services Framework
22+
23+
activity.description.dsfgdb = C/C++ debugging with the DSF GDB debugger
24+
activity.name.dsfgdb = CDT DSF-GDB - GDB Debugging
25+
activity.description.cdtdebug = Commands for C/C++ debugging
26+
activity.name.cdtdebug = CDT Debug - C/C++ Development Tools
27+
activity.description.cdigdb = C/C++ debugging with the CDI (legacy) GDB debugger
28+
activity.name.cdigdb = CDT CDI-GDB - GDB Debugging (Legacy)

releng/org.eclipse.cdt/plugin.xml

+38
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,42 @@
1515
pattern="org\.eclipse\.cdt\.dsf\.ui/org\.eclipse\.cdt\.dsf\.debug\.ui\.[A-Za-z]+\.viewmodel\.update\.actions\.refresh">
1616
</activityPatternBinding>
1717
</extension>
18+
19+
<!-- In #974 I removed activities we were not using anymore, but it turns
20+
out if LaunchUtils.enableActivity is called on a removed id, strange
21+
things happen, such as other activities incorrectly being enabled.
22+
This may be a bug in platform, or just undefined behavior. But because
23+
extenders do have calls to LaunchUtils.enableActivity in their code,
24+
leave the empty activity ids behind. -->
25+
26+
<extension
27+
point="org.eclipse.ui.activities">
28+
29+
<activity
30+
name="%activity.name.dsf"
31+
description="%activity.description.dsf"
32+
id="org.eclipse.cdt.dsf.ui.dsfActivity">
33+
</activity>
34+
35+
<activity
36+
name="%activity.name.dsfgdb"
37+
description="%activity.description.dsfgdb"
38+
id="org.eclipse.cdt.debug.dsfgdbActivity">
39+
</activity>
40+
41+
<activity
42+
name="%activity.name.cdtdebug"
43+
description="%activity.description.cdtdebug"
44+
id="org.eclipse.cdt.debug.ui.cdtActivity">
45+
</activity>
46+
47+
<defaultEnablement id="org.eclipse.cdt.debug.ui.cdtActivity" />
48+
49+
<activity
50+
name="%activity.name.cdigdb"
51+
description="%activity.description.cdigdb"
52+
id="org.eclipse.cdt.debug.cdigdbActivity">
53+
</activity>
54+
55+
</extension>
1856
</plugin>

0 commit comments

Comments
 (0)