Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-10 07:30:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

Removing star and unused imports with checkstyle

Browse source
This commit is contained in:
napoly 2023-03-14 20:28:47 +01:00 • committed by woodser
parent ce05710537
commit 3b8f19c4ce
1206 changed files with 5197 additions and 6620 deletions
Download patch file Download diff file Expand all files Collapse all files

5
desktop/src/main/java/haveno/desktop/DesktopModule.java
View file

@ -17,8 +17,6 @@
package haveno.desktop;
import static haveno.common.config.Config.APP_NAME;
import com.google.inject.Singleton;
import com.google.inject.name.Names;
import haveno.common.app.AppModule;
@ -28,8 +26,11 @@ import haveno.desktop.common.fxml.FxmlViewLoader;
import haveno.desktop.common.view.ViewFactory;
import haveno.desktop.common.view.ViewLoader;
import haveno.desktop.common.view.guice.InjectorViewFactory;
import java.util.ResourceBundle;
import static haveno.common.config.Config.APP_NAME;
public class DesktopModule extends AppModule {
public DesktopModule(Config config) {

14
desktop/src/main/java/haveno/desktop/Navigation.java
View file

@ -25,19 +25,17 @@ import haveno.desktop.common.view.View;
import haveno.desktop.common.view.ViewPath;
import haveno.desktop.main.MainView;
import haveno.desktop.main.market.MarketView;
import javax.inject.Singleton;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.stream.Collectors;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import javax.inject.Singleton;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.stream.Collectors;
@Slf4j
@Singleton

33
desktop/src/main/java/haveno/desktop/app/HavenoApp.java
View file

@ -17,6 +17,9 @@
package haveno.desktop.app;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import com.google.common.base.Joiner;
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.name.Names;
@ -48,43 +51,33 @@ import haveno.desktop.main.overlays.windows.SendAlertMessageWindow;
import haveno.desktop.main.overlays.windows.ShowWalletDataWindow;
import haveno.desktop.util.CssTheme;
import haveno.desktop.util.ImageUtil;
import com.google.common.base.Joiner;
import javafx.application.Application;
import javafx.stage.Modality;
import javafx.stage.Screen;
import javafx.stage.Stage;
import javafx.stage.StageStyle;
import javafx.geometry.BoundingBox;
import javafx.geometry.Rectangle2D;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.StackPane;
import javafx.geometry.BoundingBox;
import javafx.geometry.Rectangle2D;
import javafx.stage.Modality;
import javafx.stage.Screen;
import javafx.stage.Stage;
import javafx.stage.StageStyle;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.function.Consumer;
import org.slf4j.LoggerFactory;
import static haveno.desktop.util.Layout.INITIAL_WINDOW_HEIGHT;
import static haveno.desktop.util.Layout.INITIAL_WINDOW_WIDTH;
import static haveno.desktop.util.Layout.MIN_WINDOW_HEIGHT;
import static haveno.desktop.util.Layout.MIN_WINDOW_WIDTH;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class HavenoApp extends Application implements UncaughtExceptionHandler {
@Setter

7
desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java
View file

@ -29,9 +29,6 @@ import haveno.desktop.setup.DesktopPersistedDataHost;
import haveno.desktop.util.ImageUtil;
import javafx.application.Application;
import javafx.application.Platform;
import javafx.stage.Stage;
import javafx.scene.control.ButtonBar;
import javafx.scene.control.ButtonType;
import javafx.scene.control.Dialog;
@ -40,13 +37,13 @@ import javafx.scene.control.PasswordField;
import javafx.scene.image.ImageView;
import javafx.scene.layout.VBox;
import javafx.scene.paint.Color;
import javafx.stage.Stage;
import lombok.extern.slf4j.Slf4j;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class HavenoAppMain extends HavenoExecutable {

6
desktop/src/main/java/haveno/desktop/common/UITimer.java
View file

@ -17,15 +17,15 @@
package haveno.desktop.common;
import javafx.application.Platform;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.reactfx.FxTimer;
import java.time.Duration;
import javafx.application.Platform;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.time.Duration;
public class UITimer implements Timer {
private final Logger log = LoggerFactory.getLogger(UITimer.class);
private haveno.common.reactfx.Timer timer;

19
desktop/src/main/java/haveno/desktop/common/fxml/FxmlViewLoader.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.common.fxml;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.base.Joiner;
import haveno.common.util.Utilities;
import haveno.desktop.common.ViewfxException;
@ -28,17 +25,15 @@ import haveno.desktop.common.view.View;
import haveno.desktop.common.view.ViewFactory;
import haveno.desktop.common.view.ViewLoader;
import javafx.fxml.FXMLLoader;
import java.net.URL;
import java.io.IOException;
import java.util.ResourceBundle;
import java.lang.annotation.Annotation;
import lombok.extern.slf4j.Slf4j;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.net.URL;
import java.util.ResourceBundle;
import static com.google.common.base.Preconditions.checkNotNull;
@Slf4j

2
desktop/src/main/java/haveno/desktop/common/view/AbstractView.java
View file

@ -18,9 +18,7 @@
package haveno.desktop.common.view;
import javafx.fxml.FXML;
import javafx.scene.Node;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

3
desktop/src/main/java/haveno/desktop/common/view/ActivatableViewAndModel.java
View file

@ -17,12 +17,11 @@
package haveno.desktop.common.view;
import haveno.desktop.common.model.Activatable;
import javafx.scene.Node;
import static com.google.common.base.Preconditions.checkNotNull;
import haveno.desktop.common.model.Activatable;
public abstract class ActivatableViewAndModel<R extends Node, M extends Activatable> extends ActivatableView<R, M> {
public ActivatableViewAndModel(M model) {

1
desktop/src/main/java/haveno/desktop/common/view/CachingViewLoader.java
View file

@ -19,7 +19,6 @@ package haveno.desktop.common.view;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.HashMap;
import java.util.Map;

3
desktop/src/main/java/haveno/desktop/common/view/FxmlView.java
View file

@ -17,12 +17,11 @@
package haveno.desktop.common.view;
import java.util.function.Function;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.function.Function;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)

2
desktop/src/main/java/haveno/desktop/common/view/InitializableView.java
View file

@ -18,11 +18,9 @@
package haveno.desktop.common.view;
import javafx.fxml.Initializable;
import javafx.scene.Node;
import java.net.URL;
import java.util.ResourceBundle;
public abstract class InitializableView<R extends Node, M> extends AbstractView<R, M> implements Initializable {

4
desktop/src/main/java/haveno/desktop/common/view/guice/InjectorViewFactory.java
View file

@ -17,11 +17,11 @@
package haveno.desktop.common.view.guice;
import com.google.common.base.Preconditions;
import com.google.inject.Injector;
import haveno.desktop.common.view.ViewFactory;
import javax.inject.Singleton;
import com.google.common.base.Preconditions;
import javax.inject.Singleton;
@Singleton
public class InjectorViewFactory implements ViewFactory {

7
desktop/src/main/java/haveno/desktop/components/AccountStatusTooltipLabel.java
View file

@ -27,6 +27,9 @@ import haveno.desktop.components.controlsfx.control.PopOver;
import haveno.desktop.main.offer.offerbook.OfferBookListItem;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.GUIUtil;
import javafx.geometry.Bounds;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.control.ContentDisplay;
import javafx.scene.control.Hyperlink;
@ -34,10 +37,6 @@ import javafx.scene.control.Label;
import javafx.scene.layout.VBox;
import javafx.scene.text.Text;
import javafx.geometry.Bounds;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import java.util.concurrent.TimeUnit;

15
desktop/src/main/java/haveno/desktop/components/AddressTextField.java
View file

@ -17,6 +17,7 @@
package haveno.desktop.components;
import com.jfoenix.controls.JFXTextField;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
@ -24,23 +25,19 @@ import haveno.core.locale.Res;
import haveno.core.trade.HavenoUtils;
import haveno.desktop.main.overlays.popups.Popup;
import haveno.desktop.util.GUIUtil;
import com.jfoenix.controls.JFXTextField;
import javafx.scene.control.Label;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.AnchorPane;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.scene.control.Label;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.AnchorPane;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.math.BigInteger;
import java.net.URI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AddressTextField extends AnchorPane {
private static final Logger log = LoggerFactory.getLogger(AddressTextField.class);

12
desktop/src/main/java/haveno/desktop/components/AddressWithIconAndDirection.java
View file

@ -19,19 +19,15 @@ package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Hyperlink;
import javafx.scene.control.Label;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

5
desktop/src/main/java/haveno/desktop/components/AutoTooltipButton.java
View file

@ -17,14 +17,13 @@
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.skins.JFXButtonSkin;
import javafx.scene.Node;
import javafx.scene.control.Skin;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipButton extends JFXButton {
public AutoTooltipButton() {

5
desktop/src/main/java/haveno/desktop/components/AutoTooltipCheckBox.java
View file

@ -17,13 +17,12 @@
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import com.jfoenix.controls.JFXCheckBox;
import com.jfoenix.skins.JFXCheckBoxSkin;
import javafx.scene.control.Skin;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipCheckBox extends JFXCheckBox {
public AutoTooltipCheckBox() {

4
desktop/src/main/java/haveno/desktop/components/AutoTooltipLabel.java
View file

@ -17,12 +17,12 @@
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import javafx.scene.control.Label;
import javafx.scene.control.Skin;
import javafx.scene.control.skin.LabelSkin;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipLabel extends Label {
public AutoTooltipLabel() {

5
desktop/src/main/java/haveno/desktop/components/AutoTooltipRadioButton.java
View file

@ -17,12 +17,11 @@
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import com.jfoenix.controls.JFXRadioButton;
import javafx.scene.control.Skin;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipRadioButton extends JFXRadioButton {
public AutoTooltipRadioButton() {

5
desktop/src/main/java/haveno/desktop/components/AutoTooltipSlideToggleButton.java
View file

@ -1,12 +1,11 @@
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import com.jfoenix.controls.JFXToggleButton;
import com.jfoenix.skins.JFXToggleButtonSkin;
import javafx.scene.control.Skin;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipSlideToggleButton extends JFXToggleButton {
public AutoTooltipSlideToggleButton() {
super();

4
desktop/src/main/java/haveno/desktop/components/AutoTooltipToggleButton.java
View file

@ -17,13 +17,13 @@
package haveno.desktop.components;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
import javafx.scene.Node;
import javafx.scene.control.Skin;
import javafx.scene.control.ToggleButton;
import javafx.scene.control.skin.ToggleButtonSkin;
import static haveno.desktop.components.TooltipUtil.showTooltipIfTruncated;
public class AutoTooltipToggleButton extends ToggleButton {
public AutoTooltipToggleButton() {

13
desktop/src/main/java/haveno/desktop/components/AutocompleteComboBox.java
View file

@ -17,19 +17,16 @@
package haveno.desktop.components;
import org.apache.commons.lang3.StringUtils;
import com.jfoenix.controls.JFXComboBox;
import com.jfoenix.skins.JFXComboBoxListViewSkin;
import haveno.common.UserThread;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import javafx.event.Event;
import javafx.event.EventHandler;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.Event;
import javafx.event.EventHandler;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;

3
desktop/src/main/java/haveno/desktop/components/BalanceTextField.java
View file

@ -26,9 +26,8 @@ import javafx.scene.effect.Effect;
import javafx.scene.layout.AnchorPane;
import javafx.scene.paint.Color;
import java.math.BigInteger;
import javax.annotation.Nullable;
import java.math.BigInteger;
public class BalanceTextField extends AnchorPane {

1
desktop/src/main/java/haveno/desktop/components/BusyAnimation.java
View file

@ -18,7 +18,6 @@
package haveno.desktop.components;
import com.jfoenix.controls.JFXSpinner;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;

3
desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java
View file

@ -19,11 +19,10 @@ package haveno.desktop.components;
import haveno.common.util.Tuple2;
import haveno.core.util.FormattingUtils;
import javafx.geometry.Pos;
import javafx.scene.control.Label;
import javafx.scene.layout.HBox;
import javafx.geometry.Pos;
public class ColoredDecimalPlacesWithZerosText extends HBox {
public ColoredDecimalPlacesWithZerosText(String number, int numberOfZerosToColorize) {

4
desktop/src/main/java/haveno/desktop/components/ExplorerAddressTextField.java
View file

@ -17,6 +17,7 @@
package haveno.desktop.components;
import com.jfoenix.controls.JFXTextField;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
@ -24,13 +25,10 @@ import haveno.core.locale.Res;
import haveno.core.user.BlockChainExplorer;
import haveno.core.user.Preferences;
import haveno.desktop.util.GUIUtil;
import com.jfoenix.controls.JFXTextField;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.AnchorPane;
import lombok.Getter;
import lombok.Setter;

12
desktop/src/main/java/haveno/desktop/components/FundsTextField.java
View file

@ -17,22 +17,20 @@
package haveno.desktop.components;
import static haveno.desktop.util.FormBuilder.getIcon;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
import haveno.core.locale.Res;
import javafx.scene.control.Label;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.AnchorPane;
import javafx.beans.binding.Bindings;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.scene.control.Label;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.AnchorPane;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static haveno.desktop.util.FormBuilder.getIcon;
public class FundsTextField extends InfoTextField {
public static final Logger log = LoggerFactory.getLogger(FundsTextField.class);

1
desktop/src/main/java/haveno/desktop/components/HavenoTextArea.java
View file

@ -1,7 +1,6 @@
package haveno.desktop.components;
import com.jfoenix.controls.JFXTextArea;
import javafx.scene.control.Skin;
public class HavenoTextArea extends JFXTextArea {

1
desktop/src/main/java/haveno/desktop/components/HavenoTextField.java
View file

@ -1,7 +1,6 @@
package haveno.desktop.components;
import com.jfoenix.controls.JFXTextField;
import javafx.scene.control.Skin;
public class HavenoTextField extends JFXTextField {

4
desktop/src/main/java/haveno/desktop/components/HyperlinkWithIcon.java
View file

@ -21,14 +21,12 @@ import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import de.jensd.fx.glyphs.GlyphIcons;
import haveno.desktop.util.FormBuilder;
import javafx.geometry.Insets;
import javafx.scene.Node;
import javafx.scene.control.ContentDisplay;
import javafx.scene.control.Hyperlink;
import javafx.scene.control.Label;
import javafx.scene.text.Text;
import javafx.geometry.Insets;
import lombok.Getter;
public class HyperlinkWithIcon extends Hyperlink {

5
desktop/src/main/java/haveno/desktop/components/InfoAutoTooltipLabel.java
View file

@ -17,16 +17,15 @@
package haveno.desktop.components;
import static haveno.desktop.util.FormBuilder.getIcon;
import de.jensd.fx.fontawesome.AwesomeIcon;
import de.jensd.fx.glyphs.GlyphIcons;
import haveno.desktop.components.controlsfx.control.PopOver;
import javafx.geometry.Insets;
import javafx.scene.Node;
import javafx.scene.control.ContentDisplay;
import javafx.scene.control.Label;
import javafx.geometry.Insets;
import static haveno.desktop.util.FormBuilder.getIcon;
public class InfoAutoTooltipLabel extends AutoTooltipLabel {

19
desktop/src/main/java/haveno/desktop/components/InfoDisplay.java
View file

@ -21,16 +21,6 @@ import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.UserThread;
import haveno.core.locale.Res;
import haveno.desktop.util.FormBuilder;
import javafx.scene.Parent;
import javafx.scene.control.Hyperlink;
import javafx.scene.control.Label;
import javafx.scene.control.OverrunStyle;
import javafx.scene.layout.GridPane;
import javafx.scene.text.TextFlow;
import javafx.geometry.Insets;
import javafx.geometry.VPos;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleIntegerProperty;
@ -38,9 +28,16 @@ import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.beans.value.ChangeListener;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.geometry.Insets;
import javafx.geometry.VPos;
import javafx.scene.Parent;
import javafx.scene.control.Hyperlink;
import javafx.scene.control.Label;
import javafx.scene.control.OverrunStyle;
import javafx.scene.layout.GridPane;
import javafx.scene.text.TextFlow;
/**
* Convenience Component for info icon, info text and link display in a GridPane.

6
desktop/src/main/java/haveno/desktop/components/InfoInputTextField.java
View file

@ -20,13 +20,11 @@ package haveno.desktop.components;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.desktop.components.controlsfx.control.PopOver;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.layout.AnchorPane;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import lombok.Getter;
import javax.annotation.Nullable;

17
desktop/src/main/java/haveno/desktop/components/InfoTextField.java
View file

@ -17,27 +17,22 @@
package haveno.desktop.components;
import com.jfoenix.controls.JFXTextField;
import de.jensd.fx.fontawesome.AwesomeIcon;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
import haveno.desktop.components.controlsfx.control.PopOver;
import static haveno.desktop.util.FormBuilder.getIcon;
import static haveno.desktop.util.FormBuilder.getRegularIconForLabel;
import com.jfoenix.controls.JFXTextField;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.layout.AnchorPane;
import javafx.scene.text.Text;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import lombok.Getter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.Getter;
import static haveno.desktop.util.FormBuilder.getIcon;
import static haveno.desktop.util.FormBuilder.getRegularIconForLabel;
public class InfoTextField extends AnchorPane {
public static final Logger log = LoggerFactory.getLogger(InfoTextField.class);

4
desktop/src/main/java/haveno/desktop/components/InputTextField.java
View file

@ -19,13 +19,11 @@ package haveno.desktop.components;
import com.jfoenix.controls.JFXTextField;
import haveno.core.locale.Res;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.util.validation.JFXInputValidator;
import javafx.scene.control.Skin;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.scene.control.Skin;
/**
* TextField with validation support.

8
desktop/src/main/java/haveno/desktop/components/JFXRadioButtonSkinHavenoStyle.java
View file

@ -22,9 +22,9 @@ import com.jfoenix.controls.JFXRippler;
import com.jfoenix.transitions.JFXAnimationTimer;
import com.jfoenix.transitions.JFXKeyFrame;
import com.jfoenix.transitions.JFXKeyValue;
import javafx.animation.Interpolator;
import javafx.geometry.HPos;
import javafx.geometry.VPos;
import javafx.scene.Node;
import javafx.scene.control.RadioButton;
import javafx.scene.control.skin.RadioButtonSkin;
@ -35,10 +35,6 @@ import javafx.scene.shape.Circle;
import javafx.scene.shape.Rectangle;
import javafx.scene.shape.StrokeType;
import javafx.scene.text.Text;
import javafx.geometry.HPos;
import javafx.geometry.VPos;
import javafx.util.Duration;
/**

7
desktop/src/main/java/haveno/desktop/components/JFXTextAreaSkinHavenoStyle.java
View file

@ -4,7 +4,7 @@ import com.jfoenix.adapters.ReflectionHelper;
import com.jfoenix.controls.JFXTextArea;
import com.jfoenix.skins.PromptLinesWrapper;
import com.jfoenix.skins.ValidationPane;
import javafx.geometry.Insets;
import javafx.scene.Node;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.skin.TextAreaSkin;
@ -15,11 +15,8 @@ import javafx.scene.layout.Region;
import javafx.scene.paint.Color;
import javafx.scene.text.Text;
import javafx.geometry.Insets;
import java.util.Arrays;
import java.lang.reflect.Field;
import java.util.Arrays;
/**
* Code copied and adapted from com.jfoenix.skins.JFXTextAreaSkin

6
desktop/src/main/java/haveno/desktop/components/JFXTextFieldSkinHavenoStyle.java
View file

@ -4,16 +4,14 @@ import com.jfoenix.adapters.ReflectionHelper;
import com.jfoenix.controls.base.IFXLabelFloatControl;
import com.jfoenix.skins.PromptLinesWrapper;
import com.jfoenix.skins.ValidationPane;
import javafx.beans.property.DoubleProperty;
import javafx.beans.value.ObservableDoubleValue;
import javafx.scene.Node;
import javafx.scene.control.TextField;
import javafx.scene.control.skin.TextFieldSkin;
import javafx.scene.layout.Pane;
import javafx.scene.text.Text;
import javafx.beans.property.DoubleProperty;
import javafx.beans.value.ObservableDoubleValue;
import java.lang.reflect.Field;
/**

14
desktop/src/main/java/haveno/desktop/components/MenuItem.java
View file

@ -20,24 +20,20 @@ package haveno.desktop.components;
import com.jfoenix.controls.JFXButton;
import haveno.desktop.Navigation;
import haveno.desktop.common.view.View;
import javafx.scene.control.Toggle;
import javafx.scene.control.ToggleGroup;
import javafx.geometry.Pos;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.value.ChangeListener;
import javafx.geometry.Pos;
import javafx.scene.control.Toggle;
import javafx.scene.control.ToggleGroup;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
@Slf4j
public class MenuItem extends JFXButton implements Toggle {
private final Navigation navigation;

3
desktop/src/main/java/haveno/desktop/components/NewBadge.java
View file

@ -3,9 +3,8 @@ package haveno.desktop.components;
import com.jfoenix.controls.JFXBadge;
import haveno.core.locale.Res;
import haveno.core.user.Preferences;
import javafx.scene.Node;
import javafx.collections.MapChangeListener;
import javafx.scene.Node;
public class NewBadge extends JFXBadge {

1
desktop/src/main/java/haveno/desktop/components/PasswordTextField.java
View file

@ -18,7 +18,6 @@
package haveno.desktop.components;
import com.jfoenix.controls.JFXPasswordField;
import javafx.scene.control.Skin;
public class PasswordTextField extends JFXPasswordField {

12
desktop/src/main/java/haveno/desktop/components/PeerInfoIcon.java
View file

@ -26,6 +26,7 @@ import haveno.core.user.Preferences;
import haveno.desktop.main.overlays.editor.PeerInfoWithTagEditor;
import haveno.desktop.util.DisplayUtils;
import haveno.network.p2p.NodeAddress;
import javafx.geometry.Point2D;
import javafx.scene.Group;
import javafx.scene.canvas.Canvas;
import javafx.scene.canvas.GraphicsContext;
@ -34,18 +35,13 @@ import javafx.scene.control.Tooltip;
import javafx.scene.image.ImageView;
import javafx.scene.layout.Pane;
import javafx.scene.paint.Color;
import javafx.geometry.Point2D;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Map;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Map;
@Slf4j
public class PeerInfoIcon extends Group {

4
desktop/src/main/java/haveno/desktop/components/PeerInfoIconDispute.java
View file

@ -17,13 +17,13 @@
package haveno.desktop.components;
import static haveno.desktop.util.Colors.AVATAR_GREY;
import haveno.core.locale.Res;
import haveno.core.user.Preferences;
import haveno.network.p2p.NodeAddress;
import lombok.extern.slf4j.Slf4j;
import static haveno.desktop.util.Colors.AVATAR_GREY;
@Slf4j
public class PeerInfoIconDispute extends PeerInfoIcon {

1
desktop/src/main/java/haveno/desktop/components/PeerInfoIconSmall.java
View file

@ -6,6 +6,7 @@ import haveno.core.offer.Offer;
import haveno.core.trade.Trade;
import haveno.core.user.Preferences;
import haveno.network.p2p.NodeAddress;
import javax.annotation.Nullable;
public class PeerInfoIconSmall extends PeerInfoIconTrading {

9
desktop/src/main/java/haveno/desktop/components/PeerInfoIconTrading.java
View file

@ -26,15 +26,12 @@ import haveno.core.payment.payload.PaymentMethod;
import haveno.core.trade.Trade;
import haveno.core.user.Preferences;
import haveno.network.p2p.NodeAddress;
import javafx.scene.paint.Color;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import javafx.scene.paint.Color;
import java.util.Date;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import java.util.Date;
import static com.google.common.base.Preconditions.checkNotNull;
import static haveno.desktop.util.Colors.AVATAR_BLUE;

1
desktop/src/main/java/haveno/desktop/components/PopOverWrapper.java
View file

@ -19,6 +19,7 @@ package haveno.desktop.components;
import haveno.common.UserThread;
import haveno.desktop.components.controlsfx.control.PopOver;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;

9
desktop/src/main/java/haveno/desktop/components/TableGroupHeadline.java
View file

@ -17,16 +17,13 @@
package haveno.desktop.components;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.geometry.Insets;
import javafx.scene.control.Label;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Pane;
import javafx.scene.layout.StackPane;
import javafx.geometry.Insets;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import lombok.extern.slf4j.Slf4j;
@Slf4j

8
desktop/src/main/java/haveno/desktop/components/TextFieldWithCopyIcon.java
View file

@ -17,20 +17,18 @@
package haveno.desktop.components;
import com.jfoenix.controls.JFXTextField;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
import haveno.core.locale.Res;
import com.jfoenix.controls.JFXTextField;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.AnchorPane;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
public class TextFieldWithCopyIcon extends AnchorPane {
private final StringProperty text = new SimpleStringProperty();

7
desktop/src/main/java/haveno/desktop/components/TextFieldWithIcon.java
View file

@ -17,18 +17,15 @@
package haveno.desktop.components;
import com.jfoenix.controls.JFXTextField;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.UserThread;
import com.jfoenix.controls.JFXTextField;
import javafx.geometry.Pos;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.layout.AnchorPane;
import javafx.scene.text.TextAlignment;
import javafx.geometry.Pos;
import lombok.Getter;
public class TextFieldWithIcon extends AnchorPane {

10
desktop/src/main/java/haveno/desktop/components/TitledGroupBg.java
View file

@ -20,18 +20,16 @@ package haveno.desktop.components;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.GUIUtil;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Label;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Pane;
import javafx.scene.text.Text;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
public class TitledGroupBg extends Pane {
private final HBox box;

7
desktop/src/main/java/haveno/desktop/components/TxIdTextField.java
View file

@ -17,6 +17,7 @@
package haveno.desktop.components;
import com.jfoenix.controls.JFXTextField;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import haveno.common.util.Utilities;
@ -26,17 +27,15 @@ import haveno.core.user.Preferences;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.components.indicator.TxConfidenceIndicator;
import haveno.desktop.util.GUIUtil;
import com.jfoenix.controls.JFXTextField;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.control.Tooltip;
import javafx.scene.layout.AnchorPane;
import lombok.Getter;
import lombok.Setter;
import monero.daemon.model.MoneroTx;
import monero.wallet.model.MoneroWalletListener;
import javax.annotation.Nullable;
public class TxIdTextField extends AnchorPane {
@ -125,7 +124,7 @@ public class TxIdTextField extends AnchorPane {
missingTxWarningIcon.setManaged(true);
return;
}
// listen for tx updates
// TODO: this only listens for new blocks, listen for double spend
txUpdater = new MoneroWalletListener() {

3
desktop/src/main/java/haveno/desktop/components/chart/ChartDataModel.java
View file

@ -18,10 +18,9 @@
package haveno.desktop.components.chart;
import haveno.desktop.common.model.ActivatableDataModel;
import java.time.Instant;
import java.time.temporal.TemporalAdjuster;
import java.util.Comparator;
import java.util.Map;
import java.util.function.BinaryOperator;
import java.util.function.Predicate;

39
desktop/src/main/java/haveno/desktop/components/chart/ChartView.java
View file

@ -22,9 +22,16 @@ import haveno.core.locale.Res;
import haveno.desktop.common.view.ActivatableViewAndModel;
import haveno.desktop.components.AutoTooltipSlideToggleButton;
import haveno.desktop.components.AutoTooltipToggleButton;
import javafx.stage.PopupWindow;
import javafx.stage.Stage;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.beans.value.ChangeListener;
import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList;
import javafx.event.EventHandler;
import javafx.geometry.Bounds;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.geometry.Side;
import javafx.scene.Node;
import javafx.scene.chart.Axis;
import javafx.scene.chart.LineChart;
@ -43,25 +50,14 @@ import javafx.scene.layout.Priority;
import javafx.scene.layout.Region;
import javafx.scene.layout.VBox;
import javafx.scene.text.Text;
import javafx.geometry.Bounds;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.geometry.Side;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.beans.value.ChangeListener;
import javafx.event.EventHandler;
import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList;
import javafx.stage.PopupWindow;
import javafx.stage.Stage;
import javafx.util.Duration;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import java.time.temporal.TemporalAdjuster;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@ -73,11 +69,6 @@ import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Stream;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
@Slf4j
public abstract class ChartView<T extends ChartViewModel<? extends ChartDataModel>> extends ActivatableViewAndModel<VBox, T> {
private Pane center;

7
desktop/src/main/java/haveno/desktop/components/chart/ChartViewModel.java
View file

@ -21,20 +21,17 @@ import haveno.common.util.Tuple2;
import haveno.desktop.common.model.ActivatableWithDataModel;
import haveno.desktop.util.DisplayUtils;
import javafx.scene.chart.XYChart;
import javafx.util.StringConverter;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import java.time.temporal.TemporalAdjuster;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public abstract class ChartViewModel<T extends ChartDataModel> extends ActivatableWithDataModel<T> {
private final static double LEFT_TIMELINE_SNAP_VALUE = 0.01;

12
desktop/src/main/java/haveno/desktop/components/chart/TemporalAdjusterModel.java
View file

@ -17,6 +17,11 @@
package haveno.desktop.components.chart;
import haveno.common.util.MathUtils;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import java.math.RoundingMode;
import java.time.DayOfWeek;
import java.time.Instant;
import java.time.LocalDate;
@ -24,15 +29,8 @@ import java.time.ZoneId;
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAdjusters;
import java.math.RoundingMode;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import static java.time.temporal.ChronoField.DAY_OF_YEAR;
import haveno.common.util.MathUtils;
@Slf4j
public class TemporalAdjusterModel {
private static final ZoneId ZONE_ID = ZoneId.systemDefault();

28
desktop/src/main/java/haveno/desktop/components/controlsfx/control/PopOver.java
View file

@ -27,20 +27,8 @@
package haveno.desktop.components.controlsfx.control;
import haveno.desktop.components.controlsfx.skin.PopOverSkin;
import javafx.animation.FadeTransition;
import javafx.stage.Window;
import javafx.stage.WindowEvent;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.control.PopupControl;
import javafx.scene.control.Skin;
import javafx.scene.layout.StackPane;
import javafx.geometry.Bounds;
import javafx.geometry.Insets;
import javafx.beans.InvalidationListener;
import javafx.beans.WeakInvalidationListener;
import javafx.beans.property.BooleanProperty;
@ -53,20 +41,24 @@ import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.WeakChangeListener;
import javafx.event.EventHandler;
import javafx.event.WeakEventHandler;
import javafx.geometry.Bounds;
import javafx.geometry.Insets;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.control.PopupControl;
import javafx.scene.control.Skin;
import javafx.scene.layout.StackPane;
import javafx.stage.Window;
import javafx.stage.WindowEvent;
import javafx.util.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
import static javafx.scene.input.MouseEvent.MOUSE_CLICKED;
import haveno.desktop.components.controlsfx.skin.PopOverSkin;
/**
* The PopOver control provides detailed information about an owning node in a
* popup window. The popup window has a very lightweight appearance (no default

43
desktop/src/main/java/haveno/desktop/components/controlsfx/skin/PopOverSkin.java
View file

@ -26,8 +26,15 @@
*/
package haveno.desktop.components.controlsfx.skin;
import javafx.stage.Window;
import haveno.desktop.components.controlsfx.control.PopOver;
import haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation;
import javafx.beans.InvalidationListener;
import javafx.beans.binding.Bindings;
import javafx.beans.property.DoubleProperty;
import javafx.beans.property.SimpleDoubleProperty;
import javafx.event.EventHandler;
import javafx.geometry.Point2D;
import javafx.geometry.Pos;
import javafx.scene.Group;
import javafx.scene.Node;
import javafx.scene.control.Label;
@ -44,32 +51,30 @@ import javafx.scene.shape.Path;
import javafx.scene.shape.PathElement;
import javafx.scene.shape.QuadCurveTo;
import javafx.scene.shape.VLineTo;
import javafx.geometry.Point2D;
import javafx.geometry.Pos;
import javafx.beans.InvalidationListener;
import javafx.beans.binding.Bindings;
import javafx.beans.property.DoubleProperty;
import javafx.beans.property.SimpleDoubleProperty;
import javafx.event.EventHandler;
import javafx.stage.Window;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.*;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.BOTTOM_CENTER;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.BOTTOM_LEFT;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.BOTTOM_RIGHT;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.LEFT_BOTTOM;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.LEFT_CENTER;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.LEFT_TOP;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.RIGHT_BOTTOM;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.RIGHT_CENTER;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.RIGHT_TOP;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.TOP_CENTER;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.TOP_LEFT;
import static haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation.TOP_RIGHT;
import static java.lang.Double.MAX_VALUE;
import static javafx.geometry.Pos.CENTER_LEFT;
import static javafx.scene.control.ContentDisplay.GRAPHIC_ONLY;
import static javafx.scene.paint.Color.YELLOW;
import haveno.desktop.components.controlsfx.control.PopOver;
import haveno.desktop.components.controlsfx.control.PopOver.ArrowLocation;
public class PopOverSkin implements Skin<PopOver> {
private static final String DETACHED_STYLE_CLASS = "detached"; //$NON-NLS-1$

9
desktop/src/main/java/haveno/desktop/components/indicator/TxConfidenceIndicator.java
View file

@ -42,16 +42,15 @@
package haveno.desktop.components.indicator;
import javafx.scene.control.Control;
import javafx.scene.control.Skin;
import javafx.css.PseudoClass;
import javafx.css.StyleableProperty;
import haveno.desktop.components.indicator.skin.StaticProgressIndicatorSkin;
import javafx.beans.property.DoubleProperty;
import javafx.beans.property.DoublePropertyBase;
import javafx.beans.property.ReadOnlyBooleanProperty;
import javafx.beans.property.ReadOnlyBooleanWrapper;
import javafx.css.PseudoClass;
import javafx.css.StyleableProperty;
import javafx.scene.control.Control;
import javafx.scene.control.Skin;
// TODO Copied form OpenJFX, check license issues and way how we integrated it
// We changed behaviour which was not exposed via APIs

41
desktop/src/main/java/haveno/desktop/components/indicator/skin/StaticProgressIndicatorSkin.java
View file

@ -42,6 +42,25 @@
package haveno.desktop.components.indicator.skin;
import haveno.desktop.components.indicator.TxConfidenceIndicator;
import javafx.beans.InvalidationListener;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.ObjectProperty;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.css.CssMetaData;
import javafx.css.StyleOrigin;
import javafx.css.Styleable;
import javafx.css.StyleableBooleanProperty;
import javafx.css.StyleableIntegerProperty;
import javafx.css.StyleableObjectProperty;
import javafx.css.StyleableProperty;
import javafx.css.converter.BooleanConverter;
import javafx.css.converter.PaintConverter;
import javafx.css.converter.SizeConverter;
import javafx.geometry.Insets;
import javafx.geometry.NodeOrientation;
import javafx.scene.Node;
import javafx.scene.control.SkinBase;
import javafx.scene.layout.Pane;
@ -54,28 +73,6 @@ import javafx.scene.shape.ArcType;
import javafx.scene.shape.Circle;
import javafx.scene.transform.Scale;
import javafx.css.CssMetaData;
import javafx.css.StyleOrigin;
import javafx.css.Styleable;
import javafx.css.StyleableBooleanProperty;
import javafx.css.StyleableIntegerProperty;
import javafx.css.StyleableObjectProperty;
import javafx.css.StyleableProperty;
import javafx.css.converter.BooleanConverter;
import javafx.css.converter.PaintConverter;
import javafx.css.converter.SizeConverter;
import javafx.geometry.Insets;
import javafx.geometry.NodeOrientation;
import javafx.beans.InvalidationListener;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.ObjectProperty;
import javafx.collections.ObservableList;
import javafx.collections.FXCollections;
import haveno.desktop.components.indicator.TxConfidenceIndicator;
import java.util.ArrayList;
import java.util.List;

7
desktop/src/main/java/haveno/desktop/components/list/FilterBox.java
View file

@ -21,12 +21,11 @@ import haveno.core.locale.Res;
import haveno.desktop.components.AutoTooltipLabel;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.filtering.FilterableListItem;
import javafx.scene.control.TableView;
import javafx.scene.layout.HBox;
import javafx.geometry.Insets;
import javafx.beans.value.ChangeListener;
import javafx.collections.transformation.FilteredList;
import javafx.geometry.Insets;
import javafx.scene.control.TableView;
import javafx.scene.layout.HBox;
public class FilterBox extends HBox {
private final InputTextField textField;

12
desktop/src/main/java/haveno/desktop/components/paymentmethods/AchTransferForm.java
View file

@ -17,13 +17,6 @@
package haveno.desktop.components.paymentmethods;
import javafx.scene.control.ComboBox;
import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import static haveno.desktop.util.FormBuilder.*;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.BankUtil;
import haveno.core.locale.Country;
@ -36,6 +29,11 @@ import haveno.core.payment.payload.BankAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import javafx.collections.FXCollections;
import javafx.scene.control.ComboBox;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addComboBox;
public class AchTransferForm extends GeneralUsBankForm {

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/AdvancedCashForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane;
import haveno.common.util.Tuple2;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
@ -37,6 +33,10 @@ import javafx.scene.control.Label;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane;
@Deprecated
public class AdvancedCashForm extends PaymentMethodForm {
private final AdvancedCashAccount advancedCashAccount;

7
desktop/src/main/java/haveno/desktop/components/paymentmethods/AliPayForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.payment.AliPayAccount;
@ -30,6 +26,9 @@ import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.validation.AliPayValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
public class AliPayForm extends GeneralAccountNumberForm {

13
desktop/src/main/java/haveno/desktop/components/paymentmethods/AmazonGiftCardForm.java
View file

@ -17,8 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.*;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Country;
import haveno.core.locale.CountryUtil;
@ -33,17 +31,20 @@ import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.Layout;
import javafx.collections.FXCollections;
import javafx.scene.control.ComboBox;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import javafx.util.StringConverter;
import lombok.extern.slf4j.Slf4j;
import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import static haveno.desktop.util.FormBuilder.addComboBox;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
@Slf4j
public class AmazonGiftCardForm extends PaymentMethodForm {

16
desktop/src/main/java/haveno/desktop/components/paymentmethods/AssetsForm.java
View file

@ -17,12 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.DisplayUtils.createAssetsAccountName;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addLabelCheckBox;
import static haveno.desktop.util.GUIUtil.getComboBoxButtonCell;
import haveno.common.UserThread;
import haveno.common.util.Tuple3;
import haveno.core.account.witness.AccountAgeWitnessService;
@ -43,16 +37,20 @@ import haveno.desktop.components.InputTextField;
import haveno.desktop.main.overlays.popups.Popup;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.Layout;
import javafx.geometry.Insets;
import javafx.scene.control.CheckBox;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.VBox;
import javafx.geometry.Insets;
import javafx.util.StringConverter;
import static haveno.desktop.util.DisplayUtils.createAssetsAccountName;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addLabelCheckBox;
import static haveno.desktop.util.GUIUtil.getComboBoxButtonCell;
public class AssetsForm extends PaymentMethodForm {
public static final String INSTANT_TRADE_NEWS = "instantTradeNews0.9.5";
private final AssetAccount assetAccount;

6
desktop/src/main/java/haveno/desktop/components/paymentmethods/AustraliaPayidForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -35,6 +32,9 @@ import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
public class AustraliaPayidForm extends PaymentMethodForm {
private final AustraliaPayidAccount australiaPayidAccount;
private final AustraliaPayidValidator australiaPayidValidator;

10
desktop/src/main/java/haveno/desktop/components/paymentmethods/BankForm.java
View file

@ -17,8 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.*;
import haveno.common.util.Tuple2;
import haveno.common.util.Tuple4;
import haveno.core.account.witness.AccountAgeWitnessService;
@ -37,12 +35,18 @@ import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.GUIUtil;
import javafx.collections.FXCollections;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import static haveno.desktop.util.FormBuilder.addComboBox;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addInputTextFieldInputTextField;
abstract class BankForm extends GeneralBankForm {

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/BizumForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.Res;
@ -36,6 +32,10 @@ import haveno.desktop.util.Layout;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
public class BizumForm extends PaymentMethodForm {
private final BizumAccount account;

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/CapitualForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane;
import haveno.common.util.Tuple2;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
@ -37,6 +33,10 @@ import javafx.scene.control.Label;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane;
public class CapitualForm extends PaymentMethodForm {
private final CapitualAccount capitualAccount;
private final CapitualValidator capitualValidator;

9
desktop/src/main/java/haveno/desktop/components/paymentmethods/CashByMailForm.java
View file

@ -17,8 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.*;
import com.jfoenix.controls.JFXTextArea;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.CurrencyUtil;
@ -32,10 +30,15 @@ import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.Layout;
import javafx.collections.FXCollections;
import javafx.scene.control.TextArea;
import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextArea;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextArea;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
public class CashByMailForm extends PaymentMethodForm {
private final CashByMailAccount cashByMailAccount;

12
desktop/src/main/java/haveno/desktop/components/paymentmethods/CashDepositForm.java
View file

@ -17,8 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.*;
import haveno.common.util.Tuple2;
import haveno.common.util.Tuple4;
import haveno.core.account.witness.AccountAgeWitnessService;
@ -38,13 +36,21 @@ import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.GUIUtil;
import javafx.collections.FXCollections;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.TextArea;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import static haveno.desktop.util.FormBuilder.addComboBox;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextArea;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addInputTextFieldInputTextField;
import static haveno.desktop.util.FormBuilder.addTextArea;
public class CashDepositForm extends GeneralBankForm {

6
desktop/src/main/java/haveno/desktop/components/paymentmethods/CelPayForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.payment.CelPayAccount;
@ -35,6 +32,9 @@ import javafx.scene.control.TextField;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
public class CelPayForm extends PaymentMethodForm {
private final CelPayAccount account;
private final EmailValidator validator = new EmailValidator();

6
desktop/src/main/java/haveno/desktop/components/paymentmethods/ChaseQuickPayForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -35,6 +32,9 @@ import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
public class ChaseQuickPayForm extends PaymentMethodForm {
private final ChaseQuickPayAccount chaseQuickPayAccount;

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/ClearXchangeForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -36,6 +32,10 @@ import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
public class ClearXchangeForm extends PaymentMethodForm {
private final ClearXchangeAccount clearXchangeAccount;
private final EmailOrMobileNrValidator clearXchangeValidator;

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/F2FForm.java
View file

@ -17,8 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.*;
import com.jfoenix.controls.JFXTextArea;
import haveno.common.util.Tuple2;
import haveno.core.account.witness.AccountAgeWitnessService;
@ -43,6 +41,12 @@ import javafx.scene.control.ComboBox;
import javafx.scene.control.TextArea;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextArea;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextArea;
public class F2FForm extends PaymentMethodForm {
private final F2FAccount f2fAccount;
private final F2FValidator f2fValidator;

6
desktop/src/main/java/haveno/desktop/components/paymentmethods/FasterPaymentsForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -36,6 +33,9 @@ import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
public class FasterPaymentsForm extends PaymentMethodForm {
private static final String UK_SORT_CODE = "UK sort code";

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralAccountNumberForm.java
View file

@ -1,9 +1,5 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -14,6 +10,10 @@ import haveno.desktop.components.InputTextField;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
public abstract class GeneralAccountNumberForm extends PaymentMethodForm {
GeneralAccountNumberForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService, InputValidator inputValidator, GridPane gridPane, int gridRow, CoinFormatter formatter) {

4
desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralBankForm.java
View file

@ -12,10 +12,8 @@ import haveno.core.payment.validation.NationalAccountIdValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import org.apache.commons.lang3.StringUtils;
import javafx.scene.layout.GridPane;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralSepaForm.java
View file

@ -1,9 +1,5 @@
package haveno.desktop.components.paymentmethods;
import org.apache.commons.lang3.StringUtils;
import static haveno.desktop.util.FormBuilder.addTopLabelWithVBox;
import com.jfoenix.controls.JFXComboBox;
import com.jfoenix.controls.JFXTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
@ -23,12 +19,14 @@ import javafx.scene.control.Tooltip;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javafx.util.StringConverter;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
import java.util.Objects;
import static haveno.desktop.util.FormBuilder.addTopLabelWithVBox;
public abstract class GeneralSepaForm extends PaymentMethodForm {
static final String BIC = "BIC";

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/GeneralUsBankForm.java
View file

@ -38,7 +38,13 @@ import javafx.scene.layout.GridPane;
import javax.annotation.Nullable;
import static haveno.common.util.Utilities.cleanString;
import static haveno.desktop.util.FormBuilder.*;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextArea;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextArea;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
public abstract class GeneralUsBankForm extends GeneralBankForm {

6
desktop/src/main/java/haveno/desktop/components/paymentmethods/HalCashForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -35,6 +32,9 @@ import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
public class HalCashForm extends PaymentMethodForm {
private final HalCashAccount halCashAccount;
private final HalCashValidator halCashValidator;

10
desktop/src/main/java/haveno/desktop/components/paymentmethods/IfscBankForm.java
View file

@ -17,11 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.Res;
@ -37,6 +32,11 @@ import haveno.desktop.util.Layout;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
public class IfscBankForm extends PaymentMethodForm {
private final IfscBasedAccountPayload ifscBasedAccountPayload;
private final RegexValidator ifscValidator; // https://en.wikipedia.org/wiki/Indian_Financial_System_Code

6
desktop/src/main/java/haveno/desktop/components/paymentmethods/InteracETransferForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -34,6 +31,9 @@ import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
public class InteracETransferForm extends PaymentMethodForm {
private final InteracETransferAccount interacETransferAccount;

14
desktop/src/main/java/haveno/desktop/components/paymentmethods/JapanBankTransferForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.*;
import static haveno.desktop.util.GUIUtil.getComboBoxButtonCell;
import haveno.common.util.Tuple2;
import haveno.common.util.Tuple3;
import haveno.common.util.Tuple4;
@ -41,16 +38,21 @@ import haveno.core.util.validation.InputValidator;
import haveno.core.util.validation.RegexValidator;
import haveno.desktop.components.AutocompleteComboBox;
import haveno.desktop.components.InputTextField;
import org.apache.commons.lang3.StringUtils;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.RadioButton;
import javafx.scene.control.TextField;
import javafx.scene.control.ToggleGroup;
import javafx.scene.layout.GridPane;
import javafx.util.StringConverter;
import org.apache.commons.lang3.StringUtils;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addInputTextFieldInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelRadioButtonRadioButton;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldAutocompleteComboBox;
import static haveno.desktop.util.GUIUtil.getComboBoxButtonCell;
public class JapanBankTransferForm extends PaymentMethodForm {
private final JapanBankAccount japanBankAccount;

6
desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneseForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.payment.MoneseAccount;
@ -33,6 +30,9 @@ import haveno.desktop.util.FormBuilder;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
public class MoneseForm extends PaymentMethodForm {
private final MoneseAccount account;

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneyBeamForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -36,6 +32,10 @@ import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
public class MoneyBeamForm extends PaymentMethodForm {
private final MoneyBeamAccount account;
private final MoneyBeamValidator validator;

11
desktop/src/main/java/haveno/desktop/components/paymentmethods/MoneyGramForm.java
View file

@ -17,11 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane;
import haveno.common.util.Tuple2;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.BankUtil;
@ -41,9 +36,13 @@ import haveno.desktop.util.Layout;
import javafx.scene.control.Label;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import lombok.extern.slf4j.Slf4j;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane;
@Slf4j
public class MoneyGramForm extends PaymentMethodForm {

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/NequiForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.Res;
@ -36,6 +32,10 @@ import haveno.desktop.util.Layout;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
public class NequiForm extends PaymentMethodForm {
private final NequiAccount account;

6
desktop/src/main/java/haveno/desktop/components/paymentmethods/PaxumForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.payment.PaxumAccount;
@ -35,6 +32,9 @@ import javafx.scene.control.TextField;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
public class PaxumForm extends PaymentMethodForm {
private final PaxumAccount account;
private final EmailValidator validator = new EmailValidator();

28
desktop/src/main/java/haveno/desktop/components/paymentmethods/PaymentMethodForm.java
View file

@ -17,13 +17,6 @@
package haveno.desktop.components.paymentmethods;
import org.bitcoinj.core.Coin;
import org.apache.commons.lang3.StringUtils;
import static haveno.desktop.util.DisplayUtils.createAccountName;
import static haveno.desktop.util.FormBuilder.*;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
import haveno.common.util.Tuple3;
import haveno.common.util.Utilities;
@ -48,6 +41,9 @@ import haveno.desktop.util.DisplayUtils;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.GUIUtil;
import haveno.desktop.util.Layout;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.collections.FXCollections;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
@ -57,18 +53,22 @@ import javafx.scene.control.Tooltip;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.VBox;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.collections.FXCollections;
import javafx.util.StringConverter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.bitcoinj.core.Coin;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
import static haveno.desktop.util.DisplayUtils.createAccountName;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelInfoTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelInfoTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelInputTextFieldSlideToggleButton;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
@Slf4j
public abstract class PaymentMethodForm {

6
desktop/src/main/java/haveno/desktop/components/paymentmethods/PayseraForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.payment.PaymentAccount;
@ -35,6 +32,9 @@ import javafx.scene.control.TextField;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
public class PayseraForm extends PaymentMethodForm {
private final PayseraAccount account;
private final EmailValidator validator = new EmailValidator();

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/PaytmForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.Res;
@ -36,6 +32,10 @@ import haveno.desktop.util.Layout;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
public class PaytmForm extends PaymentMethodForm {
private final PaytmAccount account;

10
desktop/src/main/java/haveno/desktop/components/paymentmethods/PerfectMoneyForm.java
View file

@ -17,12 +17,6 @@
package haveno.desktop.components.paymentmethods;
import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.FiatCurrency;
import haveno.core.locale.Res;
@ -33,6 +27,10 @@ import haveno.core.payment.payload.PerfectMoneyAccountPayload;
import haveno.core.payment.validation.PerfectMoneyValidator;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.validation.InputValidator;
import javafx.collections.FXCollections;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
public class PerfectMoneyForm extends GeneralAccountNumberForm {

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/PixForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.Res;
@ -36,6 +32,10 @@ import haveno.desktop.util.Layout;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
public class PixForm extends PaymentMethodForm {
private final PixAccount account;

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/PopmoneyForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -36,6 +32,10 @@ import haveno.desktop.util.FormBuilder;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
public class PopmoneyForm extends PaymentMethodForm {
private final PopmoneyAccount account;
private final PopmoneyValidator validator;

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/PromptPayForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
import haveno.core.locale.TradeCurrency;
@ -35,6 +31,10 @@ import haveno.desktop.components.InputTextField;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addInputTextField;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
public class PromptPayForm extends PaymentMethodForm {
private final PromptPayAccount promptPayAccount;
private final PromptPayValidator promptPayValidator;

9
desktop/src/main/java/haveno/desktop/components/paymentmethods/RevolutForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane;
import haveno.common.util.Tuple2;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Res;
@ -37,9 +33,12 @@ import haveno.desktop.util.Layout;
import javafx.scene.control.TextField;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
import lombok.extern.slf4j.Slf4j;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelFlowPane;
@Slf4j
public class RevolutForm extends PaymentMethodForm {
private final RevolutAccount account;

8
desktop/src/main/java/haveno/desktop/components/paymentmethods/SatispayForm.java
View file

@ -17,10 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.Res;
@ -34,6 +30,10 @@ import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import javafx.scene.layout.GridPane;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import static haveno.desktop.util.FormBuilder.addTopLabelTextField;
public class SatispayForm extends PaymentMethodForm {
private final SatispayAccount account;

11
desktop/src/main/java/haveno/desktop/components/paymentmethods/SepaForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Country;
import haveno.core.locale.CountryUtil;
@ -36,13 +33,17 @@ import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.normalization.IBANNormalizer;
import java.util.List;
import java.util.Optional;
import javafx.collections.FXCollections;
import javafx.scene.control.ComboBox;
import javafx.scene.control.TextFormatter;
import javafx.scene.layout.GridPane;
import java.util.List;
import java.util.Optional;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
public class SepaForm extends GeneralSepaForm {
public static int addFormForBuyer(GridPane gridPane, int gridRow,

9
desktop/src/main/java/haveno/desktop/components/paymentmethods/SepaInstantForm.java
View file

@ -17,9 +17,6 @@
package haveno.desktop.components.paymentmethods;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.locale.Country;
import haveno.core.locale.CountryUtil;
@ -36,15 +33,17 @@ import haveno.core.util.validation.InputValidator;
import haveno.desktop.components.InputTextField;
import haveno.desktop.util.FormBuilder;
import haveno.desktop.util.normalization.IBANNormalizer;
import javafx.collections.FXCollections;
import javafx.scene.control.ComboBox;
import javafx.scene.control.TextFormatter;
import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import java.util.List;
import java.util.Optional;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static haveno.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon;
public class SepaInstantForm extends GeneralSepaForm {
public static int addFormForBuyer(GridPane gridPane, int gridRow,

Some files were not shown because too many files have changed in this diff Show more