Move SessionFinishCallback into TermSession

The interface isn't useful except to users of TermSession, so just move
it into there.

Signed-off-by: Jack Palevich <jackpal@google.com>

diff --git a/src/jackpal/androidterm/TermService.java b/src/jackpal/androidterm/TermService.java
index dbe3c21..71992cd 100644 (file)
--- a/src/jackpal/androidterm/TermService.java
+++ b/src/jackpal/androidterm/TermService.java
@@ -26,12 +26,11 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 
 import jackpal.androidterm.compat.ServiceForegroundCompat;
-import jackpal.androidterm.model.SessionFinishCallback;
 import jackpal.androidterm.model.UpdateCallback;
 import jackpal.androidterm.session.TermSession;
 import jackpal.androidterm.util.SessionList;
 
-public class TermService extends Service implements SessionFinishCallback
+public class TermService extends Service implements TermSession.FinishCallback
 {
     /* Parallels the value of START_STICKY on API Level >= 5 */
     private static final int COMPAT_START_STICKY = 1;

diff --git a/src/jackpal/androidterm/model/SessionFinishCallback.java b/src/jackpal/androidterm/model/SessionFinishCallback.java
deleted file mode 100644 (file)
index fe01d0d..0000000
--- a/src/jackpal/androidterm/model/SessionFinishCallback.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jackpal.androidterm.model;
-
-import jackpal.androidterm.session.TermSession;
-
-/**
- * Callback to be invoked when a TermSession finishes.
- */
-public interface SessionFinishCallback {
-    void onSessionFinish(TermSession session);
-}

diff --git a/src/jackpal/androidterm/session/TermSession.java b/src/jackpal/androidterm/session/TermSession.java
index 821bcd7..b115fe1 100644 (file)
--- a/src/jackpal/androidterm/session/TermSession.java
+++ b/src/jackpal/androidterm/session/TermSession.java
@@ -34,7 +34,6 @@ import android.util.Log;
 
 import jackpal.androidterm.Exec;
 import jackpal.androidterm.TermDebug;
-import jackpal.androidterm.model.SessionFinishCallback;
 import jackpal.androidterm.model.UpdateCallback;
 import jackpal.androidterm.util.ByteQueue;
 import jackpal.androidterm.util.TermSettings;
@@ -47,7 +46,6 @@ import jackpal.androidterm.util.TermSettings;
 public class TermSession {
     private TermSettings mSettings;
     private UpdateCallback mNotify;
-    private SessionFinishCallback mFinishCallback;
 
     private int mProcId;
     private FileDescriptor mTermFd;
@@ -76,6 +74,14 @@ public class TermSession {
     private static final int NEW_INPUT = 1;
     private static final int PROCESS_EXITED = 2;
 
+    /**
+     * Callback to be invoked when a TermSession finishes.
+     */
+    public interface FinishCallback {
+        void onSessionFinish(TermSession session);
+    }
+    private FinishCallback mFinishCallback;
+
     private boolean mIsRunning = false;
     private Handler mMsgHandler = new Handler() {
         @Override
@@ -91,7 +97,7 @@ public class TermSession {
         }
     };
 
-    public TermSession(TermSettings settings, SessionFinishCallback finishCallback, String initialCommand) {
+    public TermSession(TermSettings settings, FinishCallback finishCallback, String initialCommand) {
         mSettings = settings;
         mFinishCallback = finishCallback;