Rename initialized to initialize, add null checks in base UI classes

src/main/java/io/bitsquare/gui/CachedViewCB.java

@@ -30,6 +30,7 @@ public class CachedViewCB<T extends PresentationModel> extends ViewCB<T> {
     @Override
     public void initialize(URL url, ResourceBundle rb) {
         log.trace("Lifecycle: initialize " + this.getClass().getSimpleName());
+        if (root != null) {
             root.sceneProperty().addListener((ov, oldValue, newValue) -> {
                 // we got removed from the scene
                 // lets terminate
@@ -38,8 +39,10 @@ public class CachedViewCB<T extends PresentationModel> extends ViewCB<T> {
                 if (oldValue == null && newValue != null) activate();
                 else if (oldValue != null && newValue == null) deactivate();
             });
+        }
 
-        presentationModel.initialized();
+        if (presentationModel != null)
+            presentationModel.initialize();
     }
 
     /**
@@ -49,6 +52,7 @@ public class CachedViewCB<T extends PresentationModel> extends ViewCB<T> {
         log.trace("Lifecycle: activate " + this.getClass().getSimpleName());
         if (childController instanceof CachedViewCB) ((CachedViewCB) childController).activate();
 
+        if (presentationModel != null)
             presentationModel.activate();
     }
 
@@ -59,6 +63,7 @@ public class CachedViewCB<T extends PresentationModel> extends ViewCB<T> {
         log.trace("Lifecycle: deactivate " + this.getClass().getSimpleName());
         if (childController instanceof CachedViewCB) ((CachedViewCB) childController).deactivate();
 
+        if (presentationModel != null)
             presentationModel.deactivate();
     }
 
@@ -70,6 +75,7 @@ public class CachedViewCB<T extends PresentationModel> extends ViewCB<T> {
         log.trace("Lifecycle: terminate " + this.getClass().getSimpleName());
         super.terminate();
 
+        if (presentationModel != null)
             presentationModel.terminate();
     }
 

src/main/java/io/bitsquare/gui/PresentationModel.java

@@ -8,25 +8,31 @@ public class PresentationModel<T extends UIModel> {
         this.model = model;
     }
 
+    // TODO Still open question if we enforce a model or not? For small UIs it might be too much overhead.
     public PresentationModel() {
     }
 
-    public void initialized() {
+    public void initialize() {
-        model.initialized();
+        if (model != null)
+            model.initialize();
+
         activate();
     }
 
     public void activate() {
+        if (model != null)
             model.activate();
     }
 
     public void deactivate() {
+        if (model != null)
             model.deactivate();
     }
 
     public void terminate() {
+        if (model != null)
             model.terminate();
+        
         deactivate();
     }
-
 }

src/main/java/io/bitsquare/gui/UIModel.java

@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory;
 public class UIModel<T> {
     private static final Logger log = LoggerFactory.getLogger(UIModel.class);
 
-    public void initialized() {
+    public void initialize() {
         activate();
     }
 

src/main/java/io/bitsquare/gui/ViewCB.java

@@ -24,12 +24,14 @@ public class ViewCB<T extends PresentationModel> implements Initializable {
     protected Initializable childController;
     //TODO Initializable has to be changed to CodeBehind<? extends PresentationModel> when all UIs are updated
     protected Initializable parentController;
+
     @FXML protected Parent root;
 
     public ViewCB(T presentationModel) {
         this.presentationModel = presentationModel;
     }
 
+    // TODO Still open question if we enforce a presentationModel or not? For small UIs it might be too much overhead.
     public ViewCB() {
     }
 
@@ -42,16 +44,17 @@ public class ViewCB<T extends PresentationModel> implements Initializable {
     @Override
     public void initialize(URL url, ResourceBundle rb) {
         log.trace("Lifecycle: initialize " + this.getClass().getSimpleName());
+        if (root != null) {
             root.sceneProperty().addListener((ov, oldValue, newValue) -> {
                 // we got removed from the scene
                 // lets terminate
                 if (oldValue != null && newValue == null)
                     terminate();
-
             });
+        }
 
-        presentationModel.initialized();
+        if (presentationModel != null)
-        presentationModel.activate();
+            presentationModel.initialize();
     }
 
     /**
@@ -63,7 +66,7 @@ public class ViewCB<T extends PresentationModel> implements Initializable {
         if (childController != null)
             ((ViewCB<? extends PresentationModel>) childController).terminate();
 
-        presentationModel.deactivate();
+        if (presentationModel != null)
             presentationModel.terminate();
     }
 

src/main/java/io/bitsquare/gui/main/MainModel.java

@@ -84,8 +84,8 @@ public class MainModel extends UIModel {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @SuppressWarnings("EmptyMethod")

src/main/java/io/bitsquare/gui/main/MainPM.java

@@ -64,8 +64,8 @@ public class MainPM extends PresentationModel<MainModel> {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
 
         backendInited.bind(model.backendInited);
         networkSyncComplete.bind(model.networkSyncComplete);

src/main/java/io/bitsquare/gui/main/MainViewCB.java

@@ -50,7 +50,6 @@ import javafx.scene.layout.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class MainViewCB extends ViewCB<MainPM> {
     private static final Logger log = LoggerFactory.getLogger(MainViewCB.class);
 

src/main/java/io/bitsquare/gui/main/account/AccountModel.java

@@ -47,8 +47,8 @@ public class AccountModel extends UIModel {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/account/AccountPM.java

@@ -44,8 +44,8 @@ public class AccountPM extends PresentationModel<AccountModel> {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordModel.java

@@ -42,8 +42,8 @@ public class ChangePasswordModel extends UIModel {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordPM.java

@@ -63,8 +63,8 @@ public class ChangePasswordPM extends PresentationModel<ChangePasswordModel> {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountModel.java

@@ -89,8 +89,8 @@ public class FiatAccountModel extends UIModel {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java

@@ -78,8 +78,8 @@ public class FiatAccountPm extends PresentationModel<FiatAccountModel> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
 
         // input
         title.bindBidirectional(model.title);

src/main/java/io/bitsquare/gui/main/account/content/password/PasswordModel.java

@@ -43,8 +43,8 @@ public class PasswordModel extends UIModel {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/account/content/password/PasswordPM.java

@@ -63,8 +63,8 @@ public class PasswordPM extends PresentationModel<PasswordModel> {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java

@@ -78,8 +78,8 @@ public class RegistrationModel extends UIModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
 
         if (walletFacade != null && walletFacade.getWallet() != null) {
             addressEntry = walletFacade.getRegistrationAddressEntry();

src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java

@@ -64,8 +64,8 @@ public class RegistrationPM extends PresentationModel<RegistrationModel> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
 
         if (model.getAddressEntry() != null) {
             address.set(model.getAddressEntry().getAddress());

src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java

@@ -79,8 +79,8 @@ public class RestrictionsModel extends UIModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
 
         Settings persistedSettings = (Settings) persistence.read(settings);
         if (persistedSettings != null) {

src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsPM.java

@@ -55,8 +55,8 @@ public class RestrictionsPM extends PresentationModel<RestrictionsModel> {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
 
     }
 

src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsModel.java

@@ -50,8 +50,8 @@ public class SeedWordsModel extends UIModel {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsPM.java

@@ -50,8 +50,8 @@ public class SeedWordsPM extends PresentationModel<SeedWordsModel> {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
 
         if (model.getMnemonicCode() != null)
             seedWords.set(BSFormatter.mnemonicCodeToString(model.getMnemonicCode()));

src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsModel.java

@@ -43,8 +43,8 @@ public class AccountSettingsModel extends UIModel {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsPM.java

@@ -44,8 +44,8 @@ public class AccountSettingsPM extends PresentationModel<AccountSettingsModel> {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupModel.java

@@ -43,8 +43,8 @@ public class AccountSetupModel extends UIModel {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupPM.java

@@ -44,8 +44,8 @@ public class AccountSetupPM extends PresentationModel<AccountSetupModel> {
 
     @SuppressWarnings("EmptyMethod")
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
     }
 
     @Override

src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java

@@ -126,8 +126,8 @@ public class CreateOfferModel extends UIModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
 
         // static data
         offerFeeAsCoin.set(FeePolicy.CREATE_OFFER_FEE);

src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java

@@ -115,8 +115,8 @@ public class CreateOfferPM extends PresentationModel<CreateOfferModel> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void initialized() {
+    public void initialize() {
-        super.initialized();
+        super.initialize();
 
         // static
         paymentLabel.set(BSResources.get("createOffer.fundsBox.paymentLabel", model.getOfferId()));

src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPMTest.java

@@ -50,7 +50,7 @@ public class CreateOfferPMTest {
         BSFormatter.setFiatCurrencyCode("USD");
 
         presenter = new CreateOfferPM(model, new FiatValidator(null), new BtcValidator());
-        presenter.initialized();
+        presenter.initialize();
     }