[395211] fix shutdown deadlock etc.

3 files changed, 8 insertions, 22 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/PrintStreamExceptionHandler.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/PrintStreamExceptionHandler.java
index 175d731cd1..245da67730 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/PrintStreamExceptionHandler.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/PrintStreamExceptionHandler.java
@@ -10,14 +10,13 @@
 package org.eclipse.jpt.common.utility.internal;
 
 import java.io.PrintStream;
-import org.eclipse.jpt.common.utility.ExceptionHandler;
 
 /**
  * An exception handler that prints the exceptions to the configured
  * {@link PrintStream}.
  */
 public class PrintStreamExceptionHandler
-	implements ExceptionHandler
+	extends ExceptionHandlerAdapter
 {
 	private final PrintStream printStream;
 
@@ -33,12 +32,8 @@ public class PrintStreamExceptionHandler
 		this.printStream = printStream;
 	}
 
+	@Override
 	public void handleException(Throwable t) {
 		t.printStackTrace(this.printStream);
 	}
-
-	@Override
-	public String toString() {
-		return ObjectTools.toString(this);
-	}
 }
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/PrintWriterExceptionHandler.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/PrintWriterExceptionHandler.java
index 48cf43116e..4b1e16dd5a 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/PrintWriterExceptionHandler.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/PrintWriterExceptionHandler.java
@@ -10,14 +10,13 @@
 package org.eclipse.jpt.common.utility.internal;
 
 import java.io.PrintWriter;
-import org.eclipse.jpt.common.utility.ExceptionHandler;
 
 /**
  * An exception handler that prints the exceptions to the configured
  * {@link PrintWriter}.
  */
 public class PrintWriterExceptionHandler
-	implements ExceptionHandler
+	extends ExceptionHandlerAdapter
 {
 	private final PrintWriter printWriter;
 
@@ -33,12 +32,8 @@ public class PrintWriterExceptionHandler
 		this.printWriter = printWriter;
 	}
 
+	@Override
 	public void handleException(Throwable t) {
 		t.printStackTrace(this.printWriter);
 	}
-
-	@Override
-	public String toString() {
-		return ObjectTools.toString(this);
-	}
 }
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/log/LoggingMultiThreadedExceptionHandler.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/log/LoggingMultiThreadedExceptionHandler.java
index f195f3023c..84b8680e4e 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/log/LoggingMultiThreadedExceptionHandler.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/log/LoggingMultiThreadedExceptionHandler.java
@@ -12,14 +12,13 @@ package org.eclipse.jpt.common.utility.internal.log;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import org.eclipse.jpt.common.utility.MultiThreadedExceptionHandler;
-import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.jpt.common.utility.internal.MultiThreadedExceptionHandlerAdapter;
 
 /**
  * This exception handler logs any exceptions to a JDK logger.
  */
 public class LoggingMultiThreadedExceptionHandler
-	implements MultiThreadedExceptionHandler
+	extends MultiThreadedExceptionHandlerAdapter
 {
 	private final Logger logger;
 	private final Level level;
@@ -67,6 +66,7 @@ public class LoggingMultiThreadedExceptionHandler
 	}
 
 
+	@Override
 	public void handleException(Throwable exception) {
 		this.handleException(null, exception);
 	}
@@ -76,6 +76,7 @@ public class LoggingMultiThreadedExceptionHandler
 	 * does not pass through {@link Logger#doLog(LogRecord)}
 	 * like all the other <code>Logger#log(...)</code> methods.
 	 */
+	@Override
 	public void handleException(Thread thread, Throwable exception) {
 		LogRecord logRecord = new LogRecord(this.level, this.message);
 		logRecord.setParameters(new Object[] { (thread == null) ? "null" : thread.getName() }); //$NON-NLS-1$
@@ -84,9 +85,4 @@ public class LoggingMultiThreadedExceptionHandler
 		logRecord.setResourceBundle(this.logger.getResourceBundle());
 		this.logger.log(logRecord);
 	}
-
-	@Override
-	public String toString() {
-		return ObjectTools.toString(this);
-	}
 }