diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml index e1bb246be1..7727a36f6a 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml +++ b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml @@ -137,7 +137,6 @@ - diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java index 82ebd0c87b..4307f2b6c0 100644 --- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java +++ b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java @@ -42,9 +42,7 @@ import java.util.List; import javax.inject.Inject; -import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyObjectWrapper; -import javafx.beans.value.ChangeListener; import javafx.collections.transformation.SortedList; import javafx.event.ActionEvent; import javafx.fxml.FXML; @@ -69,7 +67,7 @@ public class OfferBookView extends ActivatableViewAndModel priceColumn, amountColumn, volumeColumn, directionColumn, - /*countryColumn,*/ bankAccountTypeColumn, statusColumn; + /*countryColumn,*/ bankAccountTypeColumn; @FXML Label amountBtcLabel, priceDescriptionLabel, priceFiatLabel, volumeDescriptionLabel, volumeFiatLabel, extendedButton1Label, extendedButton2Label, extendedCheckBoxLabel; @@ -109,7 +107,6 @@ public class OfferBookView extends ActivatableViewAndModel new ReadOnlyObjectWrapper<>(offer.getValue())); - statusColumn.setCellFactory( - new Callback, TableCell>() { - - @Override - public TableCell call( - TableColumn column) { - return new TableCell() { - final ImageView iconView = new ImageView(); - private ChangeListener stateChangeListener; - private ObjectProperty stateProperty; - - private void updateIcon(final OfferBookListItem item) { - Offer offer = item.getOffer(); - if (model.isMyOffer(offer)) { - iconView.setId("image-offer_state_available"); - } - else { - switch (offer.getState()) { - case UNKNOWN: - iconView.setId("image-offer_state_unknown"); - break; - case AVAILABLE: - iconView.setId("image-offer_state_available"); - break; - case OFFERER_OFFLINE: - case RESERVED: - case FAULT: - case REMOVED: - iconView.setId("image-offer_state_not_available"); - break; - } - } - } - - @Override - public void updateItem(final OfferBookListItem item, boolean empty) { - super.updateItem(item, empty); - - if (item != null) { - stateProperty = item.getOffer().stateProperty(); - this.stateChangeListener = (ov, o, n) -> updateIcon(item); - stateProperty.addListener(stateChangeListener); - updateIcon(item); - - setGraphic(iconView); - } - else { - if (stateProperty != null && stateChangeListener != null) { - stateProperty.removeListener(stateChangeListener); - stateChangeListener = null; - } - setGraphic(null); - } - } - }; - } - }); - } + /* private void setCountryColumnCellFactory() { countryColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); diff --git a/doc/new_tag.sh b/doc/new_tag.sh deleted file mode 100644 index 1f871884ef..0000000000 --- a/doc/new_tag.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -cd /Users/mk/Documents/_intellij/bitsquare - -git tag v0.1.3 -git push --tags