Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-18 11:59:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rename ImageUtil methods

Browse source
This commit is contained in:
Manfred Karrer 2014-09-16 01:34:30 +02:00
parent f0f5ddd4ec
commit 908874fd92
12 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/io/bitsquare/BitSquare.java
View file

@ -128,7 +128,6 @@ public class BitSquare extends Application {
primaryStage.setMinHeight(500); primaryStage.setMinHeight(500);
primaryStage.show(); primaryStage.show();
} catch (IOException e) { } catch (IOException e) {
log.error(e.getMessage()); log.error(e.getMessage());
} }

8
src/main/java/io/bitsquare/gui/Navigation.java
View file

@ -59,7 +59,8 @@ public class Navigation {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public void navigationTo(Item... items) { public void navigationTo(Item... items) {
log.trace("navigationTo " + Arrays.asList(items).toString()); if (items != null)
log.trace("navigationTo " + Arrays.asList(items).toString());
List<Item> temp = new ArrayList<>(); List<Item> temp = new ArrayList<>();
for (int i = 0; i < items.length; i++) { for (int i = 0; i < items.length; i++) {
Item item = items[i]; Item item = items[i];
@ -82,8 +83,9 @@ public class Navigation {
currentItems = items; currentItems = items;
persistence.write(this, "navigationItems", items); persistence.write(this, "navigationItems", items);
log.trace("navigationTo notify listeners " + Arrays.asList(items).toString() + " / " + listeners if (items != null)
.size()); log.trace("navigationTo notify listeners " + Arrays.asList(items).toString() + " / " + listeners
.size());
listeners.stream().forEach((e) -> e.onNavigationRequested(items)); listeners.stream().forEach((e) -> e.onNavigationRequested(items));
} }

2
src/main/java/io/bitsquare/gui/components/InfoDisplay.java
View file

@ -72,7 +72,7 @@ public class InfoDisplay extends Parent {
public InfoDisplay() { public InfoDisplay() {
icon = ImageUtil.getIconImageView(ImageUtil.INFO); icon = ImageUtil.getImageView(ImageUtil.INFO);
icon.setPickOnBounds(true); icon.setPickOnBounds(true);
icon.setPreserveRatio(true); icon.setPreserveRatio(true);
icon.visibleProperty().bind(visibleProperty()); icon.visibleProperty().bind(visibleProperty());

13
src/main/java/io/bitsquare/gui/main/MainViewCB.java
View file

@ -85,7 +85,6 @@ public class MainViewCB extends ViewCB<MainPM> {
// Lifecycle // Lifecycle
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@SuppressWarnings("EmptyMethod")
@Override @Override
public void initialize(URL url, ResourceBundle rb) { public void initialize(URL url, ResourceBundle rb) {
super.initialize(url, rb); super.initialize(url, rb);
@ -188,7 +187,7 @@ public class MainViewCB extends ViewCB<MainPM> {
Profiler.printMsgWithTime("MainController.ondMainNavigationAdded"); Profiler.printMsgWithTime("MainController.ondMainNavigationAdded");
presentationModel.takeOfferRequested.addListener((ov, olaValue, newValue) -> { presentationModel.takeOfferRequested.addListener((ov, olaValue, newValue) -> {
final Button alertButton = new Button("", ImageUtil.getIconImageView(ImageUtil.MSG_ALERT)); final Button alertButton = new Button("", ImageUtil.getImageView(ImageUtil.MSG_ALERT));
alertButton.setId("nav-alert-button"); alertButton.setId("nav-alert-button");
alertButton.relocate(36, 19); alertButton.relocate(36, 19);
alertButton.setOnAction((e) -> alertButton.setOnAction((e) ->
@ -361,8 +360,8 @@ public class MainViewCB extends ViewCB<MainPM> {
onMainNavigationAdded(); onMainNavigationAdded();
} }
private ToggleButton addNavButton(Pane parent, String title, Navigation.Item item) { private ToggleButton addNavButton(Pane parent, String title, Navigation.Item navigationItem) {
ImageView icon = ImageUtil.getIconImageView(item.getIcon()); ImageView icon = ImageUtil.getImageView(navigationItem.getIcon());
icon.setFitWidth(32); icon.setFitWidth(32);
icon.setFitHeight(32); icon.setFitHeight(32);
@ -381,16 +380,16 @@ public class MainViewCB extends ViewCB<MainPM> {
toggleButton.setMaxSize(50, 50); toggleButton.setMaxSize(50, 50);
toggleButton.setGraphicTextGap(newValue ? -1 : 0); toggleButton.setGraphicTextGap(newValue ? -1 : 0);
if (newValue) { if (newValue) {
Image activeIcon = ImageUtil.getIconImage(item.getActiveIcon()); Image activeIcon = ImageUtil.getImage(navigationItem.getActiveIcon());
((ImageView) toggleButton.getGraphic()).setImage(activeIcon); ((ImageView) toggleButton.getGraphic()).setImage(activeIcon);
} }
else { else {
Image activeIcon = ImageUtil.getIconImage(item.getIcon()); Image activeIcon = ImageUtil.getImage(navigationItem.getIcon());
((ImageView) toggleButton.getGraphic()).setImage(activeIcon); ((ImageView) toggleButton.getGraphic()).setImage(activeIcon);
} }
}); });
toggleButton.setOnAction(e -> navigation.navigationTo(Navigation.Item.MAIN, item)); toggleButton.setOnAction(e -> navigation.navigationTo(Navigation.Item.MAIN, navigationItem));
parent.getChildren().add(toggleButton); parent.getChildren().add(toggleButton);
return toggleButton; return toggleButton;

6
src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java
View file

@ -236,7 +236,7 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
public ListCell<Locale> call(ListView<Locale> list) { public ListCell<Locale> call(ListView<Locale> list) {
return new ListCell<Locale>() { return new ListCell<Locale>() {
final Label label = new Label(); final Label label = new Label();
final ImageView icon = ImageUtil.getIconImageView(ImageUtil.REMOVE_ICON); final ImageView icon = ImageUtil.getImageView(ImageUtil.REMOVE_ICON);
final Button removeButton = new Button("", icon); final Button removeButton = new Button("", icon);
final AnchorPane pane = new AnchorPane(label, removeButton); final AnchorPane pane = new AnchorPane(label, removeButton);
@ -294,7 +294,7 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
public ListCell<Country> call(ListView<Country> list) { public ListCell<Country> call(ListView<Country> list) {
return new ListCell<Country>() { return new ListCell<Country>() {
final Label label = new Label(); final Label label = new Label();
final ImageView icon = ImageUtil.getIconImageView(ImageUtil.REMOVE_ICON); final ImageView icon = ImageUtil.getImageView(ImageUtil.REMOVE_ICON);
final Button removeButton = new Button("", icon); final Button removeButton = new Button("", icon);
final AnchorPane pane = new AnchorPane(label, removeButton); final AnchorPane pane = new AnchorPane(label, removeButton);
@ -338,7 +338,7 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
public ListCell<Arbitrator> call(ListView<Arbitrator> list) { public ListCell<Arbitrator> call(ListView<Arbitrator> list) {
return new ListCell<Arbitrator>() { return new ListCell<Arbitrator>() {
final Label label = new Label(); final Label label = new Label();
final ImageView icon = ImageUtil.getIconImageView(ImageUtil.REMOVE_ICON); final ImageView icon = ImageUtil.getImageView(ImageUtil.REMOVE_ICON);
final Button removeButton = new Button("", icon); final Button removeButton = new Button("", icon);
final AnchorPane pane = new AnchorPane(label, removeButton); final AnchorPane pane = new AnchorPane(label, removeButton);

6
src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupViewCB.java
View file

@ -202,7 +202,7 @@ class WizardItem extends HBox {
setSpacing(5); setSpacing(5);
setPrefWidth(200); setPrefWidth(200);
imageView = ImageUtil.getIconImageView(ImageUtil.ARROW_GREY); imageView = ImageUtil.getImageView(ImageUtil.ARROW_GREY);
imageView.setFitHeight(15); imageView.setFitHeight(15);
imageView.setFitWidth(20); imageView.setFitWidth(20);
imageView.setPickOnBounds(true); imageView.setPickOnBounds(true);
@ -237,7 +237,7 @@ class WizardItem extends HBox {
navigationItem); navigationItem);
setId("wizard-item-background-active"); setId("wizard-item-background-active");
imageView.setImage(ImageUtil.getIconImage(ImageUtil.ARROW_BLUE)); imageView.setImage(ImageUtil.getImage(ImageUtil.ARROW_BLUE));
titleLabel.setId("wizard-title-active"); titleLabel.setId("wizard-title-active");
subTitleLabel.setId("wizard-sub-title-active"); subTitleLabel.setId("wizard-sub-title-active");
return childController; return childController;
@ -245,7 +245,7 @@ class WizardItem extends HBox {
void onCompleted() { void onCompleted() {
setId("wizard-item-background-completed"); setId("wizard-item-background-completed");
imageView.setImage(ImageUtil.getIconImage(ImageUtil.TICK)); imageView.setImage(ImageUtil.getImage(ImageUtil.TICK));
titleLabel.setId("wizard-title-completed"); titleLabel.setId("wizard-title-completed");
subTitleLabel.setId("wizard-sub-title-completed"); subTitleLabel.setId("wizard-sub-title-completed");
} }

2
src/main/java/io/bitsquare/gui/main/orders/offer/OfferController.java
View file

@ -155,7 +155,7 @@ public class OfferController extends CachedViewController {
@Override @Override
public TableCell<String, OfferListItem> call(TableColumn<String, OfferListItem> directionColumn) { public TableCell<String, OfferListItem> call(TableColumn<String, OfferListItem> directionColumn) {
return new TableCell<String, OfferListItem>() { return new TableCell<String, OfferListItem>() {
final ImageView iconView = ImageUtil.getIconImageView(ImageUtil.REMOVE_ICON); final ImageView iconView = ImageUtil.getImageView(ImageUtil.REMOVE_ICON);
final Button button = new Button(); final Button button = new Button();
{ {

6
src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java
View file

@ -78,8 +78,8 @@ public class PendingTradeController extends CachedViewController {
private Trade currentTrade; private Trade currentTrade;
private final Image buyIcon = ImageUtil.getIconImage(ImageUtil.BUY_ICON); private final Image buyIcon = ImageUtil.getImage(ImageUtil.BUY_ICON);
private final Image sellIcon = ImageUtil.getIconImage(ImageUtil.SELL_ICON); private final Image sellIcon = ImageUtil.getImage(ImageUtil.SELL_ICON);
private ConfidenceDisplay confidenceDisplay; private ConfidenceDisplay confidenceDisplay;
@FXML private TableView openTradesTable; @FXML private TableView openTradesTable;
@ -365,7 +365,7 @@ public class PendingTradeController extends CachedViewController {
if (tradesTableItem != null) { if (tradesTableItem != null) {
Country country = tradesTableItem.getTrade().getOffer().getBankAccountCountry(); Country country = tradesTableItem.getTrade().getOffer().getBankAccountCountry();
try { try {
hBox.getChildren().add(ImageUtil.getIconImageView( hBox.getChildren().add(ImageUtil.getImageView(
"/images/countries/" + country.getCode().toLowerCase() + ".png")); "/images/countries/" + country.getCode().toLowerCase() + ".png"));
} catch (Exception e) { } catch (Exception e) {

6
src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java
View file

@ -90,9 +90,8 @@ public class TradeViewCB extends CachedViewCB {
super.activate(); super.activate();
// We need to remove open validation error popups // We need to remove open validation error popups
// TODO Find a way to do that in the InputTextField directly, but a tab change does not trigger any event
// there
// Platform.runLater needed as focus-out event is called after selectedIndexProperty changed // Platform.runLater needed as focus-out event is called after selectedIndexProperty changed
// TODO Find a way to do that in the InputTextField directly, but a tab change does not trigger any event...
TabPane tabPane = (TabPane) root; TabPane tabPane = (TabPane) root;
tabPane.getSelectionModel().selectedIndexProperty() tabPane.getSelectionModel().selectedIndexProperty()
.addListener((observableValue, oldValue, newValue) -> .addListener((observableValue, oldValue, newValue) ->
@ -128,8 +127,7 @@ public class TradeViewCB extends CachedViewCB {
// Navigation // Navigation
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// @Override @Override
protected Initializable loadView(Navigation.Item navigationItem) { protected Initializable loadView(Navigation.Item navigationItem) {
super.loadView(navigationItem); super.loadView(navigationItem);
TabPane tabPane = (TabPane) root; TabPane tabPane = (TabPane) root;

4
src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
View file

@ -190,8 +190,8 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
showAdvancedSettingsButton.setVisible(true); showAdvancedSettingsButton.setVisible(true);
if (expand == null) { if (expand == null) {
expand = ImageUtil.getIconImageView(ImageUtil.EXPAND); expand = ImageUtil.getImageView(ImageUtil.EXPAND);
collapse = ImageUtil.getIconImageView(ImageUtil.COLLAPSE); collapse = ImageUtil.getImageView(ImageUtil.COLLAPSE);
} }
showAdvancedSettingsButton.setGraphic(expand); showAdvancedSettingsButton.setGraphic(expand);

10
src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java
View file

@ -70,8 +70,8 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
private boolean detailsVisible; private boolean detailsVisible;
private boolean advancedScreenInited; private boolean advancedScreenInited;
private final Image buyIcon = ImageUtil.getIconImage(ImageUtil.BUY_ICON); private final Image buyIcon = ImageUtil.getImage(ImageUtil.BUY_ICON);
private final Image sellIcon = ImageUtil.getIconImage(ImageUtil.SELL_ICON); private final Image sellIcon = ImageUtil.getImage(ImageUtil.SELL_ICON);
private ImageView expand; private ImageView expand;
private ImageView collapse; private ImageView collapse;
@ -125,8 +125,8 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
setupValidators(); setupValidators();
setupComparators(); setupComparators();
expand = ImageUtil.getIconImageView(ImageUtil.EXPAND); expand = ImageUtil.getImageView(ImageUtil.EXPAND);
collapse = ImageUtil.getIconImageView(ImageUtil.COLLAPSE); collapse = ImageUtil.getImageView(ImageUtil.COLLAPSE);
showAdvancedSettingsButton.setGraphic(expand); showAdvancedSettingsButton.setGraphic(expand);
super.initialize(url, rb); super.initialize(url, rb);
@ -456,7 +456,7 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
Offer offer = item.getOffer(); Offer offer = item.getOffer();
if (presentationModel.isMyOffer(offer)) { if (presentationModel.isMyOffer(offer)) {
icon = ImageUtil.getIconImage(ImageUtil.REMOVE_ICON); icon = ImageUtil.getImage(ImageUtil.REMOVE_ICON);
title = "Remove"; title = "Remove";
button.setOnAction(event -> presentationModel.removeOffer(item button.setOnAction(event -> presentationModel.removeOffer(item
.getOffer())); .getOffer()));

11
src/main/java/io/bitsquare/gui/util/ImageUtil.java
View file

@ -24,6 +24,7 @@ import javafx.scene.image.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class ImageUtil { public class ImageUtil {
private static final Logger log = LoggerFactory.getLogger(ImageUtil.class); private static final Logger log = LoggerFactory.getLogger(ImageUtil.class);
@ -63,17 +64,17 @@ public class ImageUtil {
public static final String ARROW_GREY = "/images/arrow_grey.png"; public static final String ARROW_GREY = "/images/arrow_grey.png";
public static final String INFO = "/images/info.png"; public static final String INFO = "/images/info.png";
public static Image getIconImage(String iconName) { public static Image getImage(String url) {
return new Image(ImageUtil.class.getResourceAsStream(iconName)); return new Image(ImageUtil.class.getResourceAsStream(url));
} }
public static ImageView getIconImageView(String iconName) { public static ImageView getImageView(String url) {
return new ImageView(new Image(ImageUtil.class.getResourceAsStream(iconName))); return new ImageView(getImage(url));
} }
public static ImageView getCountryIconImageView(Country country) { public static ImageView getCountryIconImageView(Country country) {
try { try {
return ImageUtil.getIconImageView("/images/countries/" + country.getCode().toLowerCase() + ".png"); return ImageUtil.getImageView("/images/countries/" + country.getCode().toLowerCase() + ".png");
} catch (Exception e) { } catch (Exception e) {
log.error("Country icon not found URL = /images/countries/" + country.getCode().toLowerCase() + log.error("Country icon not found URL = /images/countries/" + country.getCode().toLowerCase() +