1 diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/input/AbstractInputHandler.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/input/AbstractInputHandler.java |
|
2 --- 5.0.0/jEdit/org/gjt/sp/jedit/input/AbstractInputHandler.java 2012-11-17 16:41:23.000000000 +0100 |
|
3 +++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/input/AbstractInputHandler.java 2012-12-01 18:40:31.000000000 +0100 |
|
4 @@ -29,8 +29,6 @@ |
|
5 import java.awt.event.KeyEvent; |
|
6 import java.util.Hashtable; |
|
7 import java.util.StringTokenizer; |
|
8 -import javax.annotation.Nonnull; |
|
9 -import javax.annotation.Nullable; |
|
10 |
|
11 import org.gjt.sp.jedit.JEditAbstractEditAction; |
|
12 import org.gjt.sp.jedit.gui.ShortcutPrefixActiveEvent; |
|
13 @@ -198,8 +196,7 @@ |
|
14 * @param keyBinding The key binding |
|
15 * @since jEdit 3.2pre5 |
|
16 */ |
|
17 - @Nullable |
|
18 - public Object getKeyBinding(@Nonnull String keyBinding) |
|
19 + public Object getKeyBinding(String keyBinding) |
|
20 { |
|
21 Hashtable current = bindings; |
|
22 StringTokenizer st = new StringTokenizer(keyBinding); |
|
23 diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/jEdit.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/jEdit.java |
|
24 --- 5.0.0/jEdit/org/gjt/sp/jedit/jEdit.java 2012-11-17 16:42:29.000000000 +0100 |
|
25 +++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/jEdit.java 2012-12-01 18:40:40.000000000 +0100 |
|
26 @@ -35,8 +35,6 @@ |
|
27 import org.gjt.sp.jedit.View.ViewConfig; |
|
28 import org.gjt.sp.jedit.bsh.UtilEvalError; |
|
29 |
|
30 -import javax.annotation.Nonnull; |
|
31 -import javax.annotation.Nullable; |
|
32 import javax.swing.*; |
|
33 import java.awt.event.*; |
|
34 import java.io.*; |
|
35 @@ -3853,8 +3851,7 @@ |
|
36 |
|
37 } //}}} |
|
38 |
|
39 - @Nonnull |
|
40 - private static String getPLAFClassName(@Nullable String lf) |
|
41 + private static String getPLAFClassName(String lf) |
|
42 { |
|
43 if (lf != null && lf.length() != 0) |
|
44 { |
|
45 |
|