Remove deprecated methods, fixes #69

jline · Dec 16, 2016 · c89ff39 · c89ff39
1 parent 6a26a97
commit c89ff39
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 32 deletions.
diff --git a/src/main/java/org/jline/terminal/impl/AbstractTerminal.java b/src/main/java/org/jline/terminal/impl/AbstractTerminal.java
@@ -60,17 +60,11 @@ public SignalHandler handle(Signal signal, SignalHandler handler) {
     public void raise(Signal signal) {
         Objects.requireNonNull(signal);
         SignalHandler handler = handlers.get(signal);
-        if (handler == SignalHandler.SIG_DFL) {
-            handleDefaultSignal(signal);
-        } else if (handler != SignalHandler.SIG_IGN) {
+        if (handler != SignalHandler.SIG_DFL && handler != SignalHandler.SIG_IGN) {
             handler.handle(signal);
         }
     }
 
-    @Deprecated
-    protected void handleDefaultSignal(Signal signal) {
-    }
-
     protected void echoSignal(Signal signal) {
         ControlChar cc = null;
         switch (signal) {

diff --git a/src/main/java/org/jline/utils/Signals.java b/src/main/java/org/jline/utils/Signals.java
@@ -71,18 +71,6 @@ public static Object registerDefault(String name) {
         }
     }
 
-    @Deprecated
-    public static Object registerIgnore(String name) {
-        try {
-            Class<?> signalHandlerClass = Class.forName("sun.misc.SignalHandler");
-            return doRegister(name, signalHandlerClass.getField("SIG_IGN").get(null));
-        } catch (Exception e) {
-            // Ignore this one too, if the above failed, the signal API is incompatible with what we're expecting
-            Log.debug("Error registering ignored handler for signal ", name, e);
-            return null;
-        }
-    }
-
     public static void unregister(String name, Object previous) {
         try {
             // We should make sure the current signal is the one we registered
@@ -95,19 +83,6 @@ public static void unregister(String name, Object previous) {
         }
     }
 
-    @Deprecated
-    public static void invokeHandler(String name, Object handler) {
-        try {
-            Class<?> signalClass = Class.forName("sun.misc.Signal");
-            Class<?> signalHandlerClass = Class.forName("sun.misc.SignalHandler");
-            Object signal = signalClass.getConstructor(String.class).newInstance(name);
-            signalHandlerClass.getMethod("handle", signalClass).invoke(handler, signal);
-        } catch (Exception e) {
-            // Ignore
-            Log.debug("Error invoking handler for signal ", name, e);
-        }
-    }
-
     private static Object doRegister(String name, Object handler) throws Exception {
         Log.trace(() -> "Registering signal " + name + " with handler " + toString(handler));
         if ("QUIT".equals(name) || "INFO".equals(name) && "9".equals(System.getProperty("java.specification.version"))) {