From cf2d1510a2f235a5ee04ab34f9326f91dcfb65ca Mon Sep 17 00:00:00 2001 From: brinn <brinn> Date: Tue, 24 Mar 2009 20:57:15 +0000 Subject: [PATCH] refactor: rename HardStopException to StopException SVN: 10357 --- .../systemsx/cisd/common/concurrent/TerminableCallable.java | 4 ++-- .../java/ch/systemsx/cisd/common/concurrent/ThreadGuard.java | 4 ++-- .../exceptions/{HardStopException.java => StopException.java} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename common/source/java/ch/systemsx/cisd/common/exceptions/{HardStopException.java => StopException.java} (92%) diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/TerminableCallable.java b/common/source/java/ch/systemsx/cisd/common/concurrent/TerminableCallable.java index 69eec3d58ea..c4f5f21daf8 100644 --- a/common/source/java/ch/systemsx/cisd/common/concurrent/TerminableCallable.java +++ b/common/source/java/ch/systemsx/cisd/common/concurrent/TerminableCallable.java @@ -19,7 +19,7 @@ package ch.systemsx.cisd.common.concurrent; import java.util.concurrent.Callable; import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel; -import ch.systemsx.cisd.common.exceptions.HardStopException; +import ch.systemsx.cisd.common.exceptions.StopException; import ch.systemsx.cisd.common.exceptions.InterruptedExceptionUnchecked; import ch.systemsx.cisd.common.utilities.ITerminable; @@ -323,7 +323,7 @@ public final class TerminableCallable<V> implements Callable<V>, ITerminable if (throwableOrNull == null) { cause = FinishCause.COMPLETED; - } else if (throwableOrNull instanceof HardStopException) + } else if (throwableOrNull instanceof StopException) { cause = FinishCause.STOPPED; } else if (throwableOrNull instanceof InterruptedExceptionUnchecked diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/ThreadGuard.java b/common/source/java/ch/systemsx/cisd/common/concurrent/ThreadGuard.java index 66a32c27c5e..842f5d37c35 100644 --- a/common/source/java/ch/systemsx/cisd/common/concurrent/ThreadGuard.java +++ b/common/source/java/ch/systemsx/cisd/common/concurrent/ThreadGuard.java @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import ch.systemsx.cisd.common.exceptions.HardStopException; +import ch.systemsx.cisd.common.exceptions.StopException; /** * A class that provides the framework for guarding a {@link Thread} such that it can be stopped @@ -53,7 +53,7 @@ final class ThreadGuard @SuppressWarnings("deprecation") private static void stopNow(Thread t) { - t.stop(new HardStopException()); + t.stop(new StopException()); } // Do not synchronize this or things will stop working! diff --git a/common/source/java/ch/systemsx/cisd/common/exceptions/HardStopException.java b/common/source/java/ch/systemsx/cisd/common/exceptions/StopException.java similarity index 92% rename from common/source/java/ch/systemsx/cisd/common/exceptions/HardStopException.java rename to common/source/java/ch/systemsx/cisd/common/exceptions/StopException.java index d8ac52f52a0..712c3a85134 100644 --- a/common/source/java/ch/systemsx/cisd/common/exceptions/HardStopException.java +++ b/common/source/java/ch/systemsx/cisd/common/exceptions/StopException.java @@ -21,7 +21,7 @@ package ch.systemsx.cisd.common.exceptions; * * @author Bernd Rinn */ -public class HardStopException extends InterruptedExceptionUnchecked +public class StopException extends InterruptedExceptionUnchecked { private static final long serialVersionUID = 1L; -- GitLab