rename ValidatingTextField to InputTextField

This commit is contained in:
Manfred Karrer 2014-08-29 23:16:54 +02:00
parent c87a9a3acc
commit 29ad94c4d9
4 changed files with 15 additions and 15 deletions

View file

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

View file

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

View file

@ -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<CreateOfferPM> {
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,

View file

@ -20,7 +20,7 @@
<?import io.bitsquare.gui.components.btc.AddressTextField?>
<?import io.bitsquare.gui.components.btc.BalanceTextField?>
<?import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator?>
<?import io.bitsquare.gui.components.ValidatingTextField?>
<?import io.bitsquare.gui.components.InputTextField?>
<?import io.bitsquare.gui.components.VSpacer?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
@ -48,16 +48,16 @@
<Label GridPane.rowIndex="1" fx:id="buyLabel"/>
<HBox GridPane.rowIndex="1" GridPane.columnIndex="1" spacing="5" GridPane.hgrow="NEVER" alignment="CENTER_LEFT">
<ValidatingTextField fx:id="amountTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
<InputTextField fx:id="amountTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
<Label text="BTC for price of "/>
<ValidatingTextField fx:id="priceTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
<InputTextField fx:id="priceTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
<Label text="EUR/BTC ="/>
<ValidatingTextField fx:id="volumeTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
<InputTextField fx:id="volumeTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
<Label text="EUR in total"/>
</HBox>
<Label GridPane.rowIndex="2" text="Min. Amount (BTC):"/>
<ValidatingTextField GridPane.rowIndex="2" GridPane.columnIndex="1" fx:id="minAmountTextField"/>
<InputTextField GridPane.rowIndex="2" GridPane.columnIndex="1" fx:id="minAmountTextField"/>
<!-- group -->