From 97817aa724fa0384cb4df4bdb70e85116495afc3 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 22 Nov 2014 20:58:43 +0100 Subject: [PATCH] Remove all but the last implementation of View#terminate --- src/main/java/io/bitsquare/gui/ActivatableView.java | 8 -------- src/main/java/io/bitsquare/gui/View.java | 5 ----- .../java/io/bitsquare/gui/main/account/AccountView.java | 7 ------- .../gui/main/account/setup/AccountSetupView.java | 1 - 4 files changed, 21 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/ActivatableView.java b/src/main/java/io/bitsquare/gui/ActivatableView.java index c290226793..967ce4e25e 100644 --- a/src/main/java/io/bitsquare/gui/ActivatableView.java +++ b/src/main/java/io/bitsquare/gui/ActivatableView.java @@ -92,12 +92,4 @@ public abstract class ActivatableView extends View imp protected void doDeactivate() { } - /** - * In caching controllers the terminate calls the deactivate method. - */ - @Override - public void terminate() { - model.deactivate(); - } - } diff --git a/src/main/java/io/bitsquare/gui/View.java b/src/main/java/io/bitsquare/gui/View.java index 2590b2b2fa..33cf493f02 100644 --- a/src/main/java/io/bitsquare/gui/View.java +++ b/src/main/java/io/bitsquare/gui/View.java @@ -71,12 +71,7 @@ public abstract class View implements Initializable { } } - /** - * Called automatically when view gets removed. Used for house keeping (removing listeners, - * stopping timers or animations,...). - */ public void terminate() { - log.trace("Lifecycle: terminate " + this.getClass().getSimpleName()); } /** diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/src/main/java/io/bitsquare/gui/main/account/AccountView.java index 7696c22a5b..88d4a3d844 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountView.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountView.java @@ -116,13 +116,6 @@ public class AccountView extends ActivatableView { ((TabPane) root).getSelectionModel().selectedItemProperty().removeListener(tabChangeListener); } - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - - /////////////////////////////////////////////////////////////////////////////////////////// // Navigation /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java index df38ba712f..fc078db8b8 100644 --- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java +++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java @@ -142,7 +142,6 @@ public class AccountSetupView extends View implements MultiStepNavigation { @Override public void terminate() { - super.terminate(); navigation.removeListener(listener); }