From 16647f45643c734f6aebb0f32f5c85317c6babd8 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Wed, 30 Jul 2014 13:38:19 +0200
Subject: [PATCH] SONAR-4898 rename Terminatable to Terminable

---
 .../src/main/java/org/sonar/process/Monitor.java              | 2 +-
 .../src/main/java/org/sonar/process/ProcessMXBean.java        | 2 +-
 .../src/main/java/org/sonar/process/ProcessUtils.java         | 4 ++--
 .../src/main/java/org/sonar/process/ProcessWrapper.java       | 2 +-
 .../org/sonar/process/{Terminatable.java => Terminable.java}  | 4 ++--
 .../src/main/java/org/sonar/server/app/EmbeddedTomcat.java    | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename server/sonar-process/src/main/java/org/sonar/process/{Terminatable.java => Terminable.java} (89%)

diff --git a/server/sonar-process/src/main/java/org/sonar/process/Monitor.java b/server/sonar-process/src/main/java/org/sonar/process/Monitor.java
index 0900c110973..2d6054ee11a 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/Monitor.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/Monitor.java
@@ -31,7 +31,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-public class Monitor extends Thread implements Terminatable {
+public class Monitor extends Thread implements Terminable {
 
   private static final long PING_DELAY_MS = 3000L;
   private static final long TIMEOUT_MS = 15000L;
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessMXBean.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessMXBean.java
index ed306eeba82..d212c08ccdd 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessMXBean.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessMXBean.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.process;
 
-public interface ProcessMXBean extends Terminatable {
+public interface ProcessMXBean extends Terminable {
 
   boolean isReady();
 
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessUtils.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessUtils.java
index 307743ba073..92537412587 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessUtils.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessUtils.java
@@ -50,11 +50,11 @@ public class ProcessUtils {
     }
   }
 
-  public static void addSelfShutdownHook(final Terminatable terminatable) {
+  public static void addSelfShutdownHook(final Terminable terminable) {
     Thread shutdownHook = new Thread(new Runnable() {
       @Override
       public void run() {
-        terminatable.terminate();
+        terminable.terminate();
       }
     });
     Runtime.getRuntime().addShutdownHook(shutdownHook);
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
index 7231df67ed1..3b0a960dead 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
@@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Fork and monitor a new process
  */
-public class ProcessWrapper extends Thread implements Terminatable {
+public class ProcessWrapper extends Thread implements Terminable {
 
   private final static Logger LOGGER = LoggerFactory.getLogger(ProcessWrapper.class);
   public static final long READY_TIMEOUT_MS = 120000L;
diff --git a/server/sonar-process/src/main/java/org/sonar/process/Terminatable.java b/server/sonar-process/src/main/java/org/sonar/process/Terminable.java
similarity index 89%
rename from server/sonar-process/src/main/java/org/sonar/process/Terminatable.java
rename to server/sonar-process/src/main/java/org/sonar/process/Terminable.java
index 403ba5895de..109e91c42da 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/Terminatable.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/Terminable.java
@@ -20,9 +20,9 @@
 package org.sonar.process;
 
 /**
- * This interface was not named Stopable in order to not conflict with {@link Thread#stop()}.
+ * This term "terminate" is used in order to not conflict with {@link Thread#stop()}.
  */
-public interface Terminatable {
+public interface Terminable {
   /**
    * Stops pending work. Must <b>not</b> throw an exception on error.
    */
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java b/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java
index 596541d3c3d..ef6541dbc2f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java
@@ -25,11 +25,11 @@ import org.apache.commons.io.FileUtils;
 import org.slf4j.LoggerFactory;
 import org.sonar.process.ProcessUtils;
 import org.sonar.process.Props;
-import org.sonar.process.Terminatable;
+import org.sonar.process.Terminable;
 
 import java.io.File;
 
-class EmbeddedTomcat implements Terminatable {
+class EmbeddedTomcat implements Terminable {
 
   private final Props props;
   private Tomcat tomcat = null;
-- 
2.39.5