From 46863bb4c2184bd257257164fc85ff864c2c53a5 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Thu, 11 Sep 2014 12:14:56 +0200
Subject: [PATCH] Remove static methods from Validator

---
 .../java/io/bitsquare/gui/main/MainModel.java   |  3 +--
 .../registration/RegistrationViewCB.java        |  2 +-
 .../gui/util/validation/FiatValidator.java      | 17 ++++++++++-------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/bitsquare/gui/main/MainModel.java b/src/main/java/io/bitsquare/gui/main/MainModel.java
index 5dfbabe3ed..bab979ff9f 100644
--- a/src/main/java/io/bitsquare/gui/main/MainModel.java
+++ b/src/main/java/io/bitsquare/gui/main/MainModel.java
@@ -169,8 +169,7 @@ public class MainModel extends UIModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     private void onFacadesInitialised() {
-        // TODO Check this: never called on regtest
-        // Consider to use version from Mike Hearn
+        // TODO Consider to use version from Mike Hearn
         walletFacade.addDownloadListener(new WalletFacade.DownloadListener() {
             @Override
             public void progress(double percent) {
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java
index 70d475a9ea..762750c8ec 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java
@@ -163,7 +163,7 @@ public class RegistrationViewCB extends CachedViewCB<RegistrationPM> implements
     @Override
     public void useSettingsContext(boolean useSettingsContext) {
         if (useSettingsContext) {
-            // TODO
+            // TODO not impl. yet
         }
     }
 
diff --git a/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java b/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
index 252c716b4f..745d3b8228 100644
--- a/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
+++ b/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
@@ -28,8 +28,6 @@ import javax.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-//TODO convert to non static
-
 /**
  * FiatNumberValidator for validating fiat values.
  * <p>
@@ -41,13 +39,9 @@ public final class FiatValidator extends NumberValidator {
     //TODO Find appropriate values - depends on currencies
     public static final double MIN_FIAT_VALUE = 0.01; // usually a cent is the smallest currency unit
     public static final double MAX_FIAT_VALUE = 1000000;
-    private static String currencyCode = "Fiat";
+    private String currencyCode = "Fiat";
 
 
-    public static void setFiatCurrencyCode(String currencyCode) {
-        FiatValidator.currencyCode = currencyCode;
-    }
-
     @Inject
     public FiatValidator(User user) {
         if (user != null) {
@@ -85,6 +79,15 @@ public final class FiatValidator extends NumberValidator {
     }
 
 
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Setter
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public void setFiatCurrencyCode(String currencyCode) {
+        this.currencyCode = currencyCode;
+    }
+
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Private methods
     ///////////////////////////////////////////////////////////////////////////////////////////