Skip to content

Commit e4b25da

Browse files
EcljpseB0Tjukzi
EcljpseB0T
authored and
jukzi
committed
delete WorkbenchCommandSupport "API is scheduled for deletion"
fix "overriding a synchronized method without being synchronized" and several deprecation warnings
1 parent 3448545 commit e4b25da

File tree

55 files changed

+413
-5879
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+413
-5879
lines changed

‎bundles/org.eclipse.core.commands/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.core.commands
5-
Bundle-Version: 3.11.300.qualifier
5+
Bundle-Version: 3.12.0.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Export-Package: org.eclipse.core.commands,

‎bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/CommandException.java

+1-20
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ public abstract class CommandException extends Exception {
3131
*/
3232
private static final long serialVersionUID = 5389763628699257234L;
3333

34-
/**
35-
* This member variable is required here to allow us to compile against JCL
36-
* foundation libraries. The value may be <code>null</code>.
37-
*/
38-
private Throwable cause;
39-
4034
/**
4135
* Creates a new instance of this class with the specified detail message.
4236
*
@@ -57,20 +51,7 @@ public CommandException(final String message) {
5751
* the cause; may be <code>null</code>.
5852
*/
5953
public CommandException(final String message, final Throwable cause) {
60-
super(message);
61-
// don't pass the cause to super, to allow compilation against JCL Foundation
62-
this.cause = cause;
63-
}
64-
65-
/**
66-
* Returns the cause of this throwable or <code>null</code> if the
67-
* cause is nonexistent or unknown.
68-
*
69-
* @return the cause or <code>null</code>
70-
*/
71-
@Override
72-
public Throwable getCause() {
73-
return cause;
54+
super(message, cause);
7455
}
7556

7657
}

‎bundles/org.eclipse.jface/src/org/eclipse/jface/resource/DeviceResourceException.java

+1-17
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
*/
2222
public class DeviceResourceException extends RuntimeException {
2323

24-
private Throwable cause;
25-
2624
/**
2725
* All serializable objects should have a stable serialVersionUID
2826
*/
@@ -36,9 +34,7 @@ public class DeviceResourceException extends RuntimeException {
3634
* @param cause cause of the exception (or null if none)
3735
*/
3836
public DeviceResourceException(DeviceResourceDescriptor<?> missingResource, Throwable cause) {
39-
super("Unable to create resource " + missingResource); //$NON-NLS-1$
40-
// don't pass the cause to super, to allow compilation against JCL Foundation (bug 80059)
41-
this.cause = cause;
37+
super("Unable to create resource " + missingResource, cause); //$NON-NLS-1$
4238
}
4339

4440
/**
@@ -51,16 +47,4 @@ public DeviceResourceException(DeviceResourceDescriptor<?> missingResource) {
5147
this(missingResource, null);
5248
}
5349

54-
/**
55-
* Returns the cause of this throwable or <code>null</code> if the
56-
* cause is nonexistent or unknown.
57-
*
58-
* @return the cause or <code>null</code>
59-
* @since 3.1
60-
*/
61-
@Override
62-
public Throwable getCause() {
63-
return cause;
64-
}
65-
6650
}

‎bundles/org.eclipse.ui.workbench/.settings/.api_filters

+203
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<component id="org.eclipse.ui.workbench" version="2">
3+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.AbstractHandler">
4+
<filter id="305324134">
5+
<message_arguments>
6+
<message_argument value="org.eclipse.ui.commands.AbstractHandler"/>
7+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
8+
</message_arguments>
9+
</filter>
10+
</resource>
11+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.ActionHandler">
12+
<filter id="305324134">
13+
<message_arguments>
14+
<message_argument value="org.eclipse.ui.commands.ActionHandler"/>
15+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
16+
</message_arguments>
17+
</filter>
18+
</resource>
19+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.CategoryEvent">
20+
<filter id="305324134">
21+
<message_arguments>
22+
<message_argument value="org.eclipse.ui.commands.CategoryEvent"/>
23+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
24+
</message_arguments>
25+
</filter>
26+
</resource>
27+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.CommandEvent">
28+
<filter id="305324134">
29+
<message_arguments>
30+
<message_argument value="org.eclipse.ui.commands.CommandEvent"/>
31+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
32+
</message_arguments>
33+
</filter>
34+
</resource>
35+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.CommandException">
36+
<filter id="305324134">
37+
<message_arguments>
38+
<message_argument value="org.eclipse.ui.commands.CommandException"/>
39+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
40+
</message_arguments>
41+
</filter>
42+
</resource>
43+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.CommandManagerEvent">
44+
<filter id="305324134">
45+
<message_arguments>
46+
<message_argument value="org.eclipse.ui.commands.CommandManagerEvent"/>
47+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
48+
</message_arguments>
49+
</filter>
50+
</resource>
51+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.ExecutionException">
52+
<filter id="305324134">
53+
<message_arguments>
54+
<message_argument value="org.eclipse.ui.commands.ExecutionException"/>
55+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
56+
</message_arguments>
57+
</filter>
58+
</resource>
59+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.HandlerEvent">
60+
<filter id="305324134">
61+
<message_arguments>
62+
<message_argument value="org.eclipse.ui.commands.HandlerEvent"/>
63+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
64+
</message_arguments>
65+
</filter>
66+
</resource>
67+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.HandlerSubmission">
68+
<filter id="305324134">
69+
<message_arguments>
70+
<message_argument value="org.eclipse.ui.commands.HandlerSubmission"/>
71+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
72+
</message_arguments>
73+
</filter>
74+
</resource>
75+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.ICategory">
76+
<filter id="305324134">
77+
<message_arguments>
78+
<message_argument value="org.eclipse.ui.commands.ICategory"/>
79+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
80+
</message_arguments>
81+
</filter>
82+
</resource>
83+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.ICategoryListener">
84+
<filter id="305324134">
85+
<message_arguments>
86+
<message_argument value="org.eclipse.ui.commands.ICategoryListener"/>
87+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
88+
</message_arguments>
89+
</filter>
90+
</resource>
91+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.ICommand">
92+
<filter id="305324134">
93+
<message_arguments>
94+
<message_argument value="org.eclipse.ui.commands.ICommand"/>
95+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
96+
</message_arguments>
97+
</filter>
98+
</resource>
99+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.ICommandListener">
100+
<filter id="305324134">
101+
<message_arguments>
102+
<message_argument value="org.eclipse.ui.commands.ICommandListener"/>
103+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
104+
</message_arguments>
105+
</filter>
106+
</resource>
107+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.ICommandManager">
108+
<filter id="305324134">
109+
<message_arguments>
110+
<message_argument value="org.eclipse.ui.commands.ICommandManager"/>
111+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
112+
</message_arguments>
113+
</filter>
114+
</resource>
115+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.ICommandManagerListener">
116+
<filter id="305324134">
117+
<message_arguments>
118+
<message_argument value="org.eclipse.ui.commands.ICommandManagerListener"/>
119+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
120+
</message_arguments>
121+
</filter>
122+
</resource>
123+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.IHandler">
124+
<filter id="305324134">
125+
<message_arguments>
126+
<message_argument value="org.eclipse.ui.commands.IHandler"/>
127+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
128+
</message_arguments>
129+
</filter>
130+
</resource>
131+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.IHandlerListener">
132+
<filter id="305324134">
133+
<message_arguments>
134+
<message_argument value="org.eclipse.ui.commands.IHandlerListener"/>
135+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
136+
</message_arguments>
137+
</filter>
138+
</resource>
139+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.IKeyConfiguration">
140+
<filter id="305324134">
141+
<message_arguments>
142+
<message_argument value="org.eclipse.ui.commands.IKeyConfiguration"/>
143+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
144+
</message_arguments>
145+
</filter>
146+
</resource>
147+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.IKeyConfigurationListener">
148+
<filter id="305324134">
149+
<message_arguments>
150+
<message_argument value="org.eclipse.ui.commands.IKeyConfigurationListener"/>
151+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
152+
</message_arguments>
153+
</filter>
154+
</resource>
155+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.IKeySequenceBinding">
156+
<filter id="305324134">
157+
<message_arguments>
158+
<message_argument value="org.eclipse.ui.commands.IKeySequenceBinding"/>
159+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
160+
</message_arguments>
161+
</filter>
162+
</resource>
163+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.IWorkbenchCommandSupport">
164+
<filter id="305324134">
165+
<message_arguments>
166+
<message_argument value="org.eclipse.ui.commands.IWorkbenchCommandSupport"/>
167+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
168+
</message_arguments>
169+
</filter>
170+
</resource>
171+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.KeyConfigurationEvent">
172+
<filter id="305324134">
173+
<message_arguments>
174+
<message_argument value="org.eclipse.ui.commands.KeyConfigurationEvent"/>
175+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
176+
</message_arguments>
177+
</filter>
178+
</resource>
179+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.NotDefinedException">
180+
<filter id="305324134">
181+
<message_arguments>
182+
<message_argument value="org.eclipse.ui.commands.NotDefinedException"/>
183+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
184+
</message_arguments>
185+
</filter>
186+
</resource>
187+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.NotHandledException">
188+
<filter id="305324134">
189+
<message_arguments>
190+
<message_argument value="org.eclipse.ui.commands.NotHandledException"/>
191+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
192+
</message_arguments>
193+
</filter>
194+
</resource>
195+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.commands.Priority">
196+
<filter id="305324134">
197+
<message_arguments>
198+
<message_argument value="org.eclipse.ui.commands.Priority"/>
199+
<message_argument value="org.eclipse.ui.workbench_3.131.100"/>
200+
</message_arguments>
201+
</filter>
202+
</resource>
203+
</component>

‎bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbench.java

-16
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.eclipse.ui.activities.IWorkbenchActivitySupport;
2424
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
2525
import org.eclipse.ui.commands.ICommandService;
26-
import org.eclipse.ui.commands.IWorkbenchCommandSupport;
2726
import org.eclipse.ui.contexts.IContextService;
2827
import org.eclipse.ui.contexts.IWorkbenchContextSupport;
2928
import org.eclipse.ui.handlers.IHandlerService;
@@ -473,21 +472,6 @@ IWorkbenchPage showPerspective(String perspectiveId, IWorkbenchWindow window, IA
473472
*/
474473
IWorkbenchActivitySupport getActivitySupport();
475474

476-
/**
477-
* Returns an interface to manage commands at the workbench level.
478-
*
479-
* @return an interface to manage commands at the workbench level. Guaranteed
480-
* not to be <code>null</code>.
481-
* @since 3.0
482-
* @deprecated Please use {@link IServiceLocator#getService(Class)} instead.
483-
* This API is scheduled for deletion, see Bug 431177 for details
484-
* @see ICommandService
485-
* @see IHandlerService
486-
* @noreference IWorkbenchCommandSupport is scheduled for deletion.
487-
*/
488-
@Deprecated
489-
IWorkbenchCommandSupport getCommandSupport();
490-
491475
/**
492476
* Returns an interface to manage contexts at the workbench level.
493477
*

0 commit comments

Comments
 (0)