From 29ad94c4d9e1744fc7d1f0c39c9fe6e62b585f1f Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 29 Aug 2014 23:16:54 +0200 Subject: [PATCH] rename ValidatingTextField to InputTextField --- ...{ValidatingTextField.java => InputTextField.java} | 12 ++++++------ .../java/io/bitsquare/gui/trade/TradeController.java | 4 ++-- .../gui/trade/createoffer/CreateOfferCB.java | 4 ++-- .../gui/trade/createoffer/CreateOfferView.fxml | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) rename src/main/java/io/bitsquare/gui/components/{ValidatingTextField.java => InputTextField.java} (93%) diff --git a/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java b/src/main/java/io/bitsquare/gui/components/InputTextField.java similarity index 93% rename from src/main/java/io/bitsquare/gui/components/ValidatingTextField.java rename to src/main/java/io/bitsquare/gui/components/InputTextField.java index 9255812dcf..88b7325d61 100644 --- a/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java +++ b/src/main/java/io/bitsquare/gui/components/InputTextField.java @@ -43,8 +43,8 @@ import org.slf4j.LoggerFactory; * There can be only 1 errorMessageDisplays at a time we use static field for it. * The position is derived from the position of the textField itself or if set from the layoutReference node. */ -public class ValidatingTextField extends TextField { - private static final Logger log = LoggerFactory.getLogger(ValidatingTextField.class); +public class InputTextField extends TextField { + private static final Logger log = LoggerFactory.getLogger(InputTextField.class); private Effect invalidEffect = new DropShadow(BlurType.GAUSSIAN, Color.RED, 4, 0.0, 0, 0); @@ -67,7 +67,7 @@ public class ValidatingTextField extends TextField { // Constructor /////////////////////////////////////////////////////////////////////////////////////////// - public ValidatingTextField() { + public InputTextField() { super(); amountValidationResult.addListener((ov, oldValue, newValue) -> { @@ -153,9 +153,9 @@ public class ValidatingTextField extends TextField { errorLabel.setId("validation-error"); errorLabel.setPadding(new Insets(0, 10, 0, 10)); - ValidatingTextField.errorMessageDisplay = new PopOver(errorLabel); - ValidatingTextField.errorMessageDisplay.setDetachable(false); - ValidatingTextField.errorMessageDisplay.setArrowIndent(5); + InputTextField.errorMessageDisplay = new PopOver(errorLabel); + InputTextField.errorMessageDisplay.setDetachable(false); + InputTextField.errorMessageDisplay.setArrowIndent(5); } } \ No newline at end of file diff --git a/src/main/java/io/bitsquare/gui/trade/TradeController.java b/src/main/java/io/bitsquare/gui/trade/TradeController.java index 3ea0705aff..e1eba34810 100644 --- a/src/main/java/io/bitsquare/gui/trade/TradeController.java +++ b/src/main/java/io/bitsquare/gui/trade/TradeController.java @@ -20,7 +20,7 @@ package io.bitsquare.gui.trade; import io.bitsquare.di.GuiceFXMLLoader; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.NavigationItem; -import io.bitsquare.gui.components.ValidatingTextField; +import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.trade.createoffer.CreateOfferCB; import io.bitsquare.gui.trade.orderbook.OrderBookController; import io.bitsquare.gui.trade.takeoffer.TakeOfferController; @@ -78,7 +78,7 @@ public class TradeController extends CachedViewController { //TODO update to new verison ((TabPane) root).getSelectionModel().selectedIndexProperty().addListener((observableValue) -> - Platform.runLater(ValidatingTextField::hideErrorMessageDisplay)); + Platform.runLater(InputTextField::hideErrorMessageDisplay)); } diff --git a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferCB.java b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferCB.java index 9c00dba0b9..7f9b7671de 100644 --- a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferCB.java +++ b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferCB.java @@ -18,8 +18,8 @@ package io.bitsquare.gui.trade.createoffer; import io.bitsquare.gui.CachedCodeBehind; +import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.Popups; -import io.bitsquare.gui.components.ValidatingTextField; import io.bitsquare.gui.components.btc.AddressTextField; import io.bitsquare.gui.components.btc.BalanceTextField; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; @@ -43,7 +43,7 @@ public class CreateOfferCB extends CachedCodeBehind { private static final Logger log = LoggerFactory.getLogger(CreateOfferCB.class); @FXML private Label buyLabel, confirmationLabel, txTitleLabel, collateralLabel; - @FXML private ValidatingTextField amountTextField, minAmountTextField, priceTextField, volumeTextField; + @FXML private InputTextField amountTextField, minAmountTextField, priceTextField, volumeTextField; @FXML private Button placeOfferButton, closeButton; @FXML private TextField totalToPayTextField, collateralTextField, bankAccountTypeTextField, bankAccountCurrencyTextField, bankAccountCountyTextField, acceptedCountriesTextField, diff --git a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml index 9a41287f26..d89074575a 100644 --- a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml +++ b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml @@ -20,7 +20,7 @@ - + @@ -48,16 +48,16 @@