From eb310baae0dfac418b8e2c4dff2e6dacdd50513f Mon Sep 17 00:00:00 2001
From: Chris Beams <chris@beams.io>
Date: Sat, 22 Nov 2014 15:31:59 +0100
Subject: [PATCH] Remove null checks in CachedViewCB activation methods

... as model can never be null
---
 .../java/io/bitsquare/gui/CachedViewCB.java   | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/bitsquare/gui/CachedViewCB.java b/src/main/java/io/bitsquare/gui/CachedViewCB.java
index 4807c5f9e0..4978a61536 100644
--- a/src/main/java/io/bitsquare/gui/CachedViewCB.java
+++ b/src/main/java/io/bitsquare/gui/CachedViewCB.java
@@ -71,9 +71,9 @@ public class CachedViewCB<M extends Activatable> extends ViewCB<M> implements Ac
                         oldValue + " / newValue=" + newValue);
 
                 if (oldValue == null && newValue != null)
-                    activate();
+                    this.activate();
                 else if (oldValue != null && newValue == null)
-                    deactivate();
+                    this.deactivate();
             });
         }
     }
@@ -83,10 +83,8 @@ public class CachedViewCB<M extends Activatable> extends ViewCB<M> implements Ac
      */
     @Override
     public final void activate() {
-        if (model != null)
-            model.activate();
-
-        doActivate();
+        model.activate();
+        this.doActivate();
     }
 
     protected void doActivate() {
@@ -97,10 +95,8 @@ public class CachedViewCB<M extends Activatable> extends ViewCB<M> implements Ac
      */
     @Override
     public final void deactivate() {
-        if (model != null)
-            model.deactivate();
-
-        doDeactivate();
+        model.deactivate();
+        this.doDeactivate();
     }
 
     protected void doDeactivate() {
@@ -111,11 +107,7 @@ public class CachedViewCB<M extends Activatable> extends ViewCB<M> implements Ac
      */
     @Override
     public void terminate() {
-        log.trace("Lifecycle: terminate " + this.getClass().getSimpleName());
-        super.terminate();
-
-        if (model != null)
-            model.deactivate();
+        model.deactivate();
     }
 
 }