From 908874fd92c84c1fb8f6a4bef84b2cae47a6142d Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 16 Sep 2014 01:34:30 +0200 Subject: [PATCH] Rename ImageUtil methods --- src/main/java/io/bitsquare/BitSquare.java | 1 - src/main/java/io/bitsquare/gui/Navigation.java | 8 +++++--- .../io/bitsquare/gui/components/InfoDisplay.java | 2 +- src/main/java/io/bitsquare/gui/main/MainViewCB.java | 13 ++++++------- .../content/restrictions/RestrictionsViewCB.java | 6 +++--- .../gui/main/account/setup/AccountSetupViewCB.java | 6 +++--- .../gui/main/orders/offer/OfferController.java | 2 +- .../main/orders/pending/PendingTradeController.java | 6 +++--- .../io/bitsquare/gui/main/trade/TradeViewCB.java | 6 ++---- .../main/trade/createoffer/CreateOfferViewCB.java | 4 ++-- .../gui/main/trade/orderbook/OrderBookViewCB.java | 10 +++++----- src/main/java/io/bitsquare/gui/util/ImageUtil.java | 11 ++++++----- 12 files changed, 37 insertions(+), 38 deletions(-) diff --git a/src/main/java/io/bitsquare/BitSquare.java b/src/main/java/io/bitsquare/BitSquare.java index 2f586b9558..4589ab96f7 100644 --- a/src/main/java/io/bitsquare/BitSquare.java +++ b/src/main/java/io/bitsquare/BitSquare.java @@ -128,7 +128,6 @@ public class BitSquare extends Application { primaryStage.setMinHeight(500); primaryStage.show(); - } catch (IOException e) { log.error(e.getMessage()); } diff --git a/src/main/java/io/bitsquare/gui/Navigation.java b/src/main/java/io/bitsquare/gui/Navigation.java index cd743adcc5..d7ebf9742c 100644 --- a/src/main/java/io/bitsquare/gui/Navigation.java +++ b/src/main/java/io/bitsquare/gui/Navigation.java @@ -59,7 +59,8 @@ public class Navigation { /////////////////////////////////////////////////////////////////////////////////////////// public void navigationTo(Item... items) { - log.trace("navigationTo " + Arrays.asList(items).toString()); + if (items != null) + log.trace("navigationTo " + Arrays.asList(items).toString()); List temp = new ArrayList<>(); for (int i = 0; i < items.length; i++) { Item item = items[i]; @@ -82,8 +83,9 @@ public class Navigation { currentItems = items; persistence.write(this, "navigationItems", items); - log.trace("navigationTo notify listeners " + Arrays.asList(items).toString() + " / " + listeners - .size()); + if (items != null) + log.trace("navigationTo notify listeners " + Arrays.asList(items).toString() + " / " + listeners + .size()); listeners.stream().forEach((e) -> e.onNavigationRequested(items)); } diff --git a/src/main/java/io/bitsquare/gui/components/InfoDisplay.java b/src/main/java/io/bitsquare/gui/components/InfoDisplay.java index 9fc7cde03a..7673613e82 100644 --- a/src/main/java/io/bitsquare/gui/components/InfoDisplay.java +++ b/src/main/java/io/bitsquare/gui/components/InfoDisplay.java @@ -72,7 +72,7 @@ public class InfoDisplay extends Parent { public InfoDisplay() { - icon = ImageUtil.getIconImageView(ImageUtil.INFO); + icon = ImageUtil.getImageView(ImageUtil.INFO); icon.setPickOnBounds(true); icon.setPreserveRatio(true); icon.visibleProperty().bind(visibleProperty()); diff --git a/src/main/java/io/bitsquare/gui/main/MainViewCB.java b/src/main/java/io/bitsquare/gui/main/MainViewCB.java index e320d30ab5..ad5b6abb07 100644 --- a/src/main/java/io/bitsquare/gui/main/MainViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/MainViewCB.java @@ -85,7 +85,6 @@ public class MainViewCB extends ViewCB { // Lifecycle /////////////////////////////////////////////////////////////////////////////////////////// - @SuppressWarnings("EmptyMethod") @Override public void initialize(URL url, ResourceBundle rb) { super.initialize(url, rb); @@ -188,7 +187,7 @@ public class MainViewCB extends ViewCB { Profiler.printMsgWithTime("MainController.ondMainNavigationAdded"); 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.relocate(36, 19); alertButton.setOnAction((e) -> @@ -361,8 +360,8 @@ public class MainViewCB extends ViewCB { onMainNavigationAdded(); } - private ToggleButton addNavButton(Pane parent, String title, Navigation.Item item) { - ImageView icon = ImageUtil.getIconImageView(item.getIcon()); + private ToggleButton addNavButton(Pane parent, String title, Navigation.Item navigationItem) { + ImageView icon = ImageUtil.getImageView(navigationItem.getIcon()); icon.setFitWidth(32); icon.setFitHeight(32); @@ -381,16 +380,16 @@ public class MainViewCB extends ViewCB { toggleButton.setMaxSize(50, 50); toggleButton.setGraphicTextGap(newValue ? -1 : 0); if (newValue) { - Image activeIcon = ImageUtil.getIconImage(item.getActiveIcon()); + Image activeIcon = ImageUtil.getImage(navigationItem.getActiveIcon()); ((ImageView) toggleButton.getGraphic()).setImage(activeIcon); } else { - Image activeIcon = ImageUtil.getIconImage(item.getIcon()); + Image activeIcon = ImageUtil.getImage(navigationItem.getIcon()); ((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); return toggleButton; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java index 3bdf0520ab..b3817c5d21 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java @@ -236,7 +236,7 @@ public class RestrictionsViewCB extends CachedViewCB implements public ListCell call(ListView list) { return new ListCell() { 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 AnchorPane pane = new AnchorPane(label, removeButton); @@ -294,7 +294,7 @@ public class RestrictionsViewCB extends CachedViewCB implements public ListCell call(ListView list) { return new ListCell() { 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 AnchorPane pane = new AnchorPane(label, removeButton); @@ -338,7 +338,7 @@ public class RestrictionsViewCB extends CachedViewCB implements public ListCell call(ListView list) { return new ListCell() { 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 AnchorPane pane = new AnchorPane(label, removeButton); diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupViewCB.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupViewCB.java index 79b54d09bc..020f37ff34 100644 --- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupViewCB.java @@ -202,7 +202,7 @@ class WizardItem extends HBox { setSpacing(5); setPrefWidth(200); - imageView = ImageUtil.getIconImageView(ImageUtil.ARROW_GREY); + imageView = ImageUtil.getImageView(ImageUtil.ARROW_GREY); imageView.setFitHeight(15); imageView.setFitWidth(20); imageView.setPickOnBounds(true); @@ -237,7 +237,7 @@ class WizardItem extends HBox { navigationItem); setId("wizard-item-background-active"); - imageView.setImage(ImageUtil.getIconImage(ImageUtil.ARROW_BLUE)); + imageView.setImage(ImageUtil.getImage(ImageUtil.ARROW_BLUE)); titleLabel.setId("wizard-title-active"); subTitleLabel.setId("wizard-sub-title-active"); return childController; @@ -245,7 +245,7 @@ class WizardItem extends HBox { void onCompleted() { setId("wizard-item-background-completed"); - imageView.setImage(ImageUtil.getIconImage(ImageUtil.TICK)); + imageView.setImage(ImageUtil.getImage(ImageUtil.TICK)); titleLabel.setId("wizard-title-completed"); subTitleLabel.setId("wizard-sub-title-completed"); } diff --git a/src/main/java/io/bitsquare/gui/main/orders/offer/OfferController.java b/src/main/java/io/bitsquare/gui/main/orders/offer/OfferController.java index 2594fd9cdd..3ca3154dc5 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/offer/OfferController.java +++ b/src/main/java/io/bitsquare/gui/main/orders/offer/OfferController.java @@ -155,7 +155,7 @@ public class OfferController extends CachedViewController { @Override public TableCell call(TableColumn directionColumn) { return new TableCell() { - final ImageView iconView = ImageUtil.getIconImageView(ImageUtil.REMOVE_ICON); + final ImageView iconView = ImageUtil.getImageView(ImageUtil.REMOVE_ICON); final Button button = new Button(); { diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java index f4738cbd66..1ca30526f8 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java +++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java @@ -78,8 +78,8 @@ public class PendingTradeController extends CachedViewController { private Trade currentTrade; - private final Image buyIcon = ImageUtil.getIconImage(ImageUtil.BUY_ICON); - private final Image sellIcon = ImageUtil.getIconImage(ImageUtil.SELL_ICON); + private final Image buyIcon = ImageUtil.getImage(ImageUtil.BUY_ICON); + private final Image sellIcon = ImageUtil.getImage(ImageUtil.SELL_ICON); private ConfidenceDisplay confidenceDisplay; @FXML private TableView openTradesTable; @@ -365,7 +365,7 @@ public class PendingTradeController extends CachedViewController { if (tradesTableItem != null) { Country country = tradesTableItem.getTrade().getOffer().getBankAccountCountry(); try { - hBox.getChildren().add(ImageUtil.getIconImageView( + hBox.getChildren().add(ImageUtil.getImageView( "/images/countries/" + country.getCode().toLowerCase() + ".png")); } catch (Exception e) { diff --git a/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java index aa545a83e9..71b6d1802e 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/TradeViewCB.java @@ -90,9 +90,8 @@ public class TradeViewCB extends CachedViewCB { super.activate(); // 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 + // 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.getSelectionModel().selectedIndexProperty() .addListener((observableValue, oldValue, newValue) -> @@ -128,8 +127,7 @@ public class TradeViewCB extends CachedViewCB { // Navigation /////////////////////////////////////////////////////////////////////////////////////////// - // @Override - + @Override protected Initializable loadView(Navigation.Item navigationItem) { super.loadView(navigationItem); TabPane tabPane = (TabPane) root; diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java index 6780e3c175..b95f17bb59 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java @@ -190,8 +190,8 @@ public class CreateOfferViewCB extends CachedViewCB { showAdvancedSettingsButton.setVisible(true); if (expand == null) { - expand = ImageUtil.getIconImageView(ImageUtil.EXPAND); - collapse = ImageUtil.getIconImageView(ImageUtil.COLLAPSE); + expand = ImageUtil.getImageView(ImageUtil.EXPAND); + collapse = ImageUtil.getImageView(ImageUtil.COLLAPSE); } showAdvancedSettingsButton.setGraphic(expand); diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java index 40a972528a..d4c3bc9235 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java @@ -70,8 +70,8 @@ public class OrderBookViewCB extends CachedViewCB { private boolean detailsVisible; private boolean advancedScreenInited; - private final Image buyIcon = ImageUtil.getIconImage(ImageUtil.BUY_ICON); - private final Image sellIcon = ImageUtil.getIconImage(ImageUtil.SELL_ICON); + private final Image buyIcon = ImageUtil.getImage(ImageUtil.BUY_ICON); + private final Image sellIcon = ImageUtil.getImage(ImageUtil.SELL_ICON); private ImageView expand; private ImageView collapse; @@ -125,8 +125,8 @@ public class OrderBookViewCB extends CachedViewCB { setupValidators(); setupComparators(); - expand = ImageUtil.getIconImageView(ImageUtil.EXPAND); - collapse = ImageUtil.getIconImageView(ImageUtil.COLLAPSE); + expand = ImageUtil.getImageView(ImageUtil.EXPAND); + collapse = ImageUtil.getImageView(ImageUtil.COLLAPSE); showAdvancedSettingsButton.setGraphic(expand); super.initialize(url, rb); @@ -456,7 +456,7 @@ public class OrderBookViewCB extends CachedViewCB { Offer offer = item.getOffer(); if (presentationModel.isMyOffer(offer)) { - icon = ImageUtil.getIconImage(ImageUtil.REMOVE_ICON); + icon = ImageUtil.getImage(ImageUtil.REMOVE_ICON); title = "Remove"; button.setOnAction(event -> presentationModel.removeOffer(item .getOffer())); diff --git a/src/main/java/io/bitsquare/gui/util/ImageUtil.java b/src/main/java/io/bitsquare/gui/util/ImageUtil.java index a24a3ee5ab..f5931d52b2 100644 --- a/src/main/java/io/bitsquare/gui/util/ImageUtil.java +++ b/src/main/java/io/bitsquare/gui/util/ImageUtil.java @@ -24,6 +24,7 @@ import javafx.scene.image.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + public class ImageUtil { 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 INFO = "/images/info.png"; - public static Image getIconImage(String iconName) { - return new Image(ImageUtil.class.getResourceAsStream(iconName)); + public static Image getImage(String url) { + return new Image(ImageUtil.class.getResourceAsStream(url)); } - public static ImageView getIconImageView(String iconName) { - return new ImageView(new Image(ImageUtil.class.getResourceAsStream(iconName))); + public static ImageView getImageView(String url) { + return new ImageView(getImage(url)); } public static ImageView getCountryIconImageView(Country country) { try { - return ImageUtil.getIconImageView("/images/countries/" + country.getCode().toLowerCase() + ".png"); + return ImageUtil.getImageView("/images/countries/" + country.getCode().toLowerCase() + ".png"); } catch (Exception e) { log.error("Country icon not found URL = /images/countries/" + country.getCode().toLowerCase() +