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

Fix sorting of date

Browse source
This commit is contained in:
Manfred Karrer 2016-05-05 14:03:57 +02:00
parent afb8c18d31
commit 3bf861561b
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java
View file

@ -30,12 +30,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Date;
import java.util.Optional; import java.util.Optional;
public class TransactionsListItem { public class TransactionsListItem {
private final Logger log = LoggerFactory.getLogger(this.getClass()); private final Logger log = LoggerFactory.getLogger(this.getClass());
private String date; private String dateString;
private final Date date;
private final String txId; private final String txId;
private final WalletService walletService; private final WalletService walletService;
private final ConfidenceProgressIndicator progressIndicator; private final ConfidenceProgressIndicator progressIndicator;
@ -166,7 +168,8 @@ public class TransactionsListItem {
details = received ? "Received funds" : "Withdrawn from wallet"; details = received ? "Received funds" : "Withdrawn from wallet";
} }
date = formatter.formatDateTime(transaction.getUpdateTime()); date = transaction.getUpdateTime();
dateString = formatter.formatDateTime(date);
} }
@ -203,8 +206,8 @@ public class TransactionsListItem {
return progressIndicator; return progressIndicator;
} }
public final String getDate() { public final String getDateString() {
return date; return dateString;
} }
@ -241,6 +244,10 @@ public class TransactionsListItem {
return detailsAvailable; return detailsAvailable;
} }
public Date getDate() {
return date;
}
@Nullable @Nullable
public Tradable getTradable() { public Tradable getTradable() {
return tradable; return tradable;

2
gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
View file

@ -311,7 +311,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
super.updateItem(item, empty); super.updateItem(item, empty);
if (item != null && !empty) { if (item != null && !empty) {
setText(item.getDate()); setText(item.getDateString());
} else { } else {
setText(""); setText("");
} }