From c7e98df174130f4f53798c090dea97a40fb9e99c Mon Sep 17 00:00:00 2001
From: Chris Beams <chris@beams.io>
Date: Sat, 22 Nov 2014 11:10:29 +0100
Subject: [PATCH] Remove #terminate method from base model classes

After removing all empty implementations of lifecycle methods (see
earlier commit), the #terminate method was no longer called anywhere
other than from CachedViewCB's #terminate method, which per its own
Javadoc is supposed to call #deactivate. Now it does just that.
---
 src/main/java/io/bitsquare/gui/CachedViewCB.java      | 2 +-
 src/main/java/io/bitsquare/gui/PresentationModel.java | 6 ------
 src/main/java/io/bitsquare/gui/UIModel.java           | 4 ----
 src/main/java/io/bitsquare/gui/ViewCB.java            | 3 ---
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/main/java/io/bitsquare/gui/CachedViewCB.java b/src/main/java/io/bitsquare/gui/CachedViewCB.java
index 5be4174ccc..6175ef9e48 100644
--- a/src/main/java/io/bitsquare/gui/CachedViewCB.java
+++ b/src/main/java/io/bitsquare/gui/CachedViewCB.java
@@ -98,7 +98,7 @@ public class CachedViewCB<T extends PresentationModel> extends ViewCB<T> {
         super.terminate();
 
         if (presentationModel != null)
-            presentationModel.terminate();
+            presentationModel.deactivate();
     }
 
 }
diff --git a/src/main/java/io/bitsquare/gui/PresentationModel.java b/src/main/java/io/bitsquare/gui/PresentationModel.java
index 0370ea01e8..ab673470c9 100644
--- a/src/main/java/io/bitsquare/gui/PresentationModel.java
+++ b/src/main/java/io/bitsquare/gui/PresentationModel.java
@@ -49,10 +49,4 @@ public class PresentationModel<T extends UIModel> {
         if (model != null)
             model.deactivate();
     }
-
-    public void terminate() {
-        log.trace("Lifecycle: terminate " + this.getClass().getSimpleName());
-        if (model != null)
-            model.terminate();
-    }
 }
diff --git a/src/main/java/io/bitsquare/gui/UIModel.java b/src/main/java/io/bitsquare/gui/UIModel.java
index 7161c0acb6..15e9b45077 100644
--- a/src/main/java/io/bitsquare/gui/UIModel.java
+++ b/src/main/java/io/bitsquare/gui/UIModel.java
@@ -34,8 +34,4 @@ public class UIModel {
     public void deactivate() {
         log.trace("Lifecycle: deactivate " + this.getClass().getSimpleName());
     }
-
-    public void terminate() {
-        log.trace("Lifecycle: terminate " + this.getClass().getSimpleName());
-    }
 }
diff --git a/src/main/java/io/bitsquare/gui/ViewCB.java b/src/main/java/io/bitsquare/gui/ViewCB.java
index efbb46dfe7..2066e87aeb 100644
--- a/src/main/java/io/bitsquare/gui/ViewCB.java
+++ b/src/main/java/io/bitsquare/gui/ViewCB.java
@@ -79,9 +79,6 @@ public class ViewCB<T extends PresentationModel> implements Initializable {
      */
     public void terminate() {
         log.trace("Lifecycle: terminate " + this.getClass().getSimpleName());
-
-        if (presentationModel != null)
-            presentationModel.terminate();
     }
 
     /**