From f92f7de138a24ba7712336dcad6ffe68dea28673 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Thu, 13 Nov 2014 01:02:43 +0100
Subject: [PATCH] Cleanup

---
 src/main/java/io/bitsquare/gui/CachedViewCB.java | 6 +-----
 src/main/java/io/bitsquare/gui/ViewCB.java       | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/io/bitsquare/gui/CachedViewCB.java b/src/main/java/io/bitsquare/gui/CachedViewCB.java
index 960fa696da..5be4174ccc 100644
--- a/src/main/java/io/bitsquare/gui/CachedViewCB.java
+++ b/src/main/java/io/bitsquare/gui/CachedViewCB.java
@@ -74,9 +74,7 @@ public class CachedViewCB<T extends PresentationModel> extends ViewCB<T> {
      */
     public void activate() {
         log.trace("Lifecycle: activate " + this.getClass().getSimpleName());
-       /* if (childController instanceof CachedViewCB)
-            ((CachedViewCB) childController).activate();
-*/
+
         if (presentationModel != null)
             presentationModel.activate();
     }
@@ -86,8 +84,6 @@ public class CachedViewCB<T extends PresentationModel> extends ViewCB<T> {
      */
     public void deactivate() {
         log.trace("Lifecycle: deactivate " + this.getClass().getSimpleName());
-      /*  if (childController instanceof CachedViewCB)
-            ((CachedViewCB) childController).deactivate();*/
 
         if (presentationModel != null)
             presentationModel.deactivate();
diff --git a/src/main/java/io/bitsquare/gui/ViewCB.java b/src/main/java/io/bitsquare/gui/ViewCB.java
index 6a43955681..66db9407ec 100644
--- a/src/main/java/io/bitsquare/gui/ViewCB.java
+++ b/src/main/java/io/bitsquare/gui/ViewCB.java
@@ -79,8 +79,6 @@ public class ViewCB<T extends PresentationModel> implements Initializable {
      */
     public void terminate() {
         log.trace("Lifecycle: terminate " + this.getClass().getSimpleName());
-        if (childController != null)
-            ((ViewCB<? extends PresentationModel>) childController).terminate();
 
         if (presentationModel != null)
             presentationModel.terminate();