Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-02 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename VersionedChecksummedBytes→PrefixedChecksummedBytes, Address→LegacyAddress and AbstractAddress→Address.

Browse Source 
This also renames corresponding test classes and mentions in comments.
This commit is contained in:
Andreas Schildbach
2018-02-28 16:51:44 +01:00
parent 6593d74619
commit e11119b64f
77 changed files with 669 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wallettemplate/src/main/java/wallettemplate/SendMoneyController.java
View File

@@ -68,7 +68,7 @@ public class SendMoneyController {
// Address exception cannot happen as we validated it beforehand.
try {
Coin amount = Coin.parseCoin(amountEdit.getText());
Address destination = Address.fromBase58(Main.params, address.getText());
LegacyAddress destination = LegacyAddress.fromBase58(Main.params, address.getText());
SendRequest req;
if (amount.equals(Main.bitcoin.wallet().getBalance()))
req = SendRequest.emptyWallet(destination);

4
wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java
View File

@@ -16,7 +16,7 @@
package wallettemplate.controls;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.core.AddressFormatException;
import org.bitcoinj.core.NetworkParameters;
import javafx.scene.Node;
@@ -52,7 +52,7 @@ public class BitcoinAddressValidator {
private boolean testAddr(String text) {
try {
Address.fromBase58(params, text);
LegacyAddress.fromBase58(params, text);
return true;
} catch (AddressFormatException e) {
return false;

10
wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java
View File

@@ -16,7 +16,7 @@
package wallettemplate.controls;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.uri.BitcoinURI;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
@@ -61,7 +61,7 @@ public class ClickableBitcoinAddress extends AnchorPane {
@FXML protected Label copyWidget;
@FXML protected Label qrCode;
protected SimpleObjectProperty<Address> address = new SimpleObjectProperty<>();
protected SimpleObjectProperty<LegacyAddress> address = new SimpleObjectProperty<>();
private final StringExpression addressStr;
public ClickableBitcoinAddress() {
@@ -90,15 +90,15 @@ public class ClickableBitcoinAddress extends AnchorPane {
return BitcoinURI.convertToBitcoinURI(address.get(), null, Main.APP_NAME, null);
}
public Address getAddress() {
public LegacyAddress getAddress() {
return address.get();
}
public void setAddress(Address address) {
public void setAddress(LegacyAddress address) {
this.address.set(address);
}
public ObjectProperty<Address> addressProperty() {
public ObjectProperty<LegacyAddress> addressProperty() {
return address;
}

4
wallettemplate/src/main/java/wallettemplate/utils/BitcoinUIModel.java
View File

@@ -32,7 +32,7 @@ import java.util.Date;
* A class that exposes relevant bitcoin stuff as JavaFX bindable properties.
*/
public class BitcoinUIModel {
private SimpleObjectProperty<Address> address = new SimpleObjectProperty<>();
private SimpleObjectProperty<LegacyAddress> address = new SimpleObjectProperty<>();
private SimpleObjectProperty<Coin> balance = new SimpleObjectProperty<>(Coin.ZERO);
private SimpleDoubleProperty syncProgress = new SimpleDoubleProperty(-1);
private ProgressBarUpdater syncProgressUpdater = new ProgressBarUpdater();
@@ -77,7 +77,7 @@ public class BitcoinUIModel {
public ReadOnlyDoubleProperty syncProgressProperty() { return syncProgress; }
public ReadOnlyObjectProperty<Address> addressProperty() {
public ReadOnlyObjectProperty<LegacyAddress> addressProperty() {
return address;
}