Mercurial Mercurial > repos > isabelle / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/Tools/jEdit/patches/jedit/annotation
author haftmann
Wed, 24 Apr 2013 11:32:54 +0200
changeset 51750 cb154917a496
parent 50306 b655d2d0406d
permissions -rw-r--r--
avoid odd reinit after sublocale declaration
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
50306
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
     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
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
     2
 
--- 5.0.0/jEdit/org/gjt/sp/jedit/input/AbstractInputHandler.java	2012-11-17 16:41:23.000000000 +0100
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
     3
 
+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/input/AbstractInputHandler.java	2012-12-01 18:40:31.000000000 +0100
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
     4
 
@@ -29,8 +29,6 @@
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
     5
 
 import java.awt.event.KeyEvent;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
     6
 
 import java.util.Hashtable;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
     7
 
 import java.util.StringTokenizer;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
     8
 
-import javax.annotation.Nonnull;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
     9
 
-import javax.annotation.Nullable;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    10
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    11
 
 import org.gjt.sp.jedit.JEditAbstractEditAction;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    12
 
 import org.gjt.sp.jedit.gui.ShortcutPrefixActiveEvent;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    13
 
@@ -198,8 +196,7 @@
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    14
 
 	 * @param keyBinding The key binding
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    15
 
 	 * @since jEdit 3.2pre5
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    16
 
 	 */
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    17
 
-	@Nullable
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    18
 
-	public Object getKeyBinding(@Nonnull String keyBinding)
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    19
 
+	public Object getKeyBinding(String keyBinding)
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    20
 
 	{
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    21
 
 		Hashtable current = bindings;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    22
 
 		StringTokenizer st = new StringTokenizer(keyBinding);
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    23
 
diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/jEdit.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/jEdit.java
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    24
 
--- 5.0.0/jEdit/org/gjt/sp/jedit/jEdit.java	2012-11-17 16:42:29.000000000 +0100
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    25
 
+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/jEdit.java	2012-12-01 18:40:40.000000000 +0100
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    26
 
@@ -35,8 +35,6 @@
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    27
 
 import org.gjt.sp.jedit.View.ViewConfig;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    28
 
 import org.gjt.sp.jedit.bsh.UtilEvalError;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    29
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    30
 
-import javax.annotation.Nonnull;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    31
 
-import javax.annotation.Nullable;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    32
 
 import javax.swing.*;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    33
 
 import java.awt.event.*;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    34
 
 import java.io.*;
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    35
 
@@ -3853,8 +3851,7 @@
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    36
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    37
 
 	} //}}}
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    38
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    39
 
-	@Nonnull
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    40
 
-	private static String getPLAFClassName(@Nullable String lf)
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    41
 
+	private static String getPLAFClassName(String lf)
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    42
 
 	{
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    43
 
 		if (lf != null && lf.length() != 0)
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    44
 
 		{
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents:
diff changeset 
    45
 














isabelle