Organize imports with common layout (bisq-network/style#2)

bisq-network · Mar 14, 2018 · 10c8860 · 10c8860
1 parent 6c950b0
commit 10c8860
Show file tree

Hide file tree

Showing 21 changed files with 114 additions and 54 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/src/main/java/bisq/core/alert/PrivateNotificationManager.java b/src/main/java/bisq/core/alert/PrivateNotificationManager.java
@@ -41,10 +41,10 @@
 
 import java.security.SignatureException;
 
-import java.util.UUID;
-
 import java.math.BigInteger;
 
+import java.util.UUID;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/bisq/core/app/BisqEnvironment.java b/src/main/java/bisq/core/app/BisqEnvironment.java
@@ -32,6 +32,8 @@
 import bisq.common.storage.Storage;
 import bisq.common.util.Utilities;
 
+import org.bitcoinj.core.NetworkParameters;
+
 import org.springframework.core.env.JOptCommandLinePropertySource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertiesPropertySource;
@@ -42,8 +44,6 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.ResourcePropertySource;
 
-import org.bitcoinj.core.NetworkParameters;
-
 import joptsimple.OptionSet;
 
 import org.apache.commons.lang3.StringUtils;

diff --git a/src/main/java/bisq/core/arbitration/ArbitratorManager.java b/src/main/java/bisq/core/arbitration/ArbitratorManager.java
@@ -48,6 +48,8 @@
 import java.security.PublicKey;
 import java.security.SignatureException;
 
+import java.math.BigInteger;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -57,8 +59,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import java.math.BigInteger;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/bisq/core/btc/ProxySocketFactory.java b/src/main/java/bisq/core/btc/ProxySocketFactory.java
@@ -35,15 +35,15 @@
 
 package bisq.core.btc;
 
-import java.io.IOException;
-
 import javax.net.SocketFactory;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.Socket;
 
+import java.io.IOException;
+
 /**
  * A basic SocketFactory for creating sockets that connect through the specified
  * proxy.

diff --git a/src/main/java/bisq/core/btc/wallet/BisqDefaultCoinSelector.java b/src/main/java/bisq/core/btc/wallet/BisqDefaultCoinSelector.java
@@ -28,13 +28,13 @@
 import org.bitcoinj.wallet.CoinSelection;
 import org.bitcoinj.wallet.CoinSelector;
 
+import java.math.BigInteger;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import java.math.BigInteger;
-
 import lombok.extern.slf4j.Slf4j;
 
 /**

diff --git a/src/main/java/bisq/core/btc/wallet/BtcCompensationRequestFeeCoinSelector.java b/src/main/java/bisq/core/btc/wallet/BtcCompensationRequestFeeCoinSelector.java
@@ -32,12 +32,12 @@
 
 import com.google.common.annotations.VisibleForTesting;
 
+import java.math.BigInteger;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import java.math.BigInteger;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/bisq/core/btc/wallet/WalletConfig.java b/src/main/java/bisq/core/btc/wallet/WalletConfig.java
@@ -55,6 +55,11 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.UnknownHostException;
+
 import java.nio.channels.FileLock;
 
 import java.io.File;
@@ -63,11 +68,6 @@
 import java.io.InputStream;
 import java.io.RandomAccessFile;
 
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.UnknownHostException;
-
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 

diff --git a/src/main/java/bisq/core/btc/wallet/WalletsSetup.java b/src/main/java/bisq/core/btc/wallet/WalletsSetup.java
@@ -72,14 +72,14 @@
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 import java.nio.file.Paths;
 
 import java.io.File;
 import java.io.IOException;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

diff --git a/src/main/java/bisq/core/dao/node/full/rpc/RpcService.java b/src/main/java/bisq/core/dao/node/full/rpc/RpcService.java
@@ -49,14 +49,14 @@
 
 import com.google.common.collect.ImmutableList;
 
+import java.math.BigDecimal;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import java.math.BigDecimal;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/bisq/core/dao/proposal/compensation/CompensationRequest.java b/src/main/java/bisq/core/dao/proposal/compensation/CompensationRequest.java
@@ -25,11 +25,11 @@
 
 import io.bisq.generated.protobuffer.PB;
 
-import org.springframework.util.CollectionUtils;
-
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
 
+import org.springframework.util.CollectionUtils;
+
 import java.util.Map;
 
 import lombok.Getter;

diff --git a/src/main/java/bisq/core/dao/proposal/compensation/CompensationRequestPayload.java b/src/main/java/bisq/core/dao/proposal/compensation/CompensationRequestPayload.java
@@ -26,11 +26,11 @@
 
 import io.bisq.generated.protobuffer.PB;
 
-import org.springframework.util.CollectionUtils;
-
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Utils;
 
+import org.springframework.util.CollectionUtils;
+
 import java.security.PublicKey;
 
 import java.util.Date;

diff --git a/src/main/java/bisq/core/dao/proposal/generic/GenericProposalPayload.java b/src/main/java/bisq/core/dao/proposal/generic/GenericProposalPayload.java
@@ -26,10 +26,10 @@
 
 import io.bisq.generated.protobuffer.PB;
 
-import org.springframework.util.CollectionUtils;
-
 import org.bitcoinj.core.Utils;
 
+import org.springframework.util.CollectionUtils;
+
 import java.security.PublicKey;
 
 import java.util.Date;

diff --git a/src/main/java/bisq/core/filter/FilterManager.java b/src/main/java/bisq/core/filter/FilterManager.java
@@ -50,13 +50,13 @@
 
 import java.security.SignatureException;
 
+import java.math.BigInteger;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import java.math.BigInteger;
-
 import java.lang.reflect.Method;
 
 import org.slf4j.Logger;

diff --git a/src/main/java/bisq/core/locale/Res.java b/src/main/java/bisq/core/locale/Res.java
@@ -21,14 +21,14 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.text.MessageFormat;
 
 import java.net.URL;
 import java.net.URLConnection;
 
-import java.text.MessageFormat;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 
 import java.util.Locale;
 import java.util.MissingResourceException;

diff --git a/src/main/java/bisq/core/payment/validation/params/btc/AbstractBitcoinNetParams.java b/src/main/java/bisq/core/payment/validation/params/btc/AbstractBitcoinNetParams.java
@@ -48,10 +48,10 @@
 
 import com.google.common.base.Stopwatch;
 
-import java.util.concurrent.TimeUnit;
-
 import java.math.BigInteger;
 
+import java.util.concurrent.TimeUnit;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/bisq/core/provider/fee/FeeService.java b/src/main/java/bisq/core/provider/fee/FeeService.java
@@ -36,11 +36,11 @@
 import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 
+import java.time.Instant;
+
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import java.time.Instant;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;