Skip to content

Commit 46e490a

Browse files
elsazacmickaelistria
authored andcommitted
The classes KeySequence and KeyStroke from org.eclipse.ui.keys are
deprecated. They have been replaced to use the corresponding classes from org.eclipse.jface.bindings.keys .
1 parent 62e17d4 commit 46e490a

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
import java.util.Comparator;
1818
import java.util.ResourceBundle;
19+
import org.eclipse.jface.bindings.keys.KeySequence;
20+
import org.eclipse.jface.bindings.keys.KeyStroke;
1921
import org.eclipse.ui.internal.util.Util;
2022
import org.eclipse.ui.keys.Key;
21-
import org.eclipse.ui.keys.KeySequence;
22-
import org.eclipse.ui.keys.KeyStroke;
2323
import org.eclipse.ui.keys.ModifierKey;
2424

2525
/**
@@ -62,13 +62,11 @@ public String format(Key key) {
6262
return super.format(key).toLowerCase();
6363
}
6464

65-
@SuppressWarnings("removal")
6665
@Override
6766
protected String getKeyDelimiter() {
6867
return Util.translateString(RESOURCE_BUNDLE, KEY_DELIMITER_KEY, KeyStroke.KEY_DELIMITER, false, false);
6968
}
7069

71-
@SuppressWarnings("removal")
7270
@Override
7371
protected String getKeyStrokeDelimiter() {
7472
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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
package org.eclipse.ui.internal.keys;
1616

1717
import java.util.Comparator;
18+
import org.eclipse.jface.bindings.keys.KeySequence;
19+
import org.eclipse.jface.bindings.keys.KeyStroke;
1820
import org.eclipse.ui.keys.Key;
19-
import org.eclipse.ui.keys.KeySequence;
20-
import org.eclipse.ui.keys.KeyStroke;
2121

2222
/**
2323
* Formats the keys in the internal key sequence grammar. This is used for
@@ -39,13 +39,13 @@ public String format(Key key) {
3939
return key.toString();
4040
}
4141

42-
@SuppressWarnings("removal")
42+
4343
@Override
4444
protected String getKeyDelimiter() {
4545
return KeyStroke.KEY_DELIMITER;
4646
}
4747

48-
@SuppressWarnings("removal")
48+
4949
@Override
5050
protected String getKeyStrokeDelimiter() {
5151
return KeySequence.KEY_STROKE_DELIMITER;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import java.util.Comparator;
1818
import java.util.HashMap;
1919
import java.util.ResourceBundle;
20+
import org.eclipse.jface.bindings.keys.KeySequence;
2021
import org.eclipse.ui.internal.util.Util;
2122
import org.eclipse.ui.keys.CharacterKey;
2223
import org.eclipse.ui.keys.Key;
23-
import org.eclipse.ui.keys.KeySequence;
2424
import org.eclipse.ui.keys.ModifierKey;
2525
import org.eclipse.ui.keys.SpecialKey;
2626

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
import java.util.Comparator;
1818
import java.util.HashMap;
1919
import java.util.ResourceBundle;
20+
import org.eclipse.jface.bindings.keys.KeySequence;
21+
import org.eclipse.jface.bindings.keys.KeyStroke;
2022
import org.eclipse.ui.internal.util.Util;
2123
import org.eclipse.ui.keys.CharacterKey;
2224
import org.eclipse.ui.keys.Key;
23-
import org.eclipse.ui.keys.KeySequence;
24-
import org.eclipse.ui.keys.KeyStroke;
2525
import org.eclipse.ui.keys.ModifierKey;
2626
import org.eclipse.ui.keys.SpecialKey;
2727

0 commit comments

Comments
 (0)