Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-07 06:44:16 +00:00
Code Issues Projects Releases Wiki Activity

WalletAppKit: remove accidental Java 7-ism that was introduced a few commits ago.

Browse Source
This commit is contained in:
Mike Hearn 2015-01-27 19:03:48 +01:00
parent 07d85f24ad
commit 9b5307ad45
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
View File

@ -17,36 +17,25 @@
package org.bitcoinj.kits; package org.bitcoinj.kits;
import com.google.common.collect.ImmutableList; import com.google.common.collect.*;
import com.google.common.util.concurrent.*; import com.google.common.util.concurrent.*;
import com.subgraph.orchid.TorClient; import com.subgraph.orchid.*;
import org.bitcoinj.core.*; import org.bitcoinj.core.*;
import org.bitcoinj.net.discovery.DnsDiscovery; import org.bitcoinj.net.discovery.*;
import org.bitcoinj.net.discovery.PeerDiscovery;
import org.bitcoinj.params.*; import org.bitcoinj.params.*;
import org.bitcoinj.protocols.channels.StoredPaymentChannelClientStates; import org.bitcoinj.protocols.channels.*;
import org.bitcoinj.protocols.channels.StoredPaymentChannelServerStates; import org.bitcoinj.store.*;
import org.bitcoinj.store.BlockStoreException; import org.bitcoinj.wallet.*;
import org.bitcoinj.store.SPVBlockStore; import org.slf4j.*;
import org.bitcoinj.store.WalletProtobufSerializer;
import org.bitcoinj.wallet.DeterministicSeed;
import org.bitcoinj.wallet.KeyChainGroup;
import org.bitcoinj.wallet.Protos;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable; import javax.annotation.*;
import java.io.*; import java.io.*;
import java.net.InetAddress; import java.net.*;
import java.net.UnknownHostException; import java.nio.channels.*;
import java.nio.channels.FileLock; import java.util.*;
import java.nio.file.*; import java.util.concurrent.*;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.*;
import static com.google.common.base.Preconditions.checkState;
/** /**
* <p>Utility class that wraps the boilerplate needed to set up a new SPV bitcoinj app. Instantiate it with a directory * <p>Utility class that wraps the boilerplate needed to set up a new SPV bitcoinj app. Instantiate it with a directory
@ -276,7 +265,8 @@ public class WalletAppKit extends AbstractIdleService {
if (chainFileExists) { if (chainFileExists) {
log.info("Deleting the chain file in preparation from restore."); log.info("Deleting the chain file in preparation from restore.");
vStore.close(); vStore.close();
Files.delete(chainFile.toPath()); if (!chainFile.delete())
throw new IOException("Failed to delete chain file in preparation for restore.");
vStore = new SPVBlockStore(params, chainFile); vStore = new SPVBlockStore(params, chainFile);
} }
} else { } else {
@ -286,7 +276,8 @@ public class WalletAppKit extends AbstractIdleService {
} else if (chainFileExists) { } else if (chainFileExists) {
log.info("Deleting the chain file in preparation from restore."); log.info("Deleting the chain file in preparation from restore.");
vStore.close(); vStore.close();
Files.delete(chainFile.toPath()); if (!chainFile.delete())
throw new IOException("Failed to delete chain file in preparation for restore.");
vStore = new SPVBlockStore(params, chainFile); vStore = new SPVBlockStore(params, chainFile);
} }
} }