Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-18 14:55:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove null checks in CachedViewCB activation methods

Browse Source 
... as model can never be null
This commit is contained in:
Chris Beams 2014-11-22 15:31:59 +01:00
parent d660b74b13
commit eb310baae0
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/io/bitsquare/gui/CachedViewCB.java
View File

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