Skip to content

Commit 586ef10

Browse files
committed
This PR adds @SuppressWarnings("deprecation") to avoid warnings caused
by the usage of the deprecated Key class, which is marked for removal since 2024-03.
1 parent 7a3a105 commit 586ef10

9 files changed

+14
-3
lines changed

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/AbstractKeyFormatter.java

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
*
3636
* @since 3.0
3737
*/
38+
@SuppressWarnings("removal")
3839
public abstract class AbstractKeyFormatter implements IKeyFormatter {
3940

4041
/**

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/AbstractModifierKeyComparator.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import java.util.Comparator;
1717
import org.eclipse.ui.keys.ModifierKey;
1818

19+
@SuppressWarnings("removal")
1920
abstract class AbstractModifierKeyComparator implements Comparator<ModifierKey> {
2021

2122
@Override

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/AlphabeticModifierKeyComparator.java

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
*
2323
* @since 3.0
2424
*/
25+
@SuppressWarnings("removal")
2526
public class AlphabeticModifierKeyComparator implements Comparator<ModifierKey> {
2627

2728
@Override

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/CompactKeyFormatter.java

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
*/
3535
public class CompactKeyFormatter extends NativeKeyFormatter {
3636

37+
@SuppressWarnings("removal")
3738
@Override
3839
public String format(KeySequence keySequence) {
3940
StringBuilder stringBuffer = new StringBuilder();
@@ -67,6 +68,7 @@ public String format(KeySequence keySequence) {
6768
return stringBuffer.toString();
6869
}
6970

71+
@SuppressWarnings("removal")
7072
public String formatKeyStrokes(Set<ModifierKey> modifierKeys, List<?> naturalKeys) {
7173
StringBuilder stringBuffer = new StringBuilder();
7274
String keyDelimiter = getKeyDelimiter();

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/EmacsKeyFormatter.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import java.util.Comparator;
1818
import java.util.ResourceBundle;
19-
2019
import org.eclipse.ui.internal.util.Util;
2120
import org.eclipse.ui.keys.Key;
2221
import org.eclipse.ui.keys.KeySequence;
@@ -50,6 +49,7 @@ public class EmacsKeyFormatter extends AbstractKeyFormatter {
5049
* @param key The key to format; must not be <code>null</code>.
5150
* @return The key formatted as a string; should not be <code>null</code>.
5251
*/
52+
@SuppressWarnings("removal")
5353
@Override
5454
public String format(Key key) {
5555
if (key instanceof ModifierKey) {
@@ -62,11 +62,13 @@ public String format(Key key) {
6262
return super.format(key).toLowerCase();
6363
}
6464

65+
@SuppressWarnings("removal")
6566
@Override
6667
protected String getKeyDelimiter() {
6768
return Util.translateString(RESOURCE_BUNDLE, KEY_DELIMITER_KEY, KeyStroke.KEY_DELIMITER, false, false);
6869
}
6970

71+
@SuppressWarnings("removal")
7072
@Override
7173
protected String getKeyStrokeDelimiter() {
7274
return Util.translateString(RESOURCE_BUNDLE, KEY_STROKE_DELIMITER_KEY, KeySequence.KEY_STROKE_DELIMITER, false,

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/FormalKeyFormatter.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package org.eclipse.ui.internal.keys;
1616

1717
import java.util.Comparator;
18-
1918
import org.eclipse.ui.keys.Key;
2019
import org.eclipse.ui.keys.KeySequence;
2120
import org.eclipse.ui.keys.KeyStroke;
@@ -34,16 +33,19 @@ public class FormalKeyFormatter extends AbstractKeyFormatter {
3433
*/
3534
private static final Comparator FORMAL_MODIFIER_KEY_COMPARATOR = new AlphabeticModifierKeyComparator();
3635

36+
@SuppressWarnings("removal")
3737
@Override
3838
public String format(Key key) {
3939
return key.toString();
4040
}
4141

42+
@SuppressWarnings("removal")
4243
@Override
4344
protected String getKeyDelimiter() {
4445
return KeyStroke.KEY_DELIMITER;
4546
}
4647

48+
@SuppressWarnings("removal")
4749
@Override
4850
protected String getKeyStrokeDelimiter() {
4951
return KeySequence.KEY_STROKE_DELIMITER;

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/MacKeyFormatter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
import java.util.Comparator;
1818
import java.util.HashMap;
1919
import java.util.ResourceBundle;
20-
2120
import org.eclipse.ui.internal.util.Util;
2221
import org.eclipse.ui.keys.CharacterKey;
2322
import org.eclipse.ui.keys.Key;
2423
import org.eclipse.ui.keys.KeySequence;
2524
import org.eclipse.ui.keys.ModifierKey;
2625
import org.eclipse.ui.keys.SpecialKey;
2726

27+
@SuppressWarnings("removal")
2828
public final class MacKeyFormatter extends AbstractKeyFormatter {
2929

3030
private static final class MacModifierKeyComparator extends AbstractModifierKeyComparator {

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/NativeKeyFormatter.java

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
*
3333
* @since 3.0
3434
*/
35+
@SuppressWarnings("removal")
3536
public class NativeKeyFormatter extends AbstractKeyFormatter {
3637

3738
/**

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/keys/NativeModifierKeyComparator.java

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
*
2626
* @since 3.0
2727
*/
28+
@SuppressWarnings("removal")
2829
class NativeModifierKeyComparator implements Comparator<ModifierKey> {
2930

3031
/**

0 commit comments

Comments
 (0)