From b0c5e14e1ac259f5a64773c96ab2b49d5835a776 Mon Sep 17 00:00:00 2001
From: Chris Beams <chris@beams.io>
Date: Sat, 22 Nov 2014 17:20:06 +0100
Subject: [PATCH] Enforce non-nullity for delegate objects

---
 .../io/bitsquare/gui/ActivatableWithDelegate.java    | 12 ++++--------
 src/main/java/io/bitsquare/gui/WithDelegate.java     |  4 +++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/bitsquare/gui/ActivatableWithDelegate.java b/src/main/java/io/bitsquare/gui/ActivatableWithDelegate.java
index 53912e6b2f..0d38dd09d2 100644
--- a/src/main/java/io/bitsquare/gui/ActivatableWithDelegate.java
+++ b/src/main/java/io/bitsquare/gui/ActivatableWithDelegate.java
@@ -25,10 +25,8 @@ public abstract class ActivatableWithDelegate<D extends Activatable> extends Wit
 
     @Override
     public final void activate() {
-        if (delegate != null)
-            delegate.activate();
-
-        doActivate();
+        delegate.activate();
+        this.doActivate();
     }
 
     protected void doActivate() {
@@ -36,10 +34,8 @@ public abstract class ActivatableWithDelegate<D extends Activatable> extends Wit
 
     @Override
     public final void deactivate() {
-        if (delegate != null)
-            delegate.deactivate();
-
-        doDeactivate();
+        delegate.deactivate();
+        this.doDeactivate();
     }
 
     protected void doDeactivate() {
diff --git a/src/main/java/io/bitsquare/gui/WithDelegate.java b/src/main/java/io/bitsquare/gui/WithDelegate.java
index 9718dbaf57..ba964d0944 100644
--- a/src/main/java/io/bitsquare/gui/WithDelegate.java
+++ b/src/main/java/io/bitsquare/gui/WithDelegate.java
@@ -17,11 +17,13 @@
 
 package io.bitsquare.gui;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public abstract class WithDelegate<D> {
 
     protected final D delegate;
 
     protected WithDelegate(D delegate) {
-        this.delegate = delegate;
+        this.delegate = checkNotNull(delegate, "Delegate object must not be null");
     }
 }