Enforce non-nullity for delegate objects

This commit is contained in:
Chris Beams 2014-11-22 17:20:06 +01:00
parent 16c9539597
commit b0c5e14e1a
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
2 changed files with 7 additions and 9 deletions

View file

@ -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() {

View file

@ -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");
}
}