Bug 1213: Use InterruptSource.Thread

4 files changed, 11 insertions, 7 deletions

diff --git a/src/java/com/jogamp/common/util/IOUtil.java b/src/java/com/jogamp/common/util/IOUtil.java
index 88542c4..347d843 100644
--- a/src/java/com/jogamp/common/util/IOUtil.java
+++ b/src/java/com/jogamp/common/util/IOUtil.java
@@ -812,7 +812,7 @@ public class IOUtil {
             this.istreams = streams;
             this.ostream = ostream;
             this.prefix = prefix;
-            new Thread(this, "StreamMonitor-"+Thread.currentThread().getName()).start();
+            new InterruptSource.Thread(null, this, "StreamMonitor-"+Thread.currentThread().getName()).start();
         }
         @Override
         public void run()
diff --git a/src/java/jogamp/android/launcher/MainLauncher.java b/src/java/jogamp/android/launcher/MainLauncher.java
index 0dc6b4a..e0eff7d 100644
--- a/src/java/jogamp/android/launcher/MainLauncher.java
+++ b/src/java/jogamp/android/launcher/MainLauncher.java
@@ -33,6 +33,8 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 
+import com.jogamp.common.util.InterruptSource;
+
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
@@ -117,17 +119,17 @@ public class MainLauncher extends Activity {
    public void onResume() {
      Log.d(TAG, "onResume - S - "+Thread.currentThread().getName());
      super.onResume();
-     final Thread mainThread = new Thread("Main") {
+     final Thread mainThread = new InterruptSource.Thread(null, null, "Main") {
          public void run() {
              try {
-                Log.d(TAG, "onResume - main.0 - "+Thread.currentThread().getName());
+                Log.d(TAG, "onResume - main.0 - "+java.lang.Thread.currentThread().getName());
                 mainClazzMain.invoke(null, new Object[] { mainClassArgs } );
              } catch (final InvocationTargetException ite) {
                  ite.getTargetException().printStackTrace();
              } catch (final Throwable t) {
                  t.printStackTrace();
              }
-             Log.d(TAG, "onResume - main.X -> finish() - "+Thread.currentThread().getName());
+             Log.d(TAG, "onResume - main.X -> finish() - "+java.lang.Thread.currentThread().getName());
              finish();
          } };
      mainThread.start();
diff --git a/src/java/jogamp/common/util/locks/SingletonInstanceFileLock.java b/src/java/jogamp/common/util/locks/SingletonInstanceFileLock.java
index 44a5d28..9fe7966 100644
--- a/src/java/jogamp/common/util/locks/SingletonInstanceFileLock.java
+++ b/src/java/jogamp/common/util/locks/SingletonInstanceFileLock.java
@@ -32,6 +32,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileLock;
+
+import com.jogamp.common.util.InterruptSource;
 import com.jogamp.common.util.locks.SingletonInstance;
 
 public class SingletonInstanceFileLock extends SingletonInstance {
@@ -76,7 +78,7 @@ public class SingletonInstanceFileLock extends SingletonInstance {
 
     private void setupFileCleanup() {
         file.deleteOnExit();
-        Runtime.getRuntime().addShutdownHook(new Thread() {
+        Runtime.getRuntime().addShutdownHook(new InterruptSource.Thread() {
             @Override
             public void run() {
                 if(isLocked()) {
diff --git a/src/java/jogamp/common/util/locks/SingletonInstanceServerSocket.java b/src/java/jogamp/common/util/locks/SingletonInstanceServerSocket.java
index 8ac73fa..6219b5c 100644
--- a/src/java/jogamp/common/util/locks/SingletonInstanceServerSocket.java
+++ b/src/java/jogamp/common/util/locks/SingletonInstanceServerSocket.java
@@ -77,7 +77,7 @@ public class SingletonInstanceServerSocket extends SingletonInstance {
 
         fullName = ilh.toString()+":"+portNumber;
         singletonServer = new Server(ilh, portNumber);
-        Runtime.getRuntime().addShutdownHook(new Thread() {
+        Runtime.getRuntime().addShutdownHook(new InterruptSource.Thread() {
             @Override
             public void run() {
                 singletonServer.kill();
@@ -152,7 +152,7 @@ public class SingletonInstanceServerSocket extends SingletonInstance {
            }
            synchronized (syncOnStartStop) {
                shallQuit = false;
-               serverThread = InterruptSource.Thread.create(null, this, sname);
+               serverThread = new InterruptSource.Thread(null, this, sname);
                serverThread.setDaemon(true);  // be a daemon, don't keep the JVM running
                serverThread.start();
                try {