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

Rename orders to portfolio, orderbook to offerbook

Browse source
This commit is contained in:
Manfred Karrer 2014-10-25 01:18:38 +02:00
parent 5094b2de4a
commit 68387eb13d
40 changed files with 173 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/test/java/io/bitsquare/gui/main/orders/pending/PendingTradesUIRunner.java → src/test/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesUIRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.main.orders.pending;
package io.bitsquare.gui.main.portfolio.pending;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.ViewLoader;
@ -68,7 +68,7 @@ public class PendingTradesUIRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/main/orders/pending/PendingTradesView.fxml"), false);
getUrl("/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml"), false);
try {
view = loader.load();

2
src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesControllerUIMock.java → src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesControllerUIMock.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.main.orders.pending.uimock;
package io.bitsquare.gui.main.portfolio.pending.uimock;
import io.bitsquare.gui.CachedViewCB;
import io.bitsquare.gui.components.processbar.ProcessStepBar;

4
src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesUIMockRunner.java → src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesUIMockRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.main.orders.pending.uimock;
package io.bitsquare.gui.main.portfolio.pending.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.ViewLoader;
@ -68,7 +68,7 @@ public class PendingTradesUIMockRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesViewUIMock.fxml"), false);
getUrl("/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesViewUIMock.fxml"), false);
try {
view = loader.load();

2
src/test/java/io/bitsquare/gui/main/orders/pending/uimock/PendingTradesViewUIMock.fxml → src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesViewUIMock.fxml
View file

@ -24,7 +24,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.orders.pending.uimock.PendingTradesControllerUIMock"
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.pending.uimock.PendingTradesControllerUIMock"
hgap="5.0" vgap="5" stylesheets="@../../../../../../../../../main/java/io/bitsquare/gui/bitsquare.css"
xmlns:fx="http://javafx.com/fxml">
<padding>

30
src/test/java/io/bitsquare/msg/dhttest/DHTTestController.java
View file

@ -19,13 +19,13 @@ package io.bitsquare.msg.dhttest;
import io.bitsquare.BitSquare;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.gui.main.trade.orderbook.OrderBookListItem;
import io.bitsquare.gui.main.trade.offerbook.OfferBookListItem;
import io.bitsquare.locale.CountryUtil;
import io.bitsquare.msg.BootstrappedPeerFactory;
import io.bitsquare.msg.MessageFacade;
import io.bitsquare.msg.listeners.AddOfferListener;
import io.bitsquare.msg.listeners.BootstrapListener;
import io.bitsquare.msg.listeners.OrderBookListener;
import io.bitsquare.msg.listeners.OfferBookListener;
import io.bitsquare.trade.Direction;
import io.bitsquare.trade.Offer;
import io.bitsquare.user.User;
@ -58,12 +58,12 @@ public class DHTTestController implements Initializable {
private final MessageFacade messageFacade;
private BootstrappedPeerFactory bootstrappedPeerFactory;
private User user;
private final ObservableList<OrderBookListItem> orderBookListItems = FXCollections.observableArrayList();
private final ObservableList<OfferBookListItem> offerBookListItems = FXCollections.observableArrayList();
@FXML TableView table;
@FXML TextArea stateLabel;
@FXML TextField toSaveTextField;
@FXML TableColumn<OrderBookListItem, OrderBookListItem> idColumn;
@FXML TableColumn<OfferBookListItem, OfferBookListItem> idColumn;
@Inject
private DHTTestController(MessageFacade messageFacade, User user,
@ -89,7 +89,7 @@ public class DHTTestController implements Initializable {
}
});
messageFacade.addOrderBookListener(new OrderBookListener() {
messageFacade.addOrderBookListener(new OfferBookListener() {
@Override
public void onOfferAdded(Offer offer) {
log.debug("offer added " + offer.getId());
@ -98,22 +98,22 @@ public class DHTTestController implements Initializable {
@Override
public void onOffersReceived(List<Offer> offers) {
//TODO use deltas instead replacing the whole list
orderBookListItems.clear();
offerBookListItems.clear();
offers.stream().forEach(offer -> {
if (offer != null) {
orderBookListItems.add(new OrderBookListItem(offer, CountryUtil.getDefaultCountry()));
offerBookListItems.add(new OfferBookListItem(offer, CountryUtil.getDefaultCountry()));
}
});
}
@Override
public void onOfferRemoved(Offer offer) {
orderBookListItems.removeIf(item -> item.getOffer().getId().equals(offer.getId()));
offerBookListItems.removeIf(item -> item.getOffer().getId().equals(offer.getId()));
}
});
setIDColumnCellFactory();
table.setItems(orderBookListItems);
table.setItems(offerBookListItems);
bootstrappedPeerFactory.connectionState.addListener((ov, oldValue, newValue) -> {
stateLabel.setText(newValue);
@ -162,14 +162,14 @@ public class DHTTestController implements Initializable {
private void setIDColumnCellFactory() {
idColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
idColumn.setCellFactory(
new Callback<TableColumn<OrderBookListItem, OrderBookListItem>, TableCell<OrderBookListItem,
OrderBookListItem>>() {
new Callback<TableColumn<OfferBookListItem, OfferBookListItem>, TableCell<OfferBookListItem,
OfferBookListItem>>() {
@Override
public TableCell<OrderBookListItem, OrderBookListItem> call(
TableColumn<OrderBookListItem, OrderBookListItem> column) {
return new TableCell<OrderBookListItem, OrderBookListItem>() {
public TableCell<OfferBookListItem, OfferBookListItem> call(
TableColumn<OfferBookListItem, OfferBookListItem> column) {
return new TableCell<OfferBookListItem, OfferBookListItem>() {
@Override
public void updateItem(final OrderBookListItem item, boolean empty) {
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null && item.getOffer() != null && item.getOffer().getAmount() != null)
setText(item.getOffer().getId());